diff --git a/res/drawable/more.xml b/res/drawable/more.xml
index d33979f10bb2b360613a7b33a85127bfecf4c9c4..4be6b4b7e30c9d08c21f17fe1acb2d8f1135ba47 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/black_icon"/>
 </vector>
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 27ecb2482ee6e40a7c9d7bbd6017f63989505e2b..d47b6dccafa7f74bb4e376349d1272f1bc0a2fa4 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -15,12 +15,17 @@
 -->
 <resources>
 
-    <color name="primary">@lineageos.platform:color/color_default_primary_text</color>
-    <color name="primaryDark">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="primary">@lineageos.platform:color/color_default_foreground</color>
+    <color name="primaryDark">@lineageos.platform:color/color_default_foreground</color>
+    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
     <color name="accent">#33b5e5</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="light_black">#424242</color>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 347ccb7d6881eb16c3b33d4a9e6b6a036d7dc45d..984537fd827eb114462b2bd124b7203952213adb 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,11 +15,11 @@
 -->
 <resources>
 
-    <color name="default_background">@lineageos.platform:color/color_default_primary_text</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/default_background</color>
+    <color name="albumset_placeholder">@color/black_transparent_3</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>
@@ -85,10 +85,12 @@
     <color name="edit_background">@color/black</color>
     <color name="edit_actionbar_background">@color/black</color>
     <color name="dialog_button_color">#009688</color>
-    <color name="timeline_title_text_color">@color/white</color>
-    <color name="timeline_title_number_text_color">@color/white</color>
-    <color name="timeline_title_background_color">@color/default_background</color>
+    <color name="disable_tab">#808080</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="navigation_accent_disabled">@lineageos.platform:color/color_default_primary</color>
+    <color name="navigation_accent_disabled">@color/disable_tab</color>
     <color name="navigation_accent_enabled">@lineageos.platform:color/color_default_blue1</color>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ebc975da95070d1474f96f2075e7d0eaab58ecab..44f89d91041ee42a545cc5b32c7f98fbcb500bd8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,12 +32,13 @@
         <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:statusBarColor">@color/primary</item>
         <item name="android:windowTranslucentStatus">true</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>
     </style>
     <style name="Theme.FilterShow" parent="Theme.Gallery">
         <item name="android:windowBackground">@null</item>
@@ -321,7 +322,7 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:windowBackground">@android:color/black</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/primary</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowActionBar">false</item>
@@ -332,6 +333,7 @@
         <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>
     </style>
 
     <style name="QueryTheme" parent="android:Theme.Material">
@@ -346,6 +348,7 @@
 
     <style name="ToolbarTitleStyle" parent="android:TextAppearance.Material.Widget.Toolbar.Title">
         <item name="android:textSize">@dimen/toolbar_title_text_size</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 
     <style name="ToolbarPopUpTheme" parent="android:Theme.Material.Light" />
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 8c3758450eebf0e62e219af9c7ced1b9212d8350..ea0fad703382f16dad27f97df5ce01eccd424e28 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -659,7 +659,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
             Drawable drawable = menu.getItem(i).getIcon();
             if(drawable != null) {
                 drawable.mutate();
-                drawable.setColorFilter(mActivity.getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+                drawable.setColorFilter(mActivity.getResources().getColor(R.color.color_default_primary_text), PorterDuff.Mode.SRC_ATOP);
             }
         }
 
@@ -988,7 +988,8 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
         if (tvEmptyAlbum == null) {
             tvEmptyAlbum = new TextView(mActivity);
             tvEmptyAlbum.setText(R.string.tvEmptyVideos);
-            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.white, null));
+//            tvEmptyAlbum.setTextColor(Color.parseColor("#8A000000"));
+            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.color_default_primary_text, null));
             tvEmptyAlbum.setGravity(Gravity.CENTER);
             tvEmptyAlbum.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
             RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index e61c94184253fbdae0ced99182bf1cac463b1f36..ea2b6e8198edf762deec1c1da84fb30c01565cee 100755
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -260,7 +260,8 @@ public class AlbumSetPage extends ActivityState implements
         if (tvEmptyAlbum == null) {
             tvEmptyAlbum = new TextView(mActivity);
             tvEmptyAlbum.setText(R.string.tvEmptyAlbum);
-            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.white, null));
+//            tvEmptyAlbum.setTextColor(Color.parseColor("#8A000000"));
+            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.color_default_primary_text, null));
             tvEmptyAlbum.setGravity(Gravity.CENTER);
             tvEmptyAlbum.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
             tvEmptyAlbum.setId(R.id.empty_album);
@@ -637,7 +638,7 @@ public class AlbumSetPage extends ActivityState implements
             Drawable drawable = menu.getItem(i).getIcon();
             if(drawable != null) {
                 drawable.mutate();
-                drawable.setColorFilter(mActivity.getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+                drawable.setColorFilter(mActivity.getResources().getColor(R.color.color_default_primary_text), PorterDuff.Mode.SRC_ATOP);
             }
         }
 
diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java
index d9a4eb9c64870afd83d9a6f025adea59ee2fb3b3..1a161b68546a2b02cb71b5178cafd342df8d80c1 100755
--- a/src/com/android/gallery3d/app/TimeLinePage.java
+++ b/src/com/android/gallery3d/app/TimeLinePage.java
@@ -610,7 +610,7 @@ public class TimeLinePage extends ActivityState implements
             Drawable drawable = menu.getItem(i).getIcon();
             if(drawable != null) {
                 drawable.mutate();
-                drawable.setColorFilter(mActivity.getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+                drawable.setColorFilter(mActivity.getResources().getColor(R.color.color_default_primary_text), PorterDuff.Mode.SRC_ATOP);
             }
         }
 
@@ -898,7 +898,8 @@ public class TimeLinePage extends ActivityState implements
         if (tvEmptyAlbum == null) {
             tvEmptyAlbum = new TextView(mActivity);
             tvEmptyAlbum.setText(R.string.tvEmptyAlbum);
-            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.white, null));
+//            tvEmptyAlbum.setTextColor(Color.parseColor("#8A000000"));
+            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.color_default_primary_text, null));
             tvEmptyAlbum.setGravity(Gravity.CENTER);
             tvEmptyAlbum.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
             RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index 58048bf9a71d24284464ce96a12eccf1b6daf1f7..5d92b8ee172cbd43c022771c56c4e76cd7309911 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -25,7 +25,10 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
+import android.graphics.Paint;
 import android.graphics.Point;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.net.Uri;