diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt
index 2514df5e..30047836 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt
@@ -42,7 +42,7 @@ import im.vector.riotredesign.features.rageshake.BugReporter
 import im.vector.riotredesign.features.rageshake.RageShake
 import im.vector.riotredesign.features.themes.ThemeUtils
 import im.vector.riotredesign.receivers.DebugReceiver
-import im.vector.ui.themes.ActivityOtherThemes
+import im.vector.riotredesign.features.themes.ActivityOtherThemes
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 import org.koin.android.ext.android.inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/themes/ActivityOtherThemes.kt b/vector/src/main/java/im/vector/riotredesign/features/themes/ActivityOtherThemes.kt
index da17de49..159a4801 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/themes/ActivityOtherThemes.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/themes/ActivityOtherThemes.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.ui.themes
+package im.vector.riotredesign.features.themes
 
 import androidx.annotation.StyleRes
 import im.vector.riotredesign.R
@@ -33,45 +33,4 @@ sealed class ActivityOtherThemes(@StyleRes val dark: Int,
             R.style.AppTheme_Status
     )
 
-    object NoActionBarFullscreen : ActivityOtherThemes(
-            R.style.AppTheme_NoActionBar_FullScreen_Dark,
-            R.style.AppTheme_NoActionBar_FullScreen_Black,
-            R.style.AppTheme_NoActionBar_FullScreen_Status
-    )
-
-    object Home : ActivityOtherThemes(
-            R.style.HomeActivityTheme_Dark,
-            R.style.HomeActivityTheme_Black,
-            R.style.HomeActivityTheme_Status
-    )
-
-    object Group : ActivityOtherThemes(
-            R.style.GroupAppTheme_Dark,
-            R.style.GroupAppTheme_Black,
-            R.style.GroupAppTheme_Status
-    )
-
-    object Picker : ActivityOtherThemes(
-            R.style.CountryPickerTheme_Dark,
-            R.style.CountryPickerTheme_Black,
-            R.style.CountryPickerTheme_Status
-    )
-
-    object Lock : ActivityOtherThemes(
-            R.style.Theme_Vector_Lock_Dark,
-            R.style.Theme_Vector_Lock_Light,
-            R.style.Theme_Vector_Lock_Status
-    )
-
-    object Search : ActivityOtherThemes(
-            R.style.SearchesAppTheme_Dark,
-            R.style.SearchesAppTheme_Black,
-            R.style.SearchesAppTheme_Status
-    )
-
-    object Call : ActivityOtherThemes(
-            R.style.CallActivityTheme_Dark,
-            R.style.CallActivityTheme_Black,
-            R.style.CallActivityTheme_Status
-    )
 }
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt
index 1e69b83b..26a265df 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt
@@ -28,7 +28,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.preference.PreferenceManager
 import im.vector.riotredesign.R
-import im.vector.ui.themes.ActivityOtherThemes
 import timber.log.Timber
 import java.util.*
 
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 8c1afb69..67fe9b94 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -82,83 +82,4 @@
 
     <style name="AppTheme.Black" parent="AppTheme.Base.Black" />
 
