diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a6be881c13babc36d83121a49ca542a01a9339a9..bd599f63b7abbbe5e2b4391df316e311e7213d7a 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -244,7 +244,7 @@
         </activity>
         <activity android:name="com.android.gallery3d.app.TrimVideo"
                 android:label="@string/trim_label"
-                android:theme="@style/Theme.MovieActivity"
+                android:theme="@style/Theme.TrimVideo"
                 android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter android:label="@string/crop_label">
                 <action android:name="com.android.camera.action.TRIM" />
diff --git a/res/color/primary_text.xml b/res/color/primary_text.xml
index e9fdf7b8b0630091c4629bfb1185b4fcf7f2c653..2f94489c54c1cc62460407c9adf7ed4f823e8143 100644
--- a/res/color/primary_text.xml
+++ b/res/color/primary_text.xml
@@ -16,11 +16,11 @@
 
 <!-- Copied from framework resource color/primary_text_holo_dark.xml -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/bright_foreground_disabled_holo_dark"/>
-    <item android:state_window_focused="false" android:color="@color/bright_foreground_holo_dark"/>
-    <item android:state_pressed="true" android:color="@color/bright_foreground_holo_dark"/>
-    <item android:state_selected="true" android:color="@color/bright_foreground_holo_dark"/>
-    <item android:state_activated="true" android:color="@color/bright_foreground_holo_dark"/>
-    <item android:color="@color/bright_foreground_holo_dark"/> <!-- not selected -->
+    <item android:state_enabled="false" android:color="@color/color_default_secondary_text"/>
+    <item android:state_window_focused="false" android:color="@color/color_default_secondary_text"/>
+    <item android:state_pressed="true" android:color="@color/color_default_primary_text"/>
+    <item android:state_selected="true" android:color="@color/color_default_primary_text"/>
+    <item android:state_activated="true" android:color="@color/color_default_primary_text"/>
+    <item android:color="@color/color_default_secondary_text"/> <!-- not selected -->
 </selector>
 
diff --git a/res/drawable-night-hdpi/rounded_mask.9.png b/res/drawable-night-hdpi/rounded_mask.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d10a6ac906742171d1f5fddff4e57bfccb64de7
Binary files /dev/null and b/res/drawable-night-hdpi/rounded_mask.9.png differ
diff --git a/res/drawable-night-xhdpi/rounded_mask.9.png b/res/drawable-night-xhdpi/rounded_mask.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..85b2a3502e634fb26ffd00ea2ecdb7b549146f69
Binary files /dev/null and b/res/drawable-night-xhdpi/rounded_mask.9.png differ
diff --git a/res/drawable-night-xxhdpi/rounded_mask.9.png b/res/drawable-night-xxhdpi/rounded_mask.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a8987e7588e287462ec18edaa301a8a1a754c8f
Binary files /dev/null and b/res/drawable-night-xxhdpi/rounded_mask.9.png differ
diff --git a/res/drawable/addspot.xml b/res/drawable/addspot.xml
index 5e3064e5e031903a16b739d8fd935257c6b0aad6..9324003866586283cc4dfcf281324f6f82b76ab5 100644
--- a/res/drawable/addspot.xml
+++ b/res/drawable/addspot.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M19.316,16.303v-4.351h-1.66v4.351h-4.264v1.707h4.264v4.328h1.66V18.01h4.27v-1.707H19.316zM7.814,1.638c-4.087,0 -7.4,3.313 -7.4,7.401c0,4.088 3.313,7.4 7.4,7.4s7.4,-3.313 7.4,-7.4C15.215,4.952 11.901,1.638 7.814,1.638zM7.729,15.008c-3.353,0 -6.07,-2.718 -6.07,-6.071s2.718,-6.071 6.07,-6.071c3.354,0 6.071,2.718 6.071,6.071S11.083,15.008 7.729,15.008zM7.729,4.513c-2.47,0 -4.472,2.002 -4.472,4.472s2.002,4.472 4.472,4.472s4.472,-2.002 4.472,-4.472S10.199,4.513 7.729,4.513z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/albums.xml b/res/drawable/albums.xml
index 23630a5793edc7546ec4b3bec99d31d0b3bfe382..079adc75942231df78e45c69c5b4c116b233504d 100644
--- a/res/drawable/albums.xml
+++ b/res/drawable/albums.xml
@@ -33,7 +33,7 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M17.999,2h-12c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C19.999,2.9 19.099,2 17.999,2zM5.999,4h5v8l-2.5,-1.5l-2.5,1.5V4zM5.999,19l3,-3.859l2.141,2.58l3,-3.861L17.999,19H5.999z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/back.xml b/res/drawable/back.xml
index 051e5b9c9c29d08300b0237ebd3c6656dc2b5da9..ed46a9fc855bce5f16fe3d3695da8990b77721fa 100644
--- a/res/drawable/back.xml
+++ b/res/drawable/back.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8l8,8l1.41,-1.41L7.83,13H20V11z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/beautify.xml b/res/drawable/beautify.xml
index 6962bc649cdbb37de0979c5bfc4da34ce5439e04..275d225f9708f2b99f29b98bdd65be3fa13bd0d5 100644
--- a/res/drawable/beautify.xml
+++ b/res/drawable/beautify.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M26.305,8.769c-0.433,0.9 -0.486,2.1 -0.486,2.1s-0.175,-1.205 -0.619,-2.128c-0.395,-0.822 -1.93,-1.111 -1.93,-1.111s1.492,-0.138 1.879,-0.938c0.451,-0.939 0.623,-2.139 0.623,-2.139s0.107,1.136 0.571,2.103c0.366,0.758 1.854,0.98 1.854,0.98S26.714,7.919 26.305,8.769zM24.283,18.035c0,0 0.081,-1.424 -0.418,-3.219c-1.354,-4.873 -3.568,-6.139 -3.568,-6.139s2.77,0.869 4.727,5.355C26.087,16.468 24.283,18.035 24.283,18.035zM23.139,17.76c0,0 0.488,1.772 -0.889,4.784c-1.379,3.017 -4.73,4.065 -4.73,4.065s2.842,-1.843 4.154,-4.443C22.706,20.119 23.139,17.76 23.139,17.76zM14.925,13.241c-2.487,1.971 -3.536,4.087 -3.536,7.08c0,3.931 5.176,7.127 5.176,7.127s-6.6,-2.607 -6.6,-7.426c0,-2.614 0.661,-5.133 1.835,-7.062c-0.72,0.654 -1.383,1.438 -1.868,2.416c-1.315,2.659 -0.804,6.175 -0.804,6.175c-2.54,-2.602 -3.533,-6.776 -2.229,-10.197c1.196,-3.136 3.49,-5.457 5.399,-6.058c3.968,-1.25 4.969,0.568 4.969,0.568s0.031,0.09 0.07,0.244c0.045,-0.37 -0.014,-0.573 -0.014,-0.573S21.336,8.16 14.925,13.241zM5.774,23.086c-0.294,0.622 -0.372,1.321 -0.372,1.321s-0.078,-0.701 -0.381,-1.34c-0.269,-0.566 -1.251,-0.704 -1.251,-0.704s0.954,-0.158 1.216,-0.711c0.307,-0.649 0.424,-1.481 0.424,-1.481s0.073,0.789 0.39,1.456C6.049,22.152 7,22.351 7,22.351S6.053,22.501 5.774,23.086zM24.859,22.814c0.478,-1.109 0.659,-2.631 0.659,-2.631s0.112,1.447 0.605,2.59c0.384,0.895 2.104,0.973 2.104,0.973s-1.716,0.152 -2.145,1.155c-0.459,1.063 -0.622,2.521 -0.622,2.521s-0.08,-1.464 -0.549,-2.553c-0.418,-0.972 -2.063,-1.146 -2.063,-1.146l-0.028,-0.004C22.822,23.72 24.451,23.762 24.859,22.814z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
 </vector>
diff --git a/res/drawable/beautify_select.xml b/res/drawable/beautify_select.xml
index 68cff5887237f538cf5b8f434a85ed7debb04cb4..27e6ed730127766382ff2c001e9cc7e22bf99be0 100644
--- a/res/drawable/beautify_select.xml
+++ b/res/drawable/beautify_select.xml
@@ -35,5 +35,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M26.305,8.769c-0.433,0.9 -0.486,2.1 -0.486,2.1s-0.175,-1.205 -0.619,-2.128c-0.395,-0.822 -1.93,-1.111 -1.93,-1.111s1.492,-0.138 1.879,-0.938c0.451,-0.939 0.623,-2.139 0.623,-2.139s0.107,1.136 0.571,2.103c0.366,0.758 1.854,0.98 1.854,0.98S26.714,7.919 26.305,8.769zM24.283,18.035c0,0 0.081,-1.424 -0.418,-3.219c-1.354,-4.873 -3.568,-6.139 -3.568,-6.139s2.77,0.869 4.727,5.355C26.087,16.468 24.283,18.035 24.283,18.035zM23.139,17.76c0,0 0.488,1.772 -0.889,4.784c-1.379,3.017 -4.73,4.065 -4.73,4.065s2.842,-1.843 4.154,-4.443C22.706,20.119 23.139,17.76 23.139,17.76zM14.925,13.241c-2.487,1.971 -3.536,4.087 -3.536,7.08c0,3.931 5.176,7.127 5.176,7.127s-6.6,-2.607 -6.6,-7.426c0,-2.614 0.661,-5.133 1.835,-7.062c-0.72,0.654 -1.383,1.438 -1.868,2.416c-1.315,2.659 -0.804,6.175 -0.804,6.175c-2.54,-2.602 -3.533,-6.776 -2.229,-10.197c1.196,-3.136 3.49,-5.457 5.399,-6.058c3.968,-1.25 4.969,0.568 4.969,0.568s0.031,0.09 0.07,0.244c0.045,-0.37 -0.014,-0.573 -0.014,-0.573S21.336,8.16 14.925,13.241zM5.774,23.086c-0.294,0.622 -0.372,1.321 -0.372,1.321s-0.078,-0.701 -0.381,-1.34c-0.269,-0.566 -1.251,-0.704 -1.251,-0.704s0.954,-0.158 1.216,-0.711c0.307,-0.649 0.424,-1.481 0.424,-1.481s0.073,0.789 0.39,1.456C6.049,22.152 7,22.351 7,22.351S6.053,22.501 5.774,23.086zM24.859,22.814c0.478,-1.109 0.659,-2.631 0.659,-2.631s0.112,1.447 0.605,2.59c0.384,0.895 2.104,0.973 2.104,0.973s-1.716,0.152 -2.145,1.155c-0.459,1.063 -0.622,2.521 -0.622,2.521s-0.08,-1.464 -0.549,-2.553c-0.418,-0.972 -2.063,-1.146 -2.063,-1.146l-0.028,-0.004C22.822,23.72 24.451,23.762 24.859,22.814z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/bg_vidcontrol.xml b/res/drawable/bg_vidcontrol.xml
index 9ce9f6ad09349a3fb5b9cec40ee2e84c8a5d5928..419425c870766dcef0722c1a7f8e3865bcac6bdd 100644
--- a/res/drawable/bg_vidcontrol.xml
+++ b/res/drawable/bg_vidcontrol.xml
@@ -34,7 +34,7 @@
     android:viewportHeight="48.0"
     android:viewportWidth="48.0">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:fillAlpha="0.5"
         android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" />
 </vector>
diff --git a/res/drawable/camera.xml b/res/drawable/camera.xml
index 6249f89681b57f7293ff54839ad8c71d5c542e5f..e26b05c5f2f8ea6af482fa7f0d1f14e91fb78488 100644
--- a/res/drawable/camera.xml
+++ b/res/drawable/camera.xml
@@ -37,10 +37,10 @@
     <path
         android:pathData="M0,0h24v24H0V0z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/accent"
         android:pathData="M 12 9.799 C 13.7673111995 9.799 15.2 11.2316888005 15.2 12.999 C 15.2 14.7663111995 13.7673111995 16.199 12 16.199 C 10.2326888005 16.199 8.8 14.7663111995 8.8 12.999 C 8.8 11.2316888005 10.2326888005 9.799 12 9.799 Z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/accent"
         android:pathData="M9,3L7.17,5H4c-1.1,0-2,0.9-2,2v12c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V7c0-1.1-0.9-2-2-2h-3.17L15,3H9z
 M12,18c-2.76,0-5-2.24-5-5c0-2.76,2.24-5,5-5s5,2.24,5,5C17,15.76,14.76,18,12,18z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/cancel.xml b/res/drawable/cancel.xml
index 335e609303aed335d044a3b5d8b3fc335b562f7f..dd87ea0131ceb6fc7df13896ca83f9d298469ec8 100644
--- a/res/drawable/cancel.xml
+++ b/res/drawable/cancel.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M19.205,6.41L17.795,5l-5.59,5.59L6.615,5l-1.41,1.41l5.59,5.59l-5.59,5.59L6.615,19l5.59,-5.59l5.59,5.59l1.41,-1.41L13.615,12L19.205,6.41z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/cancel2.xml b/res/drawable/cancel2.xml
index 82eaec1edfea6d69d94da2c70c3e4cdf9e8c9f34..76dcf076d06bc97a0a66ae410281e228ef25dda3 100644
--- a/res/drawable/cancel2.xml
+++ b/res/drawable/cancel2.xml
@@ -33,7 +33,7 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M19.205,6.41L17.795,5l-5.59,5.59L6.615,5l-1.41,1.41l5.59,5.59l-5.59,5.59L6.615,19l5.59,-5.59l5.59,5.59l1.41,-1.41L13.615,12L19.205,6.41z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/color.xml b/res/drawable/color.xml
index d2dc37e26287a4b0efbecf314f7929d27e247077..072f892fdd1c65790d1d5fb51d2c987a089d101a 100644
--- a/res/drawable/color.xml
+++ b/res/drawable/color.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M16,4.951C9.898,4.951 4.951,9.898 4.951,16c0,6.102 4.947,11.049 11.049,11.049c1.02,0 1.842,-0.822 1.842,-1.842c0,-0.479 -0.178,-0.908 -0.479,-1.232c-0.289,-0.326 -0.461,-0.75 -0.461,-1.223c0,-1.02 0.822,-1.842 1.842,-1.842h2.166c3.389,0 6.139,-2.75 6.139,-6.138C27.049,9.347 22.102,4.951 16,4.951zM9.248,16c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.841 1.842,-1.841s1.842,0.822 1.842,1.841C11.09,15.178 10.268,16 9.248,16zM12.932,11.09c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.842 1.842,-1.842c1.018,0 1.84,0.823 1.84,1.842C14.771,10.268 13.949,11.09 12.932,11.09zM19.068,11.09c-1.021,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.821,-1.842 1.842,-1.842c1.02,0 1.842,0.823 1.842,1.842C20.91,10.268 20.088,11.09 19.068,11.09zM22.752,16c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.841 1.842,-1.841s1.842,0.822 1.842,1.841C24.594,15.178 23.771,16 22.752,16z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
 </vector>
diff --git a/res/drawable/color_select.xml b/res/drawable/color_select.xml
index 79d107021a7ceaa12386a530c75757aaa1542178..43a49b88677fae55eb1ef323685dffb668212901 100644
--- a/res/drawable/color_select.xml
+++ b/res/drawable/color_select.xml
@@ -35,5 +35,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M16,4.951C9.898,4.951 4.951,9.898 4.951,16c0,6.102 4.947,11.049 11.049,11.049c1.02,0 1.842,-0.822 1.842,-1.842c0,-0.479 -0.178,-0.908 -0.479,-1.232c-0.289,-0.326 -0.461,-0.75 -0.461,-1.223c0,-1.02 0.822,-1.842 1.842,-1.842h2.166c3.389,0 6.139,-2.75 6.139,-6.138C27.049,9.347 22.102,4.951 16,4.951zM9.248,16c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.841 1.842,-1.841s1.842,0.822 1.842,1.841C11.09,15.178 10.268,16 9.248,16zM12.932,11.09c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.842 1.842,-1.842c1.018,0 1.84,0.823 1.84,1.842C14.771,10.268 13.949,11.09 12.932,11.09zM19.068,11.09c-1.021,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.821,-1.842 1.842,-1.842c1.02,0 1.842,0.823 1.842,1.842C20.91,10.268 20.088,11.09 19.068,11.09zM22.752,16c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.841 1.842,-1.841s1.842,0.822 1.842,1.841C24.594,15.178 23.771,16 22.752,16z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/comparison_after.xml b/res/drawable/comparison_after.xml
index 262aa4155c9c15c4b7c1023cecbefc3499f82b0a..6c324cae88cf5f2a71c314742498333d88f57cfd 100644
--- a/res/drawable/comparison_after.xml
+++ b/res/drawable/comparison_after.xml
@@ -33,10 +33,10 @@
         android:viewportWidth="36.0"
         android:viewportHeight="36.0">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M18,1c9.389,0 17,7.611 17,17c0,9.388 -7.611,17 -17,17C8.612,35 1,27.388 1,18C1,8.611 8.612,1 18,1z"
         android:fillAlpha="0.26"/>
     <path
         android:pathData="M9.258,16h1.333v-1.333H9.258V16zM9.258,18.667h1.333v-1.334H9.258V18.667zM9.258,21.333h1.333V20H9.258V21.333zM10.591,23.999v-1.333H9.258C9.258,23.402 9.854,23.999 10.591,23.999zM9.258,13.334h1.333v-1.333C9.854,12.001 9.258,12.598 9.258,13.334zM17.334,25.332h1.333V10.667h-1.333V25.332zM14.667,23.999H16v-1.333h-1.333V23.999zM25.408,12.001h-5.37v1.333h5.37v9.332h-5.37v1.333h5.37c0.737,0 1.334,-0.597 1.334,-1.333v-9.332C26.742,12.598 26.146,12.001 25.408,12.001zM15.97,12.001h-1.333v1.333h1.333V12.001zM11.955,13.334h1.334v-1.333h-1.334V13.334zM11.955,23.999h1.334v-1.333h-1.334V23.999z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/comparison_before.xml b/res/drawable/comparison_before.xml
index 5066cd987bacb8c4103267268e4fb8d60285f0ee..55c1c6f8c2620bbe9d0c0573c9cea1ee81010f7e 100644
--- a/res/drawable/comparison_before.xml
+++ b/res/drawable/comparison_before.xml
@@ -35,8 +35,8 @@
     <path
         android:pathData="M18,1c9.389,0 17,7.611 17,17c0,9.388 -7.611,17 -17,17C8.612,35 1,27.388 1,18C1,8.611 8.612,1 18,1z"
         android:fillAlpha="0.50"
-        android:fillColor="@color/black"/>
+        android:fillColor="@color/color_default_primary_text"/>
     <path
         android:pathData="M9.258,16h1.333v-1.333H9.258V16zM10.591,23.999v-1.333H9.258C9.258,23.402 9.854,23.999 10.591,23.999zM9.258,13.334h1.333v-1.333C9.854,12.001 9.258,12.598 9.258,13.334zM9.258,21.333h1.333V20H9.258V21.333zM9.258,18.667h1.333v-1.334H9.258V18.667zM14.667,23.999H16v-1.333h-1.333V23.999zM25.408,12.001h-5.37v1.333h5.37v9.332h-5.37v1.333h5.37c0.737,0 1.334,-0.597 1.334,-1.333v-9.332C26.742,12.598 26.146,12.001 25.408,12.001zM17.334,25.332h1.333V10.667h-1.333V25.332zM15.97,12.001h-1.333v1.333h1.333V12.001zM11.955,13.334h1.334v-1.333h-1.334V13.334zM11.955,23.999h1.334v-1.333h-1.334V23.999z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/crop.xml b/res/drawable/crop.xml
index 25ff649680d1fba3824f378b9a3dc62f33f7161f..d0ce475e94a9313989347978c72bc725a5fcd56f 100644
--- a/res/drawable/crop.xml
+++ b/res/drawable/crop.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M20.911,19.324h2.28v-8.26c0,-1.127 -0.945,-2.438 -2.073,-2.438h-8.262v2.312h8.055V19.324zM11.117,21.008v-16.4H8.809v4.019h-4.02l-0.031,2.315l4.051,-0.004V21.27c0,1.127 0.914,2.041 2.041,2.041h10.03v4.082h2.312v-4.082h4.052v-2.303H11.117z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
 </vector>
