From 4b939358e9f257c092af7b02057f7b532b6381d3 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Wed, 2 Sep 2020 12:47:56 +1000
Subject: [PATCH] Themes & styles cleanup.

---
 AndroidManifest.xml                           |  29 +-
 res/layout/conversation_input_panel.xml       |   2 +-
 res/layout/mediasend_fragment.xml             |   2 +-
 res/values-notnight-v21/themes.xml            |   5 +-
 res/values/styles.xml                         |  63 +--
 res/values/themes.xml                         | 359 +-----------------
 .../securesms/CreateProfileActivity.java      |   5 -
 .../securesms/PassphrasePromptActivity.java   |   4 -
 .../lock/RegistrationLockDialog.java          |   2 +-
 .../mediasend/MediaSendFragment.java          |   3 +-
 .../permissions/RationaleDialog.java          |   2 +-
 .../securesms/util/DynamicIntroTheme.java     |  16 -
 .../util/DynamicRegistrationTheme.java        |  12 -
 .../securesms/util/DynamicTheme.java          |   4 +-
 14 files changed, 73 insertions(+), 435 deletions(-)
 delete mode 100644 src/org/thoughtcrime/securesms/util/DynamicIntroTheme.java
 delete mode 100644 src/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 67a18de2a0..0a6f5f9ace 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -173,7 +173,6 @@
             android:name="org.thoughtcrime.securesms.InviteActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:parentActivityName="org.thoughtcrime.securesms.loki.activities.HomeActivity"
-            android:theme="@style/TextSecure.HighlightTheme"
             android:windowSoftInputMode="stateHidden">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -252,7 +251,7 @@
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:launchMode="singleTask"
             android:noHistory="true"
-            android:theme="@style/TextSecure.LightNoActionBar"
+            android:theme="@style/Theme.Session.DayNight.NoActionBar"
             android:windowSoftInputMode="stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -296,7 +295,6 @@
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
             android:taskAffinity=""
-            android:theme="@style/TextSecure.LightTheme.Popup"
             android:windowSoftInputMode="stateVisible" />
         <activity
             android:name="org.thoughtcrime.securesms.MessageDetailsActivity"
@@ -330,17 +328,16 @@
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:label="@string/AndroidManifest__create_passphrase"
             android:launchMode="singleTask"
-            android:theme="@style/TextSecure.LightNoActionBar"
+            android:theme="@style/Theme.Session.DayNight.NoActionBar"
             android:windowSoftInputMode="stateUnchanged" />
         <activity
             android:name="org.thoughtcrime.securesms.PassphrasePromptActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:launchMode="singleTask"
-            android:theme="@style/TextSecure.DarkIntroTheme" />
+            android:launchMode="singleTask" />
         <activity
             android:name="org.thoughtcrime.securesms.NewConversationActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:theme="@style/TextSecure.LightNoActionBar"
+            android:theme="@style/Theme.Session.DayNight.NoActionBar"
             android:windowSoftInputMode="stateAlwaysVisible" />
         <activity
             android:name="org.thoughtcrime.securesms.PushContactSelectionActivity"
@@ -379,13 +376,11 @@
             android:name="org.thoughtcrime.securesms.registration.WelcomeActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:launchMode="singleTask"
-            android:theme="@style/TextSecure.DarkRegistrationTheme"
             android:windowSoftInputMode="stateUnchanged" />
         <activity
             android:name="org.thoughtcrime.securesms.RegistrationActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:launchMode="singleTask"
-            android:theme="@style/TextSecure.DarkRegistrationTheme"
             android:windowSoftInputMode="stateUnchanged" />
         <activity
             android:name="org.thoughtcrime.securesms.registration.CaptchaActivity"
@@ -401,7 +396,6 @@
             android:name="org.thoughtcrime.securesms.stickers.StickerManagementActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:launchMode="singleTask"
-            android:theme="@style/TextSecure.LightTheme"
             android:windowSoftInputMode="stateUnchanged" />
         <activity
             android:name="org.thoughtcrime.securesms.LogSubmitActivity"
@@ -472,11 +466,10 @@
         <activity
             android:name="org.thoughtcrime.securesms.RecipientPreferenceActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:theme="@style/TextSecure.LightNoActionBar" />
+            android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.BlockedContactsActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:theme="@style/TextSecure.LightTheme" />
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
         <activity
             android:name="org.thoughtcrime.securesms.scribbles.StickerSelectActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -488,7 +481,6 @@
         <activity
             android:name="org.thoughtcrime.securesms.CreateProfileActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
             android:windowSoftInputMode="stateVisible" />
         <activity
             android:name="org.thoughtcrime.securesms.ClearProfileAvatarActivity"
@@ -504,21 +496,20 @@
         </activity>
         <activity
             android:name="org.thoughtcrime.securesms.contactshare.ContactShareEditActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:theme="@style/TextSecure.LightTheme" />
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
         <activity
             android:name="org.thoughtcrime.securesms.contactshare.ContactNameEditActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:theme="@style/TextSecure.LightNoActionBar" />
+            android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.contactshare.SharedContactDetailsActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:theme="@style/TextSecure.LightNoActionBar" />
+            android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.ShortcutLauncherActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:exported="true"
-            android:theme="@style/TextSecure.LightNoActionBar" />
+            android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <service
             android:name="org.thoughtcrime.securesms.loki.api.PushNotificationService"
             android:enabled="true"
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index a963f3b8bf..d3da6926da 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -91,7 +91,7 @@
                         android:layout_height="@dimen/conversation_compose_height" />
 
                     <org.thoughtcrime.securesms.components.ComposeText
-                        style="@style/Widget.EditText.Compose"
+                        style="@style/Widget.Session.EditText.Compose"
                         android:id="@+id/embedded_text_editor"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
diff --git a/res/layout/mediasend_fragment.xml b/res/layout/mediasend_fragment.xml
index 4e121d6a09..fd15041ea9 100644
--- a/res/layout/mediasend_fragment.xml
+++ b/res/layout/mediasend_fragment.xml
@@ -95,7 +95,7 @@
                         android:layout_height="@dimen/conversation_compose_height" />
 
                     <org.thoughtcrime.securesms.components.ComposeText
-                        style="@style/Widget.EditText.Compose"
+                        style="@style/Widget.Session.EditText.Compose"
                         android:id="@+id/mediasend_compose_text"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
diff --git a/res/values-notnight-v21/themes.xml b/res/values-notnight-v21/themes.xml
index 5805b9cb88..f8cf3bab8d 100644
--- a/res/values-notnight-v21/themes.xml
+++ b/res/values-notnight-v21/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.Session.Light">
+    <style name="Theme.Session.Light" parent="Base.Theme.Session">
         <item name="android:navigationBarColor">?android:navigationBarColor</item>
         <item name="android:textColorHint">@color/gray50</item>
 
@@ -22,13 +22,14 @@
         <item name="conversation_input_background">@drawable/compose_background_light</item>
 
         <item name="quick_camera_icon">@drawable/ic_outline_photo_camera_24</item>
-
     </style>
 
     <style name="Theme.Session.DayNight" parent="Theme.Session.Light">
 
     </style>
 
+
+    <!-- Session light theme (these values overlays their dark theme counterparts from Theme.TextSecure) -->
     <style name="Theme.TextSecure.DayNight">
 
         <item name="android:navigationBarColor">?android:navigationBarColor</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 466f3aafb9..478bdc22b4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -23,20 +23,20 @@
         <item name="closeIcon">@drawable/ic_baseline_clear_24</item>
     </style>
 
-    <style name="Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
-        <item name="buttonBarNegativeButtonStyle">@style/Session.AlertDialog.NegativeButtonStyle</item>
-        <item name="buttonBarPositiveButtonStyle">@style/Session.AlertDialog.PositiveButtonStyle</item>
+    <style name="ThemeOverlay.Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
+        <item name="buttonBarNegativeButtonStyle">@style/Widget.Session.AlertDialog.NegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/Widget.Session.AlertDialog.PositiveButtonStyle</item>
     </style>
 
     <style name="Widget.Session.BottomSheetDialog" parent="Widget.Design.BottomSheet.Modal">
         <item name="android:background">@drawable/default_bottom_sheet_background</item>
     </style>
 
-    <style name="Session.AlertDialog.NegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+    <style name="Widget.Session.AlertDialog.NegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
         <item name="android:textColor">@color/accent</item>
     </style>
 
-    <style name="Session.AlertDialog.PositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+    <style name="Widget.Session.AlertDialog.PositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
         <item name="android:textColor">@color/accent</item>
     </style>
 
@@ -112,6 +112,30 @@
         <item name="android:textColor">@android:color/white</item>
     </style>
 
+    <style name="Widget.Session.EditText.Compose" parent="@style/Signal.Text.Body">
+        <item name="android:padding">2dp</item>
+        <item name="android:background">@null</item>
+        <item name="android:maxLines">4</item>
+        <item name="android:maxLength">65536</item>
+        <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:capitalize">sentences</item>
+        <item name="android:autoText">true</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:imeOptions">flagNoEnterAction</item>
+        <item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
+        <item name="android:contentDescription">@string/conversation_activity__compose_description</item>
+        <item name="android:textColorHint">?android:textColorHint</item>
+        <item name="android:textSize">@dimen/small_font_size</item>
+        <item name="android:textCursorDrawable">@drawable/session_edit_text_cursor</item>
+        <item name="android:textAlignment">viewStart</item>
+    </style>
+
+    <style name="ThemeOverlay.Session.Settings" parent="PreferenceThemeOverlay.v14.Material" >
+        <item name="android:textColor">@color/text</item>
+        <item name="android:textColorSecondary">#99FFFFFF</item>
+        <item name="android:textSize">@dimen/medium_font_size</item>
+    </style>
+
     <style name="SessionIDTextView">
         <item name="android:background">@drawable/session_id_text_view_background</item>
         <item name="android:padding">@dimen/medium_spacing</item>
