diff --git a/arm64/Android.bp b/arm64/Android.bp
index 1ea3768..d843218 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -74,6 +74,19 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "VelvetTitan",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/VelvetTitan/VelvetTitan.apk",
+	overrides: ["Velvet"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "SetupWizard",
 	owner: "gapps",
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index 0ffa0c0..a91b86c 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -23,4 +23,8 @@ PRODUCT_PACKAGES += \
     SetupWizard
 endif
 
+ifneq ($(filter %tangorpro,$(TARGET_PRODUCT)),)
+PRODUCT_PACKAGES += VelvetTitan
+endif
+
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)
diff --git a/arm64/proprietary/product/priv-app/Velvet/Velvet.apk b/arm64/proprietary/product/priv-app/Velvet/Velvet.apk
index 78faa2c..725eff2 100644
Binary files a/arm64/proprietary/product/priv-app/Velvet/Velvet.apk and b/arm64/proprietary/product/priv-app/Velvet/Velvet.apk differ
diff --git a/arm64/proprietary/product/priv-app/VelvetTitan/VelvetTitan.apk b/arm64/proprietary/product/priv-app/VelvetTitan/VelvetTitan.apk
new file mode 100644
index 0000000..78faa2c
Binary files /dev/null and b/arm64/proprietary/product/priv-app/VelvetTitan/VelvetTitan.apk differ
diff --git a/build/meta/com/google/android/update-binary b/build/meta/com/google/android/update-binary
index ff1985b..08d542b 100644
--- a/build/meta/com/google/android/update-binary
+++ b/build/meta/com/google/android/update-binary
@@ -124,6 +124,16 @@ cd "$TMP"
 unzip -o "$ZIP"
 rm -rf META-INF
 
+# Detect tangorpro
+DEVICE=$(getprop ro.build.product)
+if [ "$DEVICE" == "tangorpro" ]; then
+  ui_print "Detected tangorpro device. Deleting normal Velvet app"
+  rm -Rf $TMP/product/priv-app/Velvet
+else
+  rm -Rf $TMP/product/priv-app/VelvetTitan
+fi
+
+
 # Check for arch. We need to do this before extracting our toybox, since that might be
 # compiled for a different architecture. Just hope that all environments have at least
 # a proper `grep` and `uname`.
diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt
index a629cef..a8cd46c 100644
--- a/proprietary-files-arm64-nongrouper.txt
+++ b/proprietary-files-arm64-nongrouper.txt
@@ -1,6 +1,7 @@
 -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|ed68878a8a06ca8c06dbc98441a657168f1b378b
 -product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk;PRESIGNED
 -product/app/talkback/talkback.apk;PRESIGNED
--product/priv-app/Velvet/Velvet.apk;PRESIGNED|0251d61f74f0557ccfd0e0424bed31e5828ea4b5
+-product/priv-app/Velvet/Velvet.apk;PRESIGNED
+-product/priv-app/VelvetTitan/VelvetTitan.apk;OVERRIDES=Velvet;PRESIGNED|0251d61f74f0557ccfd0e0424bed31e5828ea4b5
 
 -system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 2439b45..c1eddc1 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -79,6 +79,15 @@ echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK"
 write_makefiles "$MY_DIR"/proprietary-files-$DEVICE-nongrouper.txt
 echo "endif" >> "$PRODUCTMK"
 
+# Workaround for VelvetTitan on tangorpro
+if grep -q "VelvetTitan" "$PRODUCTMK"; then
+    sed -i '/VelvetTitan/d' "$PRODUCTMK"
+    printf "\n" >> "$PRODUCTMK"
+    echo "ifneq (\$(filter %tangorpro,\$(TARGET_PRODUCT)),)" >> "$PRODUCTMK"
+    echo "PRODUCT_PACKAGES += VelvetTitan" >> "$PRODUCTMK"
+    echo "endif" >> "$PRODUCTMK"
+fi
+
 printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK"
 
 sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"