diff --git a/res/drawable/crop_1_1.xml b/res/drawable/crop_1_1.xml
index 332eff7e7753f6a0d5527de7a393c072f3f0136c..be3c39176381bed7f61b0cd0970eb112b1e82b7d 100644
--- a/res/drawable/crop_1_1.xml
+++ b/res/drawable/crop_1_1.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M3,3L3,87L87,87L87,3L3,3ZM78.99,78.99L11.01,78.99L11.01,11.01L78.99,11.01L78.99,78.99Z"/>
+    <path android:fillColor="@color/color_default_primary_text" android:pathData="M3,3L3,87L87,87L87,3L3,3ZM78.99,78.99L11.01,78.99L11.01,11.01L78.99,11.01L78.99,78.99Z"/>
 </vector>
diff --git a/res/drawable/crop_1_1_select.xml b/res/drawable/crop_1_1_select.xml
index 89287071413b77097ea5b5e282610fd0a60de6ad..5d605b97173d8afd605d0599c7dedf9aabda372e 100644
--- a/res/drawable/crop_1_1_select.xml
+++ b/res/drawable/crop_1_1_select.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF4F92E9" android:pathData="M3,3L3,87L87,87L87,3L3,3ZM78.99,78.99L11.01,78.99L11.01,11.01L78.99,11.01L78.99,78.99Z"/>
+    <path android:fillColor="@color/accent" android:pathData="M3,3L3,87L87,87L87,3L3,3ZM78.99,78.99L11.01,78.99L11.01,11.01L78.99,11.01L78.99,78.99Z"/>
 </vector>
diff --git a/res/drawable/crop_crop.xml b/res/drawable/crop_crop.xml
index 0272da20dc78f9d1a174370c56d942b1230b6716..ec0d3d59f1e8c29ed019f1f5d5301408a8af7347 100644
--- a/res/drawable/crop_crop.xml
+++ b/res/drawable/crop_crop.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M15,67C15,71.42 18.58,75 23,75L23,75L67,75L67,87L75,87L75,75L87,75L87,67L23,67L23,3L15,3L15,15L3,15L3,23L15,23L15,67ZM67,59L75,59L75,23C75,18.58 71.42,15 67,15L31,15L31,23L67,23L67,59Z"/>
+    <path android:fillColor="@color/accent" android:pathData="M15,67C15,71.42 18.58,75 23,75L23,75L67,75L67,87L75,87L75,75L87,75L87,67L23,67L23,3L15,3L15,15L3,15L3,23L15,23L15,67ZM67,59L75,59L75,23C75,18.58 71.42,15 67,15L31,15L31,23L67,23L67,59Z"/>
 </vector>
diff --git a/res/drawable/crop_free.xml b/res/drawable/crop_free.xml
index eac62fb247dbaafb503582b8429c65b184e1e487..a04c854d88743c14aaea270a87a029538222057d 100644
--- a/res/drawable/crop_free.xml
+++ b/res/drawable/crop_free.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M11,62L3,62L3,87L28,87L28,79L11,79L11,62ZM79,79L62,79L62,87L87,87L87,62L79,62L79,79ZM3,28L11,28L11,11L28,11L28,3L3,3L3,28ZM62,3L62,11L79,11L79,28L87,28L87,3L62,3Z"/>
+    <path android:fillColor="@color/color_default_primary_text" android:pathData="M11,62L3,62L3,87L28,87L28,79L11,79L11,62ZM79,79L62,79L62,87L87,87L87,62L79,62L79,79ZM3,28L11,28L11,11L28,11L28,3L3,3L3,28ZM62,3L62,11L79,11L79,28L87,28L87,3L62,3Z"/>
 </vector>
diff --git a/res/drawable/crop_free_select.xml b/res/drawable/crop_free_select.xml
index f24699731c789d132123c0ac9ef8b0ac29766e02..d6084e013b460a8d1dc064f4c5ca663679f69b99 100644
--- a/res/drawable/crop_free_select.xml
+++ b/res/drawable/crop_free_select.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF4F92E9" android:pathData="M11,62L3,62L3,87L28,87L28,79L11,79L11,62ZM79,79L62,79L62,87L87,87L87,62L79,62L79,79ZM3,28L11,28L11,11L28,11L28,3L3,3L3,28ZM62,3L62,11L79,11L79,28L87,28L87,3L62,3Z"/>
+    <path android:fillColor="@color/accent" android:pathData="M11,62L3,62L3,87L28,87L28,79L11,79L11,62ZM79,79L62,79L62,87L87,87L87,62L79,62L79,79ZM3,28L11,28L11,11L28,11L28,3L3,3L3,28ZM62,3L62,11L79,11L79,28L87,28L87,3L62,3Z"/>
 </vector>
diff --git a/res/drawable/crop_original.xml b/res/drawable/crop_original.xml
index 91eef6c0c41ba5af62280d71a3864bf903fa0dea..dce12c276f876cea3b4c9bd74299941027d882e2 100644
--- a/res/drawable/crop_original.xml
+++ b/res/drawable/crop_original.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M9,1L9,89L81,89L81,1L9,1ZM17,46L44,46L44,81L17,81L17,46ZM73,81L48,81L48,42L17,42L17,9L73,9L73,81Z"/>
+    <path android:fillColor="@color/color_default_primary_text" android:pathData="M9,1L9,89L81,89L81,1L9,1ZM17,46L44,46L44,81L17,81L17,46ZM73,81L48,81L48,42L17,42L17,9L73,9L73,81Z"/>
 </vector>
diff --git a/res/drawable/crop_original_select.xml b/res/drawable/crop_original_select.xml
index 3bb0f7694d2681c91cce78bbcd663d6cdc114a9d..189a24755b485ba4b123621062bea5117fce098a 100644
--- a/res/drawable/crop_original_select.xml
+++ b/res/drawable/crop_original_select.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF4F92E9" android:pathData="M9,1L9,89L81,89L81,1L9,1ZM17,46L44,46L44,81L17,81L17,46ZM73,81L48,81L48,42L17,42L17,9L73,9L73,81Z"/>
+    <path android:fillColor="@color/accent" android:pathData="M9,1L9,89L81,89L81,1L9,1ZM17,46L44,46L44,81L17,81L17,46ZM73,81L48,81L48,42L17,42L17,9L73,9L73,81Z"/>
 </vector>
diff --git a/res/drawable/crop_rotate.xml b/res/drawable/crop_rotate.xml
index 8caf459e463efabda7fdfe6d35a59c7d7431cbf0..801339dd14df6e76673dddea1dab502e42084c62 100644
--- a/res/drawable/crop_rotate.xml
+++ b/res/drawable/crop_rotate.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M45,5C32.42,5 21.21,10.81 13.88,19.88L5,11L5.01,33.99L6.55,33.99C6.55,33.99 6.55,34 6.54,34L14.94,34C14.94,34 14.94,33.99 14.95,33.99L27.99,33.99L19.57,25.57C25.42,17.93 34.63,13 45,13C62.67,13 77,27.33 77,45C77,62.67 62.67,77 45,77C27.33,77 13,62.67 13,45L5,45C5,67.09 22.91,85 45,85C67.09,85 85,67.09 85,45C85,22.91 67.09,5 45,5Z"/>
+    <path android:fillColor="@color/color_default_primary_text" android:pathData="M45,5C32.42,5 21.21,10.81 13.88,19.88L5,11L5.01,33.99L6.55,33.99C6.55,33.99 6.55,34 6.54,34L14.94,34C14.94,34 14.94,33.99 14.95,33.99L27.99,33.99L19.57,25.57C25.42,17.93 34.63,13 45,13C62.67,13 77,27.33 77,45C77,62.67 62.67,77 45,77C27.33,77 13,62.67 13,45L5,45C5,67.09 22.91,85 45,85C67.09,85 85,67.09 85,45C85,22.91 67.09,5 45,5Z"/>
 </vector>
diff --git a/res/drawable/crop_select.xml b/res/drawable/crop_select.xml
index f2a8269f9e6871fbdf5a9470e81036299b46e6b8..f06a4ea102fd82507cd220e02faf5f13ebf34cdc 100644
--- a/res/drawable/crop_select.xml
+++ b/res/drawable/crop_select.xml
@@ -35,5 +35,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M20.911,19.324h2.28v-8.26c0,-1.127 -0.945,-2.438 -2.073,-2.438h-8.262v2.312h8.055V19.324zM11.117,21.008v-16.4H8.809v4.019h-4.02l-0.031,2.315l4.051,-0.004V21.27c0,1.127 0.914,2.041 2.041,2.041h10.03v4.082h2.312v-4.082h4.052v-2.303H11.117z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/crop_straighten.xml b/res/drawable/crop_straighten.xml
index 9fda1f4840844391cb0c6165493db45a90d70572..c66441ffb7a08ffd756ff7759f63e6e8da0be301 100644
--- a/res/drawable/crop_straighten.xml
+++ b/res/drawable/crop_straighten.xml
@@ -30,5 +30,5 @@
 
 <vector android:height="24dp" android:viewportHeight="90.0"
     android:viewportWidth="89.844" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M87.85,22.54L73.87,22.54L73.87,29.53L82.86,29.53L82.86,75.44L48.91,75.44L48.91,82.43L87.85,82.43C88.95,82.43 89.84,81.53 89.84,80.43L89.84,24.54C89.84,23.44 88.95,22.54 87.85,22.54ZM74.82,64.32L65.09,9.23C64.9,8.15 63.86,7.42 62.77,7.61L1.66,18.37C0.57,18.56 -0.16,19.6 0.03,20.68L9.77,75.77C9.96,76.86 11,77.59 12.09,77.39L73.2,66.64C74.29,66.45 75.01,65.41 74.82,64.32ZM44.55,36.57L31.7,61L21.53,51.79L14.88,64.43L7.8,24.39L59.06,15.37L66.28,56.22L44.55,36.57Z"/>
+    <path android:fillColor="@color/color_default_primary_text" android:pathData="M87.85,22.54L73.87,22.54L73.87,29.53L82.86,29.53L82.86,75.44L48.91,75.44L48.91,82.43L87.85,82.43C88.95,82.43 89.84,81.53 89.84,80.43L89.84,24.54C89.84,23.44 88.95,22.54 87.85,22.54ZM74.82,64.32L65.09,9.23C64.9,8.15 63.86,7.42 62.77,7.61L1.66,18.37C0.57,18.56 -0.16,19.6 0.03,20.68L9.77,75.77C9.96,76.86 11,77.59 12.09,77.39L73.2,66.64C74.29,66.45 75.01,65.41 74.82,64.32ZM44.55,36.57L31.7,61L21.53,51.79L14.88,64.43L7.8,24.39L59.06,15.37L66.28,56.22L44.55,36.57Z"/>
 </vector>
diff --git a/res/drawable/delete.xml b/res/drawable/delete.xml
index 1285cb91638d9db6ba3a1efa50dcbecb581d471b..55c8ecd453668716ce5c14e9e7b3b9bc3c9a18c2 100644
--- a/res/drawable/delete.xml
+++ b/res/drawable/delete.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M5.999,19.001c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2v-12h-12V19.001zM18.999,4.001h-3.5l-1,-1h-5l-1,1h-3.5v2h14V4.001z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/done.xml b/res/drawable/done.xml
index 439357c61b79d85b021e818503ecb4e48b882265..6eb431bb347607749a88af9ff35a1d4f0808fc10 100644
--- a/res/drawable/done.xml
+++ b/res/drawable/done.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M8.795,15.875l-4.17,-4.17l-1.42,1.41l5.59,5.59l12,-12l-1.41,-1.41L8.795,15.875z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/done2.xml b/res/drawable/done2.xml
index 76d5f561b9e312ffc8c3fd82f8833db6fe463050..80405d55530b2eac63c8b16b78b1e88bee0587e0 100644
--- a/res/drawable/done2.xml
+++ b/res/drawable/done2.xml
@@ -33,7 +33,7 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M8.795,15.875l-4.17,-4.17l-1.42,1.41l5.59,5.59l12,-12l-1.41,-1.41L8.795,15.875z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/drawer.xml b/res/drawable/drawer.xml
index e0a8061c8df7995a1cfd53082a08d63a151c84a0..9ec65c43ea86ade747ab5ab751fbff23e3a11b8d 100644
--- a/res/drawable/drawer.xml
+++ b/res/drawable/drawer.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M2.989,18h18.022v-2H2.989V18zM2.989,13h18.022v-2H2.989V13zM2.989,6v2h18.022V6H2.989z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml
index 49788bf9bce75a22567a70f044fb7972de93569e..9cb078aced12961d67433b63c5c1180ab8cf6a4b 100644
--- a/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml
+++ b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml
@@ -35,6 +35,6 @@
     android:viewportWidth="24.0">
     <path
         android:fillAlpha="0.54"
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M0,5h24l-12,14L0,5z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/dualcamera.xml b/res/drawable/dualcamera.xml
index 7bfdc46be6230eb8b3548891d8dc00dffb7b490c..255181f44084cb76d44c45de7a598c41426bc98f 100644
--- a/res/drawable/dualcamera.xml
+++ b/res/drawable/dualcamera.xml
@@ -5,17 +5,17 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M19.794,10.447H12.36c-1.152,0 -2.165,0.887 -2.165,2.04v7.912c0,1.153 1.012,2.086 2.165,2.086h7.434c1.154,0 2.011,-0.933 2.011,-2.086v-7.912C21.805,11.334 20.948,10.447 19.794,10.447zM19.865,20.57h-7.692v-8.175h7.692V20.57z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
     <path
         android:pathData="M21,7h4v5h2V7.713C27,6.341 26.156,5 24.783,5H21V7z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
     <path
         android:pathData="M7,12V7h4V5H7.399C6.027,5 5,6.341 5,7.713V12H7z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
     <path
         android:pathData="M11,26H7v-5H5v4.098C5,26.471 6.027,28 7.399,28H11V26z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
     <path
         android:pathData="M25,21v5h-4v2h3.783C26.156,28 27,26.471 27,25.098V21H25z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
 </vector>
diff --git a/res/drawable/dualcamera_select.xml b/res/drawable/dualcamera_select.xml
index 9835120b3390c20ef0dcdb04a45b1d0a3207025a..85976538d16c9f0d6136125eee20267c0f41a702 100644
--- a/res/drawable/dualcamera_select.xml
+++ b/res/drawable/dualcamera_select.xml
@@ -35,17 +35,17 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M19.794,10.447H12.36c-1.152,0 -2.165,0.887 -2.165,2.04v7.912c0,1.153 1.012,2.086 2.165,2.086h7.434c1.154,0 2.011,-0.933 2.011,-2.086v-7.912C21.805,11.334 20.948,10.447 19.794,10.447zM19.865,20.57h-7.692v-8.175h7.692V20.57z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
     <path
         android:pathData="M21,7h4v5h2V7.713C27,6.341 26.156,5 24.783,5H21V7z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
     <path
         android:pathData="M7,12V7h4V5H7.399C6.027,5 5,6.341 5,7.713V12H7z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
     <path
         android:pathData="M11,26H7v-5H5v4.098C5,26.471 6.027,28 7.399,28H11V26z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
     <path
         android:pathData="M25,21v5h-4v2h3.783C26.156,28 27,26.471 27,25.098V21H25z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/edit.xml b/res/drawable/edit.xml
index b28d23ef285e3152044f7fa777d37e4078b0ee05..cd8fe38c79120bb9abceaa7071652931942ac8a2 100644
--- a/res/drawable/edit.xml
+++ b/res/drawable/edit.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M2.999,17.252v3.75h3.75l11.061,-11.06l-3.75,-3.75L2.999,17.252zM20.708,7.042c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.021,-0.39 -1.41,0l-1.83,1.83l3.75,3.75L20.708,7.042z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/exposure.xml b/res/drawable/exposure.xml
index ad0a64f4f5bb3512a4c28d3d7efa9f1243a93e29..1c9353d3f663c5f5221d65209f45d02ca4c8c3e8 100644
--- a/res/drawable/exposure.xml
+++ b/res/drawable/exposure.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M19.514,21.201v2.357h1.644l0.045,-2.357h2.313v-1.688h-2.357V17.2h-1.643v2.313h-2.357v1.688H19.514zM24.85,4.793H7.061c-1.228,0 -2.223,0.995 -2.223,2.224v17.788c0,1.229 0.995,2.402 2.223,2.402H24.85c1.229,0 2.313,-1.174 2.313,-2.402V7.017C27.161,5.789 26.077,4.793 24.85,4.793zM8.173,8.173h6.671v2H8.173V8.173zM25.161,25.162h-18.1l18.1,-18.541V25.162z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
 </vector>
diff --git a/res/drawable/exposure_select.xml b/res/drawable/exposure_select.xml
index 7386e4c0185e8e65a233abb892dd7bd1505e4758..47630d8b0ab07f018e4e76ce27b3dc89d3964dd8 100644
--- a/res/drawable/exposure_select.xml
+++ b/res/drawable/exposure_select.xml
@@ -35,5 +35,5 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M19.514,21.201v2.357h1.644l0.045,-2.357h2.313v-1.688h-2.357V17.2h-1.643v2.313h-2.357v1.688H19.514zM24.85,4.793H7.061c-1.228,0 -2.223,0.995 -2.223,2.224v17.788c0,1.229 0.995,2.402 2.223,2.402H24.85c1.229,0 2.313,-1.174 2.313,-2.402V7.017C27.161,5.789 26.077,4.793 24.85,4.793zM8.173,8.173h6.671v2H8.173V8.173zM25.161,25.162h-18.1l18.1,-18.541V25.162z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/filtershow_button_background.xml b/res/drawable/filtershow_button_background.xml
index ee8a92dd9ea898aafac30b63e5a66f5026dac435..dcf85bb7c847532f3478b0f9e2ee1a2968ae817c 100644
--- a/res/drawable/filtershow_button_background.xml
+++ b/res/drawable/filtershow_button_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@android:color/holo_blue_light" android:state_pressed="true"/>
+    <item android:drawable="@color/accent" android:state_pressed="true"/>
     <item android:drawable="@drawable/filtershow_button_selected_background" android:state_selected="true"/>
     <item android:drawable="@android:color/transparent" android:state_selected="false"/>
 
diff --git a/res/drawable/filtershow_color_picker_circle.xml b/res/drawable/filtershow_color_picker_circle.xml
index 1457a68ebbf8220ce06b010bc15653c90fc4df5d..fd9b479de72b5def5910d917a13c1df69d51686e 100644
--- a/res/drawable/filtershow_color_picker_circle.xml
+++ b/res/drawable/filtershow_color_picker_circle.xml
@@ -21,6 +21,6 @@
         android:radius="0dp" />
     <solid android:color="@color/red"/>
     <stroke android:width="0dp"
-            android:color="@color/black"/>
+            android:color="@color/color_default_divider"/>
 </shape>
 
diff --git a/res/drawable/frames.xml b/res/drawable/frames.xml
index f668e4dcecb7dd53d923f0d46f85dd5274047bf9..1c9975c31b7045e636b3180ff174bc9aca222de2 100644
--- a/res/drawable/frames.xml
+++ b/res/drawable/frames.xml
@@ -34,11 +34,11 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M24.934,8.228h-4.467L16,3.761l-4.468,4.467H7.065c-1.234,0 -2.233,1 -2.233,2.233v15.441c0,1.232 0.999,2.338 2.233,2.338h17.869c1.233,0 2.233,-1.104 2.233,-2.338V10.461C27.168,9.228 26.168,8.228 24.934,8.228zM25.178,26.25H6.822V10.252h5.285l3.932,-3.699l3.886,3.699h5.253V26.25z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
     <path
         android:pathData="M23.143,12.216"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
     <path
         android:pathData="M8.923,12.216h14.153v11.966h-14.153z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/color_default_primary_text"/>
 </vector>
diff --git a/res/drawable/frames_select.xml b/res/drawable/frames_select.xml
index 6fa77e7ccd790bedbb7fb856c71d3b9fb93f6ad6..85c52df5f20383092aab1a242541542acdbac21f 100644
--- a/res/drawable/frames_select.xml
+++ b/res/drawable/frames_select.xml
@@ -35,11 +35,11 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M24.934,8.228h-4.467L16,3.761l-4.468,4.467H7.065c-1.234,0 -2.233,1 -2.233,2.233v15.441c0,1.232 0.999,2.338 2.233,2.338h17.869c1.233,0 2.233,-1.104 2.233,-2.338V10.461C27.168,9.228 26.168,8.228 24.934,8.228zM25.178,26.25H6.822V10.252h5.285l3.932,-3.699l3.886,3.699h5.253V26.25z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
     <path
         android:pathData="M23.143,12.216"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
     <path
         android:pathData="M8.923,12.216h14.153v11.966h-14.153z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/hazebuster.xml b/res/drawable/hazebuster.xml
