diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
index 15119a0..4862da9
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,19 +12,33 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <meta-data android:name="com.google.android.gms.games.APP_ID"
+        <meta-data
+            android:name="com.google.android.gms.games.APP_ID"
             android:value="@string/app_id" />
 
-        <activity android:name=".scenes.LaunchScreen" android:screenOrientation="portrait" >
+        <activity
+            android:name=".scenes.LaunchScreen"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".scenes.CounterDrawer" android:screenOrientation="portrait" />
-        <activity android:name=".scenes.ActiveCounter" android:screenOrientation="portrait" android:parentActivityName=".scenes.CounterDrawer" />
-        <activity android:name=".scenes.CreateCounter" android:screenOrientation="portrait" android:parentActivityName=".scenes.CounterDrawer" />
-    </application>
 
+        <activity
+            android:name=".scenes.CounterDrawer"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".scenes.ActiveCounter"
+            android:parentActivityName=".scenes.CounterDrawer"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".scenes.CreateCounter"
+            android:parentActivityName=".scenes.CounterDrawer"
+            android:screenOrientation="portrait" />
+
+    </application>
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_row.xml b/app/src/main/res/drawable/list_row.xml
old mode 100644
new mode 100755
index 76634ed..087a0f1
--- a/app/src/main/res/drawable/list_row.xml
+++ b/app/src/main/res/drawable/list_row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="100dp" />
-    <solid android:color="@color/colorPrimary" />
+    <solid android:color="?attr/colorPrimary" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/counter.xml b/app/src/main/res/layout/counter.xml
old mode 100644
new mode 100755
index 6a4d183..a5ad75e
--- a/app/src/main/res/layout/counter.xml
+++ b/app/src/main/res/layout/counter.xml
@@ -8,13 +8,12 @@
         android:id="@+id/donut_progress"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:elevation="4dp"
-        custom:donut_finished_color="#000"
+        custom:donut_finished_color="@color/black"
         custom:donut_finished_stroke_width="10dp"
         custom:donut_max="33"
         custom:donut_progress="15"
         custom:donut_text=""
-        custom:donut_unfinished_color="@android:color/darker_gray"
+        custom:donut_unfinished_color="@color/gray"
         custom:donut_unfinished_stroke_width="10dp" />
 
     <com.github.lzyzsd.circleprogress.CircleProgress
@@ -22,11 +21,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="15dp"
-        custom:circle_finished_color="@color/colorAccent"
+        custom:circle_finished_color="?attr/colorAccent"
         custom:circle_max="33"
         custom:circle_progress="15"
         custom:circle_suffix_text=""
-        custom:circle_unfinished_color="#000" />
+        custom:circle_unfinished_color="@color/black" />
 
     <TextView
         android:id="@+id/finished"
diff --git a/app/src/main/res/layout/counter_create.xml b/app/src/main/res/layout/counter_create.xml
old mode 100644
new mode 100755
index 0749874..d01bc1b
--- a/app/src/main/res/layout/counter_create.xml
+++ b/app/src/main/res/layout/counter_create.xml
@@ -4,69 +4,67 @@
     android:id="@+id/add_counter"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="pk.aspirasoft.tasbih.scenes.CreateCounter">
+    tools:context=".scenes.CreateCounter">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/actionBar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:background="@color/colorPrimaryDark"
-        android:elevation="4dp"
-        android:layout_alignParentTop="true">
-
-    </android.support.v7.widget.Toolbar>
+        android:layout_height="?actionBarSize"
+        android:layout_alignParentTop="true"
+        android:background="?attr/colorPrimaryDark"
+        android:elevation="4dp" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
-        android:padding="10dp"
         android:layout_below="@+id/actionBar"
+        android:background="@color/white"
         android:orientation="vertical"
-        android:background="#fff">
+        android:padding="10dp">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#fff"
-            android:textColor="#000"
-            android:text="@string/label_name"
+            android:background="@color/white"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:paddingTop="5dp"/>
+            android:paddingTop="5dp"
+            android:text="@string/label_name"
+            android:textColor="@color/black" />
 
         <EditText
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/white"
             android:hint="@string/label_name_description"
