diff --git a/res/layout/gallery_main.xml b/res/layout/gallery_main.xml
index 4b4edbd6b96656c0b953d7f260d44411e4675112..e477fc376951b29d6deb2e5378fecaf2d05a59a2 100644
--- a/res/layout/gallery_main.xml
+++ b/res/layout/gallery_main.xml
@@ -44,6 +44,7 @@
             android:id="@+id/gallery_root"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="@color/primary"
             android:layout_above="@+id/bottom_navigation">
 
             <!-- Toolbar -->
diff --git a/res/layout/gl_root_group.xml b/res/layout/gl_root_group.xml
index 6302171535f153a4c050aec07cc7cee9b10ab600..b8e7a547fe8f990f7b7d62eafe5548c71ce3c920 100644
--- a/res/layout/gl_root_group.xml
+++ b/res/layout/gl_root_group.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2012 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.
@@ -20,13 +19,16 @@
         android:id="@+id/gl_parent_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+
         <com.android.gallery3d.ui.GLRootView
             android:id="@+id/gl_root_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent" />
     </RelativeLayout>
-    <View android:id="@+id/gl_root_cover"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#fafafa"/>
+
+    <View
+        android:id="@+id/gl_root_cover"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#fafafa" />
 </merge>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index e26e0fc6b4884b4d64ed6c84ab2282a63b0d8a3d..c958c8690d4188802d6ceed9bec0ecb8571f8459 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,20 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/gallery_root"
-        android:orientation="vertical"
+    android:id="@+id/gallery_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/primary"
+    android:orientation="vertical">
+
+    <include layout="@layout/gl_root_group" />
+
+    <FrameLayout
+        android:id="@+id/header"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <include layout="@layout/gl_root_group"/>
-    <FrameLayout android:id="@+id/header"
-            android:visibility="gone"
-            android:layout_alignParentTop="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-    <FrameLayout android:id="@+id/footer"
-            android:visibility="gone"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentEnd="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:visibility="gone" />
+
+    <FrameLayout
+        android:id="@+id/footer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:visibility="gone" />
 </RelativeLayout>
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 4eb65aeadf27e93051c83fd91a8081257ed9f656..9d177b9d692741ff6957d31d7ad98e0e7bae8db3 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2012 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,7 +14,7 @@
 -->
 <resources>
 
-    <color name="primary">#333333</color>
+    <color name="primary">@lineageos.platform:color/color_default_primary_text</color>
     <color name="primaryDark">#000000</color>
     <color name="accent">#33b5e5</color>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9388e989848d5965fc9a163e94474fcd7ac6e96d..e2025534826fa51e3e7eb2526c32ca5b3556727f 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2012 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,21 +14,21 @@
 -->
 <resources>
 
-    <color name="default_background">@color/white</color>
+    <color name="default_background">@lineageos.platform:color/color_default_primary_text</color>
 
     <!-- configuration for album set page -->
-    <color name="albumset_background">@color/white</color>
+    <color name="albumset_background">@color/default_background</color>
     <color name="albumset_placeholder">@color/black_transparent_3</color>
-    <color name="albumset_label_background">@color/black_transparent_4</color>
+    <color name="albumset_label_background">@color/default_background</color>
     <color name="albumset_label_title">@color/white</color>
     <color name="albumset_label_count">@color/white</color>
-    <color name="albumlist_label_title">@color/black_transparent_4</color>
+    <color name="albumlist_label_title">@color/white</color>
 
     <color name="darker_transparent">@color/black_transparent_5</color>
 
     <!-- configuration for album page -->
-    <color name="album_background">@color/white</color>
-    <color name="album_placeholder">@color/white</color>
+    <color name="album_background">@color/default_background</color>
+    <color name="album_placeholder">@color/default_background</color>
 
     <!-- configuration for photo page -->
     <color name="photo_background">@color/black</color>
@@ -85,10 +84,10 @@
     <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/black_transparent_4</color>
-    <color name="timeline_title_number_text_color">@color/black_transparent_3</color>
-    <color name="timeline_title_background_color">@color/white</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="navigation_accent_disabled">#747474</color>
-    <color name="navigation_accent_enabled">@color/white</color>
+    <color name="navigation_accent_disabled">@lineageos.platform:color/color_default_gray2</color>
+    <color name="navigation_accent_enabled">@lineageos.platform:color/color_default_primary</color>
 </resources>
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 4f3f34814ddbb3bee4751d27a93f4d49532f960a..5ddd2dcc1c9ed0d02db6c05e31e413544da3584c 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -41,6 +41,7 @@ import android.widget.Toast;
 import android.widget.Toolbar;
 
 import org.codeaurora.gallery.R;
