diff --git a/library/ui-styles/src/debug/AndroidManifest.xml b/library/ui-styles/src/debug/AndroidManifest.xml
index 57020a0518..e32676136d 100644
--- a/library/ui-styles/src/debug/AndroidManifest.xml
+++ b/library/ui-styles/src/debug/AndroidManifest.xml
@@ -2,39 +2,39 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="im.vector.lib.ui.styles">
 
-    <application android:theme="@style/AppTheme.Light">
+    <application android:theme="@style/Theme.Vector.Light">
         <activity
             android:name=".debug.DebugMaterialThemeLightDefaultActivity"
-            android:theme="@style/VectorMaterialThemeDebugLight" />
+            android:theme="@style/Theme.Debug.Light" />
         <activity
             android:name=".debug.DebugMaterialThemeLightTestActivity"
-            android:theme="@style/VectorMaterialThemeDebugLight.Test" />
+            android:theme="@style/Theme.Debug.Light.Test" />
         <activity
             android:name=".debug.DebugMaterialThemeLightVectorActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/Theme.Vector.Light" />
         <activity
             android:name=".debug.DebugMaterialThemeDarkDefaultActivity"
-            android:theme="@style/VectorMaterialThemeDebugDark" />
+            android:theme="@style/Theme.Debug.Dark" />
         <activity
             android:name=".debug.DebugMaterialThemeDarkTestActivity"
-            android:theme="@style/VectorMaterialThemeDebugDark.Test" />
+            android:theme="@style/Theme.Debug.Dark.Test" />
         <activity
             android:name=".debug.DebugMaterialThemeDarkVectorActivity"
-            android:theme="@style/AppTheme.Dark" />
+            android:theme="@style/Theme.Vector.Dark" />
 
         <activity
             android:name=".debug.DebugVectorButtonStylesLightActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/Theme.Vector.Light" />
         <activity
             android:name=".debug.DebugVectorButtonStylesDarkActivity"
-            android:theme="@style/AppTheme.Dark" />
+            android:theme="@style/Theme.Vector.Dark" />
 
         <activity
             android:name=".debug.DebugVectorTextViewLightActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/Theme.Vector.Light" />
         <activity
             android:name=".debug.DebugVectorTextViewDarkActivity"
-            android:theme="@style/AppTheme.Dark" />
+            android:theme="@style/Theme.Vector.Dark" />
     </application>
 
 </manifest>
diff --git a/library/ui-styles/src/debug/res/values/debug_styles.xml b/library/ui-styles/src/debug/res/values/debug_styles.xml
index 090de4dd4b..d025ba1784 100644
--- a/library/ui-styles/src/debug/res/values/debug_styles.xml
+++ b/library/ui-styles/src/debug/res/values/debug_styles.xml
@@ -6,11 +6,11 @@
     </style>
 
 
-    <style name="VectorMaterialThemeDebugLight" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.Debug.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Keep all default value -->
     </style>
 
-    <style name="VectorMaterialThemeDebugLight.Test">
+    <style name="Theme.Debug.Light.Test">
         <item name="colorPrimary">#7F7F00</item>
         <item name="colorPrimaryVariant">#00FF00</item>
         <item name="colorOnPrimary">#0000FF</item>
@@ -34,11 +34,11 @@
         <item name="android:textColorLink">#000FFF</item>
     </style>
 
-    <style name="VectorMaterialThemeDebugDark" parent="Theme.MaterialComponents.NoActionBar">
+    <style name="Theme.Debug.Dark" parent="Theme.MaterialComponents.NoActionBar">
         <!-- Keep all default value -->
     </style>
 
-    <style name="VectorMaterialThemeDebugDark.Test">
+    <style name="Theme.Debug.Dark.Test">
         <item name="colorPrimary">#7F7F00</item>
         <item name="colorPrimaryVariant">#00FF00</item>
         <item name="colorOnPrimary">#0000FF</item>
diff --git a/library/ui-styles/src/main/res/values-v23/theme_black.xml b/library/ui-styles/src/main/res/values-v23/theme_black.xml
index ad6abc9fbe..e0399f6449 100644
--- a/library/ui-styles/src/main/res/values-v23/theme_black.xml
+++ b/library/ui-styles/src/main/res/values-v23/theme_black.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Black.v23" parent="AppTheme.Base.Black">
+    <style name="Theme.Vector.Black.v23" parent="Base.Theme.Vector.Black">
         <item name="android:windowLightStatusBar">false</item>
     </style>
 
-    <style name="AppTheme.Black" parent="AppTheme.Black.v23"/>
+    <style name="Theme.Vector.Black" parent="Theme.Vector.Black.v23"/>
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v23/theme_dark.xml b/library/ui-styles/src/main/res/values-v23/theme_dark.xml
index c9fb7dab28..45b340eaad 100644
--- a/library/ui-styles/src/main/res/values-v23/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values-v23/theme_dark.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Dark.v23" parent="AppTheme.Base.Dark">
+    <style name="Theme.Vector.Dark.v23" parent="Base.Theme.Vector.Dark">
         <item name="android:windowLightStatusBar">false</item>
     </style>
 
