diff --git a/res/drawable-hdpi-v11/icon_cached.png b/res/drawable-hdpi-v11/icon_cached.png
deleted file mode 100644
index 777153ba4d..0000000000
Binary files a/res/drawable-hdpi-v11/icon_cached.png and /dev/null differ
diff --git a/res/drawable-hdpi/icon_cached.png b/res/drawable-hdpi/icon_cached.png
index d319ca5216..777153ba4d 100644
Binary files a/res/drawable-hdpi/icon_cached.png and b/res/drawable-hdpi/icon_cached.png differ
diff --git a/res/drawable-mdpi-v11/icon_cached.png b/res/drawable-mdpi-v11/icon_cached.png
deleted file mode 100644
index 5654c49147..0000000000
Binary files a/res/drawable-mdpi-v11/icon_cached.png and /dev/null differ
diff --git a/res/drawable-mdpi/icon_cached.png b/res/drawable-mdpi/icon_cached.png
index 07d3a7e9d5..5654c49147 100644
Binary files a/res/drawable-mdpi/icon_cached.png and b/res/drawable-mdpi/icon_cached.png differ
diff --git a/res/drawable-v12/recycler_view_fast_scroller_bubble.xml b/res/drawable-v12/recycler_view_fast_scroller_bubble.xml
deleted file mode 100644
index f135c5c6d6..0000000000
--- a/res/drawable-v12/recycler_view_fast_scroller_bubble.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:topLeftRadius="44dp"
-             android:topRightRadius="44dp"
-             android:bottomLeftRadius="44dp"
-             android:bottomRightRadius="0dp"/>
-    <solid android:color="#FF0288D1" />
-    <size android:height="88dp" android:width="88dp" />
-</shape>
\ No newline at end of file
diff --git a/res/drawable-v21/circle_touch_highlight_background.xml b/res/drawable-v21/circle_touch_highlight_background.xml
deleted file mode 100644
index fe392b45e6..0000000000
--- a/res/drawable-v21/circle_touch_highlight_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/touch_highlight">
-    <item android:id="@android:id/mask">
-        <shape android:shape="oval">
-            <solid android:color="@color/black" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/res/drawable-v21/conversation_list_item_background.xml b/res/drawable-v21/conversation_list_item_background.xml
deleted file mode 100644
index 642879178e..0000000000
--- a/res/drawable-v21/conversation_list_item_background.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/textsecure_primary">
-    <item android:id="@android:id/mask" android:drawable="@android:color/black" />
-    <item>
-        <selector>
-            <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
-        </selector>
-    </item>
-</ripple>
diff --git a/res/drawable-v21/conversation_list_item_background_dark.xml b/res/drawable-v21/conversation_list_item_background_dark.xml
deleted file mode 100644
index 642879178e..0000000000
--- a/res/drawable-v21/conversation_list_item_background_dark.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/textsecure_primary">
-    <item android:id="@android:id/mask" android:drawable="@android:color/black" />
-    <item>
-        <selector>
-            <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
-        </selector>
-    </item>
-</ripple>
diff --git a/res/drawable-v21/dialog_background.xml b/res/drawable-v21/dialog_background.xml
deleted file mode 100644
index d607bfc022..0000000000
--- a/res/drawable-v21/dialog_background.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:insetLeft="0dp"
-    android:insetTop="16dp"
-    android:insetRight="0dp"
-    android:insetBottom="16dp">
-    <shape android:shape="rectangle">
-        <corners android:radius="2dp" />
-        <solid android:color="?dialog_background_color" />
-    </shape>
-</inset>
\ No newline at end of file
diff --git a/res/drawable-v21/media_camera_button_background.xml b/res/drawable-v21/media_camera_button_background.xml
deleted file mode 100644
index e129933aea..0000000000
--- a/res/drawable-v21/media_camera_button_background.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/core_grey_45">
-    <item android:id="@+id/mask">
-        <shape>
-            <corners android:radius="1000dp" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="@color/core_white" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/res/drawable-v21/media_count_button_background.xml b/res/drawable-v21/media_count_button_background.xml
deleted file mode 100644
index a5fdc45a06..0000000000
--- a/res/drawable-v21/media_count_button_background.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/transparent_white_40">
-    <item android:id="@+id/mask">
-        <shape>
-            <corners android:radius="1000dp" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-    <item android:drawable="@drawable/pill" />
-</ripple>
\ No newline at end of file
diff --git a/res/drawable-v21/mediarail_button_background.xml b/res/drawable-v21/mediarail_button_background.xml
deleted file mode 100644
index 035512fbff..0000000000
--- a/res/drawable-v21/mediarail_button_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/transparent_white_40">
-
-    <item android:id="@+id/mask">
-        <shape>
-            <corners android:radius="5dp" />
-            <solid android:color="@color/transparent_black" />
-        </shape>
-    </item>
-
-    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-            <corners android:radius="5dp" />
-            <solid android:color="@color/transparent_black_70"/>
-        </shape>
-    </item>
-</ripple>
diff --git a/res/drawable-v21/sticker_button_dark.xml b/res/drawable-v21/sticker_button_dark.xml
deleted file mode 100644
index bbd18b7e9f..0000000000
--- a/res/drawable-v21/sticker_button_dark.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/transparent_white_40">
-
-    <item android:id="@+id/mask">
-        <shape android:shape="oval">
-            <solid android:color="@color/transparent_black" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="oval" >
-            <solid android:color="@color/core_grey_75"/>
-        </shape>
-    </item>
-</ripple>
diff --git a/res/drawable-v21/sticker_button_light.xml b/res/drawable-v21/sticker_button_light.xml
deleted file mode 100644
index f20b4e89d1..0000000000
--- a/res/drawable-v21/sticker_button_light.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/transparent_black_40">
-
-    <item android:id="@+id/mask">
-        <shape android:shape="oval">
-            <solid android:color="@color/transparent_black" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="oval" >
-            <solid android:color="@color/core_grey_05"/>
-        </shape>
-    </item>
-</ripple>
diff --git a/res/drawable-v21/touch_highlight_background.xml b/res/drawable-v21/touch_highlight_background.xml
deleted file mode 100644
index 80e27edf3d..0000000000
--- a/res/drawable-v21/touch_highlight_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/touch_highlight">
-    <item
-        android:id="@android:id/mask"
-        android:drawable="@android:color/white" />
-</ripple>
\ No newline at end of file
diff --git a/res/drawable-xhdpi-v11/icon_cached.png b/res/drawable-xhdpi-v11/icon_cached.png
deleted file mode 100644
index 66a4b60dd3..0000000000
Binary files a/res/drawable-xhdpi-v11/icon_cached.png and /dev/null differ
diff --git a/res/drawable-xhdpi/icon_cached.png b/res/drawable-xhdpi/icon_cached.png
index b34b69604c..66a4b60dd3 100644
Binary files a/res/drawable-xhdpi/icon_cached.png and b/res/drawable-xhdpi/icon_cached.png differ
diff --git a/res/drawable-xxhdpi-v11/icon_cached.png b/res/drawable-xxhdpi-v11/icon_cached.png
deleted file mode 100644
index d17e250790..0000000000
Binary files a/res/drawable-xxhdpi-v11/icon_cached.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/icon_cached.png b/res/drawable-xxhdpi/icon_cached.png
index ac8c295810..d17e250790 100644
Binary files a/res/drawable-xxhdpi/icon_cached.png and b/res/drawable-xxhdpi/icon_cached.png differ
diff --git a/res/drawable-xxxhdpi-v11/icon_cached.png b/res/drawable-xxxhdpi-v11/icon_cached.png
deleted file mode 100644
index fc6a833547..0000000000
Binary files a/res/drawable-xxxhdpi-v11/icon_cached.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/icon_cached.png b/res/drawable-xxxhdpi/icon_cached.png
index 07c7bd5382..fc6a833547 100644
Binary files a/res/drawable-xxxhdpi/icon_cached.png and b/res/drawable-xxxhdpi/icon_cached.png differ
diff --git a/res/drawable/circle_touch_highlight_background.xml b/res/drawable/circle_touch_highlight_background.xml
index 96f6b341a6..fe392b45e6 100644
--- a/res/drawable/circle_touch_highlight_background.xml
+++ b/res/drawable/circle_touch_highlight_background.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/touch_highlight">
+    <item android:id="@android:id/mask">
         <shape android:shape="oval">