index 0b157ac8a53029a5a5d10cd6971bafb7d138198e..0979048590e9a8cfbccbca48566a6f116dbf3be5 100644
--- a/res/drawable/hazebuster.xml
+++ b/res/drawable/hazebuster.xml
@@ -34,26 +34,26 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M29,20.9c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.7,0.4-1.7,0.4-2.3-0.1c-0.2-0.1-0.5-0.3-0.7-0.3
 c-0.2,0.3-0.5,0.5-0.8,0.7c0.4,0,0.8,0.1,1.1,0.3c0.9,0.6,2.3,0.7,3.2,0.1l0.4-0.2c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2
 C29.3,21.3,29.2,21,29,20.9z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M29,16.2c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.4,0.2-0.9,0.3-1.4,0.3c0,0,0,0,0,0.1c0,0.3,0,0.5-0.1,0.8
 c0.6,0.1,1.3-0.1,1.9-0.4l0.4-0.2c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2C29.3,16.6,29.2,16.3,29,16.2z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M29,23.2c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.7,0.4-1.7,0.4-2.3-0.1c-0.9-0.6-2.2-0.7-3.2-0.1l-0.3,0.2
 c-0.7,0.4-1.7,0.4-2.3-0.1c-0.9-0.6-2.2-0.7-3.2-0.1c-0.2,0.1-0.3,0.4-0.2,0.6c0.1,0.2,0.4,0.3,0.6,0.2c0.7-0.4,1.7-0.4,2.3,0.1
 c0.5,0.3,1.1,0.5,1.7,0.5c0.5,0,1.1-0.1,1.5-0.4l0.3-0.2c0.7-0.4,1.7-0.4,2.3,0.1c0.9,0.6,2.3,0.7,3.2,0.1l0.4-0.2
 c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2C29.3,23.6,29.2,23.4,29,23.2z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M29,18.5c-0.9-0.5-2.1-0.5-3.1,0l-0.4,0.2c-0.5,0.3-1.2,0.4-1.8,0.2c-0.1,0.3-0.2,0.5-0.4,0.8
 c0.9,0.3,1.9,0.3,2.7-0.2l0.4-0.2c0.7-0.4,1.6-0.4,2.2,0c0.2,0.1,0.5,0,0.6-0.2C29.3,18.9,29.2,18.7,29,18.5z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M17.1,22.3c-1.1,0-2.2-0.2-3.2-0.7c-1.1,0.5-2.3,0.7-3.5,0.7c-4.2,0-7.7-2.9-7.7-6.5c0-2.6,1.8-5,4.6-6
 c0.9-1.9,3.2-3.2,5.6-3.2c3.2,0,5.9,2.1,6.1,4.8c2.7,0.7,4.6,2.9,4.6,5.3C23.6,19.8,20.7,22.3,17.1,22.3z
 M13.9,19.7l0.4,0.2
diff --git a/res/drawable/ic_album.xml b/res/drawable/ic_album.xml
index 3f0cfa2fb75633a12113805cf6387f112110e0e8..63cbe65aedabc021f23bb812bfb2c7e30e1b0bc8 100644
--- a/res/drawable/ic_album.xml
+++ b/res/drawable/ic_album.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/tab_icon_2"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M17.999,2h-12c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C19.999,2.9 19.099,2 17.999,2zM5.999,4h5v8l-2.5,-1.5l-2.5,1.5V4zM5.999,19l3,-3.859l2.141,2.58l3,-3.861L17.999,19H5.999z"/>
 </vector>
diff --git a/res/drawable/ic_media_bigscreen.xml b/res/drawable/ic_media_bigscreen.xml
index aaab4e40ef01b3e65293404c173a161ba8be808a..a21bf22278f6d3f1c2868196fe41fbc400cc6a84 100644
--- a/res/drawable/ic_media_bigscreen.xml
+++ b/res/drawable/ic_media_bigscreen.xml
@@ -34,6 +34,6 @@
     android:viewportHeight="180.0"
     android:viewportWidth="180.0">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/accent"
         android:pathData="M112.9,72.9l7.1,-7.1l-5.8,-5.8l-7.1,7.1L100,60v20h20L112.9,72.9zM67.1,107.1l-7.1,7.1l5.8,5.8l7.1,-7.1L80,120v-20H60L67.1,107.1zM120,100h-20v20l7.1,-7.1l7.1,7.1l5.8,-5.8l-7.1,-7.1L120,100zM65.8,60L60,65.8l7.1,7.1L60,80h20V60l-7.1,7.1L65.8,60z" />
 </vector>
diff --git a/res/drawable/ic_media_cropscreen.xml b/res/drawable/ic_media_cropscreen.xml
index a867cace49d1f6663e0b130c139c0dfcb1fa18cc..8191c9b5f14d89f443c7a7ab6c58797e8ea90067 100644
--- a/res/drawable/ic_media_cropscreen.xml
+++ b/res/drawable/ic_media_cropscreen.xml
@@ -34,6 +34,6 @@
     android:viewportHeight="180.0"
     android:viewportWidth="180.0">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/accent"
         android:pathData="M60,76h6V66h10v-6H60V76zM66,104h-6v16h16v-6H66V104zM104,60v6h10v10h6V60H104zM114,114h-10v6h16v-16h-6V114zM70,80L60,90l10,10V80zM110,100l10,-10l-10,-10V100zM90,120l10,-10H80L90,120zM80,70h20L90,60L80,70z" />
 </vector>
diff --git a/res/drawable/ic_media_fullscreen.xml b/res/drawable/ic_media_fullscreen.xml
index 51e024b425ecd1e9115fc708d3264aae60966a42..34668a2fd0f15a3bcf49ff01ab543cd8c8cdcba7 100644
--- a/res/drawable/ic_media_fullscreen.xml
+++ b/res/drawable/ic_media_fullscreen.xml
@@ -34,6 +34,6 @@
     android:viewportHeight="180.0"
     android:viewportWidth="180.0">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/accent"
         android:pathData="M80,60H60v20l7.1,-7.1l7.1,7.1l5.8,-5.8l-7.1,-7.1L80,60zM100,60l7.1,7.1l-7.1,7.1l5.8,5.8l7.1,-7.1L120,80V60H100zM74.2,100l-7.1,7.1L60,100v20h20l-7.1,-7.1l7.1,-7.1L74.2,100zM105.8,100l-5.8,5.8l7.1,7.1L100,120h20v-20l-7.1,7.1L105.8,100z" />
 </vector>
diff --git a/res/drawable/ic_selection.xml b/res/drawable/ic_selection.xml
index 1493b49b1aac8b548d8c37f06956169ee0de20af..64948ac708d6ab1fee0314d6e9f2750aa2ac7494 100644
--- a/res/drawable/ic_selection.xml
+++ b/res/drawable/ic_selection.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/accent"
         android:pathData="M3,5 L5,5 L5,3 C3.9,3,3,3.9,3,5 Z M3,13 L5,13 L5,11 L3,11 L3,13 Z M7,21 L9,21
 L9,19 L7,19 L7,21 Z M3,9 L5,9 L5,7 L3,7 L3,9 Z M13,3 L11,3 L11,5 L13,5 L13,3 Z
 M19,3 L19,5 L21,5 C21,3.9,20.1,3,19,3 Z M5,21 L5,19 L3,19 C3,20.1,3.9,21,5,21 Z
diff --git a/res/drawable/ic_timeline.xml b/res/drawable/ic_timeline.xml
index 7c30ffa4e360ecef4cdd030810dc1a16340f8a44..e2af60edc6fbc4bcb0843028f5e4027729b00e52 100644
--- a/res/drawable/ic_timeline.xml
+++ b/res/drawable/ic_timeline.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/tab_icon_1"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M9.45605,12.4586 L16.2515,12.4586 L16.2515,19.7214 L9.45608,19.7214 Z M20,8 L4,8
 L4,6 L20,6 L20,8 Z M18,2 L6,2 L6,4 L18,4 L18,2 Z M22,12 L22,20
 C22,21.1,21.1,22,20,22 L4,22 C2.9,22,2,21.1,2,20 L2,12 C2,10.9,2.9,10,4,10
diff --git a/res/drawable/ic_vidcontrol_pause.xml b/res/drawable/ic_vidcontrol_pause.xml
index cd172536017711cfa21f8eda7e69cf1d64d88ddc..f3b6d0111303c7a6c49704ac84c842cbd963c6b5 100644
--- a/res/drawable/ic_vidcontrol_pause.xml
+++ b/res/drawable/ic_vidcontrol_pause.xml
@@ -34,6 +34,6 @@
     android:viewportHeight="180.0"
     android:viewportWidth="180.0">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M66,58h16v64H66V58zM98,58h16v64H98V58z" />
 </vector>
diff --git a/res/drawable/ic_vidcontrol_play.xml b/res/drawable/ic_vidcontrol_play.xml
index d58c6d7425cbd13b87508c04cf6f6873904710f8..e58e93283095598ceb85c8bb8c51f2059764607e 100644
--- a/res/drawable/ic_vidcontrol_play.xml
+++ b/res/drawable/ic_vidcontrol_play.xml
@@ -34,6 +34,6 @@
     android:viewportHeight="180.0"
     android:viewportWidth="180.0">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M70,58v64l50,-32L70,58z" />
 </vector>
diff --git a/res/drawable/ic_video.xml b/res/drawable/ic_video.xml
index 1904d8b6847df1bcba6d9aed56f297a5c3816445..773face4d7e5c483b765ade6c625ce9ea0dc095f 100644
--- a/res/drawable/ic_video.xml
+++ b/res/drawable/ic_video.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/tab_icon_3"
+        android:fillColor="@color/color_default_secondary_text"
         android:pathData="M18,4 L20,8 L17,8 L15,4 L13,4 L15,8 L12,8 L10,4 L8,4 L10,8 L7,8 L5,4 L4,4
 C2.9,4,2.01,4.9,2.01,6 L2,18 C2,19.1,2.9,20,4,20 L20,20 C21.1,20,22,19.1,22,18
 L22,4 L18,4 Z" />
diff --git a/res/drawable/ic_watermark.xml b/res/drawable/ic_watermark.xml
index 1c579413ff77398ce3e082180bfb6b0653c90e4b..40f4d0b1f66d7d1c52655b7361ccfd8e0805d9f7 100644
--- a/res/drawable/ic_watermark.xml
+++ b/res/drawable/ic_watermark.xml
@@ -34,7 +34,7 @@
     android:viewportHeight="27">
 
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="2.13350288"
         android:pathData="M14.9362,15.8471 L14.9362,11.5098
 C16.5957,10.3574,18.5791,8.83929,18.5791,6.57669
@@ -42,7 +42,7 @@ C18.5791,3.01208,15.8574,2,12.5,2 C9.14256,2,6.42093,3.01208,6.42093,6.57669
 C6.42093,8.83929,8.40383,10.3574,10.0633,11.5098 L10.0633,15.8471 L2,17.49 L2,25
 L11.3331,25 L13.6669,25 L23,25 L23,17.49 L14.9362,15.8471 L14.9362,15.8471 Z" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="0.9482235"
         android:pathData="M3,21 L23,21" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_watermark_emotion.xml b/res/drawable/ic_watermark_emotion.xml
index bed9457cd7bdcb044867c43dd81d6915655c49fa..bf1b2eba7220305817e8566c984cd98e820156c0 100644
--- a/res/drawable/ic_watermark_emotion.xml
+++ b/res/drawable/ic_watermark_emotion.xml
@@ -34,26 +34,26 @@
     android:viewportHeight="1008">
 
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M910.4,497.6c0,230.6-187.1,417.6-417.7,417.5C264.8,915,75.2,730.5,75.4,497
 C75.7,261.1,270.2,74.7,502.8,80C728.9,85.3,911,271.3,910.4,497.6z
 M493.3,112.1c-210.1-0.4-385.5,170-385.8,385
 c-0.3,214.3,173.7,386,385.4,385.9c214.2-0.1,381.8-173.3,385.5-378.3C882.3,289.8,708.1,112.1,493.3,112.1z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M482.3,742.1c-42.7-0.4-93.1-11.6-138.9-39.9c-29.1-17.9-52.7-41.2-67.1-72.7
 c-7.2-15.8-10.8-32.5-11.1-49.8c-0.2-9.9,6.8-17.5,16.3-18c9.6-0.5,17.5,6.1,17.8,16.2c1.5,42.6,25.7,70.9,59.1,92.9
 c31.5,20.8,66.7,31.1,104,35.2c38.9,4.3,77.2,0.9,114.4-11.2c34-11,64.4-28,87.3-56.4c13.9-17.2,22.1-36.6,22.3-59.1
 c0.1-10.7,7.7-17.9,17.7-17.7c9.9,0.2,16.9,7.7,16.7,18.5c-0.6,34.3-14.2,63.3-37,88.2c-28.3,30.8-63.9,49.5-103.5,61.4
 C551.7,738.3,522.6,742.1,482.3,742.1z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M478.9,398.4c0,51.8-41.8,93.4-93.9,93.4c-51.1,0-92.9-42.1-92.9-93.5c0-51.6,41.9-93.4,93.5-93.4
 C437.2,305,478.9,346.7,478.9,398.4z
 M385.4,336.9c-33.5,0.1-61.5,28.1-61.3,61.5c0.2,33.7,27.9,61.3,61.6,61.2
 c33.6-0.1,61.3-27.8,61.3-61.4C446.9,364.7,418.9,336.9,385.4,336.9z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M600.5,304.9c51.6,0.1,93.5,42,93.4,93.5c-0.1,52.1-42.3,93.8-95.1,93.2c-52.5-0.6-92.6-44.3-91.9-95.4
 C507.7,346.3,549.6,304.8,600.5,304.9z
 M600.7,336.9c-33.4-0.1-61.5,27.6-61.6,60.8c-0.1,34,27.1,61.7,60.8,62
diff --git a/res/drawable/ic_watermark_food.xml b/res/drawable/ic_watermark_food.xml
index a5ecfcc2857be9c3f95b2a3f3805a3b95a46d087..5d00d893d947b82ee107ffdd92ca2f122c475aa8 100644
--- a/res/drawable/ic_watermark_food.xml
+++ b/res/drawable/ic_watermark_food.xml
@@ -34,7 +34,7 @@
     android:viewportHeight="1008">
 
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M222,97.3c35.6,31.4,72.7,63.7,109.2,96.6c36.4,32.8,72.3,66.1,108.2,99.4c19.9,18.4,34.5,40,39.1,67.4
 c3.4,20.9,0.9,41.1-6,61c-0.7,2-1.5,4-2.4,6.6c23.4,21.8,46.8,43.7,70.7,65.9c9.1-8.5,18.1-16.8,27.1-25.2
 c16.9-15.8,33.9-31.5,50.7-47.4c1.2-1.1,2.2-3.8,1.7-5.3c-12.1-38-10.3-76.1,3.2-112.8c32.2-87.6,92.7-146.4,183-172.3
@@ -62,7 +62,7 @@ M604.4,597.8c-13.6,14.6-27.1,29.1-40.6,43.6c1.7,1.9,3,3.4,4.4,4.8c44.3,47.5,88.5
 c7.8,8.4,17.9,12.1,29.2,12c16.8-0.2,31.6-10.9,37.3-26.3c6-16.1,1.9-32.6-10.9-44.6c-57.6-53.7-115.2-107.4-172.8-161
 C637.3,628.4,620.9,613.2,604.4,597.8z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M908.7,240.1c8.5,16.8,10.8,34.7,8.9,53c-6.6,64.5-59.1,123.9-122.2,138.2c-22.1,5-43.9,4.3-65-5.3
 c-0.7-0.3-1.5-0.8-3.5-1.8c51.7,0,93.1-21,127.5-56.5C888.7,332.3,908.5,290.3,908.7,240.1z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_watermark_location.xml b/res/drawable/ic_watermark_location.xml
index d430b60606b26fb4deaf47a753ef1e9775ce142e..1ff7d8d62732765d5052a4e2a0bc25a0748a1514 100644
--- a/res/drawable/ic_watermark_location.xml
+++ b/res/drawable/ic_watermark_location.xml
@@ -29,6 +29,6 @@
 -->
 <vector android:height="24dp" android:viewportHeight="1008.0"
     android:viewportWidth="1008.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M831.5,356.4c-1,39.1 -8.9,76.5 -21.9,113.3c-16.9,48 -43.4,90.6 -72,132c-33.4,48.6 -68,96.3 -101.6,144.8c-26.1,37.6 -50.8,76.2 -69.5,118.2c-4.3,9.6 -7.8,19.5 -11.3,29.3c-6.2,17.1 -22.2,28.6 -40.5,28.7c-18.3,0.1 -35.1,-11.2 -40.6,-28.5c-11.4,-35.5 -28.8,-68 -48,-99.6c-29.6,-48.9 -63.2,-95.2 -96,-141.9c-28.5,-40.6 -57.1,-81.2 -81.5,-124.5c-22,-38.9 -37.7,-80.1 -44.2,-124.4c-9.3,-62.7 -1.5,-123.5 26.3,-180.6C277.1,128 352.5,67.8 456.6,47.9c102.9,-19.7 194.6,7.3 272.4,77.7c53.7,48.6 85.8,109.7 97.5,181.2C829.2,323.1 829.9,339.8 831.5,356.4zM233.1,360.8c0.3,4.4 0.5,12.9 1.3,21.4c4.1,43.4 17.6,83.8 38.2,122.1c21.9,40.7 48.5,78.4 74.6,116.4c33.7,49 67.8,97.7 100.4,147.4c23.4,35.6 43.6,73.2 56.6,114.2c1.6,5.2 5.5,8 10.3,8c5.3,-0.1 8.7,-2.8 10.5,-7.7c3.2,-8.6 6.1,-17.3 9.7,-25.7c17,-39.8 39.3,-76.7 63.7,-112.3c35.7,-52 72.7,-103.2 108.5,-155.2c28.3,-41 55,-82.8 72.2,-130.2c19,-52.5 24.6,-105.7 13.1,-160.5C760.6,148.2 613.6,50.3 462.8,79.2C329.7,104.7 233.1,221.4 233.1,360.8z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M368.6,344.7c0,-81.7 65.6,-147 147.6,-147c80.8,0 146.8,66.2 146.7,147.1c-0.1,81.2 -66.1,147.1 -147.3,147.1C434.4,491.9 368.6,426.1 368.6,344.7zM515.3,459.3c63.1,0 114.3,-50.8 115.1,-112.8c0.8,-61.1 -48.4,-116.3 -114.6,-116.5c-63.2,-0.2 -114.9,51.6 -114.9,114.7C400.9,407.8 452.3,459.3 515.3,459.3z"/>
+    <path android:fillColor="@color/color_default_primary_text" android:pathData="M831.5,356.4c-1,39.1 -8.9,76.5 -21.9,113.3c-16.9,48 -43.4,90.6 -72,132c-33.4,48.6 -68,96.3 -101.6,144.8c-26.1,37.6 -50.8,76.2 -69.5,118.2c-4.3,9.6 -7.8,19.5 -11.3,29.3c-6.2,17.1 -22.2,28.6 -40.5,28.7c-18.3,0.1 -35.1,-11.2 -40.6,-28.5c-11.4,-35.5 -28.8,-68 -48,-99.6c-29.6,-48.9 -63.2,-95.2 -96,-141.9c-28.5,-40.6 -57.1,-81.2 -81.5,-124.5c-22,-38.9 -37.7,-80.1 -44.2,-124.4c-9.3,-62.7 -1.5,-123.5 26.3,-180.6C277.1,128 352.5,67.8 456.6,47.9c102.9,-19.7 194.6,7.3 272.4,77.7c53.7,48.6 85.8,109.7 97.5,181.2C829.2,323.1 829.9,339.8 831.5,356.4zM233.1,360.8c0.3,4.4 0.5,12.9 1.3,21.4c4.1,43.4 17.6,83.8 38.2,122.1c21.9,40.7 48.5,78.4 74.6,116.4c33.7,49 67.8,97.7 100.4,147.4c23.4,35.6 43.6,73.2 56.6,114.2c1.6,5.2 5.5,8 10.3,8c5.3,-0.1 8.7,-2.8 10.5,-7.7c3.2,-8.6 6.1,-17.3 9.7,-25.7c17,-39.8 39.3,-76.7 63.7,-112.3c35.7,-52 72.7,-103.2 108.5,-155.2c28.3,-41 55,-82.8 72.2,-130.2c19,-52.5 24.6,-105.7 13.1,-160.5C760.6,148.2 613.6,50.3 462.8,79.2C329.7,104.7 233.1,221.4 233.1,360.8z"/>
+    <path android:fillColor="@color/color_default_primary_text" android:pathData="M368.6,344.7c0,-81.7 65.6,-147 147.6,-147c80.8,0 146.8,66.2 146.7,147.1c-0.1,81.2 -66.1,147.1 -147.3,147.1C434.4,491.9 368.6,426.1 368.6,344.7zM515.3,459.3c63.1,0 114.3,-50.8 115.1,-112.8c0.8,-61.1 -48.4,-116.3 -114.6,-116.5c-63.2,-0.2 -114.9,51.6 -114.9,114.7C400.9,407.8 452.3,459.3 515.3,459.3z"/>
 </vector>