-    <style name="Theme.Vector.Lock.Black" parent="Theme.Vector.Lock.Dark">
-        <item name="colorPrimary">@color/riot_primary_background_color_black</item>
-        <item name="android:colorBackground">@color/riot_primary_background_color_black</item>
-    </style>
-
-    <!-- home activity -->
-    <style name="HomeActivityTheme.Black" parent="AppTheme.Black">
-        <item name="editTextColor">?android:attr/textColorPrimary</item>
-        <item name="android:editTextColor">?android:attr/textColorPrimary</item>
-        <item name="android:textColorHint">?attr/vctr_default_text_hint_color</item>
-    </style>
-
-    <!-- call activity -->
-    <style name="CallActivityTheme.Black" parent="AppTheme.Black">
-        <!-- status bar color -->
-        <item name="colorPrimaryDark">@android:color/black</item>
-    </style>
-
-    <!-- NoActionBar + FullScreen -->
-    <style name="AppTheme.NoActionBar.FullScreen.Black" parent="AppTheme.Black">
-        <item name="android:windowFullscreen">true</item>
-        <!-- activities background -->
-        <item name="android:windowBackground">@android:color/transparent</item>
-    </style>
-
-    <!-- Picker activities -->
-    <style name="CountryPickerTheme.Black" parent="AppTheme.Black">
-        <item name="editTextColor">@android:color/white</item>
-        <item name="android:editTextColor">@android:color/white</item>
-        <item name="android:textColorHint">?attr/vctr_activity_bottom_gradient_color</item>
-    </style>
-
-    <!-- searches activity -->
-    <style name="SearchesAppTheme.Black" parent="AppTheme.Black">
-        <!-- custom action bar -->
-        <item name="android:actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
-        <item name="actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
-
-        <!-- no divider -->
-        <item name="android:actionBarDivider">@null</item>
-
-        <!-- edit text -->
-        <item name="android:editTextStyle">@style/VectorSearches.EditText</item>
-
-        <!-- actionbar icons color -->
-        <item name="actionBarTheme">@style/VectorSearches.ActionBarTheme</item>
-    </style>
-
-    <style name="CallAppTheme.Black" parent="AppTheme.Black">
-        <item name="android:colorBackground">?attr/colorBackgroundFloating</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowTitleStyle">@style/RtlOverlay.DialogWindowTitle.AppCompat</item>
-        <item name="android:windowTitleBackgroundStyle">
-            @style/Base.DialogWindowTitleBackground.AppCompat
-        </item>
-        <item name="android:windowBackground">@drawable/abc_dialog_material_background</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-
-        <item name="windowActionModeOverlay">true</item>
-
-        <item name="listPreferredItemPaddingLeft">24dip</item>
-        <item name="listPreferredItemPaddingRight">24dip</item>
-
-        <item name="android:listDivider">@null</item>
-    </style>
-
-    <style name="GroupAppTheme.Black" parent="AppTheme.Black">
-        <item name="colorPrimaryDark">@color/tab_groups_secondary</item>
-
-        <item name="android:actionBarTabStyle">@style/Vector.TabView.Group</item>
-        <item name="actionBarTabStyle">@style/Vector.TabView.Group</item>
-    </style>
-
 </resources>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 9d9b1ec6..4cbf3f32 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -201,101 +201,9 @@
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
 
-    <style name="Theme.Vector.Lock.Dark" parent="Theme.AppCompat.Dialog">
-        <item name="colorPrimary">@color/primary_color_dark</item>
-        <item name="colorAccent">@color/accent_color_dark</item>
-
-        <item name="android:textColorPrimary">@color/riot_primary_text_color_dark</item>
-        <item name="android:textColorSecondary">@color/riot_secondary_text_color_dark</item>
-        <!-- Default color for text View -->
-        <item name="android:textColorTertiary">@color/riot_tertiary_text_color_dark</item>
-
-        <item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_dark</item>
-        <item name="vctr_message_text_color">?android:attr/textColorPrimary</item>
-
-        <item name="android:background">@color/riot_primary_background_color_dark</item>
-        <item name="android:textColor">@color/riot_tertiary_text_color_dark</item>
-        <item name="editTextColor">?android:attr/textColorPrimary</item>
-        <item name="android:editTextColor">?android:attr/textColorPrimary</item>
-    </style>
-
     <style name="Vector.TabView.Dark" parent="Widget.AppCompat.ActionBar.TabView">
         <item name="android:background">@drawable/vector_tabbar_background_dark</item>
         <item name="background">@drawable/vector_tabbar_background_dark</item>
     </style>
 