+
 import com.android.gallery3d.common.Utils;
 import com.android.gallery3d.data.DataManager;
 import com.android.gallery3d.data.MediaDetails;
@@ -152,26 +153,26 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
     private boolean mShowedEmptyToastForSelf;
     private PhotoFallbackEffect.PositionProvider mPositionProvider =
             new PhotoFallbackEffect.PositionProvider() {
-        @Override
-        public Rect getPosition(int index) {
-            Rect rect = mSlotView.getSlotRect(index);
-            Rect bounds = mSlotView.bounds();
-            rect.offset(bounds.left - mSlotView.getScrollX(),
-                    bounds.top - mSlotView.getScrollY());
-            return rect;
-        }
+                @Override
+                public Rect getPosition(int index) {
+                    Rect rect = mSlotView.getSlotRect(index);
+                    Rect bounds = mSlotView.bounds();
+                    rect.offset(bounds.left - mSlotView.getScrollX(),
+                            bounds.top - mSlotView.getScrollY());
+                    return rect;
+                }
 
-        @Override
-        public int getItemIndex(Path path) {
-            int start = mSlotView.getVisibleStart();
-            int end = mSlotView.getVisibleEnd();
-            for (int i = start; i < end; ++i) {
-                MediaItem item = mAlbumDataAdapter.get(i);
-                if (item != null && item.getPath() == path) return i;
-            }
-            return -1;
-        }
-    };
+                @Override
+                public int getItemIndex(Path path) {
+                    int start = mSlotView.getVisibleStart();
+                    int end = mSlotView.getVisibleEnd();
+                    for (int i = start; i < end; ++i) {
+                        MediaItem item = mAlbumDataAdapter.get(i);
+                        if (item != null && item.getPath() == path) return i;
+                    }
+                    return -1;
+                }
+            };
 
     @Override
     protected int getBackgroundColorId() {
@@ -266,7 +267,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
         } else if (mIsVideoScreen) {
             super.onBackPressed();
         } else {
-            if(mLaunchedFromPhotoPage) {
+            if (mLaunchedFromPhotoPage) {
                 mActivity.getTransitionStore().putIfNotPresent(
                         PhotoPage.KEY_ALBUMPAGE_TRANSITION,
                         PhotoPage.MSG_ALBUMPAGE_RESUMED);
@@ -397,7 +398,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
                 mActivity.getStateManager().switchState(this, FilmstripPage.class, data);
             } else {
                 mActivity.getStateManager().startStateForResult(
-                            SinglePhotoPage.class, REQUEST_PHOTO, data);
+                        SinglePhotoPage.class, REQUEST_PHOTO, data);
             }
         }
     }
@@ -417,7 +418,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
             activity.finish();
         } else {
             Intent intent = new Intent(null, item.getContentUri())
-                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                    .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             activity.setResult(Activity.RESULT_OK, intent);
             activity.finish();
         }
@@ -636,7 +637,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
             FilterUtils.setupMenuItems(mActionBar, mMediaSetPath, true);
 
             menu.findItem(R.id.action_camera).setVisible(
-                   GalleryUtils.isAnyCameraAvailable(mActivity));
+                    GalleryUtils.isAnyCameraAvailable(mActivity));
             menu.findItem(R.id.action_slideshow).setVisible(!mIsVideoScreen);
             MenuItem item = menu.findItem(R.id.action_view_type);
             updateMenuTitle(item);
@@ -645,7 +646,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
         }
         //actionBar.setSubtitle(null);
         // remove slideshow if all are videos
-        if (allVideoFiles() && !mGetContent){
+        if (allVideoFiles() && !mGetContent) {
             menu.findItem(R.id.action_slideshow).setVisible(false);
         }
         return true;
@@ -698,7 +699,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
             targetPhoto = mAlbumDataAdapter.size() - targetPhoto - 1;
         }
         prepareAnimationBackToFilmstrip(targetPhoto);