diff --git a/res/drawable/ic_watermark_selected.xml b/res/drawable/ic_watermark_selected.xml
index 736c66bc485cc22aea2f02775ec4c987fd66363c..49c1989fd131ba0d2c7ec73c4269b8aea7bcd24e 100644
--- a/res/drawable/ic_watermark_selected.xml
+++ b/res/drawable/ic_watermark_selected.xml
@@ -34,7 +34,7 @@
     android:viewportHeight="27">
 
     <path
-        android:strokeColor="#4592F9"
+        android:strokeColor="@color/accent"
         android:strokeWidth="2.13350288"
         android:pathData="M14.9362,15.8471 L14.9362,11.5098
 C16.5957,10.3574,18.5791,8.83929,18.5791,6.57669
@@ -42,7 +42,7 @@ C18.5791,3.01208,15.8574,2,12.5,2 C9.14256,2,6.42093,3.01208,6.42093,6.57669
 C6.42093,8.83929,8.40383,10.3574,10.0633,11.5098 L10.0633,15.8471 L2,17.49 L2,25
 L11.3331,25 L13.6669,25 L23,25 L23,17.49 L14.9362,15.8471 L14.9362,15.8471 Z" />
     <path
-        android:strokeColor="#4592F9"
+        android:strokeColor="@color/accent"
         android:strokeWidth="0.9482235"
         android:pathData="M3,21 L23,21" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_watermark_time.xml b/res/drawable/ic_watermark_time.xml
index 9a0b9d8c5c55d38b3afdea4161019ed592e8ad91..4643d439b4b1336bb2c619a6b23e5f95502ae1c8 100644
--- a/res/drawable/ic_watermark_time.xml
+++ b/res/drawable/ic_watermark_time.xml
@@ -34,109 +34,109 @@
     android:viewportHeight="360">
 
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="12.2107"
         android:strokeMiterLimit="10"
         android:pathData="M180.2,330.3c-83.7,0-151.7-68.1-151.7-151.7
 S96.6,26.8,180.2,26.8s151.7,68.1,151.7,151.7S263.9,330.3,180.2,330.3z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M180.2,57.8c32.3,0,62.6,12.6,85.4,35.4c22.8,22.8,35.4,53.1,35.4,85.4s-12.6,62.6-35.4,85.4
 c-22.8,22.8-53.1,35.4-85.4,35.4s-62.6-12.6-85.4-35.4c-22.8-22.8-35.4-53.1-35.4-85.4S72,115.9,94.8,93.1
 C117.6,70.3,148,57.8,180.2,57.8
 M180.2,52.6c-69.6,0-126,56.4-126,126s56.4,126,126,126s126-56.4,126-126S249.8,52.6,180.2,52.6
 L180.2,52.6z" />
     <path
-        android:strokeColor="#231F20"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="16.6991"
         android:strokeMiterLimit="10"
         android:pathData="M79.3,177.8" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="16.6991"
         android:strokeMiterLimit="10"
         android:pathData="M179.5,278" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="16.6991"
         android:strokeMiterLimit="10"
         android:pathData="M179.5,313.3" />
     <path
-        android:strokeColor="#231F20"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="16.6991"
         android:strokeMiterLimit="10"
         android:pathData="M279.7,177.8" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 179.2 103.7 L 179.2 82.4" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 142.1 113.8 L 131.5 95.3" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 115.1 141.1 L 96.7 130.4" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 105.4 178.2 L 84.1 178.2" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 115.5 215.2 L 97 225.9" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 142.8 242.2 L 132.1 260.7" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 179.9 252 L 179.9 273.3" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 216.9 241.9 L 227.6 260.4" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 243.9 214.6 L 262.4 225.3" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 253.7 177.5 L 275 177.5" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 243.6 140.5 L 262 129.8" />
     <path
-        android:strokeColor="#231F20"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 216.3 113.4 L 227 95" />
     <path
-        android:strokeColor="#231F20"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="16.6991"
         android:strokeMiterLimit="10"
         android:pathData="M 179.5 177.8 H 179.5 V 177.8 H 179.5 V 177.8 Z" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/color_default_primary_text"
         android:strokeWidth="12.2107"
         android:strokeMiterLimit="10"
         android:pathData="M 179.5 154.2 C 193.307118746 154.2 204.5 165.392881254 204.5 179.2 C 204.5 193.007118746 193.307118746 204.2 179.5 204.2 C 165.692881254 204.2 154.5 193.007118746 154.5 179.2 C 154.5 165.392881254 165.692881254 154.2 179.5 154.2 Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M179.3,154.5c-2.1,6.6,59.5-80.7,59.5-80.7l-41.2,91.6L179.3,154.5z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_watermark_weather.xml b/res/drawable/ic_watermark_weather.xml
index d1477ab8886ee5121514a02a38c5757863be9210..ebda354aa95c4192ca03d20242ecf5850aa61822 100644
--- a/res/drawable/ic_watermark_weather.xml
+++ b/res/drawable/ic_watermark_weather.xml
@@ -34,7 +34,7 @@
     android:viewportHeight="1008">
 
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M469.5,958.7c-5.9-13.1-11.4-25.3-17-37.5c-15.2-33-30.7-65.9-45.7-99c-4.8-10.6-11.7-16.6-23.2-20.3
 c-17.3-5.6-33.6-14-50.2-21.6c-3.6-1.7-6.5-2.1-10.1-0.7c-20.3,8.4-40.7,16.5-61,25.1c-29.9,12.7-59.6,25.8-89.4,38.6
 c-1.1,0.5-2.2,0.9-3.9,1.6c0.3-1.5,0.5-2.6,0.8-3.6c15.8-46.6,31.7-93.1,47.4-139.7c2-5.8,3.6-11.7,5.1-17.7
diff --git a/res/drawable/more.xml b/res/drawable/more.xml
index 4be6b4b7e30c9d08c21f17fe1acb2d8f1135ba47..c64abf3dba458f22420689cdf097300439fd5237 100644
--- a/res/drawable/more.xml
+++ b/res/drawable/more.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2c0,1.1 0.9,2 2,2c1.1,0 2,-0.9 2,-2C14,10.9 13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z"
-        android:fillColor="@color/black_icon"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/more2.xml b/res/drawable/more2.xml
index 8675d8fdf5940bbd3f59e855aba216a4fcd750bd..1337277ee3aafc5b82b9c9c56a3987161a7efb30 100644
--- a/res/drawable/more2.xml
+++ b/res/drawable/more2.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="36.0">
     <path
         android:pathData="M18,13c1.381,0 2.5,-1.119 2.5,-2.5S19.381,8 18,8s-2.5,1.119 -2.5,2.5S16.619,13 18,13zM18,15.5c-1.381,0 -2.5,1.119 -2.5,2.5s1.119,2.5 2.5,2.5s2.5,-1.119 2.5,-2.5S19.381,15.5 18,15.5zM18,23c-1.381,0 -2.5,1.119 -2.5,2.5S16.619,28 18,28s2.5,-1.119 2.5,-2.5S19.381,23 18,23z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/multiselect.xml b/res/drawable/multiselect.xml
index 053507d8676d5f5484f9c211f15c1c430e7d7740..da17ec46d610eb9208898fc26db31db9a69425cf 100644
--- a/res/drawable/multiselect.xml
+++ b/res/drawable/multiselect.xml
@@ -34,8 +34,8 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2z"
-        android:fillColor="#2196F3"/>
+        android:fillColor="@color/accent"/>
     <path
         android:pathData="M10,17l-5,-5l1.4099998,-1.4099998l3.5900002,3.58l7.59,-7.59l1.4099998,1.4200001z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/multiselect_delete.xml b/res/drawable/multiselect_delete.xml
index b3faf7b287a4ecc5395bfe598704057f35347cef..8c38f648cc4c5da6a3239daa0b373b80bf66e3a4 100644
--- a/res/drawable/multiselect_delete.xml
+++ b/res/drawable/multiselect_delete.xml
@@ -31,9 +31,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="72.0"
-    android:viewportHeight="72.0">
+    android:viewportHeight="72.0"
+    android:tint="@color/accent" >
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M59,10L46.92,10l-2.16,-4L27,6l-2.16,4L13,10a1,1 0,0 0,-1 1v4a1,1 0,0 0,1 1h46a1,1 0,0 0,1 -1L60,11A1,1 0,0 0,59 10ZM16,60a6,6 0,0 0,6 6h28a6,6 0,0 0,6 -6L56,20L16,20v40Z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/multiselect_more.xml b/res/drawable/multiselect_more.xml
index a8a23dec32857181bc218b114a237c3fadf0ae5d..6c1ab1ba592c4f6609b890aa502a080a969dac72 100644
--- a/res/drawable/multiselect_more.xml
+++ b/res/drawable/multiselect_more.xml
@@ -31,9 +31,10 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="@color/accent" >
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2c0,1.1 0.9,2 2,2c1.1,0 2,-0.9 2,-2C14,10.9 13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/multiselect_share.xml b/res/drawable/multiselect_share.xml
index 5c265c02c3ecfb4c63dc53582a6befdcbb526b6b..dc927516732bb880e7fee509efea3a28f289fb23 100644
--- a/res/drawable/multiselect_share.xml
+++ b/res/drawable/multiselect_share.xml
@@ -31,9 +31,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="72.0"
-    android:viewportHeight="72.0">
+    android:viewportHeight="72.0"
+    android:tint="@color/accent" >
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M54,48c-2.4,0 -4.5,0.9 -6.1,2.4L26.7,38.3c0.2,-0.8 0.3,-1.5 0.3,-2.4c0,-0.8 -0.1,-1.6 -0.3,-2.4l21.2,-12.1c1.6,1.7 3.7,2.6 6.1,2.6c5,0 9,-4 9,-9s-4,-9 -9,-9s-9,4 -9,9c0,0.8 0.1,1.6 0.3,2.3L24.1,29.4C22.5,27.9 20.4,27 18,27c-5,0 -9,4 -9,9s4,9 9,9c2.4,0 4.5,-0.9 6.1,-2.4l21.2,12.1C45.1,55.4 45,56.2 45,57c0,5 4,9 9,9s9,-4 9,-9S59,48 54,48z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/multiselected_back.xml b/res/drawable/multiselected_back.xml
index 0e237bfc216d5556795e348970736643306a7d10..8a34d30846c9c43e2bb1baf005adfd0e28665622 100644
--- a/res/drawable/multiselected_back.xml
+++ b/res/drawable/multiselected_back.xml
@@ -31,9 +31,10 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="@color/accent" >
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8l8,8l1.41,-1.41L7.83,13H20V11z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/overflow.xml b/res/drawable/overflow.xml
index 15d6b53124bf400803fc4e4593a2849a26e3a5e4..bf266e70c5da237f6945f6a58c048ffd4691fc45 100644
--- a/res/drawable/overflow.xml
+++ b/res/drawable/overflow.xml
@@ -32,12 +32,13 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="@color/accent" >
 
     <path
         android:pathData="M0,0h24v24H0V0z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,8c1.1,0,2-0.9,2-2s-0.9-2-2-2c-1.1,0-2,0.9-2,2S10.9,8,12,8z
 M12,10c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2 c1.1,0,2-0.9,2-2C14,10.9,13.1,10,12,10z
 M12,16c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S13.1,16,12,16z" />
diff --git a/res/drawable/seestraight.xml b/res/drawable/seestraight.xml
index 317fa4edeeeae617423f0881697de3ca0e6d1c8d..74dc30997d460514fcd8c1545abbcc41a4f141bf 100644
--- a/res/drawable/seestraight.xml
+++ b/res/drawable/seestraight.xml
@@ -34,29 +34,29 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M 7.2 23.3 L 5.5 23.3 L 5.5 7.1 L 13.3 4.8 L 14.1 4.8 L 21.7 7.1 L 21.7 11.9 L 20 11.9 L 20 8.3 L 13.7 6.5 L 13.4 6.5 L 7.2 8.3 Z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M 8.6 7 L 8 7 L 8 5.3 L 13.5 3.5 L 19.1 5.3 L 19.1 7 L 18.6 7 L 18.6 5.7 L 13.5 4.1 L 8.6 5.7 Z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M 13.4 3.8 H 13.7 V 5.6 H 13.4 V 3.8 Z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M 13 23.3 L 12.7 23.3 L 12.7 8.4 L 6.5 10.2 L 6.5 9.9 L 13 8.1 Z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M 14.4 23.3 L 14.1 23.3 L 14.1 8 L 20.7 9.8 L 20.6 10.1 L 14.4 8.3 Z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M29.8,27h-1.7v-1.4h1.7V27z M26.3,27h-1.8v-1.4h1.8V27z M22.6,27h-1.8v-1.4h1.8V27z
 M18.9,27h-1.8v-1.4 h1.8V27z M15.3,27h-1.8v-1.4h1.8V27z M11.6,27H9.8v-1.4h1.8V27z
 M8,27H6.2v-1.4H8V27z M4.3,27H2.5v-1.4h1.8V27z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M 26.7 23.3 L 25 23.3 L 25 13.4 L 22.3 12.3 L 19.6 13.4 L 19.6 23.3 L 17.8 23.3 L 17.8 12.2 L 22 10.6 L 22.6 10.6 L 26.7 12.2 Z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M 22.2 11.6 H 22.5 V 23.3 H 22.2 V 11.6 Z" />
 </vector>
diff --git a/res/drawable/share.xml b/res/drawable/share.xml
index 0ce3de8783ce6dbcd2178d8d9baad7addadacdf0..f7d435ec3095fb00aebec3e5cc433f56257a2e60 100644
--- a/res/drawable/share.xml
+++ b/res/drawable/share.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M17.999,16.121c-0.76,0 -1.439,0.3 -1.96,0.77L8.91,12.741C8.959,12.512 9,12.281 9,12.041s-0.04,-0.471 -0.09,-0.7l7.049,-4.11c0.54,0.5 1.25,0.81 2.04,0.81c1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3s-3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.851C7.5,9.351 6.79,9.041 6,9.041c-1.66,0 -3,1.34 -3,3c0,1.661 1.34,3 3,3c0.79,0 1.5,-0.311 2.04,-0.811l7.12,4.16c-0.051,0.211 -0.08,0.43 -0.08,0.65c0,1.609 1.311,2.92 2.92,2.92s2.92,-1.311 2.92,-2.92S19.608,16.121 17.999,16.121z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/sliderbg.xml b/res/drawable/sliderbg.xml
index 204c9259e3e4a8e79bf9c2584c4388a2d2884486..5abe20b8f04469bc216e572b1375dcbc3a72943a 100644
--- a/res/drawable/sliderbg.xml
+++ b/res/drawable/sliderbg.xml
@@ -35,5 +35,5 @@
     <path
         android:pathData="M0,1h216v2h-216z"
         android:fillAlpha="0.2"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/sliderprogress.xml b/res/drawable/sliderprogress.xml
index 5c2b541ab908c6380f3a018dad3412efa7cd1427..3824670511fed5a9705064f39b20af055971cb3e 100644
--- a/res/drawable/sliderprogress.xml
+++ b/res/drawable/sliderprogress.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="4.0">
     <path
         android:pathData="M0,1h216v2h-216z"
-        android:fillColor="#4f92e9"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/slideshow.xml b/res/drawable/slideshow.xml
index dfe8c9c6980643c2ddf9d86c5acfa408f20be637..95d361f5a32e419327155c211e8aa3d16da09bb1 100644
--- a/res/drawable/slideshow.xml
+++ b/res/drawable/slideshow.xml
@@ -34,5 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M10,8v8l5,-4L10,8zM19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,19H5V5h14V19z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/spinner_triangle.xml b/res/drawable/spinner_triangle.xml
index 100005962bd0a8b807991239edb0dbfb750bc3e0..5a862ae1eeacec88c59e0afd81105bc007425b6c 100644
--- a/res/drawable/spinner_triangle.xml
+++ b/res/drawable/spinner_triangle.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?><!--
   Copyright (c) 2015, The Linux Foundation. All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -28,8 +27,14 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<vector android:autoMirrored="true" android:height="12dp"
-    android:viewportHeight="12.0" android:viewportWidth="12.0"
-    android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.3" android:fillColor="@color/white" android:pathData="M12,3.7V12H3.7L12,3.7z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:autoMirrored="true"
+    android:viewportWidth="12.0"
+    android:viewportHeight="12.0">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="@color/accent"
+        android:pathData="M12,3.7V12H3.7L12,3.7z" />
 </vector>
diff --git a/res/drawable/timeline.xml b/res/drawable/timeline.xml
index 8d6dc37dabd4befc6b911a6527fbbf4f60529574..21178b0c68679e16e30ae7c0a813858756e321e4 100644
--- a/res/drawable/timeline.xml
+++ b/res/drawable/timeline.xml
@@ -33,11 +33,11 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M19.057,4.034h-1.01V2.059h-2.016v1.976H7.969V2.059H5.951v1.976H4.902c-1.115,0 -1.967,0.943 -1.967,2.058l-0.01,13.832c0,1.114 0.902,2.017 2.016,2.017h14.115c1.113,0 2.016,-0.902 2.016,-2.017V6.092C21.072,4.978 20.17,4.034 19.057,4.034zM19.098,19.965H4.941V9.015h14.156V19.965z"
         android:fillAlpha="0.54"/>
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M6.184,16.241l3.738,-4.984l2.908,3.742l2.076,-2.496l2.907,3.738H6.184z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/truescanner.xml b/res/drawable/truescanner.xml
index c79f585011d570934c928bc35352e7d0fd966dea..23f7792e080839e2f2b32f5cfda7114943e49680 100644
--- a/res/drawable/truescanner.xml
+++ b/res/drawable/truescanner.xml
@@ -33,31 +33,31 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M15.1,23.4c0,0.8,0,1.6,0,2.3c-4,0-7.9,0-11.9,0c0-6.7,0-13.4,0-20c4,0,7.9,0,11.9,0c0,0.8,0,1.5,0,2.3
 c-3.2,0-6.4,0-9.6,0c0,5.1,0,10.2,0,15.4C8.7,23.4,11.9,23.4,15.1,23.4z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M15.1,10c0,0,0,0.1,0,0.1c0,1.9,0,3.7,0,5.6c0,0.1,0,0.2-0.1,0.3c-0.1,0.2-0.2,0.4-0.3,0.6c0,0,0,0.1,0,0.1
 c0.1,0,0.3,0,0.4,0c0,0.8,0,1.5,0,2.2c-0.1,0-0.2,0-0.3,0c-0.3,0-0.7,0-1,0c-0.1,0-0.1,0-0.2,0.1c-0.4,0.8-0.7,1.6-1.1,2.4
 c0,0.1-0.1,0.1-0.1,0.1c-0.9,0-1.8,0-2.8,0c0,0,0,0-0.1,0C11.4,17.7,13.2,13.9,15.1,10C15.1,10,15.1,10,15.1,10z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M17,16.4c0,4.2,0,8.4,0,12.5c0,0.3-0.2,0.5-0.4,0.5c-0.3,0-0.5-0.2-0.5-0.4c0,0,0-0.1,0-0.1
 c0-8.3,0-16.7,0-25c0-0.1,0-0.2,0-0.2c0.1-0.2,0.3-0.4,0.5-0.3c0.2,0,0.4,0.2,0.4,0.5c0,0,0,0.1,0,0.1C17,8.1,17,12.3,17,16.4z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M28.7,6.5c0,6.1,0,12.2,0,18.3c-3.4,0-6.9,0-10.3,0c0-0.1,0-0.2,0-0.3c3.3,0,6.7,0,10,0
 c0-5.9,0-11.8,0-17.7c-3.3,0-6.6,0-9.9,0c0-0.1,0-0.2,0-0.3C21.9,6.5,25.3,6.5,28.7,6.5z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M18,9.6c1.9,4,3.8,8,5.7,12.1c-0.1,0-0.1,0-0.1,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2-0.1
 c-0.4-0.8-0.7-1.6-1.1-2.4c0-0.1-0.1-0.1-0.2-0.1c-0.3,0-0.7,0-1,0c0,0-0.1,0-0.1,0c0-0.1,0-0.2,0-0.3c0,0,0.1,0,0.1,0
 c0.4,0,0.9,0,1.3,0c0.1,0,0.1,0,0.2,0.1c0.4,0.8,0.7,1.6,1.1,2.4c0,0.1,0.1,0.1,0.2,0.1c0.8,0,1.5,0,2.3,0c0,0,0.1,0,0.1,0
 c-0.1-0.2-0.2-0.5-0.3-0.7c-1.6-3.3-3.1-6.6-4.7-9.9c0,0,0-0.1,0-0.1C17.9,10.4,17.9,10,18,9.6C18,9.7,18,9.6,18,9.6
 C18,9.6,18,9.6,18,9.6z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M18.6,16.8c-0.2,0-0.4,0-0.6,0c0-0.1,0-0.2,0-0.3c0,0,0.1,0,0.1,0c-0.2-0.3-0.1-0.7-0.1-1
 C18.2,15.9,18.4,16.4,18.6,16.8z" />
 </vector>