-            <solid android:color="@color/touch_highlight" />
+            <solid android:color="@color/black" />
         </shape>
     </item>
-</selector>
\ No newline at end of file
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/conversation_list_item_background.xml b/res/drawable/conversation_list_item_background.xml
index 92908acc6a..642879178e 100644
--- a/res/drawable/conversation_list_item_background.xml
+++ b/res/drawable/conversation_list_item_background.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
-    <item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
-    <item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/textsecure_primary">
+    <item android:id="@android:id/mask" android:drawable="@android:color/black" />
+    <item>
+        <selector>
+            <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+        </selector>
+    </item>
+</ripple>
diff --git a/res/drawable/conversation_list_item_background_dark.xml b/res/drawable/conversation_list_item_background_dark.xml
index 92908acc6a..642879178e 100644
--- a/res/drawable/conversation_list_item_background_dark.xml
+++ b/res/drawable/conversation_list_item_background_dark.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
-    <item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
-    <item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/textsecure_primary">
+    <item android:id="@android:id/mask" android:drawable="@android:color/black" />
+    <item>
+        <selector>
+            <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+        </selector>
+    </item>
+</ripple>
diff --git a/res/drawable/default_session_background.xml b/res/drawable/default_session_background.xml
index c6e75f86e6..d397981ab5 100644
--- a/res/drawable/default_session_background.xml
+++ b/res/drawable/default_session_background.xml
@@ -5,8 +5,8 @@
 
     <gradient
         android:angle="90"