@@ -165,12 +189,6 @@
     <style name="FakeChatViewMessageBubble.Outgoing">
         <item name="android:background">@drawable/fake_chat_view_outgoing_message_background</item>
     </style>
-
-    <style name="Session.SettingsTheme" parent="PreferenceThemeOverlay.v14.Material" >
-        <item name="android:textColor">@color/text</item>
-        <item name="android:textColorSecondary">#99FFFFFF</item>
-        <item name="android:textSize">@dimen/medium_font_size</item>
-    </style>
     <!-- Session -->
 
     <style name="NoAnimation.Theme.BlackScreen" parent="Theme.AppCompat.NoActionBar">
@@ -341,24 +359,6 @@
         <item name="android:background">@drawable/error_round</item>
     </style>
 
-    <style name="Widget.EditText.Compose" parent="@style/Signal.Text.Body">
-        <item name="android:padding">2dp</item>
-        <item name="android:background">@null</item>
-        <item name="android:maxLines">4</item>
-        <item name="android:maxLength">65536</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:capitalize">sentences</item>
-        <item name="android:autoText">true</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:imeOptions">flagNoEnterAction</item>
-        <item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
-        <item name="android:contentDescription">@string/conversation_activity__compose_description</item>
-        <item name="android:textColorHint">?android:textColorHint</item>
-        <item name="android:textSize">@dimen/small_font_size</item>
-        <item name="android:textCursorDrawable">@drawable/session_edit_text_cursor</item>
-        <item name="android:textAlignment">viewStart</item>
-    </style>
-
     <style name="AttachmentTypeLabel">
         <item name="android:textColor">?android:textColorTertiary</item>
         <item name="android:textSize">@dimen/small_font_size</item>
@@ -428,4 +428,9 @@
         <item name="android:foreground">?attr/selectableItemBackground</item>
     </style>
 
+    <style name="StickerPopupAnimation" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@anim/fade_in</item>
+        <item name="android:windowExitAnimation">@anim/fade_out</item>
+    </style>
+
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f8f749f0bb..5f35982520 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -3,7 +3,10 @@
 <resources>
 
     <!-- Session -->
-    <style name="Theme.Session" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
+
+    <!-- Due to historical reasons the base theme is dark and the light one
+    is implemented using "notnight" type of resources. -->
+    <style name="Base.Theme.Session" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/action_bar_background</item>
         <item name="colorPrimaryDark">@color/action_bar_background</item>
         <item name="colorAccent">@color/accent</item>
@@ -24,18 +27,14 @@
         <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
         <item name="actionBarStyle">@style/Widget.Session.ActionBar</item>
 
-        <item name="alertDialogTheme">@style/Session.AlertDialog</item>
+        <item name="alertDialogTheme">@style/ThemeOverlay.Session.AlertDialog</item>
         <item name="bottomSheetDialogTheme">@style/Theme.Session.BottomSheet</item>
-        <item name="preferenceTheme">@style/Session.SettingsTheme</item>
+        <item name="preferenceTheme">@style/ThemeOverlay.Session.Settings</item>
+        <item name="appBarLayoutStyle">@style/Widget.Session.AppBarLayout</item>
+        <item name="actionBarTabBarStyle">@style/Widget.Session.TabBar</item>
+
         <item name="statusBarBackground">@color/accent</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="appBarLayoutStyle">@style/Widget.Session.AppBarLayout</item>
-
-
-        <item name="actionBarTabBarStyle">@style/Widget.Session.TabBar</item>
-        <item name="search_toolbar_background">@color/black</item>
-        <item name="search_background">@color/black</item>
-
         <item name="windowActionModeOverlay">true</item>
         <item name="actionModeCloseDrawable">@drawable/ic_baseline_clear_24</item>
         <item name="actionModeBackground">@color/compose_view_background</item>
@@ -43,8 +42,10 @@
         <item name="dividerVertical">@color/separator</item>
         <item name="dividerHorizontal">?dividerVertical</item>
 
-
         <!-- App specific attributes -->
+        <item name="search_toolbar_background">@color/black</item>
+        <item name="search_background">@color/black</item>
+
         <item name="dialog_background_color">@color/dialog_background</item>
 
         <item name="media_overview_toolbar_background">@color/transparent</item>
@@ -88,7 +89,7 @@
     </style>
 
     <!-- This should be the default theme for the application. -->
-    <style name="Theme.Session.DayNight">
+    <style name="Theme.Session.DayNight" parent="Base.Theme.Session">
         <!-- leave empty to allow overriding -->
     </style>
 
@@ -101,10 +102,9 @@
         <item name="actionBarStyle">@style/Widget.Session.ActionBar.Flat</item>
     </style>
 
-    <!--    <style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Theme.Session.DayNight">-->
-<!--        <item name="actionBarStyle">@style/Session.DarkSubtitleActionBar</item>-->
-<!--    </style>-->
-
+    <!-- This is a temporary theme that is used by any activity
+    which doesn't have support for light theme
+    (like some old Signal screens or third-party libs with white only icons) -->
     <!-- TODO Refactor this to use color resources -->
     <style name="Base.Theme.Session.ForceDark" parent="Theme.Session.DayNight">
         <item name="colorPrimary">#171717</item>