diff --git a/res/drawable/truescanner_select.xml b/res/drawable/truescanner_select.xml
index 382c14e553e481d9c2df6bd4813e28722b24edc8..63018862476a3dbf74f04fd06ab6e79f5251ccee 100644
--- a/res/drawable/truescanner_select.xml
+++ b/res/drawable/truescanner_select.xml
@@ -33,31 +33,31 @@
     android:viewportHeight="32">
 
     <path
-        android:fillColor="#FF4F92E9"
+        android:fillColor="@color/accent"
         android:pathData="M15.1,23.4c0,0.8,0,1.6,0,2.3c-4,0-7.9,0-11.9,0c0-6.7,0-13.4,0-20c4,0,7.9,0,11.9,0c0,0.8,0,1.5,0,2.3
 c-3.2,0-6.4,0-9.6,0c0,5.1,0,10.2,0,15.4C8.7,23.4,11.9,23.4,15.1,23.4z" />
     <path
-        android:fillColor="#FF4F92E9"
+        android:fillColor="@color/accent"
         android:pathData="M15.1,10c0,0,0,0.1,0,0.1c0,1.9,0,3.7,0,5.6c0,0.1,0,0.2-0.1,0.3c-0.1,0.2-0.2,0.4-0.3,0.6c0,0,0,0.1,0,0.1
 c0.1,0,0.3,0,0.4,0c0,0.8,0,1.5,0,2.2c-0.1,0-0.2,0-0.3,0c-0.3,0-0.7,0-1,0c-0.1,0-0.1,0-0.2,0.1c-0.4,0.8-0.7,1.6-1.1,2.4
 c0,0.1-0.1,0.1-0.1,0.1c-0.9,0-1.8,0-2.8,0c0,0,0,0-0.1,0C11.4,17.7,13.2,13.9,15.1,10C15.1,10,15.1,10,15.1,10z" />
     <path
-        android:fillColor="#FF4F92E9"
+        android:fillColor="@color/accent"
         android:pathData="M17,16.4c0,4.2,0,8.4,0,12.5c0,0.3-0.2,0.5-0.4,0.5c-0.3,0-0.5-0.2-0.5-0.4c0,0,0-0.1,0-0.1
 c0-8.3,0-16.7,0-25c0-0.1,0-0.2,0-0.2c0.1-0.2,0.3-0.4,0.5-0.3c0.2,0,0.4,0.2,0.4,0.5c0,0,0,0.1,0,0.1C17,8.1,17,12.3,17,16.4z" />
     <path
-        android:fillColor="#FF4F92E9"
+        android:fillColor="@color/accent"
         android:pathData="M28.7,6.5c0,6.1,0,12.2,0,18.3c-3.4,0-6.9,0-10.3,0c0-0.1,0-0.2,0-0.3c3.3,0,6.7,0,10,0
 c0-5.9,0-11.8,0-17.7c-3.3,0-6.6,0-9.9,0c0-0.1,0-0.2,0-0.3C21.9,6.5,25.3,6.5,28.7,6.5z" />
     <path
-        android:fillColor="#FF4F92E9"
+        android:fillColor="@color/accent"
         android:pathData="M18,9.6c1.9,4,3.8,8,5.7,12.1c-0.1,0-0.1,0-0.1,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2-0.1
 c-0.4-0.8-0.7-1.6-1.1-2.4c0-0.1-0.1-0.1-0.2-0.1c-0.3,0-0.7,0-1,0c0,0-0.1,0-0.1,0c0-0.1,0-0.2,0-0.3c0,0,0.1,0,0.1,0
 c0.4,0,0.9,0,1.3,0c0.1,0,0.1,0,0.2,0.1c0.4,0.8,0.7,1.6,1.1,2.4c0,0.1,0.1,0.1,0.2,0.1c0.8,0,1.5,0,2.3,0c0,0,0.1,0,0.1,0
 c-0.1-0.2-0.2-0.5-0.3-0.7c-1.6-3.3-3.1-6.6-4.7-9.9c0,0,0-0.1,0-0.1C17.9,10.4,17.9,10,18,9.6C18,9.7,18,9.6,18,9.6
 C18,9.6,18,9.6,18,9.6z" />
     <path
-        android:fillColor="#FF4F92E9"
+        android:fillColor="@color/accent"
         android:pathData="M18.6,16.8c-0.2,0-0.4,0-0.6,0c0-0.1,0-0.2,0-0.3c0,0,0.1,0,0.1,0c-0.2-0.3-0.1-0.7-0.1-1
 C18.2,15.9,18.4,16.4,18.6,16.8z" />
 </vector>
diff --git a/res/drawable/videos.xml b/res/drawable/videos.xml
index 406d41dee3456ca4514c01b76025ed247a1766ba..1c00962a4accb8ba520aa5596255b7456c10ffec 100644
--- a/res/drawable/videos.xml
+++ b/res/drawable/videos.xml
@@ -33,7 +33,7 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/accent"
         android:pathData="M3.999,6h-2v14c0,1.1 0.9,2 2,2h14v-2h-14V6zM19.999,2h-12c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C21.999,2.9 21.099,2 19.999,2zM11.999,14.5v-9l6,4.5L11.999,14.5z"
         android:fillAlpha="0.54"/>
 </vector>
diff --git a/res/drawable/white_text_bg_gradient.xml b/res/drawable/white_text_bg_gradient.xml
index c355ce52f3c02d2b4dc3e820fd625fa8d724febf..1fc62665047b1780ebcb4e5aa4fd59460c0c1aeb 100644
--- a/res/drawable/white_text_bg_gradient.xml
+++ b/res/drawable/white_text_bg_gradient.xml
@@ -15,8 +15,8 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="#DD000000"
-        android:endColor="#00FFFFFF"
+        android:startColor="@color/color_default_primary_text"
+        android:endColor="@color/color_default_secondary_text"
         android:angle="90"
      />
 </shape>
\ No newline at end of file
diff --git a/res/layout-land/filtershow_saturation_controls.xml b/res/layout-land/filtershow_saturation_controls.xml
index 6003b73893ce8bbbd0d6bf1c4985815938d9e9f2..ce23c15a61b278796c0d5adf3d2cfdfa87da2ca5 100644
--- a/res/layout-land/filtershow_saturation_controls.xml
+++ b/res/layout-land/filtershow_saturation_controls.xml
@@ -41,7 +41,7 @@
                     android:layout_gravity="left|center_vertical"
                     android:text="@string/editor_chan_sat_yellow"
                     android:textStyle="bold"
-                    android:textColor="#ffff80"
+                    android:textColor="@color/yellow"
                     android:layout_marginStart="8dp"/>
             <TextView
                     android:layout_gravity="right|center_vertical"
diff --git a/res/layout-land/on_screen_hint.xml b/res/layout-land/on_screen_hint.xml
index 7406d0a8eb44a8d637a2a62e76ad593197e6695c..bf59a13180983cfec6b53a846031663c5b990e8b 100644
--- a/res/layout-land/on_screen_hint.xml
+++ b/res/layout-land/on_screen_hint.xml
@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:textAppearance="@style/OnScreenHintTextAppearance.Small"
-            android:textColor="@color/white"
-            android:shadowColor="#BB000000"
+            android:textColor="@color/color_default_primary_text"
+            android:shadowColor="@color/color_default_secondary_text"
             android:shadowRadius="2.75" />
 </LinearLayout>
diff --git a/res/layout-port/on_screen_hint.xml b/res/layout-port/on_screen_hint.xml
index 7a24f7dc78f2b65eff322cd53062dee3c7812769..81d8b1b49d59c960a1f96dd89817c3e27121576f 100644
--- a/res/layout-port/on_screen_hint.xml
+++ b/res/layout-port/on_screen_hint.xml
@@ -23,8 +23,8 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:textAppearance="@style/OnScreenHintTextAppearance.Small"
-            android:textColor="@color/white"
-            android:shadowColor="#BB000000"
+            android:textColor="@color/color_default_primary_text"
+            android:shadowColor="@color/color_default_secondary_text"
             android:shadowRadius="2.75" />
 </LinearLayout>
 
diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml
index 186ce5ba67ad6b584efda8a788554abd5b3ac2d8..9526f1a17eb23ac8ac25561fb8856f851aaddbfd 100644
--- a/res/layout/action_mode.xml
+++ b/res/layout/action_mode.xml
@@ -33,7 +33,7 @@
                 style="?android:attr/actionButtonStyle"
                 android:divider="?android:attr/listDividerAlertDialog"
                 android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
-                android:textColor="@color/black_transparent_4"
+                android:textColor="@color/color_default_primary_text"
                 android:textSize="18sp"
                 android:singleLine="true"
                 android:gravity="start|center_vertical"
diff --git a/res/layout/album_header.xml b/res/layout/album_header.xml
index caae962b3fc2553ab384731f5ef64cd374af3451..214bd3ed4854fa22bd1e199e0520ac5e7f17662a 100644
--- a/res/layout/album_header.xml
+++ b/res/layout/album_header.xml
@@ -39,14 +39,14 @@
             android:id="@+id/album_header_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@android:color/white"
+            android:textColor="@color/color_default_primary_text"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <TextView
             android:id="@+id/album_header_subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@android:color/white"
+            android:textColor="@color/color_default_primary_text"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
     </LinearLayout>
diff --git a/res/layout/album_set_item.xml b/res/layout/album_set_item.xml
index ad0e0db2070578f0d43b068e98ad015dea988e25..37793c2d6284fa383a3a907997e8d1670fce43eb 100644
--- a/res/layout/album_set_item.xml
+++ b/res/layout/album_set_item.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:orientation="vertical"
         android:padding="10dp"
-        android:background="#FFF" >
+        android:background="@color/color_default_foreground" >
 
         <TextView
             android:id="@+id/album_set_item_title"
@@ -19,6 +19,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:singleLine="true"
+            android:textColor="@color/color_default_primary_text"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
@@ -28,7 +29,7 @@
             android:ellipsize="end"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="#AAA" />
+            android:textColor="@color/color_default_secondary_text" />
     </LinearLayout>
 
     <ImageView
diff --git a/res/layout/appwidget_main.xml b/res/layout/appwidget_main.xml
index 368d90bc5a07989addfeed4ef256a79d90c4cf8e..f015d1863bd5277a2b7f1908b652a44de48f1d46 100644
--- a/res/layout/appwidget_main.xml
+++ b/res/layout/appwidget_main.xml
@@ -31,7 +31,7 @@
                     android:layout_width="@dimen/stack_photo_width"
                     android:layout_height="@dimen/stack_photo_height"
                     android:gravity="center"
-                    android:textColor="@android:color/black"
+                    android:textColor="@color/color_default_primary_text"
                     android:text="@string/appwidget_empty_text"/>
         </FrameLayout>
     </RelativeLayout>
diff --git a/res/layout/bookmark_edit_dialog.xml b/res/layout/bookmark_edit_dialog.xml
index 8282d39af7362fb92cd02e4ba328840c9043a3c1..23507f9deb3e7ae9bf3f1eebad72f8e4cd4eb354 100644
--- a/res/layout/bookmark_edit_dialog.xml
+++ b/res/layout/bookmark_edit_dialog.xml
@@ -20,6 +20,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dip"
+            android:textColor="@color/color_default_primary_text"
+            android:textColorHint="@color/color_default_secondary_text"
             android:inputType="text"
             android:scrollHorizontally="true"
             android:singleLine="true" />
@@ -36,6 +38,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="2dip"
             android:inputType="textUri"
+            android:textColor="@color/color_default_primary_text"
+            android:textColorHint="@color/color_default_secondary_text"
             android:scrollHorizontally="true"
             android:singleLine="true" />
     </LinearLayout>
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 7230addd741dd03ec58a2e18f63a542816f7dbd0..78c4ba65cc8925723a062605bd4d218b5d571614 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -53,9 +53,9 @@
         <TextView
             android:id="@+id/pano_stitching_progress_text"
             android:text="@string/pano_progress_text"
-            android:textColor="@color/white"
+            android:textColor="@color/color_default_primary_text"
             android:textSize="14dp"
-            android:shadowColor="@color/black"
+            android:shadowColor="@color/color_default_secondary_text"
             android:shadowDx="0"
             android:shadowDy="0"
             android:shadowRadius="2"
diff --git a/res/layout/count_down_to_capture.xml b/res/layout/count_down_to_capture.xml
index 5cf1e3f94b265070d52d076ebb620250ef6f4eab..26a5c21beb4fcc424b232c04c86b3010acf9260c 100644
--- a/res/layout/count_down_to_capture.xml
+++ b/res/layout/count_down_to_capture.xml
@@ -22,7 +22,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:textSize="160sp"
-        android:textColor="@android:color/white"
+        android:textColor="@color/color_default_primary_text"
         android:gravity="center" />
     <TextView android:id="@+id/count_down_title"
         android:layout_width="wrap_content"
@@ -30,6 +30,6 @@
         android:paddingStart="10dp"
         android:paddingTop="20dp"
         android:textSize="20sp"
-        android:textColor="@android:color/white"
+        android:textColor="@color/color_default_primary_text"
         android:text="@string/count_down_title_text" />
 </com.android.camera.ui.CountDownView>
\ No newline at end of file
diff --git a/res/layout/countdown_setting_popup.xml b/res/layout/countdown_setting_popup.xml
index 1a314ad563df1cf64ace305178d6ca57c22e977c..160802d151a80b1834058a2064ee3ea94056aee6 100644
--- a/res/layout/countdown_setting_popup.xml
+++ b/res/layout/countdown_setting_popup.xml
@@ -66,7 +66,7 @@
             android:orientation="vertical" >
 
             <View
-                android:background="#40ffffff"
+                android:background="@color/color_default_divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dip" />
             <LinearLayout
@@ -84,7 +84,7 @@
             </LinearLayout>
 
             <View
-                android:background="#40ffffff"
+                android:background="@color/color_default_divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dip" />
 
diff --git a/res/layout/dialog_picker.xml b/res/layout/dialog_picker.xml
index fc5f2877aba08b99dccb7cc5c3c15da4a6f4bbaa..3804c490089508103ee44de8681319eb829823d9 100644
--- a/res/layout/dialog_picker.xml
+++ b/res/layout/dialog_picker.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,24 +14,31 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
     <FrameLayout
-            android:layout_weight="1"
-            android:layout_width="match_parent"
-            android:layout_height="0dp">
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
         <include layout="@layout/gl_root_group" />
     </FrameLayout>
-    <ImageView android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:background="@drawable/list_divider_holo_dark" />
-    <Button style="?android:attr/buttonBarButtonStyle"
-            android:id="@+id/cancel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@android:string/cancel"
-            android:visibility="gone" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/list_divider_holo_dark" />
+
+    <Button
+        android:id="@+id/cancel"
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@android:string/cancel"
+        android:textColor="@color/accent"
+        android:visibility="gone" />
 </LinearLayout>
diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml
index bee76560437cef5e89d9faa290a613afad6475da..4173ae45b4a00d099475b042ba9b6303dbe0485e 100644
--- a/res/layout/drawer_list_item.xml
+++ b/res/layout/drawer_list_item.xml
@@ -48,7 +48,7 @@
         android:textSize="12sp"
         android:layout_centerVertical="true"
         android:fontFamily="sans-serif-medium"
-        android:textColor="@color/black"
+        android:textColor="@color/color_default_primary_text"
         android:alpha="0.87"
         android:layout_marginStart="64dp"
        />
diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml
index a71e933abf558d87ec0b0a8061b455b0e39d80a5..4406bc8eea8089bdfb02ed063483653aa9ab514c 100644
--- a/res/layout/filtershow_actionbar.xml
+++ b/res/layout/filtershow_actionbar.xml
@@ -40,6 +40,6 @@
         android:text="@string/save"
         android:textAllCaps="true"
         android:layout_gravity="center_vertical|right"
-        android:textColor="@color/white" />
+        android:textColor="@color/color_default_primary_text" />
 
 </FrameLayout>
diff --git a/res/layout/filtershow_actionbar_effects.xml b/res/layout/filtershow_actionbar_effects.xml
index 48ed3b3979aa86e2d698e781c1657081935ae968..fa2624aa5bb267df7d1fe4dfaf69043a82052e3a 100644
--- a/res/layout/filtershow_actionbar_effects.xml
+++ b/res/layout/filtershow_actionbar_effects.xml
@@ -53,7 +53,7 @@
             android:drawableEnd="@drawable/spinner_triangle"
             android:gravity="center"
             android:text="@string/apply_effect"
-            android:textColor="@color/white"
+            android:textColor="@color/color_default_primary_text"
             android:textSize="16sp" />
     </LinearLayout>
 
diff --git a/res/layout/filtershow_category_geometry_panel.xml b/res/layout/filtershow_category_geometry_panel.xml
index 50515d6ac5d2caa5b109c265f79b3c202cacc964..7f6183a622660fdde7990aa61331d7fba29bbed2 100644
--- a/res/layout/filtershow_category_geometry_panel.xml
+++ b/res/layout/filtershow_category_geometry_panel.xml
@@ -66,7 +66,7 @@
                 android:clickable="true"
                 android:background="@android:color/transparent"
                 android:layout_marginTop="@dimen/crop_text_margin_padding"
-                android:textColor="#ffffff"
+                android:textColor="@color/color_default_primary_text"
                 android:textSize="12sp" />
         </LinearLayout>
 
@@ -95,7 +95,7 @@
                 android:clickable="true"
                 android:background="@android:color/transparent"
                 android:layout_marginTop="@dimen/crop_text_margin_padding"
-                android:textColor="#ffffff"
+                android:textColor="@color/color_default_primary_text"
                 android:textSize="12sp" />
         </LinearLayout>
 
@@ -124,7 +124,7 @@
                 android:clickable="true"
                 android:background="@android:color/transparent"
                 android:layout_marginTop="@dimen/crop_text_margin_padding"
-                android:textColor="#ffffff"
+                android:textColor="@color/color_default_primary_text"
                 android:textSize="12sp" />
         </LinearLayout>
 
@@ -149,7 +149,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="16sp"
-            android:textColor="#fff"
+            android:textColor="@color/color_default_primary_text"
             android:layout_gravity="center"/>
 
         <ImageButton
diff --git a/res/layout/filtershow_category_panel_two.xml b/res/layout/filtershow_category_panel_two.xml
index e807c88efca3bc2a30d3ca2c23963620d1fca4b9..7d62b4e2839d6b29dcb9913b0b01d9fcb24ee22e 100644
--- a/res/layout/filtershow_category_panel_two.xml
+++ b/res/layout/filtershow_category_panel_two.xml
@@ -85,7 +85,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="16sp"
-            android:textColor="#fff"
+            android:textColor="@color/color_default_primary_text"
             android:layout_gravity="center"/>
 
         <ImageButton
