diff --git a/wear/src/main/java/info/nightscout/androidaps/BIGChart.java b/wear/src/main/java/info/nightscout/androidaps/BIGChart.java
index 09f09d1615..520c6bfd9b 100644
--- a/wear/src/main/java/info/nightscout/androidaps/BIGChart.java
+++ b/wear/src/main/java/info/nightscout/androidaps/BIGChart.java
@@ -18,7 +18,6 @@ import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.content.res.ResourcesCompat;
 import android.support.wearable.view.WatchViewStub;
 import android.support.wearable.watchface.WatchFaceStyle;
 import android.text.format.DateFormat;
@@ -36,16 +35,12 @@ import com.ustwo.clockwise.wearable.WatchFace;
 import com.ustwo.clockwise.common.WatchFaceTime;
 import com.ustwo.clockwise.common.WatchMode;
 import com.ustwo.clockwise.common.WatchShape;
-import com.ustwo.clockwise.common.util.Logr;
 
 import java.util.ArrayList;
 import java.util.Date;
 
-import lecho.lib.hellocharts.util.ChartUtils;
 import lecho.lib.hellocharts.view.LineChartView;
 
-import static java.security.AccessController.getContext;
-
 /**
  * Created by adrianLxM.
  */
@@ -461,7 +456,7 @@ public class BIGChart extends WatchFace implements SharedPreferences.OnSharedPre
     protected void setColorDark() {
         mTime.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mTime));
         statusView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_statusView));
-        mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mRelativeLayout));
+        mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_background));
         if (sgvLevel == 1) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
             mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
@@ -500,9 +495,9 @@ public class BIGChart extends WatchFace implements SharedPreferences.OnSharedPre
     protected void setColorBright() {
 
         if (getCurrentWatchMode() == WatchMode.INTERACTIVE) {
-            mTime.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_mTime));
-            statusView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_statusView));
-            mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_mRelativeLayout));
+            mTime.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_bigchart_time));
+            statusView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_bigchart_status));
+            mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_background));
             if (sgvLevel == 1) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
                 mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
diff --git a/wear/src/main/java/info/nightscout/androidaps/BgGraphBuilder.java b/wear/src/main/java/info/nightscout/androidaps/BgGraphBuilder.java
index 11932cfb94..8dff9b82bd 100644
--- a/wear/src/main/java/info/nightscout/androidaps/BgGraphBuilder.java
+++ b/wear/src/main/java/info/nightscout/androidaps/BgGraphBuilder.java
@@ -212,12 +212,11 @@ public class BgGraphBuilder {
         Line valueLine = new Line(lineValues);
         valueLine.setHasPoints(false);
         if (isHighlightLine){
-            valueLine.setColor(ContextCompat.getColor(context, R.color.valueLine_highlight));
+            valueLine.setColor(ContextCompat.getColor(context, R.color.tempbasal_highlight));
             valueLine.setStrokeWidth(1);
         }else {
-            valueLine.setColor(ContextCompat.getColor(context, R.color.valueLine_primary));
+            valueLine.setColor(ContextCompat.getColor(context, R.color.tempbasal_primary));
             valueLine.setStrokeWidth(strokeWidth);
-            valueLine.setFilled(true);
         }
         return valueLine;
     }
diff --git a/wear/src/main/java/info/nightscout/androidaps/Home.java b/wear/src/main/java/info/nightscout/androidaps/Home.java
index e9b337aa8e..596ecba144 100644
--- a/wear/src/main/java/info/nightscout/androidaps/Home.java
+++ b/wear/src/main/java/info/nightscout/androidaps/Home.java
@@ -6,10 +6,6 @@ import android.view.LayoutInflater;
 
 import com.ustwo.clockwise.common.WatchMode;
 
-import lecho.lib.hellocharts.util.ChartUtils;
-
-import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-
 public class Home extends BaseWatchFace {
 
     @Override
@@ -23,7 +19,7 @@ public class Home extends BaseWatchFace {
     protected void setColorDark() {
         mLinearLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_statusView));
         mTime.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mTime));
-        mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mRelativeLayout));
+        mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_background));
         if (sgvLevel == 1) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
             mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
@@ -45,9 +41,9 @@ public class Home extends BaseWatchFace {
         }
 
         if (batteryLevel == 1) {
-            mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mUploaderBattery1_home));
+            mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_uploaderBattery));
         } else {
-            mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mUploaderBattery_home));
+            mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_uploaderBatteryEmpty));
         }
 
         mStatus.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mStatus_home));
@@ -66,8 +62,8 @@ public class Home extends BaseWatchFace {
     protected void setColorBright() {
 
         if (getCurrentWatchMode() == WatchMode.INTERACTIVE) {
-            mLinearLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_mLinearLayout));
-            mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_mRelativeLayout));
+            mLinearLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_stripe_background));
+            mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_background));
             if (sgvLevel == 1) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
                 mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