@@ -138,283 +138,13 @@
 
     <!-- Session -->
 
-    <style name="TextSecure.LightNoActionBar" parent="@style/TextSecure.LightTheme">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionModeOverlay">true</item>
 
-        <item name="theme_type">light</item>
-        <item name="colorPrimary">@color/action_bar_background</item>
-        <item name="colorPrimaryDark">@color/action_bar_background</item>
-        <item name="colorAccent">@color/textsecure_primary_dark</item>
-        <item name="android:navigationBarColor">@color/compose_view_background</item>
-
-        <item name="recipient_preference_blocked">#d00000</item>
-        <item name="contact_selection_label_text">#66000000</item>
-        <item name="contact_selection_push_user">#ff000000</item>
-        <item name="contact_selection_lay_user">#a0000000</item>
-        <item name="contact_selection_header_text">@color/textsecure_primary_dark</item>
-
-        <item name="media_overview_toolbar_background">@color/white</item>
-        <item name="media_overview_toolbar_foreground">@color/gray70</item>
-        <item name="media_overview_header_foreground">@color/text</item>
-        <item name="media_overview_document_primary">@color/core_grey_90</item>
-        <item name="media_overview_document_secondary">#99FFFFFF</item>
-    </style>
-
-    <style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightTheme">
-        <item name="actionBarStyle">@style/TextSecure.FlatLightActionBar</item>
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="android:windowBackground">@color/signal_primary</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="colorButtonNormal">@color/white</item>
-    </style>
-
-    <style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="colorAccent">@color/signal_primary</item>
-
-        <item name="android:textColorHint">#cc000000</item>
-        <item name="centered_app_title_color">#55000000</item>
-        <item name="ic_arrow_forward">@drawable/ic_arrow_forward_light</item>
-        <item name="lockscreen_watermark">@drawable/lockscreen_watermark_light</item>
-        <item name="android:windowBackground">@color/white</item>
-        <item name="ic_visibility">@drawable/ic_visibility_grey600_24dp</item>
-        <item name="ic_visibility_off">@drawable/ic_visibility_off_grey600_24dp</item>
-
-        <item name="login_top_background">@color/signal_primary</item>
-        <item name="login_floating_background">@drawable/rounded_rectangle_dark</item>
-
-    </style>
-
-    <style name="TextSecure.DarkIntroTheme" parent="@style/Theme.AppCompat">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="colorAccent">@color/signal_primary_dark</item>
-
-        <item name="android:textColorHint">@color/white</item>
-        <item name="centered_app_title_color">@color/gray27</item>
-        <item name="ic_arrow_forward">@drawable/ic_arrow_forward_dark</item>
-        <item name="lockscreen_watermark">@drawable/lockscreen_watermark_dark</item>
-        <item name="android:windowBackground">@color/core_grey_95</item>
-        <item name="ic_visibility">@drawable/ic_visibility_white_24dp</item>
-        <item name="ic_visibility_off">@drawable/ic_visibility_off_white_24dp</item>
-
-        <item name="login_top_background">@color/black</item>
-        <item name="login_floating_background">@drawable/rounded_rectangle_dark</item>
-    </style>
-
-    <style name="PopupAnimation" parent="@android:style/Animation">
-        <item name="android:windowEnterAnimation">@anim/slide_from_top</item>
-        <item name="android:windowExitAnimation">@anim/slide_to_top</item>
-    </style>
-
-    <style name="StickerPopupAnimation" parent="@android:style/Animation">
-        <item name="android:windowEnterAnimation">@anim/fade_in</item>
-        <item name="android:windowExitAnimation">@anim/fade_out</item>
-    </style>
-
-    <style name="TextSecure.LightTheme.Popup" parent="TextSecure.LightTheme">
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:windowSoftInputMode">stateUnchanged</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowAnimationStyle">@style/PopupAnimation</item>
-        <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-
-    <style name="TextSecure.LightTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
-        <item name="theme_type">light</item>
-        <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
-        <item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
-        <item name="actionModeBackground">@color/compose_view_background</item>
-        <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
-        <item name="colorPrimary">@color/action_bar_background</item>
-        <item name="colorPrimaryDark">@color/action_bar_background</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="colorControlActivated">@color/accent</item>
-        <item name="colorControlNormal">@color/text</item>
-        <item name="colorControlHighlight">@color/accent</item>
-        <item name="android:windowBackground">@color/loki_darkest_gray</item>
-        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
-        <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
-        <item name="bottomSheetDialogTheme">@style/Theme.MaterialComponents.Light.BottomSheetDialog</item>
-        <item name="android:navigationBarColor">@color/compose_view_background</item>
-        <!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>-->
-
-        <item name="attachment_type_selector_background">@color/white</item>
-        <item name="attachment_document_icon_small">@drawable/ic_document_small_light</item>
-        <item name="attachment_document_icon_large">@drawable/ic_document_large_light</item>
-
-        <item name="compose_icon_tint">@color/core_grey_60</item>
-
-        <item name="conversation_list_item_background">@drawable/conversation_list_item_background</item>
-        <item name="conversation_list_item_contact_color">@color/core_grey_90</item>
-        <item name="conversation_list_item_subject_color">@color/core_grey_60</item>
-        <item name="conversation_list_item_delivery_icon_color">@color/core_grey_60</item>
-        <item name="conversation_list_item_date_color">@color/core_grey_60</item>
-        <item name="conversation_list_item_unread_color">@color/core_black</item>
-        <item name="conversation_list_item_unread_background">@drawable/unread_count_background_light</item>
-        <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
-        <item name="conversation_list_toolbar_background">@color/core_blue</item>
-        <item name="conversation_list_typing_tint">@color/core_grey_60</item>
-
-        <item name="fab_color">@color/textsecure_primary</item>
-        <item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
-
-        <item name="conversation_group_member_name">#99000000</item>
-
-        <item name="conversation_background">@color/core_white</item>
-        <item name="conversation_editor_background">#22000000</item>
-        <item name="conversation_editor_text_color">#ff111111</item>
-        <item name="conversation_input_background">@drawable/compose_background_light</item>
-        <item name="conversation_input_inline_attach_icon_tint">@color/core_grey_60</item>
-        <item name="conversation_transport_sms_indicator">@drawable/ic_arrow_up</item>
-        <item name="conversation_transport_push_indicator">@drawable/ic_arrow_up</item>
-        <item name="conversation_transport_popup_background">@color/white</item>
-        <item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_light</item>
-        <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_light</item>
-        <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_grey600_24dp</item>
-        <item name="conversation_attach_camera">@drawable/ic_photo_camera_light</item>
-        <item name="conversation_attach_image">@drawable/ic_image_light</item>
-        <item name="conversation_attach_video">@drawable/ic_movie_creation_light</item>
-        <item name="conversation_attach_sound">@drawable/ic_volume_up_light</item>
-        <item name="conversation_attach_contact_info">@drawable/ic_account_box_light</item>
-        <item name="conversation_attach">@drawable/ic_attach_grey600_24dp</item>
-        <item name="conversation_number_picker_text_color_normal">@color/gray65</item>
-        <item name="conversation_number_picker_text_color_selected">@color/black</item>
-        <item name="conversation_sticker_footer_text_color">@color/core_grey_60</item>
-        <item name="conversation_sticker_footer_icon_color">@color/core_grey_60</item>
-        <item name="conversation_sticker_author_color">@color/core_grey_95</item>
-
-        <item name="contact_list_divider">@drawable/contact_list_divider_light</item>
-
-        <item name="verification_background">@color/core_grey_05</item>
-
-        <item name="emoji_tab_strip_background">@color/cell_background</item>
-        <item name="emoji_tab_indicator">#66555555</item>
-        <item name="emoji_tab_underline">#44555555</item>
-        <item name="emoji_tab_seperator">@color/gray20</item>
-        <item name="emoji_drawer_background">@color/compose_view_background</item>
-        <item name="emoji_text_color">@color/black</item>
-
-        <item name="emoji_category_recent">@drawable/ic_recent_light_20</item>
-        <item name="emoji_category_people">@drawable/ic_emoji_people_light_20</item>
-        <item name="emoji_category_nature">@drawable/ic_emoji_animal_light_20</item>
-        <item name="emoji_category_foods">@drawable/ic_emoji_food_light_20</item>
-        <item name="emoji_category_activity">@drawable/ic_emoji_activity_light_20</item>
-        <item name="emoji_category_places">@drawable/ic_emoji_travel_light_20</item>
-        <item name="emoji_category_objects">@drawable/ic_emoji_object_light_20</item>
-        <item name="emoji_category_symbol">@drawable/ic_emoji_symbol_light_20</item>
-        <item name="emoji_category_flags">@drawable/ic_emoji_flag_light_20</item>
-        <item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_light_20</item>
-        <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_light</item>
-
-        <item name="conversation_item_bubble_background">?message_sent_background_color</item>
-        <item name="conversation_item_sent_text_primary_color">@color/core_grey_90</item>
-        <item name="conversation_item_sent_text_secondary_color">@color/core_grey_60</item>
-        <item name="conversation_item_sent_icon_color">@color/core_grey_60</item>
-        <item name="conversation_item_sent_download_icon_color">@color/core_grey_60</item>
-        <item name="conversation_item_sent_text_indicator_tab_color">#99000000</item>
-        <item name="conversation_item_received_text_primary_color">@color/text</item>
-        <item name="conversation_item_received_text_secondary_color">@color/text</item>
-        <item name="conversation_item_update_text_color">@color/core_grey_60</item>
-        <item name="conversation_item_last_seen_text_color">@color/core_grey_90</item>
-        <item name="conversation_item_last_seen_line_color">@color/core_grey_60</item>
-        <item name="conversation_item_date_line_color">@color/core_grey_25</item>
-        <item name="conversation_item_quote_text_color">@color/core_grey_90</item>
-        <item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_light</item>
-        <item name="conversation_item_sticky_date_text_color">@color/core_grey_60</item>
-        <item name="conversation_item_image_outline_color">@color/transparent_black_30</item>
-
-        <item name="quick_camera_icon">@drawable/quick_camera_light</item>
-        <item name="quick_mic_icon">@drawable/ic_mic_grey600_24dp</item>
-
-        <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape</item>
-
-        <item name="dialog_info_icon">@drawable/ic_info_outline_light</item>
-        <item name="dialog_alert_icon">@drawable/ic_warning_light</item>
-<!--        <item name="dialog_background_color">@color/background_material_light</item>-->
-
-        <item name="device_link_item_card_background">@color/device_link_item_background_light</item>
-
-        <item name="mediapicker_image_outline">@drawable/mediapicker_item_border_light</item>
-
-        <item name="import_export_item_background_color">@color/import_export_item_background_light</item>
-        <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_light</item>
-        <item name="import_export_item_card_background">@drawable/clickable_card_light</item>
-
-        <item name="linkpreview_background_color">@color/core_white</item>
-        <item name="linkpreview_primary_text_color">@color/core_black</item>
-        <item name="linkpreview_secondary_text_color">@color/core_grey_60</item>
-        <item name="linkpreview_divider_color">@color/core_grey_25</item>
-
-        <item name="media_keyboard_button_color">@color/core_grey_60</item>
-
-        <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
-        <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
-        <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
-        <item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
-        <item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item>
-        <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
-        <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
-        <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
-        <item name="menu_trash_icon">@drawable/ic_delete_white_24dp</item>
-        <item name="menu_selectall_icon">@drawable/ic_select_all_white_24dp</item>
-        <item name="menu_split_icon">@drawable/ic_call_split_white_24dp</item>
-        <item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
-        <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
-        <item name="menu_copy_icon">@drawable/ic_content_copy_white_24dp</item>
-        <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-        <item name="menu_reply_icon">@drawable/ic_reply_white_24dp</item>
-
-        <item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
-        <item name="conversation_icon_attach_video">@drawable/ic_video_light</item>
-
-        <item name="reminder_header_background">#ff1d85d7</item>
-
-        <item name="sticker_management_icon">@drawable/sticker_button_light</item>
-        <item name="sticker_management_divider_color">@color/core_grey_15</item>
-        <item name="sticker_management_empty_background_color">@color/core_grey_05</item>
-        <item name="sticker_management_action_button_color">@color/core_grey_90</item>
-        <item name="sticker_popup_background">@color/transparent_white_aa</item>
-        <item name="sticker_preview_toolbar_background">@color/core_white</item>
-        <item name="sticker_preview_status_bar_color">@color/core_grey_05</item>
-        <item name="sticker_view_missing_background">@drawable/sticker_missing_background_light</item>
-
-        <item name="tooltip_default_color">@color/core_white</item>
-
-        <item name="pref_icon_tint">@color/textsecure_primary_dark</item>
-
-        <item name="pref_divider">@drawable/preference_divider_light</item>
-
-        <item name="quote_missing_icon_color">@color/core_grey_60</item>
-
-        <item name="group_members_dialog_icon">@drawable/ic_group_grey600_24dp</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
-
-        <item name="search_toolbar_background">@color/white</item>
-        <item name="search_background">@color/white</item>
-        <item name="invite_background">@color/signal_primary</item>
-
-        <item name="shared_contact_details_header_background">@color/grey_100</item>
-        <item name="shared_contact_details_titlebar">@color/grey_400</item>
-        <item name="shared_contact_item_button_color">@color/core_grey_02</item>
-        <item name="android:statusBarColor">@color/action_bar_background</item>
-    </style>
 
     <!--  Original Signal dark theme  -->
     <style name="Theme.TextSecure" parent="@style/Theme.Session.DayNight">
 
         <item name="windowActionModeOverlay">true</item>
 