diff --git a/res/layout/filtershow_default_edittext.xml b/res/layout/filtershow_default_edittext.xml
index 9af4eb7593398fc903e0dae6f8bdd0f10b315c51..bcbb2e0fd88ece3b5d6cc27bb78b74d19be18011 100644
--- a/res/layout/filtershow_default_edittext.xml
+++ b/res/layout/filtershow_default_edittext.xml
@@ -38,6 +38,8 @@
         android:layout_marginLeft="19sp"
         android:layout_marginRight="19sp"
         android:focusable="true"
+        android:textColor="@color/color_default_primary_text"
+        android:textColorHint="@color/color_default_secondary_text"
         android:imeOptions="actionDone"
         android:hint="@string/filter_name"
         android:singleLine="true"/>
diff --git a/res/layout/filtershow_editor_crop_landscape.xml b/res/layout/filtershow_editor_crop_landscape.xml
index 65be0426337ccc7074b52f29274b7e630d71f072..70532cce9f54070d4a6fc95b03d002e02700ba52 100755
--- a/res/layout/filtershow_editor_crop_landscape.xml
+++ b/res/layout/filtershow_editor_crop_landscape.xml
@@ -91,7 +91,7 @@
                 android:clickable="true"
                 android:background="@android:color/transparent"
                 android:layout_marginTop="@dimen/crop_text_margin_padding"
-                android:textColor="#ffffff"
+                android:textColor="@color/color_default_primary_text"
                 android:textSize="12sp" />
         </LinearLayout>
 
@@ -120,7 +120,7 @@
                 android:clickable="true"
                 android:background="@android:color/transparent"
                 android:layout_marginTop="@dimen/crop_text_margin_padding"
-                android:textColor="#ffffff"
+                android:textColor="@color/color_default_primary_text"
                 android:textSize="12sp" />
         </LinearLayout>
 
@@ -149,7 +149,7 @@
                 android:clickable="true"
                 android:background="@android:color/transparent"
                 android:layout_marginTop="@dimen/crop_text_margin_padding"
-                android:textColor="#ffffff"
+                android:textColor="@color/color_default_primary_text"
                 android:textSize="12sp" />
         </LinearLayout>
     </LinearLayout>
diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml
index 4f3177051e53604675a99da84536352924e75e2a..dcb1b38c3b9ea8ae017023a6a7dc8027aed87bc6 100644
--- a/res/layout/filtershow_editor_panel.xml
+++ b/res/layout/filtershow_editor_panel.xml
@@ -57,7 +57,7 @@
 <!--                 android:layout_height="@dimen/swap_button_height" -->
 <!--                 android:text="@string/apply_effect" -->
 <!--                 android:layout_gravity="left" -->
-<!--                 android:textColor="@color/white" -->
+<!--                 android:textColor="@color/color_default_primary_text" -->
 <!--                 android:textSize="20sp"  -->
 <!--                 android:layout_weight="1"/> -->
 
diff --git a/res/layout/filtershow_export_dialog.xml b/res/layout/filtershow_export_dialog.xml
index 971260bdf01ff2fa2c27aba34ee847e0d2698438..1a688d589c5dc770582f65b39dcc287295978146 100644
--- a/res/layout/filtershow_export_dialog.xml
+++ b/res/layout/filtershow_export_dialog.xml
@@ -51,6 +51,8 @@
                 android:id="@+id/editableWidth"
                 android:layout_width="70dp"
                 android:layout_gravity="right|center_vertical"
+                android:textColor="@color/color_default_primary_text"
+                android:textColorHint="@color/color_default_secondary_text"
                 android:gravity="center"
                 android:inputType="number" />
 
@@ -63,6 +65,8 @@
                 android:id="@+id/editableHeight"
                 android:layout_width="70dp"
                 android:layout_gravity="left|center_vertical"
+                android:textColor="@color/color_default_primary_text"
+                android:textColorHint="@color/color_default_secondary_text"
                 android:gravity="center"
                 android:inputType="number" />
 
diff --git a/res/layout/filtershow_history_panel.xml b/res/layout/filtershow_history_panel.xml
index 992d05a853ab8b4d76302a327af1ea56e059dfac..fbc2ad0ff960b2455670f2c15df3263c5fd1ef16 100644
--- a/res/layout/filtershow_history_panel.xml
+++ b/res/layout/filtershow_history_panel.xml
@@ -31,7 +31,7 @@
             android:gravity="center"
             android:padding="2dip"
             android:text="@string/history"
-            android:textColor="@android:color/white"
+            android:textColor="@color/color_default_primary_text"
             android:textSize="24sp"
             android:textStyle="bold" />
 
diff --git a/res/layout/filtershow_presets_management_dialog.xml b/res/layout/filtershow_presets_management_dialog.xml
index 68754e2ba63cd02185a3ea9170154438f30265c8..faa68a4644b551bc68dda1d01211707151965caf 100644
--- a/res/layout/filtershow_presets_management_dialog.xml
+++ b/res/layout/filtershow_presets_management_dialog.xml
@@ -43,6 +43,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:focusable="true"
+            android:textColor="@color/color_default_primary_text"
+            android:textColorHint="@color/color_default_secondary_text"
             android:imeOptions="actionDone"
             android:singleLine="true"/>
     </LinearLayout>
diff --git a/res/layout/filtershow_presets_management_row.xml b/res/layout/filtershow_presets_management_row.xml
index bd3e47928bf1cb5fc507485243c79b6085a7be20..20228aad4b9961e0904ef5611878d7caab9cfe6d 100644
--- a/res/layout/filtershow_presets_management_row.xml
+++ b/res/layout/filtershow_presets_management_row.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
      Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,37 +15,39 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
 
     <ImageView
-            android:id="@+id/imageView"
-            android:layout_weight=".1"
-            android:layout_width="80dip"
-            android:layout_height="80dip"
-            android:scaleType="fitCenter"
-            android:layout_gravity="left|center_vertical"/>
+        android:id="@+id/imageView"
+        android:layout_width="80dip"
+        android:layout_height="80dip"
+        android:layout_gravity="left|center_vertical"
+        android:layout_weight=".1"
+        android:scaleType="fitCenter" />
 
     <EditText
-            android:id="@+id/editView"
-            android:gravity="center"
-            android:textSize="18sp"
-            android:layout_weight="1"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:focusable="true"
-            android:imeOptions="actionDone"
-            android:singleLine="true"/>
+        android:id="@+id/editView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:focusable="true"
+        android:gravity="center"
+        android:imeOptions="actionDone"
+        android:singleLine="true"
+        android:textColor="@color/color_default_primary_text"
+        android:textColorHint="@color/color_default_secondary_text"
+        android:textSize="18sp" />
 
     <ImageButton
-            android:id="@+id/deleteUserPreset"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:layout_weight=".1"
-            android:gravity="center"
-            android:src="@drawable/ic_menu_trash_holo_light"
-            android:visibility="gone"/>
+        android:id="@+id/deleteUserPreset"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="right|center_vertical"
+        android:layout_weight=".1"
+        android:background="@android:color/transparent"
+        android:gravity="center"
+        android:src="@drawable/ic_menu_trash_holo_light"
+        android:visibility="gone" />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/filtershow_state_panel.xml b/res/layout/filtershow_state_panel.xml
index 1f9f970b97591589063e7aae1c886f3d102efb10..94738cf1641d6c6985c8bec11a8acdde13336ad5 100644
--- a/res/layout/filtershow_state_panel.xml
+++ b/res/layout/filtershow_state_panel.xml
@@ -31,7 +31,7 @@
             android:gravity="center"
             android:padding="2dip"
             android:text="@string/imageState"
-            android:textColor="@android:color/white"
+            android:textColor="@color/color_default_primary_text"
             android:textSize="24sp"
             android:textStyle="bold" />
 
diff --git a/res/layout/filtershow_trueportrait_editor_panel.xml b/res/layout/filtershow_trueportrait_editor_panel.xml
index 13b8212acf13994f39e8766a836e2bc08e255208..b10fff98bfb0e754e7fc36c32a7f2278dcf5ac33 100644
--- a/res/layout/filtershow_trueportrait_editor_panel.xml
+++ b/res/layout/filtershow_trueportrait_editor_panel.xml
@@ -59,7 +59,7 @@
                 android:layout_gravity="center"
                 android:padding="3dp"
                 android:text="@string/brush_size"
-                android:textColor="#fff"
+                android:textColor="@color/color_default_primary_text"
                 android:textSize="16sp" />
             <ImageView
                 android:id="@+id/brush_size_sm"
diff --git a/res/layout/gl_root_group.xml b/res/layout/gl_root_group.xml
index 6aba51e41d6dfaad67b904c0700cf18b80281615..b702b0c06992c41a567463a02aa37ef024b22391 100644
--- a/res/layout/gl_root_group.xml
+++ b/res/layout/gl_root_group.xml
@@ -29,5 +29,5 @@
     <View android:id="@+id/gl_root_cover"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="#fafafa"/>
+            android:background="@color/color_default_foreground"/>
 </merge>
diff --git a/res/layout/ingest_date_tile.xml b/res/layout/ingest_date_tile.xml
index b042213616a6e21630198bec8feaf44eaef980ba..deb6085db7ba659599db0108f9bbe2208a9ddac6 100644
--- a/res/layout/ingest_date_tile.xml
+++ b/res/layout/ingest_date_tile.xml
@@ -16,7 +16,7 @@
 <com.android.gallery3d.ingest.ui.DateTileView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black" >
+    android:background="@color/color_default_background" >
     <GridLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/movie_view.xml b/res/layout/movie_view.xml
index 2679e38e857066a3514fc1b151d2ea0af93b1f14..b76ba9c6ed2fff578a2d8f16b7a0c092adaa4f58 100644
--- a/res/layout/movie_view.xml
+++ b/res/layout/movie_view.xml
@@ -16,7 +16,7 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/movie_view_root"
-        android:background="@android:color/black"
+        android:background="@color/color_default_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -29,7 +29,7 @@
         android:id="@+id/surface_view_cover"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/black"/>
+        android:background="@color/color_default_background"/>
 
     <ImageView
         android:id="@+id/img_live"
diff --git a/res/layout/photo_frame.xml b/res/layout/photo_frame.xml
index ede942f6be66a8ad9dfda95b4d78b2be55ee1fea..7c444c972dcfe9f540cd9370a0e6cf38858b7eee 100755
--- a/res/layout/photo_frame.xml
+++ b/res/layout/photo_frame.xml
@@ -40,7 +40,7 @@
                 android:layout_height="@dimen/stack_photo_height"
                 android:gravity="center"
                 android:text="@string/appwidget_empty_text"
-                android:textColor="@android:color/black" />
+                android:textColor="@color/color_default_primary_text" />
         </FrameLayout>
     </RelativeLayout>
     <ImageView android:id="@+id/photo"
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index 390863a71bbe398d75c764b8622a4b8e7a771a91..357ef36dd32a8923a2abc25e5e0f488e360f8d30 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -32,7 +32,7 @@
         android:id="@+id/flash_overlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
+        android:background="@color/color_default_background"
         android:visibility="gone"
         android:alpha="0" />
     <ViewStub android:id="@+id/face_view_stub"
diff --git a/res/layout/photo_set_item.xml b/res/layout/photo_set_item.xml
index 0f740fad95a71651b4091283cf1ecde8eee635b3..ff8ebec58457b517f7a2a27ad437ca997fbb10c2 100644
--- a/res/layout/photo_set_item.xml
+++ b/res/layout/photo_set_item.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/activatedBackgroundIndicator"
+    android:background="@color/default_background"
     android:padding="2dip">
 
     <com.android.photos.views.SquareImageView
diff --git a/res/layout/photopage_progress_bar.xml b/res/layout/photopage_progress_bar.xml
index 1acbd77cb976157acb3acc9c2d181ce4c7874b13..1b52e79c2bffaf6b5f301c614f434ba0fc3fe5b0 100644
--- a/res/layout/photopage_progress_bar.xml
+++ b/res/layout/photopage_progress_bar.xml
@@ -9,7 +9,7 @@
         android:visibility="invisible">
         <View
                 android:id="@+id/photopage_progress_background"
-                android:background="@color/black"
+                android:background="@color/color_default_background"
                 android:layout_width="match_parent"
                 android:layout_height="8dp"
                 android:layout_alignParentBottom="true"
@@ -25,9 +25,9 @@
         <TextView
                 android:id="@+id/photopage_progress_bar_text"
                 android:text="@string/pano_progress_text"
-                android:textColor="@color/white"
+                android:textColor="@color/color_default_primary_text"
                 android:textSize="14dp"
-                android:shadowColor="@color/black"
+                android:shadowColor="@color/color_default_secondary_text"
                 android:shadowDx="0"
                 android:shadowDy="0"
                 android:shadowRadius="2"
diff --git a/res/layout/popup_list_item.xml b/res/layout/popup_list_item.xml
index a2f7c31bb55b2d008fb9c7dbfb6ee259c452ae2c..80eb93a6e1ed7cf50558d3e5aa88edf0db1760e5 100644
--- a/res/layout/popup_list_item.xml
+++ b/res/layout/popup_list_item.xml
@@ -20,7 +20,7 @@
     android:layout_height="wrap_content"
     android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
     android:textSize="18sp"
-    android:textColor="@color/black_transparent_4"
+    android:textColor="@color/color_default_primary_text"
     android:singleLine="true"
     android:gravity="center_vertical"
     android:paddingStart="16dp"
diff --git a/res/layout/rotate_text_toast.xml b/res/layout/rotate_text_toast.xml
index 2c89b6f59e655efb887f5dd1a1c2cf4d8c707fbe..9b5ce9cbf50407cf5b3722f50a95cac07c4d24f9 100644
--- a/res/layout/rotate_text_toast.xml
+++ b/res/layout/rotate_text_toast.xml
@@ -30,8 +30,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:textAppearanceMedium"
-            android:textColor="@android:color/white"
-            android:shadowColor="#BB000000"
+            android:textColor="@color/color_default_primary_text"
+            android:shadowColor="@color/color_default_secondary_text"
             android:shadowRadius="2.75" />
     </FrameLayout>
 </com.android.camera.ui.RotateLayout>
diff --git a/res/layout/trim_menu.xml b/res/layout/trim_menu.xml
index 79a0f880806cc068c015be02b8e72f23ff76b75d..712094dfe3c8df5a6d9bf39143f737c4f06f9899 100644
--- a/res/layout/trim_menu.xml
+++ b/res/layout/trim_menu.xml
@@ -17,10 +17,11 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_centerVertical="true">
+        android:layout_centerVertical="true"
+        android:background="@color/toolbar_theme">
     <ImageView
         android:id="@+id/exit_trim"
-        android:background="?android:attr/actionBarItemBackground"
+        android:background="@color/toolbar_theme"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:src="@drawable/cancel"/>
diff --git a/res/layout/trim_view.xml b/res/layout/trim_view.xml
index c95c719c1cf2d07a3e31c3e839e538668f4476e1..4a837fc64eccd4a23bfc0740c4a80f0c8c487470 100644
--- a/res/layout/trim_view.xml
+++ b/res/layout/trim_view.xml
@@ -16,7 +16,7 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/trim_view_root"
-        android:background="@android:color/black"
+        android:background="@color/color_default_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
     <VideoView android:id="@+id/surface_view"
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 2df1adc9b0552677ae79106cdb344d85ab19706a..34467438b81f958e3b857323643d87d7fa64c964 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -25,7 +25,7 @@
         android:id="@+id/flash_overlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
+        android:background="@color/color_default_primary_text"
         android:visibility="gone"
         android:alpha="0" />
     <FrameLayout android:id="@+id/preview_border"
@@ -45,7 +45,7 @@
             android:layout_height="match_parent"
             android:layout_width="match_parent"
             android:visibility="gone"
-            android:background="@android:color/black"/>
+            android:background="@color/color_default_background"/>
     <ImageView
             android:id="@+id/btn_play"
             style="@style/ReviewControlIcon"
diff --git a/res/menu/gallery_multiselect.xml b/res/menu/gallery_multiselect.xml
index 685ae6b543b978a6ea8d6e0feb38f18ec58082f8..ce6becf53ca6dd1dfa361e121a75037dbdd34eae 100644
--- a/res/menu/gallery_multiselect.xml
+++ b/res/menu/gallery_multiselect.xml
@@ -5,7 +5,7 @@
             android:visible="false"
             android:showAsAction="ifRoom" />
     <item android:id="@+id/menu_delete"
-            android:icon="@android:drawable/ic_menu_delete"
+            android:icon="@drawable/delete"
             android:title="@string/delete"
             android:visible="false"
             android:showAsAction="ifRoom" />
diff --git a/res/menu/movie.xml b/res/menu/movie.xml
index ce3a100d0f793889b74226e52fdcf3dfac276274..a95a5c0c9efc8332d7cc2e2c6f819bacd5c81d24 100644
--- a/res/menu/movie.xml
+++ b/res/menu/movie.xml
@@ -15,7 +15,7 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/action_share"
-            android:icon="@drawable/ic_menu_share_holo_light"
+            android:icon="@drawable/multiselect_share"
             android:title="@string/share"
             android:enabled="true"
             android:showAsAction="ifRoom" />
diff --git a/res/menu/operation.xml b/res/menu/operation.xml
index 0647cad0afe93fdb2e8fd942afaac3668083840d..d056858a510e2cdeff6d683f2b6d799362e7143d 100644
--- a/res/menu/operation.xml
+++ b/res/menu/operation.xml
@@ -23,7 +23,7 @@
          But, if share_panorama is set to never, it doesn't seem to get promoted
          to the action bar and stays on the overflow menu. -->
     <item android:id="@+id/action_share_panorama"
-            android:icon="@drawable/ic_menu_share_holo_light"
+            android:icon="@drawable/multiselect_share"
             android:title="@string/share_panorama"
             android:visible="false"
             android:showAsAction="ifRoom">
diff --git a/res/menu/photo.xml b/res/menu/photo.xml
index b388d080be3fb3ed649a930e10b9652f141557ee..b0299cb4911d380295dcd7398a4be80b47ee81e2 100644
--- a/res/menu/photo.xml
+++ b/res/menu/photo.xml
@@ -23,12 +23,12 @@
 <!--    But, if share_panorama is set to never, it doesn't seem to get promoted -->
 <!--          to the action bar and stays on the overflow menu. -->
 <!--     <item android:id="@+id/action_share_panorama" -->
-<!--             android:icon="@drawable/ic_menu_share_holo_light" -->
+<!--             android:icon="@drawable/multiselect_share" -->
 <!--             android:title="@string/share_panorama" -->
 <!--             android:visible="false" -->
 <!--             android:showAsAction="ifRoom" /> -->
 <!--     <item android:id="@+id/action_share" -->
-<!--             android:icon="@drawable/ic_menu_share_holo_light" -->
+<!--             android:icon="@drawable/multiselect_share" -->
 <!--             android:title="@string/share" -->
 <!--             android:visible="false" -->
 <!--             android:showAsAction="never" /> -->
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index cee058d860e5d9ab767e6be8dc967ca0e54bbf4e..f0b74bfbd8b131f762d4ea0f685811015407a779 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -57,7 +57,7 @@
         <item name="android:layout_marginTop">13dp</item>
     </style>
         <style name="PanoViewHorizontalBar">
-        <item name="android:background">@color/black</item>
+        <item name="android:background">@color/color_default_divider</item>
         <item name="android:alpha">1.0</item>
         <item name="android:layout_height">0dp</item>
         <item name="android:layout_width">match_parent</item>
diff --git a/res/values-night-v27/styles.xml b/res/values-night-v27/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1a51a0080f6178aa1bc8f3b1946c50f120457350
--- /dev/null
+++ b/res/values-night-v27/styles.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.GalleryBase" parent="@style/Theme.GalleryMotherBase">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Gallery" parent="@style/Theme.BaseGallery">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.MovieActivity" parent="Theme.BaseMovieActivity">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.TrimVideo" parent="Theme.BaseTrimVideo">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="AppTheme" parent="BaseAppTheme">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b2bdbe2611922b193981fee66f1754716a21af3e
--- /dev/null
+++ b/res/values-v27/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.GalleryBase" parent="@style/Theme.GalleryMotherBase">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.Gallery" parent="@style/Theme.BaseGallery">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.MovieActivity" parent="Theme.BaseMovieActivity">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.TrimVideo" parent="Theme.BaseTrimVideo">Z
+    </style>
+
+    <style name="AppTheme" parent="BaseAppTheme">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 55b29b1faf7441915987de0c15475752962993bb..3e95e934d88e65107f6a4d4c99bca470354b1c62 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -15,6 +15,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <style name="DialogPickerTheme" parent="android:Theme.Holo.Dialog">
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
     </style>
     <bool name="picker_is_dialog">true</bool>
 
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index ae9a4601f0f76e3ac7c49ea7bcf65816bb32d03d..fdf926b49dd343c2863c8df9d952417561baf03b 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -15,30 +15,20 @@
 -->
 <resources>
 