-        if(mLaunchedFromPhotoPage) {
+        if (mLaunchedFromPhotoPage) {
             onBackPressed();
         } else {
             pickPhoto(targetPhoto, true);
@@ -742,8 +743,8 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
                 return true;
             }
             case R.id.action_view_type: {
-            switchView();
-            return true;
+                switchView();
+                return true;
             }
             default:
                 return false;
@@ -957,13 +958,13 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
             mCurrentView = LIST_VIEW;
             GalleryUtils.setIntPref(mActivity, PREF_VIEWTYPE, mCurrentView);
             mActivity.getStateManager().switchState(this,
-            AlbumListViewPage.class, mData);
+                    AlbumListViewPage.class, mData);
         } else {
             mCurrentView = GRID_VIEW;
             GalleryUtils.setIntPref(mActivity, PREF_VIEWTYPE, mCurrentView);
             mActivity.getStateManager().switchState(this, AlbumPage.class,
-            mData);
-       }
+                    mData);
+        }
 
     }
 
@@ -974,7 +975,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
         if (tvEmptyAlbum == null) {
             tvEmptyAlbum = new TextView(mActivity);
             tvEmptyAlbum.setText(R.string.tvEmptyVideos);
-            tvEmptyAlbum.setTextColor(Color.parseColor("#8A000000"));
+            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.white, 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 7eaa2bc6a427224c1b06e37775f99e2dc06c107f..0856cd38e1c27c6ad60e7d5d75b83925537998cb 100755
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -42,6 +42,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.codeaurora.gallery.R;
+
 import com.android.gallery3d.common.Utils;
 import com.android.gallery3d.data.DataManager;
 import com.android.gallery3d.data.MediaDetails;
@@ -151,9 +152,7 @@ public class AlbumSetPage extends ActivityState implements
                 paddingBottom = mConfig.paddingBottomLand;
                 paddingRight = mConfig.paddingRightLand;
                 paddingLeft = mConfig.paddingLeftLand;
-            }
-            else
-            {
+            } else {
                 paddingTop = mConfig.paddingTop;
                 paddingBottom = mConfig.paddingBottom;
                 paddingRight = mConfig.paddingRight;
@@ -169,7 +168,7 @@ public class AlbumSetPage extends ActivityState implements
             }
             int slotViewBottom = bottom - top - paddingBottom;
             int slotViewRight = right - left - paddingRight;
-            int slotViewLeft = paddingLeft ;
+            int slotViewLeft = paddingLeft;
 
 
             if (mShowDetails) {
@@ -254,11 +253,11 @@ public class AlbumSetPage extends ActivityState implements
         // 'void android.widget.RelativeLayout.addView(android.view.View
         RelativeLayout galleryRoot = (RelativeLayout) ((Activity) mActivity)
                 .findViewById(R.id.gallery_root);
-        if (galleryRoot == null) return ;
+        if (galleryRoot == null) return;
         if (tvEmptyAlbum == null) {
             tvEmptyAlbum = new TextView(mActivity);
             tvEmptyAlbum.setText(R.string.tvEmptyAlbum);
-            tvEmptyAlbum.setTextColor(Color.parseColor("#8A000000"));
+            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.white, null));
             tvEmptyAlbum.setGravity(Gravity.CENTER);
             tvEmptyAlbum.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
             tvEmptyAlbum.setId(R.id.empty_album);
@@ -389,7 +388,8 @@ public class AlbumSetPage extends ActivityState implements
                         pickAlbum(message.arg1);
                         break;
                     }
-                    default: throw new AssertionError(message.what);
+                    default:
+                        throw new AssertionError(message.what);
                 }
             }
         };
@@ -589,7 +589,7 @@ public class AlbumSetPage extends ActivityState implements
             int typeBits = mData.getInt(
                     GalleryActivity.KEY_TYPE_BITS, DataManager.INCLUDE_IMAGE);
             mActionBar.setTitle(GalleryUtils.getSelectionModePrompt(typeBits));
-        } else  if (mGetAlbum) {
+        } else if (mGetAlbum) {
             inflater.inflate(R.menu.pickup, menu);
             mActionBar.setTitle(R.string.select_album);
         } else {
@@ -603,8 +603,8 @@ public class AlbumSetPage extends ActivityState implements
                     mActionBar.disableClusterMenu(true);
                 }
             }*/
-            boolean selectAlbums = !inAlbum ;// &&
-                   // mActionBar.getClusterTypeAction() == FilterUtils.CLUSTER_BY_ALBUM;
+            boolean selectAlbums = !inAlbum;// &&
+            // mActionBar.getClusterTypeAction() == FilterUtils.CLUSTER_BY_ALBUM;
             MenuItem selectItem = menu.findItem(R.id.action_select);
             selectItem.setTitle(activity.getString(
                     selectAlbums ? R.string.select_album : R.string.select_group));
