diff --git a/Android.bp b/Android.bp
index 8860be7bcfae3bb45a5c8780f1a75d6c4d27f099..d847ee5c288cdc1fe3ab078148b73513703ef119 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,6 +16,7 @@ android_app {
         "com.android.gallery3d.common2",
         "xmp_toolkit",
         "mp4parser",
+        "elib",
     ],
 
     srcs: [
diff --git a/res/drawable/cancel.xml b/res/drawable/cancel.xml
index 335e609303aed335d044a3b5d8b3fc335b562f7f..8941389629ed3aa74a1be2c830908ba90cb9ea38 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/e_icon_color"/>
 </vector>
diff --git a/res/drawable/color.xml b/res/drawable/color.xml
index d2dc37e26287a4b0efbecf314f7929d27e247077..c0f8245faed2d60be59d5f9db9ee84eefb297c2e 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/e_icon_color"/>
 </vector>
diff --git a/res/drawable/color_select.xml b/res/drawable/color_select.xml
index 79d107021a7ceaa12386a530c75757aaa1542178..2bbc0ed015b4dd007ddb646fc9495d162e3188b6 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/e_accent"/>
 </vector>
diff --git a/res/drawable/crop.xml b/res/drawable/crop.xml
index 25ff649680d1fba3824f378b9a3dc62f33f7161f..82e0906300b033b268ca9846c1708bd9fc3ba570 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/e_icon_color"/>
 </vector>
diff --git a/res/drawable/crop_1_1.xml b/res/drawable/crop_1_1.xml
index 332eff7e7753f6a0d5527de7a393c072f3f0136c..b7c3a929530ba75a537030f608115e9456817cf9 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/e_icon_color" 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..560bec61a568311ca5d45fcef9d7f32be0640ef8 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/e_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..6e343c20bece063990310cffed55dd911af2da3b 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/e_icon_color" 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..3e2877e554ad1ce5c9cac2ad12eeaf53808ce48c 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/e_icon_color" 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..3f3dd4106fd060af10ddf2d6979365c00e86214e 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/e_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..663ef66b79e62419e1128e8293e6866a1ce4b8f0 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/e_icon_color" 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..565f670c3b1daed4e621e97e5a4c1a35eb88c116 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/e_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..2a79128c24ab75e8580074416f5e41b4f83c67a2 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/e_icon_color" 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..f6dbbfa2347f13e497bec3ad3974a1309e7550d1 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/e_accent"/>
 </vector>
diff --git a/res/drawable/crop_straighten.xml b/res/drawable/crop_straighten.xml
index 9fda1f4840844391cb0c6165493db45a90d70572..713467caf118a15edabcdb34f564bde3e467ee16 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/e_icon_color" 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/done.xml b/res/drawable/done.xml
index 439357c61b79d85b021e818503ecb4e48b882265..e68e42d2bccd4578c0c306cb52d571d8b8759e42 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/e_icon_color"/>
 </vector>
diff --git a/res/drawable/exposure.xml b/res/drawable/exposure.xml
index ad0a64f4f5bb3512a4c28d3d7efa9f1243a93e29..8f61803db736f5cacbb0f7a4855efddc3b051d1c 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/e_icon_color"/>
 </vector>
diff --git a/res/drawable/exposure_select.xml b/res/drawable/exposure_select.xml
index 7386e4c0185e8e65a233abb892dd7bd1505e4758..249f069b93f6e0c26219b15368d75170af646129 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/e_accent"/>
 </vector>
diff --git a/res/drawable/frames.xml b/res/drawable/frames.xml
index f668e4dcecb7dd53d923f0d46f85dd5274047bf9..d585af5560566738f4f46e538551b1f0b6e56e77 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/e_icon_color"/>
     <path
         android:pathData="M23.143,12.216"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/e_icon_color"/>
     <path
         android:pathData="M8.923,12.216h14.153v11.966h-14.153z"
-        android:fillColor="@color/white"/>
+        android:fillColor="@color/e_icon_color"/>
 </vector>
diff --git a/res/drawable/frames_select.xml b/res/drawable/frames_select.xml
index 6fa77e7ccd790bedbb7fb856c71d3b9fb93f6ad6..f14e0f2900757e43e9ef7adfdef1554b36d98459 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/e_accent"/>
     <path
         android:pathData="M23.143,12.216"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/e_accent"/>
     <path
         android:pathData="M8.923,12.216h14.153v11.966h-14.153z"
-        android:fillColor="#FF4F92E9"/>
+        android:fillColor="@color/e_accent"/>
 </vector>
diff --git a/res/drawable/ic_watermark.xml b/res/drawable/ic_watermark.xml
index 1c579413ff77398ce3e082180bfb6b0653c90e4b..a08985028acb7ca95ab432a5e29eec4d18963603 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/e_icon_color"
         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/e_icon_color"
         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..5a229f5b5664c9689edb773f3b4b4f8c3709a71a 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/e_icon_color"
         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/e_icon_color"
         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/e_icon_color"
         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/e_icon_color"
         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..1b98002bbdddd5553ba7d1647bbcb12de2b5bced 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/e_icon_color"
         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/e_icon_color"
         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..3e700f4193bffcfe2d6e8ee6ee85ba745b96c02c 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/e_icon_color" 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/e_icon_color" 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..764ba2ae9104e286e7b6ed05e24dce68c9326aba 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/e_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/e_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..7f6519b1381a27395d23d19a39a4398cd061c7dd 100644
--- a/res/drawable/ic_watermark_time.xml
+++ b/res/drawable/ic_watermark_time.xml
@@ -34,13 +34,13 @@
     android:viewportHeight="360">
 
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/e_icon_color"
         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/e_icon_color"
         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
@@ -52,12 +52,12 @@ L180.2,52.6z" />
         android:strokeMiterLimit="10"
         android:pathData="M79.3,177.8" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/e_icon_color"
         android:strokeWidth="16.6991"
         android:strokeMiterLimit="10"
         android:pathData="M179.5,278" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/e_icon_color"
         android:strokeWidth="16.6991"
         android:strokeMiterLimit="10"
         android:pathData="M179.5,313.3" />
@@ -67,57 +67,57 @@ L180.2,52.6z" />
         android:strokeMiterLimit="10"
         android:pathData="M279.7,177.8" />
     <path
-        android:strokeColor="#FFFFFF"
+        android:strokeColor="@color/e_icon_color"
         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/e_icon_color"
         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/e_icon_color"
         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/e_icon_color"
         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/e_icon_color"
         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/e_icon_color"
         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/e_icon_color"
         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/e_icon_color"
         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/e_icon_color"
         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/e_icon_color"
         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/e_icon_color"
         android:strokeWidth="5.5664"
         android:strokeMiterLimit="10"
         android:pathData="M 243.6 140.5 L 262 129.8" />
@@ -132,11 +132,11 @@ L180.2,52.6z" />
         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/e_icon_color"
         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/e_icon_color"
         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..5047c908ce3e9e8bbe1a6a8e1b6caada715db8e9 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/e_icon_color"
         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 d33979f10bb2b360613a7b33a85127bfecf4c9c4..5be56e73690867a53fd544c6a2a060f967a6035e 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/white"/>
+        android:fillColor="@color/e_icon_color"/>
 </vector>
diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml
index a71e933abf558d87ec0b0a8061b455b0e39d80a5..6a06011979fc20a7b62bb25ada8376eee354873e 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/e_secondary_text_color" />
 
 </FrameLayout>
diff --git a/res/layout/filtershow_actionbar_effects.xml b/res/layout/filtershow_actionbar_effects.xml
index 48ed3b3979aa86e2d698e781c1657081935ae968..c558c5549571a622a2caa6077e92c6efaa02c716 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/e_primary_text_color"
             android:textSize="16sp" />
     </LinearLayout>
 
diff --git a/res/layout/filtershow_category_geometry_panel.xml b/res/layout/filtershow_category_geometry_panel.xml
index 50515d6ac5d2caa5b109c265f79b3c202cacc964..98130c39830a99fa9b385ac3c13240496013fd08 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/e_icon_color"
                 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/e_icon_color"
                 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/e_icon_color"
                 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/e_icon_color"
             android:layout_gravity="center"/>
 
         <ImageButton
diff --git a/res/layout/filtershow_export_dialog.xml b/res/layout/filtershow_export_dialog.xml
index 971260bdf01ff2fa2c27aba34ee847e0d2698438..3010485ed9c3234155cc760898931abaa897806d 100644
--- a/res/layout/filtershow_export_dialog.xml
+++ b/res/layout/filtershow_export_dialog.xml
@@ -28,7 +28,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal|center_vertical"
             android:text="@string/select_output_settings"
-            android:textColor="@color/albumset_label_background"
+            android:textColor="@color/e_primary_text_color"
             android:textSize="16sp" />
 
         <GridLayout
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 4eb65aeadf27e93051c83fd91a8081257ed9f656..027a2037e9ffbf3492ae6df0bdc93847f010d807 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -17,7 +17,7 @@
 
     <color name="primary">#333333</color>
     <color name="primaryDark">#000000</color>
-    <color name="accent">#33b5e5</color>
+    <color name="accent">@color/e_accent</color>
 
     <color name="white">#fafafa</color>
     <color name="black">#212121</color>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 35aefa5d3280241af9252b0dbce30f54776da64b..e7c967d99e1975cb1628d8d14affbe5d74be5028 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -83,7 +83,7 @@
     <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="edit_actionbar_background">@color/e_action_bar</color>
     <color name="dialog_button_color">#009688</color>
     <color name="timeline_title_text_color">@color/black_transparent_4</color>
     <color name="timeline_title_number_text_color">@color/black_transparent_3</color>
diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml
index f9b05d9f3939d0a11f2dd2258dd085142cb54a71..1288706ee5a3261b7707eece3b5a76e388173bc6 100644
--- a/res/values/filtershow_color.xml
+++ b/res/values/filtershow_color.xml
@@ -20,7 +20,7 @@
     <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_screen">@color/e_background</color>
     <color name="background_toolbar">#363949</color>
     <color name="background_main_toolbar">#232323</color>
     <color name="toolbar_separation_line">#333333</color>
@@ -53,21 +53,21 @@
     <color name="filtershow_info_text">#DE000000</color>
     <color name="filtershow_info_test">#00FF0000</color>
 
-    <color name="filtershow_color_none">#80000000</color>
-    <color name="filtershow_color_punch">#80000000</color>
-    <color name="filtershow_color_vintage">#80000000</color>
-    <color name="filtershow_color_bw">#80000000</color>
-    <color name="filtershow_color_bleach">#80000000</color>
-    <color name="filtershow_color_instant">#80000000</color>
-    <color name="filtershow_color_latte">#80000000</color>
-    <color name="filtershow_color_blue">#80000000</color>
-    <color name="filtershow_color_litho">#80000000</color>
-    <color name="filtershow_color_xprocess">#80000000</color>
+    <color name="filtershow_color_none">@color/e_background</color>
+    <color name="filtershow_color_punch">@color/e_background</color>
+    <color name="filtershow_color_vintage">@color/e_background</color>
+    <color name="filtershow_color_bw">@color/e_background</color>
+    <color name="filtershow_color_bleach">@color/e_background</color>
+    <color name="filtershow_color_instant">@color/e_background</color>
+    <color name="filtershow_color_latte">@color/e_background</color>
+    <color name="filtershow_color_blue">@color/e_background</color>
+    <color name="filtershow_color_litho">@color/e_background</color>
+    <color name="filtershow_color_xprocess">@color/e_background</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="iconview_bottom_color">@color/e_background</color>
+    <color name="bottom_panel_background_color">@color/e_action_bar</color>
+    <color name="crop_panel_background_color">@color/e_action_bar</color>
+    <color name="crop_text_color">@color/e_icon_color</color>
     <color name="watermark_text_color">#80ffffff</color>
     <color name="watermark_highlight_color">#4592F9</color>
 </resources>
diff --git a/res/values/filtershow_styles.xml b/res/values/filtershow_styles.xml
index 6fa76a2af9ca5a70a920bd3218d6bdf255db99e2..be8b142461e9e5a794796c1a20fd8d0ca3c234ca 100644
--- a/res/values/filtershow_styles.xml
+++ b/res/values/filtershow_styles.xml
@@ -65,11 +65,11 @@
     </style>
 
     <style name="DefaultFillColor">
-        <item name="fillColorSelector">#FFFFFF</item>
+        <item name="fillColorSelector">@color/e_icon_color</item>
     </style>
 
     <style name="SelectedFillColor">
-        <item name="fillColorSelector">#4592F9</item>
+        <item name="fillColorSelector">@color/e_accent</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d714830252fdca0b406bb3a4c63ca59f5cbd1558..de5fdde6cec43649007c9c21fa3fc791e4d3e1ce 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -43,6 +43,12 @@
         <item name="android:windowBackground">@null</item>
         <item name="android:actionBarStyle">@style/FilterShowActionBar</item>
         <item name="android:toolbarStyle">@style/FilterShowToolbar</item>
+        <item name="android:colorBackgroundFloating">@color/e_floating_background</item>
+        <item name="android:itemBackground">@color/e_floating_background</item>
+        <item name="android:textColorPrimary">@color/e_primary_text_color</item>
+        <item name="android:textColorSecondary">@color/e_secondary_text_color</item>
+        <item name="android:navigationBarColor">@color/e_action_bar</item>
+        <item name="android:windowLightNavigationBar">@bool/isLight</item>
     </style>
     <style name="FilterShowToolbar" parent="@android:style/Widget.Toolbar">
         <item name="android:contentInsetStart">0dp</item>
diff --git a/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java b/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
index bd7384b0aca4b8f16b9085a6ca037e06e05d4db6..5e49747f65cb1373413454d41170ec53ba44194b 100644
--- a/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/EditorCropPanel.java
@@ -166,8 +166,8 @@ public class EditorCropPanel extends BasicGeometryPanel {
         for (int i = 0; i < size; i++) {
             TextView view = mTextViews[i];
             view.setTextColor(index == i ?
-                    getResources().getColor(R.color.crop_text_color) :
-                    Color.WHITE);
+                    getResources().getColor(R.color.e_accent) :
+                    getResources().getColor(R.color.e_icon_color));
         }
     }
 
diff --git a/src/com/android/gallery3d/filtershow/category/IconView.java b/src/com/android/gallery3d/filtershow/category/IconView.java
index 1bfd2a7af2889f54bf31396cf8b2d038c0cf1fcd..18a045d8957bbafde9de645b66cfb107d576ab87 100644
--- a/src/com/android/gallery3d/filtershow/category/IconView.java
+++ b/src/com/android/gallery3d/filtershow/category/IconView.java
@@ -66,7 +66,7 @@ public class IconView extends View {
 
     private void setup(Context context) {
         Resources res = getResources();
-        mTextColor = res.getColor(R.color.filtershow_categoryview_text);
+        mTextColor = res.getColor(R.color.e_primary_text_color);
         mBackgroundColor = res.getColor(android.R.color.transparent);
         mMargin = res.getDimensionPixelOffset(R.dimen.category_panel_margin);
         mTextSize = res.getDimensionPixelSize(R.dimen.category_panel_text_size);