-            android:maxLines="1"
-            android:background="#fff"
-            android:textColor="#000"
-            android:textColorHint="#555"
             android:inputType="text"
-            android:padding="5dp"/>
+            android:maxLines="1"
+            android:padding="5dp"
+            android:textColor="@color/black"
+            android:textColorHint="@color/gray" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#fff"
-            android:textColor="#000"
-            android:text="@string/label_memo"
+            android:background="@color/white"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:paddingTop="15dp"/>
+            android:paddingTop="15dp"
+            android:text="@string/label_memo"
+            android:textColor="@color/black" />
 
         <EditText
             android:id="@+id/description"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
+            android:background="@color/white"
+            android:gravity="top"
             android:hint="@string/label_memo_description"
             android:inputType="textMultiLine"
-            android:gravity="top"
-            android:background="#fff"
-            android:textColor="#000"
-            android:textColorHint="#555"
-            android:padding="5dp"/>
+            android:padding="5dp"
+            android:textColor="@color/black"
+            android:textColorHint="@color/gray" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/counter_details.xml b/app/src/main/res/layout/counter_details.xml
old mode 100644
new mode 100755
index 2b74e75..7284a39
--- a/app/src/main/res/layout/counter_details.xml
+++ b/app/src/main/res/layout/counter_details.xml
@@ -3,17 +3,16 @@
     xmlns:ads="http://schemas.android.com/apk/res-auto"
     xmlns:custom="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_counter_active"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="pk.aspirasoft.tasbih.scenes.ActiveCounter">
+    tools:context=".scenes.ActiveCounter">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/actionBar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="?actionBarSize"
         android:layout_alignParentTop="true"
-        android:background="@color/colorPrimaryDark"
+        android:background="?attr/colorPrimaryDark"
         android:elevation="4dp">
 
     </android.support.v7.widget.Toolbar>
@@ -49,7 +48,7 @@
                     android:layout_gravity="center_horizontal"
                     android:gravity="center_horizontal"
                     android:text="@string/label_memo"
-                    android:textColor="#000"
+                    android:textColor="@color/black"
                     android:textStyle="bold" />
 
                 <TextView
@@ -59,7 +58,7 @@
                     android:layout_gravity="center_horizontal"
                     android:gravity="center_horizontal"
                     android:text="@string/placeholder_memo"
-                    android:textColor="#000"
+                    android:textColor="@color/black"
                     android:textStyle="normal" />
 
             </LinearLayout>
@@ -98,7 +97,6 @@
                     android:id="@+id/counter"
                     android:layout_width="250dp"
                     android:layout_height="250dp"
-                    android:elevation="4dp"
                     custom:max="33"
                     custom:progress="0" />
 
diff --git a/app/src/main/res/layout/drawer.xml b/app/src/main/res/layout/drawer.xml
old mode 100644
new mode 100755
index 4226e54..44d6019
--- a/app/src/main/res/layout/drawer.xml
+++ b/app/src/main/res/layout/drawer.xml
@@ -1,35 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:ads="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-
-    tools:context="pk.aspirasoft.tasbih.scenes.CounterDrawer">
+    tools:context=".scenes.CounterDrawer">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/actionBar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:background="@color/colorPrimaryDark"
-        android:elevation="4dp"
-        android:layout_alignParentTop="true">
-
-    </android.support.v7.widget.Toolbar>
+        android:layout_height="?actionBarSize"
+        android:layout_alignParentTop="true"
+        android:background="?attr/colorPrimaryDark"
+        android:elevation="4dp" />
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
-        android:layout_below="@+id/actionBar"
-        android:layout_above="@id/adView">
+        android:layout_above="@id/adView"
+        android:layout_below="@+id/actionBar">
 
         <LinearLayout
             android:id="@+id/rootView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-        </LinearLayout>
+            android:orientation="vertical" />
 
     </ScrollView>
 
@@ -40,6 +35,6 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         ads:adSize="BANNER"
-        ads:adUnitId="@string/ad_unit_id"/>
+        ads:adUnitId="@string/ad_unit_id" />
 
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_grid_cell.xml b/app/src/main/res/layout/drawer_grid_cell.xml
old mode 100644
new mode 100755
index 27b65a8..c6ab97d
--- a/app/src/main/res/layout/drawer_grid_cell.xml
+++ b/app/src/main/res/layout/drawer_grid_cell.xml
@@ -3,23 +3,23 @@
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_weight="1"
-    android:orientation="vertical"
-    android:gravity="center">
+    android:gravity="center"
+    android:orientation="vertical">
 
     <ImageButton
         android:layout_width="75dp"
         android:layout_height="75dp"
         android:layout_gravity="center"