-    <!-- home activity -->
-    <style name="HomeActivityTheme.Dark" parent="AppTheme.Dark">
-        <item name="editTextColor">?android:attr/textColorPrimary</item>
-        <item name="android:editTextColor">?android:attr/textColorPrimary</item>
-        <item name="android:textColorHint">?attr/vctr_default_text_hint_color</item>
-    </style>
-
-    <!-- call activity -->
-    <style name="CallActivityTheme.Dark" parent="AppTheme.Dark">
-        <!-- status bar color -->
-        <item name="colorPrimaryDark">@android:color/black</item>
-    </style>
-
-    <!-- NoActionBar + FullScreen -->
-    <style name="AppTheme.NoActionBar.FullScreen.Dark" parent="AppTheme.Dark">
-        <item name="android:windowFullscreen">true</item>
-        <!-- activities background -->
-        <item name="android:windowBackground">@android:color/transparent</item>
-    </style>
-
-    <!-- Picker activities -->
-    <style name="CountryPickerTheme.Dark" parent="AppTheme.Dark">
-        <item name="editTextColor">@android:color/white</item>
-        <item name="android:editTextColor">@android:color/white</item>
-        <item name="android:textColorHint">?attr/vctr_activity_bottom_gradient_color</item>
-    </style>
-
-    <!-- searches activity -->
-    <style name="SearchesAppTheme.Dark" parent="AppTheme.Dark">
-        <!-- custom action bar -->
-        <item name="android:actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
-        <item name="actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
-
-        <!-- no divider -->
-        <item name="android:actionBarDivider">@null</item>
-
-        <!-- edit text -->
-        <item name="android:editTextStyle">@style/VectorSearches.EditText</item>
-
-        <!-- actionbar icons color -->
-        <item name="actionBarTheme">@style/VectorSearches.ActionBarTheme</item>
-    </style>
-
-    <style name="CallAppTheme.Dark" parent="AppTheme.Dark">
-        <item name="android:colorBackground">@color/primary_color_dark</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowTitleStyle">@style/RtlOverlay.DialogWindowTitle.AppCompat</item>
-        <item name="android:windowTitleBackgroundStyle">
-            @style/Base.DialogWindowTitleBackground.AppCompat
-        </item>
-        <item name="android:windowBackground">@drawable/abc_dialog_material_background</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-
-        <item name="windowActionModeOverlay">true</item>
-
-        <item name="listPreferredItemPaddingLeft">24dip</item>
-        <item name="listPreferredItemPaddingRight">24dip</item>
-
-        <item name="android:listDivider">@null</item>
-    </style>
-
-    <style name="GroupAppTheme.Dark" parent="AppTheme.Dark">
-        <item name="colorPrimaryDark">@color/tab_groups_secondary</item>
-
-        <item name="android:actionBarTabStyle">@style/Vector.TabView.Group</item>
-        <item name="actionBarTabStyle">@style/Vector.TabView.Group</item>
-    </style>
-
 </resources>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 006f026e..4880da20 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -203,108 +203,9 @@
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
 
-    <style name="Theme.Vector.Lock.Light" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorPrimary">@color/primary_color_light</item>
-        <item name="colorAccent">@color/accent_color_light</item>
-
-        <item name="android:textColorPrimary">@color/riot_primary_text_color_light</item>
-        <item name="android:textColorSecondary">@color/riot_secondary_text_color_light</item>
-        <!-- Default color for text View -->
-        <item name="android:textColorTertiary">@color/riot_tertiary_text_color_light</item>
-
-        <item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_light</item>
-        <item name="vctr_message_text_color">?android:attr/textColorPrimary</item>
-
-        <item name="android:background">@color/riot_primary_background_color_light</item>
-        <item name="android:textColor">@color/riot_tertiary_text_color_light</item>
-        <item name="editTextColor">?android:attr/textColorPrimary</item>
-        <item name="android:editTextColor">?android:attr/textColorPrimary</item>
-    </style>
-
     <style name="Vector.TabView.Light" parent="Widget.AppCompat.ActionBar.TabView">
         <item name="android:background">@drawable/vector_tabbar_background_light</item>
         <item name="background">@drawable/vector_tabbar_background_light</item>
     </style>
 