-    <style name="AppTheme.Dark" parent="AppTheme.Dark.v23"/>
+    <style name="Theme.Vector.Dark" parent="Theme.Vector.Dark.v23"/>
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v23/theme_light.xml b/library/ui-styles/src/main/res/values-v23/theme_light.xml
index 43d0027e17..28a78b98bf 100644
--- a/library/ui-styles/src/main/res/values-v23/theme_light.xml
+++ b/library/ui-styles/src/main/res/values-v23/theme_light.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Light.v23" parent="AppTheme.Base.Light">
+    <style name="Theme.Vector.Light.v23" parent="Base.Theme.Vector.Light">
         <item name="android:statusBarColor">@color/android_status_bar_background_light</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <style name="AppTheme.Light" parent="AppTheme.Light.v23"/>
+    <style name="Theme.Vector.Light" parent="Theme.Vector.Light.v23"/>
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v27/theme_black.xml b/library/ui-styles/src/main/res/values-v27/theme_black.xml
index f8650c7e8b..2a18b021e3 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_black.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_black.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Black.v27" parent="AppTheme.Black.v23">
+    <style name="Theme.Vector.Black.v27" parent="Theme.Vector.Black.v23">
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
-    <style name="AppTheme.Black" parent="AppTheme.Black.v27" />
+    <style name="Theme.Vector.Black" parent="Theme.Vector.Black.v27" />
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v27/theme_dark.xml b/library/ui-styles/src/main/res/values-v27/theme_dark.xml
index ef0a39902a..ee654bbaab 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_dark.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Dark.v27" parent="AppTheme.Dark.v23">
+    <style name="Theme.Vector.Dark.v27" parent="Theme.Vector.Dark.v23">
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
-    <style name="AppTheme.Dark" parent="AppTheme.Dark.v27" />
+    <style name="Theme.Vector.Dark" parent="Theme.Vector.Dark.v27" />
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v27/theme_light.xml b/library/ui-styles/src/main/res/values-v27/theme_light.xml
index 4755516267..0151130f5a 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_light.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_light.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Light.v27" parent="AppTheme.Light.v23">
+    <style name="Theme.Vector.Light.v27" parent="Theme.Vector.Light.v23">
         <item name="android:navigationBarColor">@color/android_navigation_bar_background_light</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
-    <style name="AppTheme.Light" parent="AppTheme.Light.v27" />
+    <style name="Theme.Vector.Light" parent="Theme.Vector.Light.v27" />
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/theme_black.xml b/library/ui-styles/src/main/res/values/theme_black.xml
index 0cce560b52..6db7e5a663 100644
--- a/library/ui-styles/src/main/res/values/theme_black.xml
+++ b/library/ui-styles/src/main/res/values/theme_black.xml
@@ -3,7 +3,7 @@
 
     <!-- BLACK THEME COLORS -->
 
-    <style name="AppTheme.Base.Black" parent="AppTheme.Base.Dark">
+    <style name="Base.Theme.Vector.Black" parent="Base.Theme.Vector.Dark">
         <!-- Only setting the items we need to override to get the background to be pure black, otherwise inheriting -->
 
         <!-- other colors -->
@@ -31,6 +31,6 @@
         <item name="android:navigationBarColor">@android:color/black</item>
     </style>
 
-    <style name="AppTheme.Black" parent="AppTheme.Base.Black" />
+    <style name="Theme.Vector.Black" parent="Base.Theme.Vector.Black" />
 
 </resources>
diff --git a/library/ui-styles/src/main/res/values/theme_common.xml b/library/ui-styles/src/main/res/values/theme_common.xml
index 2fcbd36bdf..2e9c2c5123 100644
--- a/library/ui-styles/src/main/res/values/theme_common.xml
+++ b/library/ui-styles/src/main/res/values/theme_common.xml
@@ -2,21 +2,19 @@
 <resources>
 
     <!-- Launcher Theme, only used for VectorLauncherActivity (will be use even before the Activity is started) -->
-    <style name="AppTheme.Launcher" parent="AppTheme.Launcher.Base"/>
-
-    <style name="AppTheme.Launcher.Base" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.Vector.Launcher" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="android:windowBackground">@drawable/splash</item>
         <item name="colorPrimary">@color/element_accent_light</item>
         <item name="android:statusBarColor">@color/element_accent_light</item>
         <item name="android:navigationBarColor">@color/element_accent_light</item>
     </style>
 
-    <style name="AppTheme.AttachmentsPreview" parent="AppTheme.Base.Black">
+    <style name="Theme.Vector.Black.AttachmentsPreview">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
-    <style name="AppTheme.Transparent" parent="AppTheme.Base.Black">
+    <style name="Theme.Vector.Black.Transparent">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowIsTranslucent">true</item>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 256ee72c2d..3c9d3ada33 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -3,7 +3,7 @@
 
     <!-- DARK THEME COLORS -->
 
-    <style name="AppTheme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar">
+    <style name="Base.Theme.Vector.Dark" parent="Theme.MaterialComponents.NoActionBar">
         <!-- Element attribute for palette -->
         <!-- content colors -->
         <item name="vctr_content_primary">@color/element_content_primary_dark</item>
