diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b460cf581a..4422e037f9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
         android:name="android.hardware.nfc"
         android:required="true" />
 
-    <uses-permission android:name="android.permission.USE_BIOMETRICT" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -131,18 +130,6 @@
         <activity android:name="zendesk.messaging.MessagingActivity"
             android:theme="@style/ZendeskTheme" />
 
-        <activity android:name="zendesk.support.guide.HelpCenterActivity"
-            android:theme="@style/ZendeskTheme" />
-
-        <activity android:name="zendesk.support.guide.ViewArticleActivity"
-            android:theme="@style/ZendeskTheme" />
-
-        <activity android:name="zendesk.support.request.RequestActivity"
-            android:theme="@style/ZendeskTheme" />
-
-        <activity android:name="zendesk.support.requestlist.RequestListActivity"
-            android:theme="@style/ZendeskTheme" />
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
diff --git a/app/src/main/res/values-v29/zendesk_styles.xml b/app/src/main/res/values-v29/zendesk_styles.xml
index 628e83211a..764f632e87 100644
--- a/app/src/main/res/values-v29/zendesk_styles.xml
+++ b/app/src/main/res/values-v29/zendesk_styles.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="ZendeskTheme" parent="ZendeskSdkTheme.Light">
+    <style name="ZendeskTheme" parent="ZendeskThemeBase">
         <item name="android:forceDarkAllowed">false</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/zendesk_styles.xml b/app/src/main/res/values/zendesk_styles.xml
index ebb4fcab6b..2513114d19 100644
--- a/app/src/main/res/values/zendesk_styles.xml
+++ b/app/src/main/res/values/zendesk_styles.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="ZendeskTheme" parent="ZendeskSdkTheme.Light">
+
+    <style name="ZendeskTheme" parent="ZendeskThemeBase" />
+
+    <style name="ZendeskThemeBase" parent="ZendeskSdkTheme.Light">
         <item name="colorPrimary">@color/darkGray6</item>
         <item name="colorPrimaryDark">@color/darkGray6</item>
     </style>