diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 00000000..d3a2aa3f
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Shortcut Icons -->
+    <color name="shortcutIconBackground">#26C484</color>
+    <color name="shortcutIconForeground">#FFF</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ef5095c4..6eddf9f6 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -34,9 +34,9 @@
         <item name="cb_toolbarIcon">#FFFFFF</item>
 
         <!-- Tab -->
-        <item name="cb_tabIndicator">#757575</item>
-        <item name="cb_tabText">#BDBDBD</item>
-        <item name="cb_tabTextSelected">#757575</item>
+        <item name="cb_tabIndicator">#FFF</item>
+        <item name="cb_tabText">#99FFFFFF</item>
+        <item name="cb_tabTextSelected">#FFF</item>
 
         <!-- Card -->
         <item name="cb_cardBackground">#FFFFFF</item>
diff --git a/library/src/main/res/drawable/ic_shortcut_apply.xml b/library/src/main/res/drawable/ic_shortcut_apply.xml
index c87f69f0..92e1f401 100644
--- a/library/src/main/res/drawable/ic_shortcut_apply.xml
+++ b/library/src/main/res/drawable/ic_shortcut_apply.xml
@@ -6,9 +6,9 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?cb_shortcutIconBackground"
+        android:fillColor="@color/shortcutIconBackground"
         android:pathData="M 12 1.46875 C 17.8162487717 1.46875 22.53125 6.18375122834 22.53125 12 C 22.53125 17.8162487717 17.8162487717 22.53125 12 22.53125 C 6.18375122834 22.53125 1.46875 17.8162487717 1.46875 12 C 1.46875 6.18375122834 6.18375122834 1.46875 12 1.46875 Z" />
     <path
-        android:fillColor="?cb_shortcutIconForeground"
+        android:fillColor="@color/shortcutIconForeground"
         android:pathData="M14.748495,6.05741l-5.407271,-0.005408c-0.5948,0 -1.081454,0.486654 -1.081454,1.081454l0,1.622181c0,0.2974 0.243327,0.540727 0.540727,0.540727s0.540727,-0.243327 0.540727,-0.540727l0,-0.540727l5.407271,0l0,7.57018l-5.407271,0l0,-0.540727c0,-0.2974 -0.243327,-0.540727 -0.540727,-0.540727s-0.540727,0.243327 -0.540727,0.540727l0,1.622181c0,0.5948 0.486654,1.081454 1.081454,1.081454l5.407271,0c0.5948,0 1.081454,-0.486654 1.081454,-1.081454l0,-9.733088c0,-0.5948 -0.486654,-1.076047 -1.081454,-1.076047l0,0.000001zm-3.78509,7.564772c0.2974,0 0.540727,-0.243327 0.540727,-0.540727l0,-2.703636c0,-0.2974 -0.243327,-0.540727 -0.540727,-0.540727l-2.703636,0c-0.2974,0 -0.540727,0.243327 -0.540727,0.540727s0.243327,0.540727 0.540727,0.540727l1.400483,0l-2.644156,2.644156c-0.210883,0.210883 -0.210883,0.551541 0,0.762425c0.210883,0.210883 0.551541,0.210883 0.762425,0l2.644156,-2.644156l0,1.400483c0,0.2974 0.243327,0.540727 0.540727,0.540727z" />
 </vector>
\ No newline at end of file
diff --git a/library/src/main/res/drawable/ic_shortcut_request.xml b/library/src/main/res/drawable/ic_shortcut_request.xml
index 257f32df..9e8162be 100644
--- a/library/src/main/res/drawable/ic_shortcut_request.xml
+++ b/library/src/main/res/drawable/ic_shortcut_request.xml
@@ -6,9 +6,9 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?cb_shortcutIconBackground"
+        android:fillColor="@color/shortcutIconBackground"
         android:pathData="M 12 1.46875 C 17.8162487717 1.46875 22.53125 6.18375122834 22.53125 12 C 22.53125 17.8162487717 17.8162487717 22.53125 12 22.53125 C 6.18375122834 22.53125 1.46875 17.8162487717 1.46875 12 C 1.46875 6.18375122834 6.18375122834 1.46875 12 1.46875 Z" />
     <path