-    <color name="primary">@lineageos.platform:color/color_default_foreground</color>
-    <color name="primaryDark">@lineageos.platform:color/color_default_foreground</color>
+    <color name="primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="primaryDark">@lineageos.platform:color/color_default_primary_dark</color>
     <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="color_default_divider">@lineageos.platform:color/color_default_divider</color>
+    <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
+    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
     <color name="accent">@lineageos.platform:color/color_default_accent</color>
-<!--    <color name="primary">#333333</color>-->
-<!--    <color name="primaryDark">#000000</color>-->
-<!--    <color name="accent">#33b5e5</color>-->
 
-    <color name="white">#fafafa</color>
-    <color name="black">#212121</color>
-    <color name="black_icon">#CC000000</color>
+    <color name="red1">@lineageos.platform:color/color_default_red1</color>
+    <color name="green1">@lineageos.platform:color/color_default_green1</color>
+    <color name="orange1">@lineageos.platform:color/color_default_orange1</color>
+    <color name="gray1">@lineageos.platform:color/color_default_gray1</color>
+    <color name="gray2">@lineageos.platform:color/color_default_gray2</color>
 
-    <color name="light_black">#424242</color>
-
-    <color name="tab_1">@color/primary</color>
-    <color name="tab_2">@color/primary</color>
-    <color name="tab_3">@color/primary</color>
-    <color name="tab_icon_1">@color/white</color>
-    <color name="tab_icon_2">@color/white</color>
-    <color name="tab_icon_3">@color/white</color>
-
-    <color name="black_transparent_1">#1a000000</color>
-    <color name="black_transparent_2">#26000000</color>
-    <color name="black_transparent_3">#75000000</color>
-    <color name="black_transparent_4">#8A000000</color>
-    <color name="black_transparent_5">#C1000000</color>
+    <color name="light_black">@color/color_default_foreground</color>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5a02df1b86cb25bd064f6986e9a3ce72b23b7e60..48337e2fc58d8ada29f5d85bf322af070c539a5e 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,27 +15,27 @@
 -->
 <resources>
 
-    <color name="default_background">@lineageos.platform:color/color_default_foreground</color>
+    <color name="default_background">@lineageos.platform:color/color_default_background</color>
     <!-- configuration for album set page -->
     <color name="albumset_background">@color/default_background</color>
-    <color name="albumset_placeholder">@color/black_transparent_3</color>
+    <color name="albumset_placeholder">@color/color_default_foreground</color>
 <!--    <color name="albumset_placeholder">@color/default_background</color>-->
-    <color name="albumset_label_background">@color/black_transparent_4</color>
-    <color name="albumset_label_title">@color/white</color>
-    <color name="albumset_label_count">@color/white</color>
+    <color name="albumset_label_background">@color/color_default_secondary_text</color>
+    <color name="albumset_label_title">@color/color_default_primary_text</color>
+    <color name="albumset_label_count">@color/color_default_primary_text</color>
     <color name="albumlist_label_title">@color/color_default_primary_text</color>
 
-    <color name="darker_transparent">@color/black_transparent_5</color>
+    <color name="darker_transparent">@color/color_default_background</color>
 
     <!-- configuration for album page -->
     <color name="album_background">@color/default_background</color>
-    <color name="album_placeholder">@color/white</color>
+    <color name="album_placeholder">@color/color_default_foreground</color>
 
     <!-- configuration for photo page -->
-    <color name="photo_background">@color/black</color>
-    <color name="photo_placeholder">@color/light_black</color>
+    <color name="photo_background">@color/color_default_background</color>
+    <color name="photo_placeholder">@color/color_default_foreground</color>
     <color name="photo_page_action_bar">@color/default_background</color>
-    <color name="photo_page_bottom_panel">#8A000000</color>
+    <color name="photo_page_bottom_panel">@color/primaryDark</color>
 
     <!-- configuration for manage cache page -->
     <color name="cache_background">@color/primary</color>
@@ -43,54 +43,54 @@
 
     <color name="bitmap_screennail_placeholder">@color/light_black</color>
 
-    <color name="slideshow_background">@color/light_black</color>
+    <color name="slideshow_background">@color/default_background</color>
 
     <color name="button_dark_transparent_background">#6000</color>
 
-    <color name="ingest_highlight_semitransparent">#8833b5e5</color>
+    <color name="ingest_highlight_semitransparent">@color/accent</color>
     <color name="ingest_date_tile_text">@color/accent</color>
 
     <!-- Camera resources below -->
 
-    <color name="recording_time_elapsed_text">@color/white</color>
-    <color name="recording_time_remaining_text">#FFFF0033</color>
-    <color name="on_viewfinder_label_background_color">#77333333</color>
+    <color name="recording_time_elapsed_text">@color/primaryDark</color>
+    <color name="recording_time_remaining_text">@color/red1</color>
+    <color name="on_viewfinder_label_background_color">@color/primaryDark</color>
     <color name="review_control_pressed_color">@color/accent</color>
-    <color name="review_control_pressed_fan_color">#3F33B5E5</color>
-    <color name="review_background">@color/black</color>
-    <color name="icon_disabled_color">#DD777777</color>
-    <color name="time_lapse_arc">#FFC5C5C5</color>
-    <color name="indicator_background">#40000000</color>
+    <color name="review_control_pressed_fan_color">@color/accent</color>
+    <color name="review_background">@color/color_default_foreground</color>
+    <color name="icon_disabled_color">@color/gray2</color>
+    <color name="time_lapse_arc">@color/gray1</color>
+    <color name="indicator_background">@color/color_default_foreground</color>
     <color name="popup_title_color">@color/accent</color>
-    <color name="popup_background">#ff282828</color>
-    <color name="pano_progress_empty">#FF2E2E2E</color>
-    <color name="pano_progress_done">#FF33525E</color>
-    <color name="pano_progress_indication">#FF0099CC</color>
-    <color name="pano_progress_indication_fast">#FFFF2222</color>
+    <color name="popup_background">@color/color_default_background</color>
+    <color name="pano_progress_empty">@color/gray2</color>
+    <color name="pano_progress_done">@color/accent</color>
+    <color name="pano_progress_indication">@color/accent</color>
+    <color name="pano_progress_indication_fast">@color/red1</color>
     <color name="mode_selection_border">@color/accent</color>
     <color name="holo_blue_light">@color/accent</color>
-    <color name="bright_foreground_disabled_holo_dark">#ff4c4c4c</color>
-    <color name="bright_foreground_holo_dark">#fff3f3f3</color>
-    <color name="face_detect_start">#80ffffff</color>
-    <color name="face_detect_success">#8050d060</color>
-    <color name="face_detect_fail">#80d05060</color>
-    <color name="gray">#FFAAAAAA</color>
-
-    <color name="highlight">#f41e26</color>
-    <color name="lowlight">#650101</color>
-    <color name="grey">#e7e7e7</color>
-    <color name="disabled_knob">#575757</color>
-    <color name="toolbar_theme">@color/primary</color>
-    <color name="multiselect_background">@color/white</color>
-    <color name="edit_background">@color/black</color>
-    <color name="edit_actionbar_background">@color/black</color>
-    <color name="dialog_button_color">#009688</color>
-    <color name="disable_tab">#808080</color>
+    <color name="bright_foreground_disabled_holo_dark">@color/gray1</color>
+    <color name="bright_foreground_holo_dark">@color/color_default_foreground</color>
+    <color name="face_detect_start">@color/color_default_background</color>
+    <color name="face_detect_success">@color/green1</color>
+    <color name="face_detect_fail">@color/red1</color>
+    <color name="gray">@color/gray1</color>
+
+    <color name="highlight">@color/red1</color>
+    <color name="lowlight">@color/orange1</color>
+    <color name="grey">@color/gray1</color>
+    <color name="disabled_knob">@color/gray2</color>
+    <color name="toolbar_theme">@color/primaryDark</color>
+    <color name="multiselect_background">@color/primaryDark</color>
+    <color name="edit_background">@color/color_default_background</color>
+    <color name="edit_actionbar_background">@color/primaryDark</color>
+    <color name="dialog_button_color">@color/accent</color>
+    <color name="disable_tab">@color/gray1</color>
     <color name="timeline_title_text_color">@color/color_default_primary_text</color>
     <color name="timeline_title_number_text_color">@color/color_default_primary_text</color>
-    <color name="timeline_title_background_color">@color/primary</color>
+    <color name="timeline_title_background_color">@color/primaryDark</color>
 
     <color name="navigation_accent_disabled">@color/disable_tab</color>
-    <color name="navigation_accent_enabled">@lineageos.platform:color/color_default_accent</color>
+    <color name="navigation_accent_enabled">@color/accent</color>
 
 </resources>
diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml
index f9b05d9f3939d0a11f2dd2258dd085142cb54a71..56bf1c5e70f6b23b1f7efa2552ade14ef4800594 100644
--- a/res/values/filtershow_color.xml
+++ b/res/values/filtershow_color.xml
@@ -16,36 +16,36 @@
 
 <resources>
     <color name="yellow">#FFFF00</color>
-    <color name="green">#00FF00</color>
-    <color name="red">#FF0000</color>
-    <color name="blue">#0000FF</color>
-    <color name="text_toolbar">@color/white</color>
-    <color name="background_screen">#212121</color>
-    <color name="background_toolbar">#363949</color>
-    <color name="background_main_toolbar">#232323</color>
-    <color name="toolbar_separation_line">#333333</color>
-    <color name="slider_dot_color">#646464</color>
-    <color name="slider_line_color">#888888</color>
-    <color name="state_panel_separation_line">#232323</color>
+    <color name="green">@lineageos.platform:color/color_default_green1</color>
+    <color name="red">@lineageos.platform:color/color_default_red1</color>
+    <color name="blue">@lineageos.platform:color/color_default_blue1</color>
+    <color name="text_toolbar">@color/color_default_primary_text</color>
+    <color name="background_screen">@lineageos.platform:color/color_default_background</color>
+    <color name="background_toolbar">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="background_main_toolbar">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="toolbar_separation_line">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="slider_dot_color">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="slider_line_color">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="state_panel_separation_line">@lineageos.platform:color/color_default_divider</color>
     <color name="filtershow_background">#333333</color>
     <color name="filtershow_graphic">#717171</color>
     <color name="filtershow_stateview_end_background">#232323</color>
-    <color name="filtershow_stateview_end_text">#a7a7a7</color>
+    <color name="filtershow_stateview_end_text">@lineageos.platform:color/color_default_primary_text</color>
     <color name="filtershow_stateview_background">#464646</color>
-    <color name="filtershow_stateview_text">@color/white</color>
+    <color name="filtershow_stateview_text">@color/color_default_primary_text</color>
     <color name="filtershow_stateview_selected_background">#c8c8c8</color>
-    <color name="filtershow_stateview_selected_text">@color/black</color>
+    <color name="filtershow_stateview_selected_text">@color/color_default_primary_text</color>
     <color name="filtershow_categoryview_background">#1a1a1a</color>
-    <color name="filtershow_categoryview_text">@color/white</color>
-    <color name="filtershow_category_selection">#4592F9</color>
-    <color name="gradcontrol_point_center">@color/white</color>
-    <color name="gradcontrol_point_edge">@color/white</color>
+    <color name="filtershow_categoryview_text">@color/color_default_primary_text</color>
+    <color name="filtershow_category_selection">@color/accent</color>
+    <color name="gradcontrol_point_center">@color/color_default_primary_text</color>
+    <color name="gradcontrol_point_edge">@color/color_default_primary_text</color>
     <color name="gradcontrol_graypoint_center">#888888</color>
     <color name="gradcontrol_graypoint_edge">#BBBBBB</color>
     <color name="gradcontrol_point_shadow_start">#66000000</color>
     <color name="gradcontrol_point_shadow_end">@android:color/transparent</color>
-    <color name="gradcontrol_line_color">@color/white</color>
-    <color name="gradcontrol_line_shadow">@color/black</color>
+    <color name="gradcontrol_line_color">@color/color_default_primary_text</color>
+    <color name="gradcontrol_line_shadow">@color/color_default_secondary_text</color>
     <color name="draw_rect_border">#888888</color>
     <color name="color_chooser_unslected_border">#3d4040</color>
     <color name="color_chooser_slected_border">#a7a7a7</color>
@@ -65,9 +65,9 @@
     <color name="filtershow_color_xprocess">#80000000</color>
 
     <color name="iconview_bottom_color">#80000000</color>
-    <color name="bottom_panel_background_color">#A5000000</color>
-    <color name="crop_panel_background_color">#A5000000</color>
-    <color name="crop_text_color">#4f92e9</color>
-    <color name="watermark_text_color">#80ffffff</color>
-    <color name="watermark_highlight_color">#4592F9</color>
+    <color name="bottom_panel_background_color">@color/primaryDark</color>
+    <color name="crop_panel_background_color">@color/primaryDark</color>
+    <color name="crop_text_color">@color/color_default_primary_text</color>
+    <color name="watermark_text_color">@color/color_default_primary_text</color>
+    <color name="watermark_highlight_color">@color/accent</color>
 </resources>
diff --git a/res/values/filtershow_styles.xml b/res/values/filtershow_styles.xml
index 6fa76a2af9ca5a70a920bd3218d6bdf255db99e2..3124a407d4689bcce3f76533498a2792d13feac4 100644
--- a/res/values/filtershow_styles.xml
+++ b/res/values/filtershow_styles.xml
@@ -23,7 +23,7 @@
         <item name="android:background">@drawable/filtershow_button_background</item>
         <item name="android:gravity">center</item>
         <item name="android:padding">2dip</item>
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:textSize">18dip</item>
         <item name="android:textStyle">bold</item>
     </style>
@@ -34,7 +34,7 @@
         <item name="android:background">@drawable/filtershow_button_background</item>
         <item name="android:gravity">center</item>
         <item name="android:padding">8dip</item>
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:textSize">18dip</item>
         <item name="android:textStyle">bold</item>
         <item name="android:scaleType">centerInside</item>
@@ -65,11 +65,11 @@
     </style>
 
     <style name="DefaultFillColor">
-        <item name="fillColorSelector">#FFFFFF</item>
+        <item name="fillColorSelector">@color/color_default_primary_text</item>
     </style>
 
     <style name="SelectedFillColor">
-        <item name="fillColorSelector">#4592F9</item>
+        <item name="fillColorSelector">@color/accent</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 166f93723065a92ff36413873e9cc982835b1136..a2c85bb2597d403bf8cb264fa49e48197b639cec 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,35 +15,91 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <style name="Theme.GalleryBase" parent="android:Theme.Material">
+
+    <style name="Toolbar.Button.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
+        <item name="tint">@color/accent</item>
+    </style>
+
+    <style name="customSpinnerItemStyle" parent="@android:style/Widget.Holo.DropDownItem.Spinner">
+        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:background">@color/color_default_background</item>
+    </style>
+
+    <style name="CustomDropDownListViewStyle" parent="Widget.AppCompat.ListView.DropDown">
+        <item name="android:background">@color/color_default_background</item>
+    </style>
+
+    <style name="CustomPopupMenuStyle" parent="@android:style/Widget.PopupMenu">
+        <item name="android:popupBackground">@color/color_default_background</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:itemBackground">@color/color_default_background</item>
+    </style>
+
+    <style name="Theme.GalleryBase" parent="@style/Theme.GalleryMotherBase">
+    </style>
+
+    <style name="Theme.GalleryMotherBase" parent="android:Theme.Material">
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorPrimaryDark">@color/primaryDark</item>
         <item name="android:colorAccent">@color/accent</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+        <item name="android:background">@color/color_default_background</item>
         <item name="listPreferredItemHeightSmall">48dp</item>
         <item name="switchStyle">@android:style/Widget.CompoundButton</item>
+        <item name="android:navigationBarColor">@color/primaryDark</item>
+        <item name="android:navigationBarDividerColor">@color/primaryDark</item>
+        <item name="android:itemBackground">@color/color_default_background</item>
+        <item name="android:statusBarColor">@color/primaryDark</item>
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
+        <item name="android:spinnerDropDownItemStyle">@style/customSpinnerItemStyle</item>
+        <item name="android:alertDialogTheme">@style/Theme.Gallery.Dialog</item>
+        <item name="android:dropDownListViewStyle">@style/CustomDropDownListViewStyle</item>
+        <item name="android:actionMenuTextColor">@color/color_default_primary_text</item>
+        <item name="actionMenuTextColor">@color/color_default_primary_text</item>
+        <item name="android:popupMenuStyle">@style/CustomPopupMenuStyle</item>
     </style>
 
-    <style name="Theme.Gallery.Dialog" parent="android:Theme.Material.Dialog">
+    <style name="Theme.Gallery.Dialog" parent="@style/custom_alert_dialog">
+    </style>
+
+    <style name="custom_alert_dialog" parent="android:Theme.Material.Dialog">
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorPrimaryDark">@color/primaryDark</item>
         <item name="android:colorAccent">@color/accent</item>
+        <item name="android:background">@color/color_default_background</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+    </style>
+
+    <style name="Theme.Gallery" parent="@style/Theme.BaseGallery">
     </style>
 
-    <style name="Theme.Gallery" parent="android:Theme.Material.Light">
+    <style name="Theme.BaseGallery" parent="android:Theme.Material.Light">
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorPrimaryDark">@color/primaryDark</item>
         <item name="android:colorAccent">@color/accent</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:statusBarColor">@color/primaryDark</item>
+        <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowActionModeOverlay">true</item>
         <item name="android:actionOverflowButtonStyle">@style/WhiteOverflow</item>
         <item name="android:logo">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:navigationBarColor">@color/primaryDark</item>
+        <item name="android:navigationBarDividerColor">@color/primaryDark</item>
+        <item name="android:alertDialogTheme">@style/Theme.Gallery.Dialog</item>
+        <item name="android:itemBackground">@color/color_default_background</item>
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
+        <item name="android:spinnerDropDownItemStyle">@style/customSpinnerItemStyle</item>
+        <item name="android:dropDownListViewStyle">@style/CustomDropDownListViewStyle</item>
+        <item name="android:actionMenuTextColor">@color/color_default_primary_text</item>
+        <item name="actionMenuTextColor">@color/color_default_primary_text</item>
+        <item name="android:popupMenuStyle">@style/CustomPopupMenuStyle</item>
     </style>
+
     <style name="Theme.FilterShow" parent="Theme.Gallery">
         <item name="android:windowBackground">@null</item>
         <item name="android:actionBarStyle">@style/FilterShowActionBar</item>
@@ -52,13 +108,30 @@
     <style name="FilterShowToolbar" parent="@android:style/Widget.Toolbar">
         <item name="android:contentInsetStart">0dp</item>
     </style>
-    <style name="Theme.MovieActivity" parent="android:Theme.DeviceDefault.Light.DarkActionBar">
+
+    <style name="Theme.MovieActivity" parent="Theme.BaseMovieActivity">
+    </style>
+
+    <style name="Theme.BaseMovieActivity" parent="android:Theme.DeviceDefault.Light.DarkActionBar">
+        <item name="android:alertDialogTheme">@style/Theme.Gallery.Dialog</item>
+        <item name="android:navigationBarColor">@color/primaryDark</item>
+        <item name="android:navigationBarDividerColor">@color/primaryDark</item>
+        <item name="android:statusBarColor">@color/primaryDark</item>
+    </style>
+
+    <style name="Theme.TrimVideo" parent="Theme.BaseTrimVideo">
     </style>
+
+    <style name="Theme.BaseTrimVideo" parent="android:Theme.DeviceDefault.Light.DarkActionBar">
+        <item name="android:navigationBarColor">@color/primaryDark</item>
+        <item name="android:navigationBarDividerColor">@color/primaryDark</item>
+        <item name="android:statusBarColor">@color/primaryDark</item>
+    </style>
+
     <style name="Theme.Crop" parent="Theme.GalleryBase">
         <item name="android:displayOptions"></item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:actionBarStyle">@style/Material.ActionBar</item>