-        android:startColor="#121212"
-        android:endColor="#171717"
+        android:startColor="@color/default_background_start"
+        android:endColor="@color/default_background_end"
         android:type="linear" />
 
 </shape>
\ No newline at end of file
diff --git a/res/drawable/dialog_background.xml b/res/drawable/dialog_background.xml
index 1c3a6cfb02..d607bfc022 100644
--- a/res/drawable/dialog_background.xml
+++ b/res/drawable/dialog_background.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/transparent" />
-</shape>
\ No newline at end of file
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="0dp"
+    android:insetTop="16dp"
+    android:insetRight="0dp"
+    android:insetBottom="16dp">
+    <shape android:shape="rectangle">
+        <corners android:radius="2dp" />
+        <solid android:color="?dialog_background_color" />
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/res/drawable/ic_advanced_24dp.xml b/res/drawable/ic_advanced_24dp.xml
index 4fb9e1ab03..7f05df0360 100644
--- a/res/drawable/ic_advanced_24dp.xml
+++ b/res/drawable/ic_advanced_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_advanced_white_24dp"
-    android:tint="?attr/pref_icon_tint"/>
+    android:tint="?attr/pref_icon_tint"/>
\ No newline at end of file
diff --git a/res/drawable/media_camera_button_background.xml b/res/drawable/media_camera_button_background.xml
index a5074afb2a..e129933aea 100644
--- a/res/drawable/media_camera_button_background.xml
+++ b/res/drawable/media_camera_button_background.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/core_white"/>
-</shape>
\ No newline at end of file
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/core_grey_45">
+    <item android:id="@+id/mask">
+        <shape>
+            <corners android:radius="1000dp" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/core_white" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/media_count_button_background.xml b/res/drawable/media_count_button_background.xml
index 57cfd3a85c..a5fdc45a06 100644
--- a/res/drawable/media_count_button_background.xml
+++ b/res/drawable/media_count_button_background.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="1000dp" />
-    <solid android:color="@color/accent" />
-</shape>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/transparent_white_40">
+    <item android:id="@+id/mask">
+        <shape>
+            <corners android:radius="1000dp" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/pill" />
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/mediarail_button_background.xml b/res/drawable/mediarail_button_background.xml
index 09e616ea41..035512fbff 100644
--- a/res/drawable/mediarail_button_background.xml
+++ b/res/drawable/mediarail_button_background.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <corners android:radius="5dp" />
-    <solid android:color="@color/transparent_black_70"/>
-</shape>
\ No newline at end of file
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/transparent_white_40">
+
+    <item android:id="@+id/mask">
+        <shape>
+            <corners android:radius="5dp" />
+            <solid android:color="@color/transparent_black" />
+        </shape>
+    </item>
+
+    <item>
+        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+            <corners android:radius="5dp" />
+            <solid android:color="@color/transparent_black_70"/>
+        </shape>
+    </item>
+</ripple>
diff --git a/res/drawable/recycler_view_fast_scroller_bubble.xml b/res/drawable/recycler_view_fast_scroller_bubble.xml
index 417f6e4bc6..f135c5c6d6 100644
--- a/res/drawable/recycler_view_fast_scroller_bubble.xml
+++ b/res/drawable/recycler_view_fast_scroller_bubble.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:topLeftRadius="44dp"
              android:topRightRadius="44dp"