diff --git a/wear/src/main/java/info/nightscout/androidaps/LargeHome.java b/wear/src/main/java/info/nightscout/androidaps/LargeHome.java
index ab790b6882..8f4f0e88af 100644
--- a/wear/src/main/java/info/nightscout/androidaps/LargeHome.java
+++ b/wear/src/main/java/info/nightscout/androidaps/LargeHome.java
@@ -21,7 +21,7 @@ public class LargeHome extends BaseWatchFace {
     protected void setColorDark(){
         mLinearLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mLinearLayout));
         mTime.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mTime));
-        mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mRelativeLayout));
+        mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_background));
         if (sgvLevel == 1) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
             mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
@@ -43,9 +43,9 @@ public class LargeHome extends BaseWatchFace {
         }
 
         if (batteryLevel == 1) {
-            mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mUploaderBattery1_home));
+            mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_uploaderBattery));
         } else {
-            mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mUploaderBattery_home));
+            mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_uploaderBatteryEmpty));
         }
 
         mStatus.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mStatus_home));
@@ -54,8 +54,8 @@ public class LargeHome extends BaseWatchFace {
     @Override
     protected void setColorBright() {
         if (getCurrentWatchMode() == WatchMode.INTERACTIVE) {
-            mLinearLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_mLinearLayout));
-            mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_mRelativeLayout));
+            mLinearLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_stripe_background));
+            mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_background));
             if (sgvLevel == 1) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
                 mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
diff --git a/wear/src/main/res/values/colors.xml b/wear/src/main/res/values/colors.xml
index 7852f93413..372c343b44 100644
--- a/wear/src/main/res/values/colors.xml
+++ b/wear/src/main/res/values/colors.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- light colors -->
-    <color name="light_mTime">@color/black</color>
-    <color name="light_statusView">@color/black</color>
-    <color name="light_mRelativeLayout">@color/grey_50</color>
-    <color name="light_mLinearLayout">@color/black</color>
+    <color name="light_bigchart_time">@color/black</color>
+    <color name="light_bigchart_status">@color/black</color>
+    <color name="light_background">@color/grey_50</color>
+    <color name="light_stripe_background">@color/black</color>
     <color name="light_mTimestamp1">@color/black</color>
     <color name="light_mTimestamp1_home">@color/grey_50</color>
     <color name="light_mTimestamp">@color/red_600</color>
@@ -12,9 +12,9 @@
     <color name="light_inter_mTimestamp">@color/grey_50</color>
     <color name="light_inter_statusView">@color/grey_50</color>
     <color name="light_inter_mRelativeLayout">@color/black</color>
-    <color name="light_mUploaderBattery1_home">@color/black</color>
-    <color name="light_mUploaderBattery_home">@color/red_600</color>
-    <color name="light_mStatus_home">@color/black</color>
+    <color name="light_uploaderBattery">@color/black</color>
+    <color name="light_uploaderBatteryEmpty">@color/red_600</color>
+    <color name="light_status_home">@color/black</color>
 
     <color name="light_highColor">@color/yellow_700</color>
     <color name="light_lowColor">@color/red_600</color>
@@ -27,13 +27,13 @@
     <!-- dark colors -->
     <color name="dark_mTime">@color/grey_50</color>
     <color name="dark_statusView">@color/grey_50</color>
-    <color name="dark_mRelativeLayout">@color/black</color>
+    <color name="dark_background">@color/black</color>
     <color name="dark_mLinearLayout">@color/grey_50</color>
     <color name="dark_mTimestamp1">@color/grey_50</color>
     <color name="dark_mTimestamp1_home">@color/black</color>
     <color name="dark_mTimestamp">@color/red_600</color>
-    <color name="dark_mUploaderBattery1_home">@color/black</color>
-    <color name="dark_mUploaderBattery_home">@color/red_600</color>
+    <color name="dark_uploaderBattery">@color/black</color>
+    <color name="dark_uploaderBatteryEmpty">@color/red_600</color>
     <color name="dark_mStatus_home">@color/black</color>
 
     <color name="dark_highColor">@color/yellow_700</color>
@@ -48,8 +48,8 @@
 
     <!-- basal colors -->
     <color name="basalLine_primary">@color/blue_300</color>
-    <color name="valueLine_highlight">@color/blue_300</color>
-    <color name="valueLine_primary">@color/blue_600</color>
+    <color name="tempbasal_highlight">@color/blue_300</color>
+    <color name="tempbasal_primary">@color/BLUE</color>
 
 
     <!-- Material Design - Color Palette -->
@@ -352,6 +352,7 @@
     <!-- Grey -->
 
     <!-- Blue Grey -->
+    <color name="BLUE">#0000FF</color>
     <color name="blue_grey_50">#ECEFF1</color>
     <color name="blue_grey_100">#CFD8DC</color>
     <color name="blue_grey_200">#B0BEC5</color>
diff --git a/wear/wear.iml b/wear/wear.iml
index 7db2f0c9ea..6bcf7b706c 100644
--- a/wear/wear.iml
+++ b/wear/wear.iml
@@ -43,13 +43,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/full/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/full/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/assets" type="java-test-resource" />
@@ -58,6 +51,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/full/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/full/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/full/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/full/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/full/assets" type="java-resource" />
@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/full/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/full/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/full/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFull/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestFull/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFull/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />