diff --git a/res/drawable-hdpi/rounded.9.png b/res/drawable-hdpi/rounded.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..503ffe083a8fc8a7762c0979d806a7254b06a346
Binary files /dev/null and b/res/drawable-hdpi/rounded.9.png differ
diff --git a/res/drawable-hdpi/rounded_overlay.9.png b/res/drawable-hdpi/rounded_overlay.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..15460a343d1a17c5328b6fd5bba754500547e025
Binary files /dev/null and b/res/drawable-hdpi/rounded_overlay.9.png differ
diff --git a/res/drawable-xhdpi/rounded_overlay.9.png b/res/drawable-xhdpi/rounded_overlay.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdea9186ef762a065b541955e0dad2a8881263c5
Binary files /dev/null and b/res/drawable-xhdpi/rounded_overlay.9.png differ
diff --git a/res/drawable-xxhdpi/rounded_overlay.9.png b/res/drawable-xxhdpi/rounded_overlay.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f40a2328b5edf49926b2a8960f1e6b93f5ea6bc
Binary files /dev/null and b/res/drawable-xxhdpi/rounded_overlay.9.png differ
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..d1284f0d123bbc8d3ecff96e085b2ab0fdaba2d7 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -15,12 +15,14 @@
 -->
 <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="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 d8572524fe302040c0ca31360a13ae17b86b7a99..2eeb834aa6b8115ef9c23510ca318143e6a591de 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,7 +15,7 @@
 -->
 <resources>
 
-    <color name="default_background">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="default_background">@lineageos.platform:color/color_default_background</color>
     <color name="color_default_blue">@lineageos.platform:color/color_default_blue1</color>
     <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
 
@@ -87,10 +87,11 @@
     <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="disable_tab_color">#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/default_background</color>
 
-    <color name="navigation_accent_disabled">@lineageos.platform:color/color_default_primary</color>
+    <color name="navigation_accent_disabled">@color/disable_tab_color</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 e846a7779941b727901b759154cfb106a9bcc447..19de51af2f04462705791c35a2c9396fe470a753 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:windowTranslucentNavigation">false</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowActionModeOverlay">true</item>
@@ -331,6 +332,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">
@@ -349,6 +351,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..61cefde4510bc152aa5a06e70c902a404b308e45 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,7 @@ 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(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..5f707309daf99664ac418b3ce2614eadb6447cdf 100755
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -260,7 +260,7 @@ 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(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 +637,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 3a242d441e69a39f8a8012dc4aec05b3cbfa7112..471bf8cb1283997204d2506a45f4184ea035b642 100755
--- a/src/com/android/gallery3d/app/TimeLinePage.java
+++ b/src/com/android/gallery3d/app/TimeLinePage.java
@@ -606,7 +606,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);
             }
         }
 
@@ -893,7 +893,7 @@ 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(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/ui/AbstractSlotRenderer.java b/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
index d9a6bc07d2da85751b15e6aba11eced92a20b098..48fc3c579c298c9d6e85d67da474fc98a8734e04 100644
--- a/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
@@ -36,6 +36,7 @@ public abstract class AbstractSlotRenderer implements SlotView.SlotRenderer {
     private final NinePatchTexture mFrameSelected;
     private final ResourceTexture mDrmIcon;
     private final ResourceTexture mSelectionIcon;
+//    private final NinePatchTexture mRoundedOverlay;
     private FadeOutTexture mFramePressedUp;
 
     protected AbstractSlotRenderer(Context context) {
@@ -46,6 +47,7 @@ public abstract class AbstractSlotRenderer implements SlotView.SlotRenderer {
         mFrameSelected = new NinePatchTexture(context, R.drawable.grid_selected);
         mDrmIcon = new ResourceTexture(context, R.drawable.drm_image);
         mSelectionIcon = new ResourceTexture(context, R.drawable.multiselect);
+//        mRoundedOverlay = new NinePatchTexture(context, R.drawable.rounded);
     }
 
     protected void drawContent(GLCanvas canvas,
@@ -128,8 +130,16 @@ public abstract class AbstractSlotRenderer implements SlotView.SlotRenderer {
 
     protected void drawPressedFrame(GLCanvas canvas, int width, int height) {
         drawFrame(canvas, mFramePressed.getPaddings(), mFramePressed, 0, 0, width, height);
+//        drawFrame(canvas, mFrameSelected.getPaddings(), mFrameSelected, 0, 0, width, height);
     }
 
+//    protected void drawRoundedOverlay(GLCanvas canvas, int width, int height) {
+//        Rect padding = mRoundedOverlay.getPaddings();
+//        mRoundedOverlay.draw(canvas, 0 - padding.left, 0 - padding.top, width + padding.left + padding.right,
+//                height + padding.top + padding.bottom);
+//    }
+
+
     protected void drawSelectedFrame(GLCanvas canvas, int width, int height) {
         mSelectionIcon.draw(canvas, 5, 5);
         //drawFrame(canvas, mFrameSelected.getPaddings(), mFrameSelected, 0, 0, width, height);
diff --git a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
index 575b9d6378e5d89232511a8059ff16ed351367f5..81a43002f3ec31dccf1d9dc162e8565aa74d46b4 100644
--- a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
@@ -191,6 +191,10 @@ public class TimeLineSlotRenderer extends AbstractSlotRenderer {
             }
             drawContent(canvas, content, width, height, entry.rotation);
 
+//            if (entry.mediaType != MediaObject.MEDIA_TYPE_TIMELINE_TITLE) {
+//                drawRoundedOverlay(canvas, width, height);
+//            }
+
             if (entry.mediaType == MediaObject.MEDIA_TYPE_VIDEO) {
                 drawVideoOverlay(canvas, width, height, true, 0);
             }