-    <!-- home activity -->
-    <style name="HomeActivityTheme.Light" parent="AppTheme.Light">
-        <item name="editTextColor">@android:color/white</item>
-        <item name="android:editTextColor">@android:color/white</item>
-        <item name="android:textColorHint">?attr/vctr_activity_bottom_gradient_color</item>
-    </style>
-
-    <!-- call activity -->
-    <style name="CallActivityTheme.Light" parent="AppTheme.Light">
-        <!-- status bar color -->
-        <item name="colorPrimaryDark">@android:color/black</item>
-    </style>
-
-    <!-- NoActionBar + FullScreen -->
-    <style name="AppTheme.NoActionBar.FullScreen.Light" parent="AppTheme.Light">
-        <item name="android:windowFullscreen">true</item>
-        <!-- activities background -->
-        <item name="android:windowBackground">@android:color/transparent</item>
-    </style>
-
-    <!-- Picker activities -->
-    <style name="CountryPickerTheme.Light" parent="AppTheme.Light">
-        <item name="editTextColor">@android:color/white</item>
-        <item name="android:editTextColor">@android:color/white</item>
-        <item name="android:textColorHint">?attr/vctr_activity_bottom_gradient_color</item>
-    </style>
-
-    <!-- searches activity -->
-    <style name="SearchesAppTheme.Light" parent="AppTheme.Light">
-        <!-- custom action bar -->
-        <item name="android:actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
-        <item name="actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
-
-        <!-- no divider -->
-        <item name="android:actionBarDivider">@null</item>
-
-        <!-- edit text -->
-        <item name="android:editTextStyle">@style/VectorSearches.EditText</item>
-
-        <!-- actionbar icons color -->
-        <item name="actionBarTheme">@style/VectorSearches.ActionBarTheme</item>
-    </style>
-
-    <style name="CallAppTheme.Light" parent="AppTheme.Light">
-        <item name="android:colorBackground">?attr/colorBackgroundFloating</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowTitleStyle">@style/RtlOverlay.DialogWindowTitle.AppCompat</item>
-        <item name="android:windowTitleBackgroundStyle">
-            @style/Base.DialogWindowTitleBackground.AppCompat
-        </item>
-        <item name="android:windowBackground">@drawable/abc_dialog_material_background</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-
-        <item name="windowActionModeOverlay">true</item>
-
-        <item name="listPreferredItemPaddingLeft">24dip</item>
-        <item name="listPreferredItemPaddingRight">24dip</item>
-
-        <item name="android:listDivider">@null</item>
-    </style>
-
-    <style name="GroupAppTheme.Light" parent="AppTheme.Light">
-        <item name="colorPrimaryDark">@color/tab_groups_secondary</item>
-
-        <item name="android:actionBarTabStyle">@style/Vector.TabView.Group</item>
-        <item name="actionBarTabStyle">@style/Vector.TabView.Group</item>
-    </style>
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat">
-        <item name="titleTextColor">?attr/actionMenuTextColor</item>
-        <item name="android:background">?attr/colorPrimary</item>
-    </style>
-
-    <style name="AppTheme.Dialog.Light" parent="Theme.AppCompat.Light.Dialog.Alert" />
-
 </resources>
diff --git a/vector/src/main/res/values/theme_status.xml b/vector/src/main/res/values/theme_status.xml
index dd4397a1..59ab34e8 100644
--- a/vector/src/main/res/values/theme_status.xml
+++ b/vector/src/main/res/values/theme_status.xml
@@ -162,103 +162,9 @@
 
     <style name="AppTheme.Status" parent="AppTheme.Base.Status" />
 