-<!--        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>-->
         <item name="colorPrimary">@color/action_bar_background</item>
         <item name="colorPrimaryDark">@color/action_bar_background</item>
 
@@ -429,23 +159,9 @@
         <item name="media_overview_header_foreground">@color/text</item>
 
         <item name="theme_type">dark</item>
-<!--        <item name="actionBarTheme">@style/Widget.Session.ActionBar</item>-->
         <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
-<!--        <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>-->
-<!--        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>-->
-<!--        <item name="actionModeBackground">@color/compose_view_background</item>-->
-<!--        <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>-->
-<!--        <item name="android:textColor">@color/text_color_dark_theme</item>-->
-<!--        <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>-->
-<!--        <item name="colorAccent">@color/accent</item>-->
-<!--        <item name="colorControlActivated">@color/accent</item>-->
-<!--        <item name="colorControlNormal">@color/text</item>-->
-<!--        <item name="colorControlHighlight">@color/accent</item>-->
-<!--        <item name="alertDialogTheme">@style/Session.AlertDialog</item>-->
-<!--        <item name="bottomSheetDialogTheme">@style/Theme.MaterialComponents.BottomSheetDialog</item>-->
         <item name="android:navigationBarColor">@color/compose_view_background</item>
 
-<!--        <item name="attachment_type_selector_background">@color/gray95</item>-->
         <item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
         <item name="attachment_document_icon_large">@drawable/ic_document_large_dark</item>
 
@@ -488,7 +204,6 @@
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
         <item name="dialog_alert_icon">@drawable/ic_warning_dark</item>
-<!--        <item name="dialog_background_color">@color/background_material_dark</item>-->
 
         <item name="device_link_item_card_background">@color/device_link_item_background_dark</item>
 
@@ -508,9 +223,6 @@
         <item name="conversation_transport_sms_indicator">@drawable/ic_arrow_up_circle_24</item>
         <item name="conversation_transport_push_indicator">@drawable/ic_arrow_up_circle_24</item>
         <item name="conversation_transport_popup_background">@color/black</item>
-<!--        <item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_dark</item>-->
-<!--        <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_dark</item>-->
-<!--        <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_white_24dp</item>-->
         <item name="conversation_attach_camera">@drawable/ic_photo_camera_dark</item>
         <item name="conversation_attach_image">@drawable/ic_image_dark</item>
         <item name="conversation_attach_video">@drawable/ic_movie_creation_dark</item>
@@ -601,54 +313,19 @@
         <!-- leave empty to allow overriding -->
     </style>
 
-    <!--    <style name="Theme.TextSecure.DarkNoActionBar" parent="@style/Theme.TextSecure.BaseDarkNoActionBar">-->
-    <!--&lt;!&ndash;        <item name="android:navigationBarColor">@color/compose_view_background</item>&ndash;&gt;-->
-    <!--        <item name="android:colorControlActivated">@color/signal_primary_dark</item>-->
-    <!--    </style>-->
-
     <style name="Theme.TextSecure.DayNight.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionModeOverlay">true</item>
-
-        <!-- TODO Should be moved elsewhere -->
-        <item name="android:colorControlActivated">@color/signal_primary_dark</item>
-
-        <!--        <item name="theme_type">dark</item>-->
-        <!--        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>-->
-        <!--        <item name="colorPrimary">@color/action_bar_background</item>-->
-        <!--        <item name="colorPrimaryDark">@color/action_bar_background</item>-->
-        <!--&lt;!&ndash;        <item name="colorAccent">@color/signal_primary_dark</item>&ndash;&gt;-->
-        <!--        <item name="android:navigationBarColor">@color/compose_view_background</item>-->
-
-        <!--        <item name="recipient_preference_blocked">#d00000</item>-->
-        <!--        <item name="contact_selection_label_text">#66eeeeee</item>-->
-        <!--        <item name="contact_selection_push_user">#ffeeeeee</item>-->
-        <!--        <item name="contact_selection_lay_user">#afeeeeee</item>-->
-        <!--        <item name="contact_selection_header_text">#66eeeeee</item>-->
-
-        <!--        <item name="media_overview_toolbar_background">@color/transparent</item>-->
-        <!--        <item name="media_overview_toolbar_foreground">@color/white</item>-->
-        <!--        <item name="media_overview_header_foreground">@color/text</item>-->
-        <!--        <item name="media_overview_document_primary">@color/core_grey_05</item>-->
-        <!--        <item name="media_overview_document_secondary">#99FFFFFF</item>-->
     </style>
     
-    <style name="RationaleDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
-<!--        <item name="android:windowBackground">@drawable/permission_rationale_dialog_corners</item>-->
+    <style name="Theme.TextSecure.Dialog.Rationale" parent="Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="android:windowBackground">@drawable/default_dialog_background</item>
     </style>
 
-    <style name="TextSecure.MediaSendProgressDialog" parent="@android:style/Theme.Dialog">
-<!--        <item name="android:background">@color/dialog_background</item>-->
+    <style name="Theme.TextSecure.Dialog.MediaSendProgress" parent="@android:style/Theme.Dialog">
         <item name="android:background">@drawable/default_dialog_background</item>
         <item name="android:windowNoTitle">true</item>
     </style>
 
-    <style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar">
-    </style>
-
-    <style name="TextSecure.DarkRegistrationTheme" parent="Theme.TextSecure.DayNight.NoActionBar">
-    </style>
-
 </resources>
diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
index 92d631f576..1c9af4f4c6 100644
--- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -48,8 +48,6 @@ import org.thoughtcrime.securesms.profiles.SystemProfileUtil;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicRegistrationTheme;
-import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -85,7 +83,6 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
   public static final String NEXT_INTENT    = "next_intent";
   public static final String EXCLUDE_SYSTEM = "exclude_system";
 
-  private final DynamicTheme    dynamicTheme    = new DynamicRegistrationTheme();
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
 
   @Inject SignalServiceAccountManager accountManager;
@@ -107,7 +104,6 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
   public void onCreate(Bundle bundle) {
     super.onCreate(bundle);
 
-    dynamicTheme.onCreate(this);
     dynamicLanguage.onCreate(this);
 
     setContentView(R.layout.profile_create_activity);
@@ -125,7 +121,6 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
   @Override
   public void onResume() {
     super.onResume();
-    dynamicTheme.onResume(this);
     dynamicLanguage.onResume(this);
   }
 
diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index f4e881c057..1e8f089d72 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -55,7 +55,6 @@ import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.util.DynamicIntroTheme;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -70,7 +69,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {
 
   private static final String TAG = PassphrasePromptActivity.class.getSimpleName();
 
-  private DynamicIntroTheme dynamicTheme    = new DynamicIntroTheme();
   private DynamicLanguage   dynamicLanguage = new DynamicLanguage();
 
   private View                   passphraseAuthContainer;
@@ -92,7 +90,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   @Override
   public void onCreate(Bundle savedInstanceState) {
     Log.i(TAG, "onCreate()");
-    dynamicTheme.onCreate(this);
     dynamicLanguage.onCreate(this);
     getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
     getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
@@ -105,7 +102,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   @Override
   public void onResume() {
     super.onResume();
-    dynamicTheme.onResume(this);
     dynamicLanguage.onResume(this);
 
     setLockTypeVisibility();
diff --git a/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java b/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
index 7dc4f2c296..44e109ff37 100644
--- a/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
+++ b/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
@@ -45,7 +45,7 @@ public class RegistrationLockDialog {
     if (!RegistrationLockReminders.needsReminder(context))    return;
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
 
-    AlertDialog dialog      = new AlertDialog.Builder(context, R.style.RationaleDialog)
+    AlertDialog dialog      = new AlertDialog.Builder(context, R.style.Theme_TextSecure_Dialog_Rationale)
                                              .setView(R.layout.registration_lock_reminder_view)
                                              .setCancelable(true)
                                              .setOnCancelListener(d -> RegistrationLockReminders.scheduleReminder(context, false))
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
index 219252d6ef..a563f3546f 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
@@ -49,7 +49,6 @@ import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
@@ -448,7 +447,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
       protected void onPreExecute() {
         renderTimer   = new Stopwatch("ProcessMedia");
         progressTimer = () -> {
-          dialog = new AlertDialog.Builder(new ContextThemeWrapper(requireContext(), R.style.TextSecure_MediaSendProgressDialog))
+          dialog = new AlertDialog.Builder(new ContextThemeWrapper(requireContext(), R.style.Theme_TextSecure_Dialog_MediaSendProgress))
                                   .setView(R.layout.progress_dialog)
                                   .setCancelable(false)
                                   .create();
diff --git a/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java b/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java
index ccacd0873f..135cf6c077 100644
--- a/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java
+++ b/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java
@@ -47,7 +47,7 @@ public class RationaleDialog {
 
     text.setText(message);
 
-    return new AlertDialog.Builder(context, R.style.RationaleDialog).setView(view);
+    return new AlertDialog.Builder(context, R.style.Theme_TextSecure_Dialog_Rationale).setView(view);
   }
 
 }
diff --git a/src/org/thoughtcrime/securesms/util/DynamicIntroTheme.java b/src/org/thoughtcrime/securesms/util/DynamicIntroTheme.java
deleted file mode 100644
index ee5d82968c..0000000000
--- a/src/org/thoughtcrime/securesms/util/DynamicIntroTheme.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import android.app.Activity;
-
-import network.loki.messenger.R;
-
-public class DynamicIntroTheme extends DynamicTheme {
-  @Override
-  protected int getSelectedTheme(Activity activity) {
-    String theme = TextSecurePreferences.getTheme(activity);
-
-    if (theme.equals("dark")) return R.style.TextSecure_DarkIntroTheme;
-
-    return R.style.TextSecure_LightIntroTheme;
-  }
-}
diff --git a/src/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java b/src/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
deleted file mode 100644
index e4eebc15a0..0000000000
--- a/src/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import android.app.Activity;
-
-import network.loki.messenger.R;
-
-public class DynamicRegistrationTheme extends DynamicTheme {
-  @Override
-  protected int getSelectedTheme(Activity activity) {
-    return R.style.TextSecure_DarkRegistrationTheme;
-  }
-}
diff --git a/src/org/thoughtcrime/securesms/util/DynamicTheme.java b/src/org/thoughtcrime/securesms/util/DynamicTheme.java
index 346604e139..5668b310f6 100644
--- a/src/org/thoughtcrime/securesms/util/DynamicTheme.java
+++ b/src/org/thoughtcrime/securesms/util/DynamicTheme.java
@@ -6,7 +6,9 @@ import android.content.Intent;
 import network.loki.messenger.R;
 
 /**
- * @deprecated Use conventional DayNight app themes to support dark/light modes.
+ * @deprecated Use one of the Theme.Session.DayNight.*
+ * (or Theme.TextSecure.DayNight.* for old Signal activities)
+ * app themes to support dark/light modes.
  */
 @Deprecated
 public class DynamicTheme {