@@ -665,7 +665,7 @@ public class AlbumSetPage extends ActivityState implements
             case R.id.action_manage_offline: {
                 Bundle data = new Bundle();
                 String mediaPath = mActivity.getDataManager().getTopSetPath(
-                    DataManager.INCLUDE_ALL);
+                        DataManager.INCLUDE_ALL);
                 data.putString(AlbumSetPage.KEY_MEDIA_PATH, mediaPath);
                 mActivity.getStateManager().startState(ManageCachePage.class, data);
                 return true;
diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java
index a9abc81fff972724d6bcff234e695c2da56ae269..2e09d3ae7215ab52e80ae1c4f94249a6533f8798 100755
--- a/src/com/android/gallery3d/app/TimeLinePage.java
+++ b/src/com/android/gallery3d/app/TimeLinePage.java
@@ -72,6 +72,7 @@ import com.android.gallery3d.ui.TimeLineSlotRenderer;
 import com.android.gallery3d.ui.TimeLineSlotView;
 import com.android.gallery3d.util.Future;
 import com.android.gallery3d.util.GalleryUtils;
+
 import org.codeaurora.gallery.R;
 
 import java.lang.ref.WeakReference;
@@ -175,9 +176,9 @@ public class TimeLinePage extends ActivityState implements
             } else {
                 slotViewTop = mActivity.getGalleryActionBar().getHeight();
             }
-            int padding =0 ;
-            if((right - left) > (bottom - top)) {
-                padding =  (int) mActivity.getResources().getDimension(R.dimen.timeline_land_margin);
+            int padding = 0;
+            if ((right - left) > (bottom - top)) {
+                padding = (int) mActivity.getResources().getDimension(R.dimen.timeline_land_margin);
             } else {
                 padding = (int) mActivity.getResources().getDimension(R.dimen.timeline_port_margin);
             }
@@ -235,10 +236,10 @@ public class TimeLinePage extends ActivityState implements
         } else if (mSelectionManager.inSelectionMode()) {
             mSelectionManager.leaveSelectionMode();
         } else {
-            if(mLaunchedFromPhotoPage) {
-            mActivity.getTransitionStore().putIfNotPresent(
-                    PhotoPage.KEY_ALBUMPAGE_TRANSITION,
-                    PhotoPage.MSG_ALBUMPAGE_RESUMED);
+            if (mLaunchedFromPhotoPage) {
+                mActivity.getTransitionStore().putIfNotPresent(
+                        PhotoPage.KEY_ALBUMPAGE_TRANSITION,
+                        PhotoPage.MSG_ALBUMPAGE_RESUMED);
             }
             if (mInCameraApp) {
                 super.onBackPressed();
@@ -268,33 +269,33 @@ public class TimeLinePage extends ActivityState implements
         }
     }
 
-    private void onSingleTapUp(int slotIndex , boolean isTitle) {
+    private void onSingleTapUp(int slotIndex, boolean isTitle) {
         if (!mIsActive) return;
-            if (mSelectionManager.inSelectionMode()) {
-                if(isTitle){
-                    MediaSet targetSet = mAlbumDataAdapter.getMediaSet(slotIndex);
-                    if (targetSet == null) return;
-                    ArrayList<Path> paths = ((ClusterAlbum)targetSet).getMediaItems();
-                    if (paths == null || paths.size() <= 0) return;
-                    mSelectionManager.toggleTimeLineSet(paths);
-                    mSlotView.invalidate();
-                } else {
-                    MediaItem item = mAlbumDataAdapter.get(slotIndex);
-                    if (item == null) return; // Item not ready yet, ignore the click
-                    if (mSelectionManager.getSelectedCount() > 0) {
-                        if (!ActionModeHandler.isThreadComplete)
-                            return;
-                    }
-                    mSelectionManager.toggle(item.getPath());
-                    mSlotView.invalidate();
+        if (mSelectionManager.inSelectionMode()) {
+            if (isTitle) {
+                MediaSet targetSet = mAlbumDataAdapter.getMediaSet(slotIndex);
+                if (targetSet == null) return;
+                ArrayList<Path> paths = ((ClusterAlbum) targetSet).getMediaItems();
+                if (paths == null || paths.size() <= 0) return;
+                mSelectionManager.toggleTimeLineSet(paths);
+                mSlotView.invalidate();
+            } else {
+                MediaItem item = mAlbumDataAdapter.get(slotIndex);
+                if (item == null) return; // Item not ready yet, ignore the click
+                if (mSelectionManager.getSelectedCount() > 0) {
+                    if (!ActionModeHandler.isThreadComplete)
+                        return;
                 }
-            } else if(!isTitle){
-                // Render transition in pressed state
-                mAlbumView.setPressedIndex(slotIndex);
-                mAlbumView.setPressedUp();
-                mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_PICK_PHOTO, slotIndex, 0),
-                        FadeTexture.DURATION);
+                mSelectionManager.toggle(item.getPath());
+                mSlotView.invalidate();
             }
+        } else if (!isTitle) {
+            // Render transition in pressed state
+            mAlbumView.setPressedIndex(slotIndex);
+            mAlbumView.setPressedUp();
+            mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_PICK_PHOTO, slotIndex, 0),
+                    FadeTexture.DURATION);
+        }
     }
 
     private void pickPhoto(int slotIndex) {
@@ -327,7 +328,7 @@ public class TimeLinePage extends ActivityState implements
             if (targetset == null || item == null) return;
 
             Bundle data = new Bundle();
-            data.putInt(PhotoPage.KEY_INDEX_HINT, slotIndex-1);
+            data.putInt(PhotoPage.KEY_INDEX_HINT, slotIndex - 1);
             data.putString(PhotoPage.KEY_MEDIA_SET_PATH,
                     targetset.getPath().toString());
             data.putParcelable(PhotoPage.KEY_OPEN_ANIMATION_RECT,
@@ -368,10 +369,10 @@ public class TimeLinePage extends ActivityState implements
 
     public void onLongTap(int slotIndex, boolean isTitle) {
         if (mGetContent) return;
-        if(isTitle){
+        if (isTitle) {
             MediaSet targetSet = mAlbumDataAdapter.getMediaSet(slotIndex);
             if (targetSet == null) return;
-            ArrayList<Path> paths = ((ClusterAlbum)targetSet).getMediaItems();
+            ArrayList<Path> paths = ((ClusterAlbum) targetSet).getMediaItems();
             if (paths == null || paths.size() <= 0) return;
             mSelectionManager.setAutoLeaveSelectionMode(true);
             mSelectionManager.toggleTimeLineSet(paths);
@@ -620,7 +621,7 @@ public class TimeLinePage extends ActivityState implements
             targetPhoto = mAlbumDataAdapter.size() - targetPhoto - 1;
         }
         prepareAnimationBackToFilmstrip(targetPhoto);
-        if(mLaunchedFromPhotoPage) {
+        if (mLaunchedFromPhotoPage) {
             onBackPressed();
         } else {
             pickPhoto(targetPhoto, true);
@@ -670,8 +671,7 @@ public class TimeLinePage extends ActivityState implements
     @Override
     protected void onStateResult(int request, int result, Intent data) {
         switch (request) {
-            case REQUEST_SLIDESHOW:
-            {
+            case REQUEST_SLIDESHOW: {
                 // data could be null, if there is no images in the album
                 if (data == null) return;
                 mFocusIndex = data.getIntExtra(SlideshowPage.KEY_PHOTO_INDEX, 0);
@@ -852,7 +852,7 @@ public class TimeLinePage extends ActivityState implements
 
     private boolean setupCameraButton() {
         if (!GalleryUtils.isAnyCameraAvailable(mActivity)) return false;
-        RelativeLayout galleryRoot = (RelativeLayout)mActivity.findViewById(R.id.gallery_root);
+        RelativeLayout galleryRoot = (RelativeLayout) mActivity.findViewById(R.id.gallery_root);
         if (galleryRoot == null) return false;
 
         mCameraButton = new Button(mActivity);
@@ -878,7 +878,7 @@ public class TimeLinePage extends ActivityState implements
         if (tvEmptyAlbum == null) {
             tvEmptyAlbum = new TextView(mActivity);
             tvEmptyAlbum.setText(R.string.tvEmptyAlbum);
-            tvEmptyAlbum.setTextColor(Color.parseColor("#8A000000"));
+            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.white, null));
             tvEmptyAlbum.setGravity(Gravity.CENTER);
             tvEmptyAlbum.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
             RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(