@@ -132,6 +132,6 @@
         <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark</item>
     </style>
 
-    <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
+    <style name="Theme.Vector.Dark" parent="Base.Theme.Vector.Dark" />
 
 </resources>
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index 49cd85e4d0..08d9761a7a 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -3,7 +3,7 @@
 
     <!-- LIGHT THEME COLORS -->
 
-    <style name="AppTheme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Base.Theme.Vector.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Element attribute for palette -->
         <!-- content colors -->
         <item name="vctr_content_primary">@color/element_content_primary_light</item>
@@ -134,6 +134,6 @@
         <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light</item>
     </style>
 
-    <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
+    <style name="Theme.Vector.Light" parent="Base.Theme.Vector.Light" />
 
 </resources>
diff --git a/vector/src/debug/res/layout/demo_themes.xml b/vector/src/debug/res/layout/demo_themes.xml
index 7cd4a77066..3b2f5acbf0 100644
--- a/vector/src/debug/res/layout/demo_themes.xml
+++ b/vector/src/debug/res/layout/demo_themes.xml
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:theme="@style/AppTheme.Light">
+        android:theme="@style/Theme.Vector.Light">
 
         <include layout="@layout/demo_theme_sample" />
 
@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:theme="@style/AppTheme.Dark">
+        android:theme="@style/Theme.Vector.Dark">
 
         <include layout="@layout/demo_theme_sample" />
 
@@ -34,7 +34,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:theme="@style/AppTheme.Black">
+        android:theme="@style/Theme.Vector.Black">
 
         <include layout="@layout/demo_theme_sample" />
 
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index f601dc88dd..e71f355a23 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -75,7 +75,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Light"
+        android:theme="@style/Theme.Vector.Light"
         tools:replace="android:allowBackup">
 
         <!-- No limit for screen ratio: avoid black strips -->
@@ -85,7 +85,7 @@
 
         <activity
             android:name=".features.MainActivity"
-            android:theme="@style/AppTheme.Launcher" />
+            android:theme="@style/Theme.Vector.Launcher" />
 
         <!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->
         <activity-alias
@@ -141,7 +141,7 @@
         <!-- Add tools:ignore="Instantiatable" for the error reported only by Buildkite :/ -->
         <activity
             android:name=".features.media.VectorAttachmentViewerActivity"
-            android:theme="@style/AppTheme.Transparent"
+            android:theme="@style/Theme.Vector.Black.Transparent"
             tools:ignore="Instantiatable" />
 
         <activity android:name=".features.media.BigImageViewerActivity" />
@@ -268,7 +268,7 @@
 
         <activity
             android:name=".features.attachments.preview.AttachmentsPreviewActivity"
-            android:theme="@style/AppTheme.AttachmentsPreview" />
+            android:theme="@style/Theme.Vector.Black.AttachmentsPreview" />
         <activity
             android:name=".features.call.VectorCallActivity"
             android:excludeFromRecents="true" />
diff --git a/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
index a1065ed10b..8c21e96bea 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
@@ -27,22 +27,22 @@ sealed class ActivityOtherThemes(@StyleRes val dark: Int,
                                  @StyleRes val black: Int) {
 
     object Default : ActivityOtherThemes(
-            R.style.AppTheme_Dark,
-            R.style.AppTheme_Black
+            R.style.Theme_Vector_Dark,
+            R.style.Theme_Vector_Black
     )
 
     object Launcher : ActivityOtherThemes(
-            R.style.AppTheme_Launcher,
-            R.style.AppTheme_Launcher
+            R.style.Theme_Vector_Launcher,
+            R.style.Theme_Vector_Launcher
     )
 
     object AttachmentsPreview : ActivityOtherThemes(
-            R.style.AppTheme_AttachmentsPreview,
-            R.style.AppTheme_AttachmentsPreview
+            R.style.Theme_Vector_Black_AttachmentsPreview,
+            R.style.Theme_Vector_Black_AttachmentsPreview
     )
 
     object VectorAttachmentsPreview : ActivityOtherThemes(
-            R.style.AppTheme_Transparent,
-            R.style.AppTheme_Transparent
+            R.style.Theme_Vector_Black_Transparent,
+            R.style.Theme_Vector_Black_Transparent
     )
 }
diff --git a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index db8ad61c0a..c4c9ca63ae 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -114,10 +114,10 @@ object ThemeUtils {
         currentTheme.set(aTheme)
         context.setTheme(
                 when (aTheme) {
-                    SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(context.resources)) R.style.AppTheme_Dark else R.style.AppTheme_Light
-                    THEME_DARK_VALUE   -> R.style.AppTheme_Dark
-                    THEME_BLACK_VALUE  -> R.style.AppTheme_Black
-                    else               -> R.style.AppTheme_Light
+                    SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(context.resources)) R.style.Theme_Vector_Dark else R.style.Theme_Vector_Light
+                    THEME_DARK_VALUE   -> R.style.Theme_Vector_Dark
+                    THEME_BLACK_VALUE  -> R.style.Theme_Vector_Black
+                    else               -> R.style.Theme_Vector_Light
                 }
         )