-        android:fillColor="?cb_shortcutIconForeground"
+        android:fillColor="@color/shortcutIconForeground"
         android:pathData="M15.876559,9.021597l-4.845699,0l0,2.422849c0,0.266513 -0.218056,0.48457 -0.48457,0.48457s-0.48457,-0.218056 -0.48457,-0.48457l0,-3.391989l2.422849,0c0.266513,0 0.48457,-0.218056 0.48457,-0.48457l0,-0.96914c0,-0.266513 -0.218056,-0.48457 -0.48457,-0.48457l-2.907419,0c-0.266513,0 -0.48457,0.218056 -0.48457,0.48457l0,2.422849l-0.96914,0c-0.533027,0 -0.96914,0.436113 -0.96914,0.96914l0,5.814839c0,0.533027 0.436113,0.96914 0.96914,0.96914l7.753118,0c0.533027,0 0.96914,-0.436113 0.96914,-0.96914l0,-5.814839c0,-0.533027 -0.436113,-0.96914 -0.96914,-0.96914z" />
 </vector>
\ No newline at end of file
diff --git a/library/src/main/res/drawable/ic_shortcut_wallpapers.xml b/library/src/main/res/drawable/ic_shortcut_wallpapers.xml
index 9ae6d153..b0a5cdab 100644
--- a/library/src/main/res/drawable/ic_shortcut_wallpapers.xml
+++ b/library/src/main/res/drawable/ic_shortcut_wallpapers.xml
@@ -6,9 +6,9 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?cb_shortcutIconBackground"
+        android:fillColor="@color/shortcutIconBackground"
         android:pathData="M 12 1.46875 C 17.8162487717 1.46875 22.53125 6.18375122834 22.53125 12 C 22.53125 17.8162487717 17.8162487717 22.53125 12 22.53125 C 6.18375122834 22.53125 1.46875 17.8162487717 1.46875 12 C 1.46875 6.18375122834 6.18375122834 1.46875 12 1.46875 Z" />
     <path
-        android:fillColor="?cb_shortcutIconForeground"
+        android:fillColor="@color/shortcutIconForeground"
         android:pathData="M12.782779,7.782158l-1.924332,2.563601l1.467711,1.956947c0.215264,0.287019 0.156556,0.697978 -0.130463,0.913242c-0.287019,0.215264 -0.697978,0.163079 -0.913242,-0.130463c-0.684932,-0.913242 -1.50685,-2.00261 -2.022179,-2.700587c-0.260926,-0.345727 -0.782779,-0.345727 -1.043705,0l-2.609263,3.476843c-0.319635,0.437052 -0.013046,1.050228 0.521853,1.050228l11.741685,0c0.534899,0 0.841487,-0.613177 0.521853,-1.043705l-4.566211,-6.086107c-0.260926,-0.352251 -0.782779,-0.352251 -1.043705,0z" />
 </vector>
\ No newline at end of file
diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml
new file mode 100644
index 00000000..d3a2aa3f
--- /dev/null
+++ b/library/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Shortcut Icons -->
+    <color name="shortcutIconBackground">#26C484</color>
+    <color name="shortcutIconForeground">#FFF</color>
+</resources>
\ No newline at end of file
diff --git a/library/src/main/res/values/themes.xml b/library/src/main/res/values/themes.xml
index 7ac68eb2..92b8937a 100644
--- a/library/src/main/res/values/themes.xml
+++ b/library/src/main/res/values/themes.xml
@@ -74,10 +74,6 @@
         <item name="cb_wallpaperStatusBar">#66000000</item>
         <item name="cb_wallpaperToolbar">#66000000</item>
 
-        <!-- Shortcut Icons -->
-        <item name="cb_shortcutIconBackground">#26C484</item>
-        <item name="cb_shortcutIconForeground">#FFF</item>
-
         <!--
         =====================
             Other Stuff