diff --git a/app/app-release.apk b/app/app-release.apk
index ffb4dc4f5..a58073491 100644
Binary files a/app/app-release.apk and b/app/app-release.apk differ
diff --git a/app/build.gradle b/app/build.gradle
index 8521df100..317206be3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,6 +31,7 @@ repositories {
 dependencies {
     compile "com.android.support:appcompat-v7:21.+"
     compile "com.android.support:recyclerview-v7:21.+"
+    compile "com.android.support:palette-v7:21.+"
 
     //compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':libraries:openpgp-api-lib')
diff --git a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
index 43bcfca81..c0bbfd798 100644
--- a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
@@ -8,6 +8,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.ActionBarActivity;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
@@ -58,7 +59,7 @@ import java.util.regex.Pattern;
 
 // TODO move the messages to strings.xml
 
-public class GitHandler extends Activity {
+public class GitHandler extends ActionBarActivity {
 
     private Activity activity;
     private Context context;
diff --git a/app/src/main/res/drawable/bottom_line.xml b/app/src/main/res/drawable/bottom_line.xml
index fab0b04f1..a28cc6d3e 100644
--- a/app/src/main/res/drawable/bottom_line.xml
+++ b/app/src/main/res/drawable/bottom_line.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@android:color/holo_orange_dark"/>
+            <solid android:color="@color/blue_grey_700"/>
         </shape>
     </item>
 
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index f1adcd6d9..f26d6f8d5 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -21,7 +21,7 @@
             style="@android:style/TextAppearance.Large"
             android:gravity="left"
             android:paddingBottom="6dp"
-            android:textColor="@android:color/holo_orange_dark"
+            android:textColor="@color/blue_grey_700"
             android:background="@drawable/bottom_line"/>
 
         <RelativeLayout
@@ -61,6 +61,7 @@
                 android:id="@+id/label_server_user"
                 android:layout_centerVertical="true"
                 android:layout_alignParentLeft="true"
+                android:paddingBottom="8dp"
                 android:layout_alignParentStart="true" />
 
             <EditText
@@ -68,6 +69,7 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/server_user_hint"
                 android:id="@+id/server_user"
+                android:layout_marginLeft="8dp"
                 android:layout_toEndOf="@+id/label_server_user"
                 android:layout_toRightOf="@+id/label_server_user"
                 android:layout_alignParentRight="true"
@@ -83,6 +85,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/server_url"
+                android:paddingBottom="8dp"
                 android:id="@+id/label_server_url"
                 android:layout_centerVertical="true"
                 android:layout_alignParentLeft="true"
@@ -93,6 +96,7 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/server_url_hint"
                 android:id="@+id/server_url"
+                android:layout_marginLeft="8dp"
                 android:layout_toEndOf="@+id/label_server_url"
                 android:layout_toRightOf="@+id/label_server_url"
                 android:layout_toLeftOf="@+id/label_server_port"
@@ -102,6 +106,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=":"
+                android:paddingBottom="8dp"
                 android:id="@+id/label_server_port"
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/server_port"
@@ -125,6 +130,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/server_path"
+                android:paddingBottom="8dp"
                 android:id="@+id/label_server_path"
                 android:layout_centerVertical="true"
                 android:layout_alignParentLeft="true"
@@ -134,6 +140,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/server_path_hint"
+                android:layout_marginLeft="8dp"
                 android:id="@+id/server_path"
                 android:layout_toEndOf="@+id/label_server_path"
                 android:layout_toRightOf="@+id/label_server_path"
@@ -150,7 +157,7 @@
             style="@android:style/TextAppearance.Large"
             android:gravity="left"
             android:paddingBottom="6dp"
-            android:textColor="@android:color/holo_orange_dark"
+            android:textColor="@color/blue_grey_700"
             android:background="@drawable/bottom_line"/>
 
         <EditText
diff --git a/app/src/main/res/layout/fragment_to_clone_or_not.xml b/app/src/main/res/layout/fragment_to_clone_or_not.xml
index e5c4172fd..3aed7df4c 100644
--- a/app/src/main/res/layout/fragment_to_clone_or_not.xml
+++ b/app/src/main/res/layout/fragment_to_clone_or_not.xml
@@ -2,7 +2,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#eee"
+    android:layout_marginLeft="@dimen/activity_horizontal_margin"
+    android:layout_marginRight="@dimen/activity_horizontal_margin"
     tools:context="com.zeapo.pwdstore.ToCloneOrNot">
 
     <RelativeLayout
@@ -25,6 +26,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
+            android:textStyle="bold"
             android:onClick="initRepository"
             android:text="@string/initialize"
             android:id="@+id/button"
@@ -36,7 +38,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
-            android:textColor="@android:color/holo_orange_dark"
+            android:textColor="@color/deep_orange_500"
+            android:textStyle="bold"
             android:onClick="getClone"
             android:text="@string/clone"
             android:layout_below="@+id/textView"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f62f87017..08f50df74 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,7 +5,7 @@
         <item name="colorPrimary">@color/blue_grey_500</item>
         <item name="colorPrimaryDark">@color/blue_grey_500</item>
         <item name="android:windowBackground">@color/blue_grey_100</item>
-        <item name="android:textColorPrimary">@color/blue_grey_50</item>
+        <item name="android:textColorPrimary">@color/teal_900</item>
         <item name="android:textColor">@color/blue_grey_900</item>
     </style>
 </resources>