-        android:scaleType="centerInside"
-        android:contentDescription="Thumbnail of the counter." />
+        android:contentDescription="Thumbnail of the counter."
+        android:scaleType="centerInside" />
 
     <TextView
         android:layout_width="75dp"
         android:layout_height="wrap_content"
-        android:text="Counter Title"
-        android:textColor="#fff"
+        android:ellipsize="end"
         android:gravity="center"
         android:maxLines="1"
-        android:ellipsize="end"/>
+        android:text="Counter Title"
+        android:textColor="#fff" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_list_item.xml b/app/src/main/res/layout/drawer_list_item.xml
old mode 100644
new mode 100755
index 3f9d88e..4765591
--- a/app/src/main/res/layout/drawer_list_item.xml
+++ b/app/src/main/res/layout/drawer_list_item.xml
@@ -21,7 +21,7 @@
         android:gravity="center"
         android:maxLines="1"
         android:text="@string/label_name"
-        android:textColor="#000"
+        android:textColor="@color/black"
         android:textSize="18sp"
         android:textStyle="bold" />
 
@@ -31,9 +31,9 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center_vertical|end"
-        android:maxLines="2"
+        android:maxLines="1"
         android:text="0"
-        android:textColor="#333"
+        android:textColor="@color/charcoal"
         android:textSize="12sp"
         android:textStyle="normal" />
 
diff --git a/app/src/main/res/layout/drawer_row.xml b/app/src/main/res/layout/drawer_row.xml
old mode 100644
new mode 100755
index 76e5ac2..2c7ba66
--- a/app/src/main/res/layout/drawer_row.xml
+++ b/app/src/main/res/layout/drawer_row.xml
@@ -2,8 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="10dp"
     android:orientation="horizontal"
-    android:weightSum="3"
-    android:layout_marginBottom="10dp">
-
-</LinearLayout>
\ No newline at end of file
+    android:weightSum="3" />
\ No newline at end of file
diff --git a/app/src/main/res/menu/counter.xml b/app/src/main/res/menu/counter.xml
old mode 100644
new mode 100755
index 03aceed..5a3171e
--- a/app/src/main/res/menu/counter.xml
+++ b/app/src/main/res/menu/counter.xml
@@ -2,13 +2,15 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:id="@+id/reset"
-        android:title="@string/hint_reset"
+    <item
+        android:id="@+id/reset"
         android:icon="@drawable/ic_action_reset"
-        app:showAsAction="ifRoom"/>
+        android:title="@string/hint_reset"
+        app:showAsAction="ifRoom" />
 
-    <item android:id="@+id/remove"
-        android:title="@string/hint_delete"
+    <item
+        android:id="@+id/remove"
         android:icon="@android:drawable/ic_menu_delete"
-        app:showAsAction="ifRoom"/>
+        android:title="@string/hint_delete"
+        app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/create_counter.xml b/app/src/main/res/menu/create_counter.xml
old mode 100644
new mode 100755
index a26b923..e43fe92
--- a/app/src/main/res/menu/create_counter.xml
+++ b/app/src/main/res/menu/create_counter.xml
@@ -2,8 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:id="@+id/add"
+    <item
+        android:id="@+id/add"
         android:title="@string/label_add"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/home.xml b/app/src/main/res/menu/home.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5db61df..a41a12a 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#C18D19</color>
-    <color name="colorPrimaryDark">#db3c15</color>
-    <color name="colorAccent">#12A3C9</color>
+    <color name="colorPrimary">#ff6d00</color>
+    <color name="colorPrimaryDark">#bf360c</color>
+    <color name="colorAccent">#00acc1</color>
+    <color name="black">#000000</color>
+    <color name="charcoal">#263238</color>
+    <color name="gray">#9e9e9e</color>
     <color name="white">#FFFFFF</color>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755