-             android:bottomLeftRadius="0dp"
-             android:bottomRightRadius="44dp"/>
+             android:bottomLeftRadius="44dp"
+             android:bottomRightRadius="0dp"/>
     <solid android:color="#FF0288D1" />
     <size android:height="88dp" android:width="88dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/sticker_button_dark.xml b/res/drawable/sticker_button_dark.xml
index 646748d34b..bbd18b7e9f 100644
--- a/res/drawable/sticker_button_dark.xml
+++ b/res/drawable/sticker_button_dark.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
-    <solid android:color="@color/core_grey_75"/>
-</shape>
\ No newline at end of file
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/transparent_white_40">
+
+    <item android:id="@+id/mask">
+        <shape android:shape="oval">
+            <solid android:color="@color/transparent_black" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="oval" >
+            <solid android:color="@color/core_grey_75"/>
+        </shape>
+    </item>
+</ripple>
diff --git a/res/drawable/sticker_button_light.xml b/res/drawable/sticker_button_light.xml
index 97fcffe0fb..f20b4e89d1 100644
--- a/res/drawable/sticker_button_light.xml
+++ b/res/drawable/sticker_button_light.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
-    <solid android:color="@color/core_grey_05"/>
-</shape>
\ No newline at end of file
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/transparent_black_40">
+
+    <item android:id="@+id/mask">
+        <shape android:shape="oval">
+            <solid android:color="@color/transparent_black" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="oval" >
+            <solid android:color="@color/core_grey_05"/>
+        </shape>
+    </item>
+</ripple>
diff --git a/res/drawable/touch_highlight_background.xml b/res/drawable/touch_highlight_background.xml
index 8089a02808..80e27edf3d 100644
--- a/res/drawable/touch_highlight_background.xml
+++ b/res/drawable/touch_highlight_background.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@color/touch_highlight" />
-    <item android:state_focused="true" android:drawable="@color/signal_primary" />
-    <item android:drawable="@android:color/transparent" />
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/touch_highlight">
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@android:color/white" />
+</ripple>
\ No newline at end of file
diff --git a/res/layout-v16/video_player.xml b/res/layout-v16/video_player.xml
deleted file mode 100644
index b855fca65a..0000000000
--- a/res/layout-v16/video_player.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.exoplayer2.ui.PlayerView
-        android:id="@+id/video_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:gravity="center"
-        app:player_layout_id="@layout/media_preview_exoplayer_layout"/>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index bff6499952..e0312b15f8 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -161,6 +161,22 @@
                 android:layout_marginTop="@dimen/large_spacing"
                 android:background="@color/separator" />
 
+            <TextView
+                android:id="@+id/themeSwitchButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/setting_button_height"
+                android:background="@color/accent"
+                android:textColor="@color/text"
+                android:textSize="@dimen/medium_font_size"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:text="Switch Theme" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/separator" />
+
             <TextView
                 android:id="@+id/privacyButton"
                 android:layout_width="match_parent"