-    <style name="Theme.Vector.Lock.Status" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorPrimary">@color/primary_color_status</item>
-        <item name="colorAccent">@color/accent_color_status</item>
-
-        <item name="android:textColorPrimary">@color/riot_primary_text_color_status</item>
-        <item name="android:textColorSecondary">@color/riot_secondary_text_color_status</item>
-        <!-- Default color for text View -->
-        <item name="android:textColorTertiary">@color/riot_tertiary_text_color_status</item>
-
-        <item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_light</item>
-        <item name="vctr_message_text_color">?android:attr/textColorPrimary</item>
-
-        <item name="android:background">@color/riot_primary_background_color_status</item>
-        <item name="android:textColor">@color/riot_tertiary_text_color_status</item>
-        <item name="editTextColor">?android:attr/textColorPrimary</item>
-        <item name="android:editTextColor">?android:attr/textColorPrimary</item>
-    </style>
-
     <style name="Vector.TabView.Status" parent="Widget.AppCompat.ActionBar.TabView">
         <item name="android:background">@drawable/vector_tabbar_background_status</item>
         <item name="background">@drawable/vector_tabbar_background_status</item>
     </style>
 
-    <!-- home activity -->
-    <style name="HomeActivityTheme.Status" parent="AppTheme.Status">
-        <item name="editTextColor">?android:attr/textColorPrimary</item>
-        <item name="android:editTextColor">?android:attr/textColorPrimary</item>
-        <item name="android:textColorHint">?attr/vctr_default_text_hint_color</item>
-    </style>
-
-    <!-- call activity -->
-    <style name="CallActivityTheme.Status" parent="AppTheme.Status">
-        <!-- status bar color -->
-        <item name="colorPrimaryDark">@android:color/black</item>
-    </style>
-
-    <!-- NoActionBar + FullScreen -->
-    <style name="AppTheme.NoActionBar.FullScreen.Status" parent="AppTheme.Status">
-        <item name="android:windowFullscreen">true</item>
-        <!-- activities background -->
-        <item name="android:windowBackground">@android:color/transparent</item>
-    </style>
-
-    <!-- Picker activities -->
-    <style name="CountryPickerTheme.Status" parent="AppTheme.Status">
-        <item name="editTextColor">@android:color/white</item>
-        <item name="android:editTextColor">@android:color/white</item>
-        <item name="android:textColorHint">?attr/vctr_activity_bottom_gradient_color</item>
-    </style>
-
-    <!-- searches activity -->
-    <style name="SearchesAppTheme.Status" parent="AppTheme.Status">
-        <!-- custom action bar -->
-        <item name="android:actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
-        <item name="actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
-
-        <!-- no divider -->
-        <item name="android:actionBarDivider">@null</item>
-
-        <!-- edit text -->
-        <item name="android:editTextStyle">@style/VectorSearches.EditText</item>
-
-        <!-- actionbar icons color -->
-        <item name="actionBarTheme">@style/VectorSearches.ActionBarTheme</item>
-    </style>
-
-    <style name="CallAppTheme.Status" parent="AppTheme.Status">
-        <item name="android:colorBackground">?attr/colorBackgroundFloating</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowTitleStyle">@style/RtlOverlay.DialogWindowTitle.AppCompat</item>
-        <item name="android:windowTitleBackgroundStyle">
-            @style/Base.DialogWindowTitleBackground.AppCompat
-        </item>
-        <item name="android:windowBackground">@drawable/abc_dialog_material_background</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-
-        <item name="windowActionModeOverlay">true</item>
-
-        <item name="listPreferredItemPaddingLeft">24dip</item>
-        <item name="listPreferredItemPaddingRight">24dip</item>
-
-        <item name="android:listDivider">@null</item>
-    </style>
-
-    <style name="GroupAppTheme.Status" parent="AppTheme.Status">
-        <item name="colorPrimaryDark">@color/tab_groups_secondary</item>
-
-        <item name="android:actionBarTabStyle">@style/Vector.TabView.Group</item>
-        <item name="actionBarTabStyle">@style/Vector.TabView.Group</item>
-    </style>
-
-    <style name="AppTheme.Dialog.Status" parent="Theme.AppCompat.Light.Dialog.Alert" />
-
 </resources>