diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
index 64a1ff12..7a7c6d12 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
@@ -15,7 +15,6 @@
 */
 package com.health.openscale.gui.activities;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -25,6 +24,7 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TableLayout;
@@ -58,7 +58,7 @@ import java.util.Date;
 
 import lecho.lib.hellocharts.util.ChartUtils;
 
-public class DataEntryActivity extends Activity {
+public class DataEntryActivity extends AppCompatActivity {
     public static String EXTRA_ID = "id";
 
     private ArrayList<MeasurementView> dataEntryMeasurements;
diff --git a/android_app/app/src/main/res/layout/activity_usersettings.xml b/android_app/app/src/main/res/layout/activity_usersettings.xml
index 81deec2b..7a099d3a 100644
--- a/android_app/app/src/main/res/layout/activity_usersettings.xml
+++ b/android_app/app/src/main/res/layout/activity_usersettings.xml
@@ -16,7 +16,7 @@
             android:orientation="vertical"
             android:padding="5dp" >
 
-        <TableLayout
+            <TableLayout
                 android:id="@+id/tableUserData"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -165,25 +165,25 @@
 
                 </TableRow>
 
-            <TableRow
-                android:id="@+id/tableRowInitialWeight"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/lblInitialWeight"
+                <TableRow
+                    android:id="@+id/tableRowInitialWeight"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/label_initial_weight" />
+                    android:layout_height="wrap_content" >
 
-                <EditText
-                    android:id="@+id/txtInitialWeight"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:hint="@string/info_enter_initial_weight"
-                    android:inputType="numberDecimal|numberSigned" />
-            </TableRow>
+                    <TextView
+                        android:id="@+id/lblInitialWeight"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/label_initial_weight" />
+
+                    <EditText
+                        android:id="@+id/txtInitialWeight"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ems="10"
+                        android:hint="@string/info_enter_initial_weight"
+                        android:inputType="numberDecimal|numberSigned" />
+                </TableRow>
 
                 <TableRow
                     android:id="@+id/rowGoalWeight"
@@ -229,42 +229,38 @@
 
             </TableLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <Button
+                    android:id="@+id/btnCancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:background="@drawable/flat_selector"
+                    android:text="@string/label_cancel"
+                    android:layout_marginRight="10dp" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <Button
-                android:id="@+id/btnCancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:background="@drawable/flat_selector"
-                android:text="@string/label_cancel"
-                android:layout_marginRight="10dp" />
+                <Button
+                    android:id="@+id/btnDelete"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:background="@drawable/flat_selector"
+                    android:text="@string/label_delete"
+                    android:layout_marginRight="10dp" />
 
-            <Button
-                android:id="@+id/btnDelete"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:background="@drawable/flat_selector"
-                android:text="@string/label_delete"
-                android:layout_marginRight="10dp" />
+                <Button
+                    android:id="@+id/btnOk"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:background="@drawable/flat_selector"
+                    android:text="@string/label_ok" />
+            </LinearLayout>
 
-            <Button
-                android:id="@+id/btnOk"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:background="@drawable/flat_selector"
-                android:text="@string/label_ok" />
         </LinearLayout>
-
-</LinearLayout>
     </ScrollView>
 
-
-
-
 </LinearLayout>
 
diff --git a/android_app/app/src/main/res/values/colors.xml b/android_app/app/src/main/res/values/colors.xml
index 98c6296e..17a99a01 100644
--- a/android_app/app/src/main/res/values/colors.xml
+++ b/android_app/app/src/main/res/values/colors.xml
@@ -3,4 +3,8 @@
     <color name="blue_pressed">@android:color/holo_blue_dark</color>
     <color name="blue_normal">@android:color/holo_blue_light</color>
     <color name="gray_disabled">#ccc</color>
+
+    <color name="primaryColor">#000000</color>
+    <color name="primaryLightColor">@android:color/holo_blue_light</color>
+    <color name="primaryDarkColor">#000000</color>
 </resources>
diff --git a/android_app/app/src/main/res/values/styles.xml b/android_app/app/src/main/res/values/styles.xml
index 2257f464..9f3cd6f0 100644
--- a/android_app/app/src/main/res/values/styles.xml
+++ b/android_app/app/src/main/res/values/styles.xml
@@ -1,12 +1,11 @@
 <resources>
     <!-- Application theme. -->
-    <style name="AppTheme_Light" parent="Theme.Design.Light.NoActionBar">
-        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
-        <item name="colorPrimary">#000000</item>
-        <item name="colorPrimaryDark">#000000</item>
-        <item name="colorAccent">@android:color/holo_blue_light</item>
+    <style name="AppTheme_Light" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/primaryColor</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColor</item>
+        <item name="colorAccent">@color/primaryLightColor</item>
     </style>
 
-    <style name="AppTheme_Dark" parent="Theme.Design.NoActionBar">
+    <style name="AppTheme_Dark" parent="Theme.AppCompat.NoActionBar">
     </style>
 </resources>