diff --git a/res/layout/video_player.xml b/res/layout/video_player.xml
index 144e0f51ec..b855fca65a 100644
--- a/res/layout/video_player.xml
+++ b/res/layout/video_player.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <VideoView android:id="@+id/video_view"
-               android:layout_width="match_parent"
-               android:layout_height="match_parent"
-               android:layout_gravity="center"
-               android:gravity="center"/>
+    <com.google.android.exoplayer2.ui.PlayerView
+        android:id="@+id/video_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        app:player_layout_id="@layout/media_preview_exoplayer_layout"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/values-notnight/colors.xml b/res/values-notnight/colors.xml
new file mode 100644
index 0000000000..ba86608401
--- /dev/null
+++ b/res/values-notnight/colors.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+
+<!-- Session -->
+<color name="accent">#00E97B</color>
+<color name="text">#000000</color>
+<color name="cell_background">#FCFCFC</color>
+<color name="cell_selected">#DFDFDF</color>
+<color name="navigation_bar_background">#FCFCFC</color>
+<color name="unimportant_button_background">@color/transparent</color>
+<color name="dialog_background">#FCFCFC</color>
+<color name="dialog_border">#212121</color>
+<color name="compose_view_background">#FCFCFC</color>
+<color name="compose_text_view_background">#EDEDED</color>
+<color name="received_message_background">#F5F5F5</color>
+<color name="sent_message_background">#00E97B</color>
+<color name="new_conversation_button_collapsed_background">#F5F5F5</color>
+<color name="pn_option_background">#FCFCFC</color>
+<color name="fake_chat_bubble_background">#F5F5F5</color>
+
+
+<color name="default_background_start">#fcfcfd</color>
+<color name="default_background_end">#fcfcfd</color>
+<color name="action_bar_background">#fcfcfd</color>
+
+
+<color name="unimportant_dialog_button_background">#1B1B1B</color>
+<color name="app_icon_background">#333132</color>
+<color name="progress_bar_background">#0AFFFFFF</color>
+<color name="quote_not_found_background">#99FFFFFF</color>
+
+</resources>
\ No newline at end of file
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
deleted file mode 100644
index e5a9a0dffe..0000000000
--- a/res/values-v11/styles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.Holo.ProgressBar.Horizontal">
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/res/values-v19/colors.xml b/res/values-v19/colors.xml
deleted file mode 100644
index 8eee1017ab..0000000000
--- a/res/values-v19/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="touch_highlight">#22000000</color>
-</resources>
\ No newline at end of file
diff --git a/res/values-v19/themes.xml b/res/values-v19/themes.xml
deleted file mode 100644
index 1d73d342bf..0000000000
--- a/res/values-v19/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="TextSecure.ScribbleTheme" parent="TextSecure.DarkNoActionBar">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFullscreen">true</item>
-    </style>
-</resources>
diff --git a/res/values-v21/themes.xml b/res/values-v21/themes.xml
deleted file mode 100644
index c3189760de..0000000000
--- a/res/values-v21/themes.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
-        <item name="android:navigationBarColor">@color/compose_view_background</item>
-    </style>
-
-    <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
-        <item name="android:navigationBarColor">@color/compose_view_background</item>
-        <item name="android:colorControlActivated">@color/signal_primary_dark</item>
-    </style>
-
-</resources>
diff --git a/res/values-v9/styles.xml b/res/values-v9/styles.xml
deleted file mode 100644
index 736e77a5d6..0000000000
--- a/res/values-v9/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" />
-    <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" />
-</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e46a888f01..63ebf4387d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -82,7 +82,7 @@
     <color name="conversation_compose_divider">#32000000</color>
 
     <color name="action_mode_status_bar">@color/gray65</color>
-    <color name="touch_highlight">#400099cc</color>
+    <color name="touch_highlight">#22000000</color>
 
     <color name="device_link_item_background_light">#ffffffff</color>
     <color name="device_link_item_background_dark">#ff333333</color>
@@ -107,4 +107,7 @@
 
     <color name="avatar_background">@color/transparent_black_90</color>
 
+    <color name="default_background_start">#121212</color>
+    <color name="default_background_end">#171717</color>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3355423f77..9fc46d2f60 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -296,13 +296,12 @@
         <item name="android:textColor">#BFffffff</item>
     </style>
 
-    <style name="NotificationText">
-      <item name="android:textColor">?android:attr/textColorPrimary</item>
+    <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
-
-    <style name="NotificationTitle">
-      <item name="android:textColor">?android:attr/textColorPrimary</item>
-      <item name="android:textStyle">bold</item>
+    <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textStyle">bold</item>
     </style>
 
     <style name="Registration.Description" parent="@android:style/TextAppearance">
@@ -350,7 +349,7 @@
 
     <!-- For Holo Light Dialog Activity Styling Emulation -->
 
-    <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.ProgressBar.Horizontal">
+    <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.Holo.ProgressBar.Horizontal">
     </style>
 
     <style name="MaterialButton">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index edd5adf795..fde5f00df2 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -3,43 +3,23 @@
 <resources>
 
     <!-- Session -->