-        <item name="android:colorBackground">@null</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowBackground">@drawable/filtershow_tiled_background</item>
     </style>
@@ -66,6 +139,8 @@
         <item name="android:displayOptions">useLogo|showHome</item>
         <item name="android:background">@drawable/actionbar_translucent</item>
         <item name="android:backgroundStacked">@null</item>
+        <item name="icon">@color/color_default_primary_text</item>
+        <item name="colorControlNormal">@color/color_default_primary_text</item>
     </style>
     <style name="MediaButton.Play" parent="@android:style/MediaButton.Play">
         <item name="android:background">@null</item>
@@ -74,6 +149,11 @@
     <style name="DialogPickerTheme" parent="android:Theme.Material">
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorPrimaryDark">@color/primaryDark</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:background">@color/color_default_background</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
     </style>
     <style name="Theme.ProxyLauncher" parent="@android:Theme.Translucent.NoTitleBar">
     </style>
@@ -87,23 +167,23 @@
     <!-- Camera resources below -->
 
     <style name="Theme.Camera" parent="Theme.CameraBase">
-        <item name="android:windowBackground">@android:color/black</item>
-        <item name="android:colorBackground">@android:color/black</item>
-        <item name="android:colorBackgroundCacheHint">@android:color/black</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
+        <item name="android:colorBackground">@color/color_default_background</item>
+        <item name="android:colorBackgroundCacheHint">@color/color_default_background</item>
     </style>
     <style name="Theme.CameraBase" parent="android:Theme.Black.NoTitleBar.Fullscreen"/>
     <style name="OnScreenHintTextAppearance">
-        <item name="android:textColor">@android:color/primary_text_dark</item>
-        <item name="android:textColorHighlight">#FFFF9200</item>
-        <item name="android:textColorHint">#808080</item>
-        <item name="android:textColorLink">#5C5CFF</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:textColorHighlight">@color/color_default_primary_text</item>
+        <item name="android:textColorHint">@color/color_default_secondary_text</item>
+        <item name="android:textColorLink">@color/accent</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textStyle">normal</item>
     </style>
     <style name="OnScreenHintTextAppearance.Small">
         <item name="android:textSize">14sp</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:textColor">@android:color/secondary_text_dark</item>
+        <item name="android:textColor">@color/color_default_secondary_text</item>
     </style>
     <style name="Animation_OnScreenHint">
         <item name="android:windowEnterAnimation">@anim/on_screen_hint_enter</item>
@@ -115,6 +195,7 @@
         <item name="android:layout_centerInParent">true</item>
         <item name="android:visibility">gone</item>
         <item name="android:src">@drawable/ic_gallery_play_big</item>
+        <item name="tint">@color/accent</item>
     </style>
     <style name="PopupTitleSeparator">
         <item name="android:layout_width">match_parent</item>
@@ -166,7 +247,7 @@
         <item name="android:paddingEnd">15dp</item>
         <item name="android:paddingTop">3dp</item>
         <item name="android:paddingBottom">3dp</item>
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:textSize">16dp</item>
         <item name="android:background">@drawable/bg_text_on_preview</item>
     </style>
@@ -197,7 +278,7 @@
     <style name="EffectSettingItemTitle">
         <item name="android:textSize">@dimen/effect_setting_item_text_size</item>
         <item name="android:gravity">center</item>
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:singleLine">true</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -206,7 +287,7 @@
     <style name="EffectSettingTypeTitle">
         <item name="android:textSize">@dimen/effect_setting_type_text_size</item>
         <item name="android:gravity">left|center_vertical</item>
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:alpha">0.7</item>
         <item name="android:singleLine">true</item>
         <item name="android:layout_width">match_parent</item>
@@ -220,13 +301,13 @@
         <item name="android:layout_marginEnd">8dp</item>
         <item name="android:layout_marginBottom">14dp</item>
         <item name="android:layout_height">2dp</item>
-        <item name="android:background">#2c2c2c</item>
+        <item name="android:background">@color/color_default_divider</item>
     </style>
     <style name="EffectTitleSeparator">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">2dp</item>
         <item name="android:paddingBottom">4dp</item>
-        <item name="android:background">@android:drawable/divider_horizontal_dark</item>
+        <item name="android:background">@color/color_default_divider</item>
     </style>
     <style name="TextAppearance.DialogWindowTitle" parent="">
         <item name="android:textSize">22sp</item>
@@ -300,10 +381,10 @@
     </style>
     <style name="UndoBarTextAppearance">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
     <style name="UndoBarSeparator">
-        <item name="android:background">@color/gray</item>
+        <item name="android:background">@color/color_default_divider</item>
         <item name="android:layout_width">1dp</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_marginTop">10dp</item>
@@ -317,12 +398,15 @@
         <item name="android:textSize">12sp</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/gray</item>
+        <item name="android:textColor">@color/color_default_secondary_text</item>
         <item name="android:drawablePadding">8dp</item>
         <item name="android:background">@drawable/bg_pressed</item>
     </style>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light">
+    <style name="AppTheme" parent="BaseAppTheme">
+    </style>
+
+    <style name="BaseAppTheme" parent="Theme.AppCompat.DayNight">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primaryDark</item>
         <item name="colorAccent">@color/accent</item>
@@ -331,28 +415,38 @@
         <item name="android:colorAccent">@color/accent</item>
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:windowBackground">@color/primary</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:actionModeBackground">@color/multiselect_background</item>
+        <item name="android:actionModeBackground">@color/primaryDark</item>
         <item name="android:actionModeShareDrawable">@drawable/multiselect_share</item>
         <item name="android:actionOverflowButtonStyle">@style/MyOverFlow</item>
         <item name="android:homeAsUpIndicator">@drawable/back</item>
         <item name="android:actionModeCloseDrawable">@drawable/multiselected_back</item>
         <item name="android:windowNoTitle">true</item>
-        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:navigationBarColor">@color/primaryDark</item>
+        <item name="android:navigationBarDividerColor">@color/primaryDark</item>
+        <item name="android:statusBarColor">@color/primaryDark</item>
+        <item name="android:alertDialogTheme">@style/Theme.Gallery.Dialog</item>
+        <item name="android:itemBackground">@color/color_default_background</item>
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
+        <item name="android:spinnerDropDownItemStyle">@style/customSpinnerItemStyle</item>
+        <item name="android:dropDownListViewStyle">@style/CustomDropDownListViewStyle</item>
+        <item name="android:actionMenuTextColor">@color/color_default_primary_text</item>
+        <item name="actionMenuTextColor">@color/color_default_primary_text</item>
+        <item name="android:popupMenuStyle">@style/CustomPopupMenuStyle</item>
     </style>
 
     <style name="QueryTheme" parent="android:Theme.Material">
-        <item name="android:statusBarColor">#ab5810</item>
+        <item name="android:statusBarColor">@color/primaryDark</item>
     </style>
 
     <style name="ToolbarTheme" parent="android:Theme.Material.Light" >
         <item name="android:actionOverflowButtonStyle">@style/WhiteOverflow</item>
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primaryDark</item>
-        <item name="android:colorControlNormal">@color/color_default_primary_text</item>
+        <item name="android:colorControlNormal">@color/accent</item>
     </style>
 
     <style name="ToolbarTitleStyle" parent="android:TextAppearance.Material.Widget.Toolbar.Title">
@@ -365,9 +459,10 @@
     <!-- Styles -->
     <style name="MyOverFlow" parent="@android:style/Widget.Material.ActionButton.Overflow">
         <item name="android:src">@drawable/multiselect_more</item>
+        <item name="android:tint">@color/accent</item>
     </style>
     <style name="WhiteOverflow" parent="@android:style/Widget.Material.ActionButton.Overflow">
-        <item name="android:src">@lineageos.platform:drawable/ic_menu</item>
+        <item name="android:src">@drawable/multiselect_more</item>
     </style>
     <style name="FilterShowActionBar" parent="@android:style/Widget.Material.Light.ActionBar">
         <item name="android:background">@color/edit_actionbar_background</item>
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 01c1f38047059d2c1ff218db077164d057ee173a..a3f2e1ebf3e69bc27165f40ab3d148e8de71eab4 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.app;
 
+import android.text.style.ForegroundColorSpan;
+import android.text.SpannableString;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -650,6 +652,16 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
         if (allVideoFiles() && !mGetContent){
             menu.findItem(R.id.action_slideshow).setVisible(false);
         }
+
+        for(int i = 0; i < menu.size(); i++) {
+            MenuItem item = menu.getItem(i);
+            if (item != null && item.getTitle() != null) {
+                SpannableString spanString = new SpannableString(menu.getItem(i).getTitle().toString());
+                spanString.setSpan(new ForegroundColorSpan(mActivity.getAndroidContext().getResources().getColor(R.color.color_default_primary_text)), 0, spanString.length(), 0);
+                item.setTitle(spanString);
+            }
+        }
+
         return true;
     }
 
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index e2ae55da095ec8dcd7b47df2f6da65d01805b408..2c2cb6f4b61131d304538c4f1272d005764efd37 100755
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -19,6 +19,8 @@
 
 package com.android.gallery3d.app;
 
+import android.text.style.ForegroundColorSpan;
+import android.text.SpannableString;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -628,6 +630,16 @@ public class AlbumSetPage extends ActivityState implements
                     R.bool.config_show_more_images));
             mActionBar.setTitle(R.string.albums_title);
         }
+
+        for(int i = 0; i < menu.size(); i++) {
+            MenuItem item = menu.getItem(i);
+            if (item != null && item.getTitle() != null) {
+                SpannableString spanString = new SpannableString(item.getTitle().toString());
+                spanString.setSpan(new ForegroundColorSpan(mActivity.getApplicationContext().getResources().getColor(R.color.color_default_primary_text)), 0, spanString.length(), 0);
+                item.setTitle(spanString);
+            }
+        }
+
         return true;
     }
 
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 6108c8e3d5a8a7c235a925e3790ff7472f80abe8..e72a963157d923cc5261651b5dc5c1d0cdedcd08 100755
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.app;
 
+import android.text.style.ForegroundColorSpan;
+import android.text.SpannableString;
 import android.annotation.TargetApi;
 import android.app.ActionBar.OnMenuVisibilityListener;
 import android.app.Activity;
@@ -1123,6 +1125,14 @@ public abstract class PhotoPage extends ActivityState implements
         mHaveImageEditor = GalleryUtils.isEditorAvailable(mActivity, "image/*");
         updateMenuOperations();
         //mActionBar.setTitle(mMediaSet != null ? mMediaSet.getName() : "");
+        for(int i = 0; i < menu.size(); i++) {
+            MenuItem item = menu.getItem(i);
+            if (item != null && item.getTitle() != null) {
+                SpannableString spanString = new SpannableString(menu.getItem(i).getTitle().toString());
+                spanString.setSpan(new ForegroundColorSpan(mActivity.getAndroidContext().getResources().getColor(R.color.color_default_primary_text)), 0, spanString.length(), 0);
+                item.setTitle(spanString);
+            }
+        }
         return true;
     }
 
diff --git a/src/com/android/gallery3d/app/PickerActivity.java b/src/com/android/gallery3d/app/PickerActivity.java
index 78d0f253e4d1ee81ea1ad78a1c164248ddc4c62e..42a75a4d9b9b072ac12136637e3990146e6986b9 100644
--- a/src/com/android/gallery3d/app/PickerActivity.java
+++ b/src/com/android/gallery3d/app/PickerActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.app;
 
+import android.text.style.ForegroundColorSpan;
+import android.text.SpannableString;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -64,6 +66,16 @@ public class PickerActivity extends AbstractGalleryActivity
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.pickup, menu);
+
+        for(int i = 0; i < menu.size(); i++) {
+            MenuItem item = menu.getItem(i);
+            if (item != null && item.getTitle() != null) {
+                SpannableString spanString = new SpannableString(item.getTitle().toString());
+                spanString.setSpan(new ForegroundColorSpan(getApplicationContext().getResources().getColor(R.color.color_default_primary_text)), 0, spanString.length(), 0);
+                item.setTitle(spanString);
+            }
+        }
+
         return true;
     }
 
diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java
index 39c6412d2b27f4c59d7ab03abdf7375678f3a618..ee8bb47db2d8ccdf54d9773dd0115b0f63cdaeba 100755
--- a/src/com/android/gallery3d/app/TimeLinePage.java
+++ b/src/com/android/gallery3d/app/TimeLinePage.java
@@ -19,6 +19,8 @@
 
 package com.android.gallery3d.app;
 
+import android.text.style.ForegroundColorSpan;
+import android.text.SpannableString;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -601,6 +603,15 @@ public class TimeLinePage extends ActivityState implements
             menu.findItem(R.id.action_view_type).setVisible(false);
         }
 
+        for(int i = 0; i < menu.size(); i++) {
+            MenuItem item = menu.getItem(i);
+            if (item != null && item.getTitle() != null) {
+                SpannableString spanString = new SpannableString(menu.getItem(i).getTitle().toString());
+                spanString.setSpan(new ForegroundColorSpan(mActivity.getAndroidContext().getResources().getColor(R.color.color_default_primary_text)), 0, spanString.length(), 0);
+                item.setTitle(spanString);
+            }
+        }
+
         return true;
     }
 
diff --git a/src/com/android/gallery3d/app/TrimVideo.java b/src/com/android/gallery3d/app/TrimVideo.java
index 527f6cff38b52305c248f7de53d72afbba256150..4f46d56b1cecd3d005ed0c84d771da433507231b 100755
--- a/src/com/android/gallery3d/app/TrimVideo.java
+++ b/src/com/android/gallery3d/app/TrimVideo.java
@@ -16,6 +16,7 @@
 
 package com.android.gallery3d.app;
 
+import android.graphics.drawable.ColorDrawable;
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -89,13 +90,16 @@ public class TrimVideo extends Activity implements
         displayOptions = ActionBar.DISPLAY_SHOW_CUSTOM;
         actionBar.setDisplayOptions(displayOptions, displayOptions);
         actionBar.setCustomView(R.layout.trim_menu);
+        actionBar.setBackgroundDrawable(new ColorDrawable(getResources()
+                .getColor(R.color.toolbar_theme)));
+
 
         mExitImageView = (ImageView) findViewById(R.id.exit_trim);
         mExitImageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 mExitDialog = new AlertDialog.Builder(TrimVideo.this,
-                        AlertDialog.THEME_DEVICE_DEFAULT_LIGHT).
+                        R.style.custom_alert_dialog).
                         setTitle(R.string.trim_video_exit_title).
                         setMessage(R.string.trim_video_exit_msg).
                         setPositiveButton(R.string.trim_video_exit_discard,
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index dfd248e6b5ecd4b1a11cbb6aa7b9df0c9b78b2e3..553013cca0dfc8f56f7e35140e390d2d6d62fd3f 100755
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -22,7 +22,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Vector;
-
+import android.text.style.ForegroundColorSpan;
+import android.text.SpannableString;
 import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -2089,6 +2090,15 @@ public class FilterShowActivity extends AbstractPermissionActivity implements On
         if(mCurrentEditor != null) {
             mCurrentEditor.onPrepareOptionsMenu(menu);
         }
+
+        for(int i = 0; i < menu.size(); i++) {
+            MenuItem menuItem = menu.getItem(i);
+            if (menuItem != null && menuItem.getTitle() != null) {
+                SpannableString spanString = new SpannableString(menuItem.getTitle().toString());
+                spanString.setSpan(new ForegroundColorSpan(getApplicationContext().getResources().getColor(R.color.color_default_primary_text)), 0, spanString.length(), 0);
+                menuItem.setTitle(spanString);
+            }
+        }
         return true;
     }
 
diff --git a/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java b/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
index baaa3e1287443d0d29a8ee116b4c112f6ec65c41..2b77034bc27d51483da892fced60bc166561fbf0 100644
--- a/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
@@ -166,7 +166,7 @@ public class EditorCropPanel extends BasicGeometryPanel {
             TextView view = mTextViews[i];
             view.setTextColor(index == i ?
                     getResources().getColor(R.color.crop_text_color) :
-                    Color.WHITE);
+                    getResources().getColor(R.color.color_default_secondary_text));
         }
     }
 
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
index e12806977f0b00d009784e3bb7fd811036d82ed3..94cf0688b1cdbdd808aa3358a89d3dc360fb4dda 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
@@ -86,7 +86,7 @@ public class ImageDraw extends ImageShow {
         mBorderPaint.setStyle(Paint.Style.STROKE);
         mBorderPaint.setStrokeWidth(edge);
         mShadowPaint.setStyle(Paint.Style.FILL);
-        mShadowPaint.setColor(Color.BLACK);
+        mShadowPaint.setColor(R.color.color_default_background);
         mShadowPaint.setShadowLayer(mBorderShadowSize,mBorderShadowSize,
                 mBorderShadowSize,Color.BLACK);
         mShadow = (NinePatchDrawable) res.getDrawable(R.drawable.geometry_shadow);
diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java
index b78b03473221ce9d898cc9e2da0733f20dc8f296..e77b1aa57f1d86887f94eb0d97c927b7fc2016a3 100644
--- a/src/com/android/gallery3d/ui/ActionModeHandler.java
+++ b/src/com/android/gallery3d/ui/ActionModeHandler.java
@@ -16,6 +16,7 @@
 
 package com.android.gallery3d.ui;
 
+import android.graphics.PorterDuff;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -31,7 +32,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toolbar;
-
+import android.graphics.drawable.Drawable;
 import org.codeaurora.gallery.R;
 import com.android.gallery3d.app.AbstractGalleryActivity;
 import com.android.gallery3d.common.ApiHelper;
diff --git a/src/com/android/gallery3d/ui/DialogDetailsView.java b/src/com/android/gallery3d/ui/DialogDetailsView.java
index 5b3a016de51722312e2019dd14390b449476ce98..f5b70f29284341ecddc388b8cb22b4a15049e42c 100644
--- a/src/com/android/gallery3d/ui/DialogDetailsView.java
+++ b/src/com/android/gallery3d/ui/DialogDetailsView.java
@@ -100,7 +100,7 @@ public class DialogDetailsView implements DetailsViewContainer {
         ListView detailsList = (ListView) LayoutInflater.from(mActivity.getAndroidContext()).inflate(
                 R.layout.details_list, null, false);
         detailsList.setAdapter(mAdapter);
-        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
+        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity, R.style.custom_alert_dialog);
 
          builder.setView(detailsList);
         builder.setTitle(title);
diff --git a/src/com/android/gallery3d/ui/PopupList.java b/src/com/android/gallery3d/ui/PopupList.java
index 37c0b87a0cd29ebfded9ac1503754aeffa67dee8..cbd1270e5fc74b7ea6322ee5fdeb0da2ac6d0892 100644
--- a/src/com/android/gallery3d/ui/PopupList.java
+++ b/src/com/android/gallery3d/ui/PopupList.java
@@ -156,8 +156,6 @@ public class PopupList {
     private PopupWindow createPopupWindow() {
         PopupWindow popup = new PopupWindow(mContext, null, android.R.attr.popupMenuStyle);
         popup.setOnDismissListener(mOnDismissListener);
-        popup.setBackgroundDrawable(new ColorDrawable(
-                mContext.getResources().getColor(R.color.white)));
 
 //        popup.setBackgroundDrawable(mContext.getResources().getDrawable(
 //                R.drawable.menu_dropdown_panel_holo_dark));
diff --git a/src/org/codeaurora/gallery3d/video/BookmarkActivity.java b/src/org/codeaurora/gallery3d/video/BookmarkActivity.java
index 75e4562b67acdb2a75d614decb1c6490ef963a1d..2f6781b8109b8fd7e8ee84a25602d5c47ae7059c 100644
--- a/src/org/codeaurora/gallery3d/video/BookmarkActivity.java
+++ b/src/org/codeaurora/gallery3d/video/BookmarkActivity.java
@@ -99,7 +99,7 @@ public class BookmarkActivity extends Activity implements OnItemClickListener {
     public boolean onCreateOptionsMenu(final Menu menu) {
         super.onCreateOptionsMenu(menu);
         menu.add(0, MENU_DELETE_ALL, 0, R.string.delete_all)
-                .setIcon(android.R.drawable.ic_menu_delete);
+                .setIcon(R.drawable.delete);
         return true;
     }