-    <style name="Session.DarkTheme" parent="@style/Theme.AppCompat">
-        <item name="actionBarStyle">@style/Session.DarkActionBar</item>
+    <style name="Session.DarkTheme" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/action_bar_background</item>
         <item name="colorPrimaryDark">@color/action_bar_background</item>
-        <item name="android:navigationBarColor">@color/navigation_bar_background</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="actionBarStyle">@style/Session.DarkActionBar</item>
         <item name="alertDialogTheme">@style/Session.AlertDialog</item>
+        <item name="android:navigationBarColor">@color/compose_view_background</item>
         <item name="android:windowBackground">@drawable/default_session_background</item>
         <item name="preferenceTheme">@style/Session.SettingsTheme</item>
-        <item name="colorAccent">@color/accent</item>
         <item name="actionModeBackground">@color/compose_view_background</item>
         <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="Session.DarkTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
-        <item name="actionBarStyle">@style/Session.DarkActionBar</item>
-        <item name="colorPrimary">@color/action_bar_background</item>
-        <item name="colorPrimaryDark">@color/action_bar_background</item>
-        <item name="android:navigationBarColor">@color/navigation_bar_background</item>
-        <item name="alertDialogTheme">@style/Session.AlertDialog</item>
-        <item name="android:windowBackground">@drawable/default_session_background</item>
-        <item name="preferenceTheme">@style/Session.SettingsTheme</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="actionModeBackground">@color/compose_view_background</item>
-        <item name="windowActionModeOverlay">true</item>
-    </style>
+    <style name="Session.DarkTheme.NoActionBar" parent="@style/Theme.AppCompat.DayNight.NoActionBar"/>
 
-    <style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Theme.AppCompat">
+    <style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
         <item name="actionBarStyle">@style/Session.DarkSubtitleActionBar</item>
-        <item name="colorPrimary">@color/action_bar_background</item>
-        <item name="colorPrimaryDark">@color/action_bar_background</item>
-        <item name="android:navigationBarColor">@color/navigation_bar_background</item>
-        <item name="alertDialogTheme">@style/Session.AlertDialog</item>
-        <item name="android:windowBackground">@drawable/default_session_background</item>
-        <item name="preferenceTheme">@style/Session.SettingsTheme</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="actionModeBackground">@color/compose_view_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
     <!-- Session -->
 
@@ -68,7 +48,8 @@
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
-        <!-- leave empty to allow overriding -->
+        <item name="android:navigationBarColor">@color/compose_view_background</item>
+        <item name="android:colorControlActivated">@color/signal_primary_dark</item>
     </style>
 
     <style name="TextSecure.BaseDarkNoActionBar" parent="@style/TextSecure.BaseDarkTheme">
@@ -535,6 +516,8 @@
     </style>
 
     <style name="TextSecure.ScribbleTheme" parent="TextSecure.DarkNoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">true</item>
     </style>
 
     <style name="TextSecure.MediaSendProgressDialog" parent="@android:style/Theme.Dialog">
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
index 79cf26157f..281d965d3f 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
@@ -5,11 +5,13 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.net.Uri
 import android.os.AsyncTask
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.support.v7.app.AppCompatDelegate
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.LinearLayout
@@ -66,6 +68,11 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
+//        setTheme(if (isDarkTheme())
+//            R.style.Session_DarkTheme_NoActionBar
+//        else
+//            R.style.Session_LightTheme_NoActionBar)
+
         setContentView(R.layout.activity_settings)
         setSupportActionBar(toolbar)
         cancelButton.setOnClickListener { cancelEditingDisplayName() }
@@ -96,6 +103,21 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         seedButton.setOnClickListener { showSeed() }
         clearAllDataButton.setOnClickListener { clearAllData() }
         versionTextView.text = String.format(getString(R.string.version_s), BuildConfig.VERSION_NAME)
+
+        themeSwitchButton.setOnClickListener {
+            setDarkTheme(!isDarkTheme())
+            recreate()
+        }
+    }
+
+    private fun isDarkTheme(): Boolean {
+        val themeFlag = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+        return themeFlag == Configuration.UI_MODE_NIGHT_YES;
+    }
+
+    private fun setDarkTheme(darkTheme: Boolean) {
+//        AppCompatDelegate.setDefaultNightMode(if (darkTheme) AppCompatDelegate.MODE_NIGHT_YES else AppCompatDelegate.MODE_NIGHT_NO )
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO)
     }
 
     public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {