diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsV2Watchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsV2Watchface.kt
index 887fe53072..d78cbe069d 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsV2Watchface.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsV2Watchface.kt
@@ -52,7 +52,7 @@ class AapsV2Watchface : BaseWatchFace() {
         binding.rigBattery.setTextColor(dividerTxtColor)
         binding.delta.setTextColor(dividerTxtColor)
         binding.avgDelta.setTextColor(dividerTxtColor)
-        binding.basalRate?.setTextColor(dividerTxtColor)
+        binding.basalRate.setTextColor(dividerTxtColor)
         binding.bgi.setTextColor(dividerTxtColor)
         when (loopLevel) {
             -1   -> binding.loop.setBackgroundResource(R.drawable.loop_grey_25)
@@ -85,7 +85,7 @@ class AapsV2Watchface : BaseWatchFace() {
         binding.avgDelta.setTextColor(dividerTxtColor)
         binding.rigBattery.setTextColor(dividerTxtColor)
         binding.uploaderBattery.setTextColor(dividerTxtColor)
-        binding.basalRate?.setTextColor(dividerTxtColor)
+        binding.basalRate.setTextColor(dividerTxtColor)
         binding.bgi.setTextColor(dividerTxtColor)
         binding.iob1.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor))
         binding.iob2.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor))
@@ -138,7 +138,7 @@ class AapsV2Watchface : BaseWatchFace() {
             binding.rigBattery.setTextColor(dividerTxtColor)
             binding.delta.setTextColor(dividerTxtColor)
             binding.avgDelta.setTextColor(dividerTxtColor)
-            binding.basalRate?.setTextColor(dividerTxtColor)
+            binding.basalRate.setTextColor(dividerTxtColor)
             binding.bgi.setTextColor(dividerTxtColor)
             when (loopLevel) {
                 -1   -> binding.loop.setBackgroundResource(R.drawable.loop_grey_25)
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsWatchface.kt
index 4086d479ec..4fb3bfc30e 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsWatchface.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/AapsWatchface.kt
@@ -19,6 +19,7 @@ class AapsWatchface : BaseWatchFace() {
     }
 
     override fun setColorDark() {
+        binding.mainLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.dark_background))
         binding.secondaryLayout.setBackgroundColor(ContextCompat.getColor(this, if (dividerMatchesBg) R.color.dark_background else R.color.dark_statusView))
         binding.time.setTextColor(ContextCompat.getColor(this, R.color.dark_mTime))
         val color = when (singleBg.sgvLevel) {
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BigChartWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BigChartWatchface.kt
index f6b472797b..dedba92761 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BigChartWatchface.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BigChartWatchface.kt
@@ -9,7 +9,6 @@ import androidx.viewbinding.ViewBinding
 import com.ustwo.clockwise.common.WatchMode
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.ActivityBigchartBinding
-import info.nightscout.androidaps.databinding.ActivityBigchartSmallBinding
 import info.nightscout.androidaps.watchfaces.utils.BaseWatchFace
 import info.nightscout.androidaps.watchfaces.utils.WatchfaceViewAdapter
 
@@ -18,11 +17,6 @@ class BigChartWatchface : BaseWatchFace() {
     private lateinit var binding: WatchfaceViewAdapter
 
     override fun inflateLayout(inflater: LayoutInflater): ViewBinding {
-        if (resources.displayMetrics.widthPixels < SCREEN_SIZE_SMALL || resources.displayMetrics.heightPixels < SCREEN_SIZE_SMALL) {
-            val layoutBinding = ActivityBigchartSmallBinding.inflate(inflater)
-            binding = WatchfaceViewAdapter.getBinding(layoutBinding)
-            return layoutBinding
-        }
         val layoutBinding = ActivityBigchartBinding.inflate(inflater)
         binding = WatchfaceViewAdapter.getBinding(layoutBinding)
         return layoutBinding
@@ -42,6 +36,7 @@ class BigChartWatchface : BaseWatchFace() {
         binding.delta?.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor))
         binding.avgDelta?.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor))
         binding.timestamp.setTextColor(ContextCompat.getColor(this, R.color.dark_Timestamp))
+        binding.timePeriod?.setTextColor(ContextCompat.getColor(this, R.color.dark_Timestamp))
 
         highColor = ContextCompat.getColor(this, R.color.dark_midColor)
         lowColor = ContextCompat.getColor(this, R.color.dark_midColor)
@@ -69,6 +64,7 @@ class BigChartWatchface : BaseWatchFace() {
 
         val colorTime = if (ageLevel == 1) R.color.dark_Timestamp else R.color.dark_TimestampOld
         binding.timestamp.setTextColor(ContextCompat.getColor(this, colorTime))
+        binding.timePeriod?.setTextColor(ContextCompat.getColor(this, colorTime))
 
         highColor = ContextCompat.getColor(this, R.color.dark_highColor)
         lowColor = ContextCompat.getColor(this, R.color.dark_lowColor)
@@ -97,6 +93,7 @@ class BigChartWatchface : BaseWatchFace() {
 
             val colorTime = if (ageLevel == 1) R.color.light_mTimestamp1 else R.color.light_mTimestamp
             binding.timestamp.setTextColor(ContextCompat.getColor(this, colorTime))
+            binding.timePeriod?.setTextColor(ContextCompat.getColor(this, colorTime))
 
             highColor = ContextCompat.getColor(this, R.color.light_highColor)
             lowColor = ContextCompat.getColor(this, R.color.light_lowColor)
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt
index 70e5a42670..af2fb397cb 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt
@@ -67,18 +67,17 @@ class DigitalStyleWatchface : BaseWatchFace() {
         /* frame styles*/
         val mShapesElements = layoutView?.findViewById<LinearLayout>(R.id.shapes_elements)
         if (mShapesElements != null) {
-            val displayFormatType = if (mShapesElements.contentDescription.toString().startsWith("round")) "round" else "rect"
             val displayStyle = sp.getString(R.string.key_digital_style_frame_style, "full")
             val displayFrameColor = sp.getString(R.string.key_digital_style_frame_color, "red")
             val displayFrameColorSaturation = sp.getString(R.string.key_digital_style_frame_color_saturation, "500")
             val displayFrameColorOpacity = sp.getString(R.string.key_digital_style_frame_color_opacity, "1")
 
             // Load image with shapes
-            val styleDrawableName = "digitalstyle_bg_" + displayStyle + "_" + displayFormatType
+            val styleDrawableName = "digital_style_bg_" + displayStyle
             try {
                 mShapesElements.background = ContextCompat.getDrawable(this, resources.getIdentifier(styleDrawableName, "drawable", this.packageName))
             } catch (e: Exception) {
-                aapsLogger.error("digitalstyle_frameStyle", "RESOURCE NOT FOUND >> $styleDrawableName")
+                aapsLogger.error("digital_style_frameStyle", "RESOURCE NOT FOUND >> $styleDrawableName")
             }
 
             // set background-tint-color
@@ -86,13 +85,13 @@ class DigitalStyleWatchface : BaseWatchFace() {
                 mShapesElements.backgroundTintList = null
             } else {
                 val strColorName = if (displayFrameColor == "white" || displayFrameColor == "black") displayFrameColor else displayFrameColor + "_" + displayFrameColorSaturation
-                aapsLogger.debug(LTag.WEAR, "digitalstyle_strColorName", strColorName)
+                aapsLogger.debug(LTag.WEAR, "digital_style_strColorName", strColorName)
                 try {
                     val colorStateList = ContextCompat.getColorStateList(this, resources.getIdentifier(strColorName, "color", this.packageName))
                     mShapesElements.backgroundTintList = colorStateList
                 } catch (e: Exception) {
                     mShapesElements.backgroundTintList = null
-                    aapsLogger.error("digitalstyle_colorName", "COLOR NOT FOUND >> $strColorName")
+                    aapsLogger.error("digital_style_colorName", "COLOR NOT FOUND >> $strColorName")
                 }
             }
 
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NoChartWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NoChartWatchface.kt
index e277945540..ac160baaf3 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NoChartWatchface.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NoChartWatchface.kt
@@ -6,9 +6,7 @@ import androidx.viewbinding.ViewBinding
 import com.ustwo.clockwise.common.WatchMode
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.ActivityBigchartBinding
-import info.nightscout.androidaps.databinding.ActivityBigchartSmallBinding
 import info.nightscout.androidaps.databinding.ActivityNochartBinding
-import info.nightscout.androidaps.databinding.ActivityNochartSmallBinding
 import info.nightscout.androidaps.watchfaces.utils.BaseWatchFace
 import info.nightscout.androidaps.watchfaces.utils.WatchfaceViewAdapter
 
@@ -17,11 +15,6 @@ class NoChartWatchface : BaseWatchFace() {
     private lateinit var binding: WatchfaceViewAdapter
 
     override fun inflateLayout(inflater: LayoutInflater): ViewBinding {
-        if (resources.displayMetrics.widthPixels < SCREEN_SIZE_SMALL || resources.displayMetrics.heightPixels < SCREEN_SIZE_SMALL) {
-            val layoutBinding = ActivityNochartSmallBinding.inflate(inflater)
-            binding = WatchfaceViewAdapter.getBinding(layoutBinding)
-            return layoutBinding
-        }
         val layoutBinding = ActivityNochartBinding.inflate(inflater)
         binding = WatchfaceViewAdapter.getBinding(layoutBinding)
         return layoutBinding
@@ -35,6 +28,7 @@ class NoChartWatchface : BaseWatchFace() {
         binding.delta?.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor))
         binding.avgDelta?.setTextColor(ContextCompat.getColor(this, R.color.dark_midColor))
         binding.timestamp.setTextColor(ContextCompat.getColor(this, R.color.dark_Timestamp))
+        binding.timePeriod?.setTextColor(ContextCompat.getColor(this, R.color.dark_Timestamp))
     }
 
     override fun setColorDark() {
@@ -52,6 +46,7 @@ class NoChartWatchface : BaseWatchFace() {
         binding.avgDelta?.setTextColor(ContextCompat.getColor(this, color))
         val colorTime = if (ageLevel == 1) R.color.dark_Timestamp else R.color.dark_TimestampOld
         binding.timestamp.setTextColor(ContextCompat.getColor(this, colorTime))
+        binding.timePeriod?.setTextColor(ContextCompat.getColor(this, colorTime))
     }
 
     override fun setColorBright() {
@@ -70,6 +65,7 @@ class NoChartWatchface : BaseWatchFace() {
             binding.avgDelta?.setTextColor(ContextCompat.getColor(this, color))
             val colorTime = if (ageLevel == 1) R.color.light_mTimestamp1 else R.color.light_mTimestamp
             binding.timestamp.setTextColor(ContextCompat.getColor(this, colorTime))
+            binding.timePeriod?.setTextColor(ContextCompat.getColor(this, colorTime))
 
         } else {
             setColorDark()
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt
index a2a7399c1e..dab8d0b7be 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt
@@ -423,7 +423,7 @@ abstract class BaseWatchFace : WatchFace() {
     }
 
     private fun setDateAndTime() {
-        binding.time?.text = dateUtil.timeString()
+        binding.time?.text = if(binding.timePeriod == null) dateUtil.timeString() else dateUtil.hourString() + ":" + dateUtil.minuteString()
         binding.hour?.text = dateUtil.hourString()
         binding.minute?.text = dateUtil.minuteString()
         binding.dateTime?.visibility = sp.getBoolean(R.string.key_show_date, false).toVisibility()
@@ -524,6 +524,5 @@ abstract class BaseWatchFace : WatchFace() {
         var iFilter = IntentFilter(Intent.ACTION_BATTERY_CHANGED)
         val NORMAL_TYPEFACE: Typeface = Typeface.create(Typeface.SANS_SERIF, Typeface.NORMAL)
         val BOLD_TYPEFACE: Typeface = Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD)
-        const val SCREEN_SIZE_SMALL = 280
     }
 }
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt
index af60e9e3f3..6a2f78d954 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt
@@ -5,7 +5,6 @@ import info.nightscout.androidaps.databinding.ActivityHomeLargeBinding
 import info.nightscout.androidaps.databinding.ActivityHome2Binding
 import info.nightscout.androidaps.databinding.ActivityHomeBinding
 import info.nightscout.androidaps.databinding.ActivityBigchartBinding
-import info.nightscout.androidaps.databinding.ActivityBigchartSmallBinding
 import info.nightscout.androidaps.databinding.ActivityCockpitBinding
 import info.nightscout.androidaps.databinding.ActivityDigitalstyleBinding
 import info.nightscout.androidaps.databinding.ActivityNochartBinding
@@ -20,7 +19,6 @@ class WatchfaceViewAdapter(
     a2: ActivityHome2Binding? = null,
     aa: ActivityHomeBinding? = null,
     bC: ActivityBigchartBinding? = null,
-    bCs: ActivityBigchartSmallBinding? = null,
     cp: ActivityCockpitBinding? = null,
     ds: ActivityDigitalstyleBinding? = null,
     nC: ActivityNochartBinding? = null,
@@ -28,7 +26,7 @@ class WatchfaceViewAdapter(
 ) {
 
     init {
-        if (aL == null && a2 == null && aa == null && bC == null && bCs == null && cp == null && ds == null && nC == null && sP == null) {
+        if (aL == null && a2 == null && aa == null && bC == null && cp == null && ds == null && nC == null && sP == null) {
             throw IllegalArgumentException("Require at least on Binding parameter")
         }
     }
@@ -67,7 +65,7 @@ class WatchfaceViewAdapter(
     val iob2 = a2?.iob2 ?: cp?.iob2 ?: ds?.iob2 ?: sP?.iob2
     val chart = a2?.chart ?: aa?.chart ?: bC?.chart ?: bC?.chart ?: ds?.chart ?: sP?.chart
     val status = aL?.status ?: aa?.status ?: bC?.status ?: bC?.status ?: nC?.status
-    val timePeriod = ds?.timePeriod
+    val timePeriod = ds?.timePeriod ?: aL?.timePeriod ?: nC?.timePeriod ?: bC?.timePeriod
     val dayName = ds?.dayName
     val mainMenuTap = ds?.mainMenuTap ?: sP?.mainMenuTap
     val chartZoomTap = ds?.chartZoomTap ?: sP?.chartZoomTap
@@ -89,11 +87,10 @@ class WatchfaceViewAdapter(
                 is ActivityHome2Binding         -> WatchfaceViewAdapter(null, bindLayout)
                 is ActivityHomeBinding          -> WatchfaceViewAdapter(null, null, bindLayout)
                 is ActivityBigchartBinding      -> WatchfaceViewAdapter(null, null, null, bindLayout)
-                is ActivityBigchartSmallBinding -> WatchfaceViewAdapter(null, null, null, null, bindLayout)
-                is ActivityCockpitBinding       -> WatchfaceViewAdapter(null, null, null, null, null, bindLayout)
-                is ActivityDigitalstyleBinding  -> WatchfaceViewAdapter(null, null, null, null, null, null, bindLayout)
-                is ActivityNochartBinding       -> WatchfaceViewAdapter(null, null, null, null, null, null, null, bindLayout)
-                is ActivitySteampunkBinding     -> WatchfaceViewAdapter(null, null, null, null, null, null, null, null, bindLayout)
+                is ActivityCockpitBinding       -> WatchfaceViewAdapter(null, null, null, null, bindLayout)
+                is ActivityDigitalstyleBinding  -> WatchfaceViewAdapter(null, null, null, null, null,  bindLayout)
+                is ActivityNochartBinding       -> WatchfaceViewAdapter(null, null, null, null, null,  null, bindLayout)
+                is ActivitySteampunkBinding     -> WatchfaceViewAdapter(null, null, null, null, null, null, null, bindLayout)
                 else                            -> throw IllegalArgumentException("ViewBinding is not implement in WatchfaceViewAdapter")
             }
         }
diff --git a/wear/src/main/res/drawable/digitalstyle_bg_full_rect.png b/wear/src/main/res/drawable-notround-nodpi/digital_style_bg_full.png
similarity index 100%
rename from wear/src/main/res/drawable/digitalstyle_bg_full_rect.png
rename to wear/src/main/res/drawable-notround-nodpi/digital_style_bg_full.png
diff --git a/wear/src/main/res/drawable/digitalstyle_bg_minimal_rect.png b/wear/src/main/res/drawable-notround-nodpi/digital_style_bg_minimal.png
similarity index 100%
rename from wear/src/main/res/drawable/digitalstyle_bg_minimal_rect.png
rename to wear/src/main/res/drawable-notround-nodpi/digital_style_bg_minimal.png
diff --git a/wear/src/main/res/drawable/digitalstyle_bg_none_rect.png b/wear/src/main/res/drawable-notround-nodpi/digital_style_bg_none.png
similarity index 100%
rename from wear/src/main/res/drawable/digitalstyle_bg_none_rect.png
rename to wear/src/main/res/drawable-notround-nodpi/digital_style_bg_none.png
diff --git a/wear/src/main/res/drawable/digitalstyle_bg_shape_rect.png b/wear/src/main/res/drawable-notround-nodpi/digital_style_bg_shape.png
similarity index 100%
rename from wear/src/main/res/drawable/digitalstyle_bg_shape_rect.png
rename to wear/src/main/res/drawable-notround-nodpi/digital_style_bg_shape.png
diff --git a/wear/src/main/res/drawable/digitalstyle_bg_full_round.png b/wear/src/main/res/drawable-round-nodpi/digital_style_bg_full.png
similarity index 100%
rename from wear/src/main/res/drawable/digitalstyle_bg_full_round.png
rename to wear/src/main/res/drawable-round-nodpi/digital_style_bg_full.png
diff --git a/wear/src/main/res/drawable/digitalstyle_bg_minimal_round.png b/wear/src/main/res/drawable-round-nodpi/digital_style_bg_minimal.png
similarity index 100%
rename from wear/src/main/res/drawable/digitalstyle_bg_minimal_round.png
rename to wear/src/main/res/drawable-round-nodpi/digital_style_bg_minimal.png
diff --git a/wear/src/main/res/drawable/digitalstyle_bg_none_round.png b/wear/src/main/res/drawable-round-nodpi/digital_style_bg_none.png
similarity index 100%
rename from wear/src/main/res/drawable/digitalstyle_bg_none_round.png
rename to wear/src/main/res/drawable-round-nodpi/digital_style_bg_none.png
diff --git a/wear/src/main/res/drawable/digitalstyle_bg_shape_round.png b/wear/src/main/res/drawable-round-nodpi/digital_style_bg_shape.png
similarity index 100%
rename from wear/src/main/res/drawable/digitalstyle_bg_shape_round.png
rename to wear/src/main/res/drawable-round-nodpi/digital_style_bg_shape.png
diff --git a/wear/src/main/res/layout-notround/activity_bigchart.xml b/wear/src/main/res/layout-notround/activity_bigchart.xml
deleted file mode 100644
index 28be3ae4bb..0000000000
--- a/wear/src/main/res/layout-notround/activity_bigchart.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    tools:context=".watchfaces.AapsWatchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-5dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingTop="5dp"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginEnd="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="30sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="41sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/avg_delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginStart="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="30sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-    <lecho.lib.hellocharts.view.LineChartView
-        android:id="@+id/chart"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        android:gravity="center_horizontal" />
-
-    <TextView
-        android:id="@+id/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="18sp"
-        tools:text="E xU/h  IOB: x (x+x)" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginEnd="6dp"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="35sp"
-            tools:text="12:00" />
-
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="26sp"
-            tools:text="-- '" />
-
-    </LinearLayout>
-
-</LinearLayout>
-
diff --git a/wear/src/main/res/layout-notround/activity_bigchart_small.xml b/wear/src/main/res/layout-notround/activity_bigchart_small.xml
deleted file mode 100644
index bb9ebc29a2..0000000000
--- a/wear/src/main/res/layout-notround/activity_bigchart_small.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    tools:context=".watchfaces.AapsWatchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-5dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingTop="5dp"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal|center"
-            android:layout_marginEnd="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="24sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="34sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/avg_delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal|center"
-            android:layout_marginStart="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="24sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-5sp"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="18sp"
-        tools:text="E xU/h  IOB: x (x+x)" />
-
-    <lecho.lib.hellocharts.view.LineChartView
-        android:id="@+id/chart"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        android:gravity="center_horizontal" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-5sp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginEnd="6dp"
-            android:paddingTop="-5sp"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="34sp"
-            tools:text="12:00" />
-
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal|center"
-            android:text="--'"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="24sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_cockpit.xml b/wear/src/main/res/layout-notround/activity_cockpit.xml
deleted file mode 100644
index ca0b0680ca..0000000000
--- a/wear/src/main/res/layout-notround/activity_cockpit.xml
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/airplane_cockpit_outside_clouds"
-    tools:context=".watchfaces.CockpitWatchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:id="@+id/inside"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="@drawable/airplane_cockpit"
-        android:orientation="vertical"
-        android:weightSum="1">
-
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="0px"
-            android:layout_weight="0.095" />
-
-        <LinearLayout
-            android:id="@+id/windows"
-            android:layout_width="fill_parent"
-            android:layout_height="0px"
-            android:layout_weight="0.2575"
-            android:orientation="horizontal">
-
-            <View
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.47"
-                tools:ignore="NestedWeights" />
-
-            <LinearLayout
-                android:id="@+id/warnings"
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.06"
-                android:baselineAligned="false"
-                android:orientation="vertical">
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.2" />
-
-                <TextView
-                    android:id="@+id/highLight"
-                    android:layout_width="fill_parent"
-                    android:layout_height="0px"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:background="@drawable/airplane_led_grey_unlit"
-                    android:gravity="center"
-                    android:text="@string/first_char_high"
-                    android:textAlignment="center"
-                    android:textColor="@color/primary_text_dark"
-                    android:textSize="8sp"
-                    android:textStyle="bold"
-                    tools:ignore="SmallSp" />
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="2" />
-
-                <TextView
-                    android:id="@+id/lowLight"
-                    android:layout_width="fill_parent"
-                    android:layout_height="0px"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:background="@drawable/airplane_led_grey_unlit"
-                    android:gravity="center"
-                    android:text="@string/first_char_low"
-                    android:textAlignment="center"
-                    android:textColor="@color/primary_text_dark"
-                    android:textSize="8sp"
-                    android:textStyle="bold"
-                    tools:ignore="SmallSp" />
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.2" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.47" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/dashboard"
-            android:layout_width="fill_parent"
-            android:layout_height="0px"
-            android:layout_weight="0.0775"
-            android:orientation="vertical">
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/instruments"
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="0.57"
-            android:orientation="horizontal">
-
-            <View
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.08"
-                tools:ignore="NestedWeights" />
-
-            <LinearLayout
-                android:id="@+id/panel1"
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.275"
-                android:orientation="vertical">
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.07" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.5"
-                    android:orientation="vertical"
-                    android:weightSum="1">
-
-                    <TextView
-                        android:id="@+id/sgv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center"
-                        android:text="---"
-                        android:textColor="@color/primary_text_dark"
-                        android:textSize="30sp"
-                        tools:ignore="HardcodedText" />
-
-                </LinearLayout>
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.03" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.276"
-                    android:orientation="horizontal"
-                    android:weightSum="1">
-
-                    <TextView
-                        android:layout_width="0px"
-                        android:layout_height="match_parent"
-                        android:layout_weight="0.35"
-                        tools:ignore="NestedWeights" />
-
-                    <TextView
-                        android:id="@+id/timestamp"
-                        android:layout_width="0px"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center"
-                        android:layout_weight="0.65"
-                        android:gravity="center"
-                        android:text="--'"
-                        android:textAlignment="center"
-                        android:textColor="@color/primary_text_dark"
-                        android:textSize="14sp"
-                        android:textStyle="bold"
-                        tools:ignore="HardcodedText" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.07" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.0225" />
-
-            <LinearLayout
-                android:id="@+id/panel2"
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.245"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.020" />
-
-                <TextView
-                    android:id="@+id/time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="0px"
-                    android:layout_gravity="center"
-                    android:layout_weight="0.19"
-                    android:gravity="center"
-                    android:textAlignment="center"
-                    android:textColor="@color/primary_text_dark"
-                    android:textSize="16sp"
-                    android:textStyle="bold"
-                    tools:text="12:00" />
-
-                <TextView
-                    android:id="@+id/basalRate"
-                    android:layout_width="wrap_content"
-                    android:layout_height="0px"
-                    android:layout_gravity="bottom|center_horizontal"
-                    android:layout_weight="0.19"
-                    android:gravity="bottom|center_horizontal"
-                    android:text="@string/no_tmp_basal_u_h"
-                    android:textAlignment="center"
-                    android:textColor="@color/primary_text_dark"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/iob2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="0px"
-                    android:layout_gravity="bottom|center_horizontal"
-                    android:layout_weight="0.18"
-                    android:gravity="bottom|center_horizontal"
-                    android:text="@string/no_iob_u"
-                    android:textAlignment="center"
-                    android:textColor="@color/primary_text_dark"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/cob2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="0px"
-                    android:layout_gravity="bottom|center_horizontal"
-                    android:layout_weight="0.185"
-                    android:gravity="bottom|center_horizontal"
-                    android:text="@string/no_cob_g"
-                    android:textAlignment="center"
-                    android:textColor="@color/white"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="0px"
-                    android:layout_gravity="center"
-                    android:layout_weight="0.185"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    android:textAlignment="center">
-
-                    <TextView
-                        android:id="@+id/uploader_battery"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="bottom|center_horizontal"
-                        android:gravity="bottom|center_horizontal"
-                        android:text="--%"
-                        android:textAlignment="center"
-                        android:textColor="@color/primary_text_dark"
-                        android:textSize="12sp"
-                        android:textStyle="bold"
-                        tools:ignore="HardcodedText" />
-
-                    <TextView
-                        android:id="@+id/rig_battery"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="bottom|center_horizontal"
-                        android:gravity="bottom|center_horizontal"
-                        android:paddingStart="4dp"
-                        android:paddingEnd="0dp"
-                        android:text="--%"
-                        android:textAlignment="center"
-                        android:textColor="@color/primary_text_dark"
-                        android:textSize="12sp"
-                        android:textStyle="bold"
-                        android:visibility="gone"
-                        tools:ignore="HardcodedText" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.06" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.0225" />
-
-            <LinearLayout
-                android:id="@+id/panel3"
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.275"
-                android:orientation="vertical">
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.07" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_gravity="center"
-                    android:layout_weight="0.5"
-                    android:gravity="center"
-                    android:orientation="vertical"
-                    android:weightSum="0.5">
-
-                    <TextView
-                        android:id="@+id/direction"
-                        android:layout_width="match_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="center"
-                        android:layout_weight="0.333"
-                        android:gravity="center"
-                        android:text="--"
-                        android:textAlignment="center"
-                        android:textColor="@color/primary_text_dark"
-                        android:textSize="28sp"
-                        android:textStyle="bold"
-                        tools:ignore="HardcodedText, NestedWeights" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="center"
-                        android:layout_weight="0.167"
-                        android:gravity="center"
-                        android:weightSum="2">
-
-                        <TextView
-                            android:id="@+id/delta"
-                            android:layout_width="0px"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="+/-"
-                            android:textAlignment="center"
-                            android:textColor="@color/primary_text_dark"
-                            android:textSize="13sp"
-                            android:textStyle="bold"
-                            tools:ignore="HardcodedText" />
-
-                        <TextView
-                            android:id="@+id/avg_delta"
-                            android:layout_width="0px"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="@string/abbreviation_average"
-                            android:textAlignment="center"
-                            android:textColor="@color/primary_text_dark"
-                            android:textSize="13sp"
-                            android:textStyle="bold" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.06" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.250"
-                    android:orientation="horizontal"
-                    android:weightSum="1">
-
-                    <View
-                        android:layout_width="0px"
-                        android:layout_height="match_parent"
-                        android:layout_weight="0.1"
-                        tools:ignore="NestedWeights" />
-
-                    <TextView
-                        android:id="@+id/loop"
-                        android:layout_width="0px"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="start"
-                        android:layout_weight="0.5"
-                        android:background="@drawable/loop_grey_25"
-                        android:gravity="center"
-                        android:text="--'"
-                        android:textAlignment="center"
-                        android:textColor="@color/primary_text_dark"
-                        android:textSize="14sp"
-                        android:textStyle="bold"
-                        tools:ignore="HardcodedText" />
-
-                    <View
-                        android:id="@+id/AAPSv2"
-                        android:layout_width="0px"
-                        android:layout_height="match_parent"
-                        android:layout_weight="0.4"
-                        android:visibility="invisible" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0px"
-                    android:layout_weight="0.16" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.08" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/wear/src/main/res/layout-notround/activity_digitalstyle.xml b/wear/src/main/res/layout-notround/activity_digitalstyle.xml
deleted file mode 100644
index 5eb13536e6..0000000000
--- a/wear/src/main/res/layout-notround/activity_digitalstyle.xml
+++ /dev/null
@@ -1,610 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <!-- background-image with shapes elements-->
-    <LinearLayout
-        android:id="@+id/shapes_elements"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/digitalstyle_bg_full_rect"
-        android:contentDescription="rect-shape-elements"
-        android:orientation="horizontal"
-        tools:ignore="HardcodedText" />
-
-    <!-- root-element-->
-    <LinearLayout
-        android:id="@+id/watchface_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:baselineAligned="false"
-        android:orientation="horizontal"
-        android:weightSum="8">
-
-        <!-- left side 3/8 width  -->
-        <LinearLayout
-            android:id="@+id/main_menu_tap"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="3"
-            android:orientation="vertical"
-            android:weightSum="100">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="13.95"
-                tools:ignore="NestedWeights" />
-
-            <!-- COB -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="20.44"
-                android:orientation="horizontal"
-                android:weightSum="13">
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="4.9" />
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="7.0"
-                    android:gravity="center_horizontal|center_vertical"
-                    android:orientation="vertical"
-                    android:weightSum="5">
-
-                    <TextView
-                        android:id="@+id/cob1"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="2"
-                        android:fontFamily="@font/roboto_slab_light"
-                        android:gravity="bottom|center_horizontal"
-                        android:text="@string/activity_carb"
-                        android:textColor="@color/light_grey"
-                        android:textSize="10sp"
-                        tools:ignore="SmallSp, NestedWeights" />
-
-                    <TextView
-                        android:id="@+id/cob2"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="3"
-                        android:fontFamily="@font/roboto_slab_light"
-                        android:gravity="top|center_horizontal"
-                        android:letterSpacing="-0.075"
-                        android:lines="1"
-                        android:text="@string/cob_000g"
-                        android:textColor="@color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1.1" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2.87" />
-
-            <!-- SGV / BZ-->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="25.48"
-                android:orientation="horizontal"
-                android:weightSum="13">
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="3.2" />
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="8.7"
-                    android:gravity="center_horizontal|center_vertical"
-                    android:orientation="vertical"
-                    android:weightSum="20">
-
-                    <!-- 1st line with direction and timestamp-->
-                    <LinearLayout
-                        android:id="@+id/directionLayout"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_weight="9"
-                        android:baselineAligned="false"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:orientation="horizontal"
-                        android:weightSum="10"
-                        tools:ignore="NestedWeights">
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="2" />
-
-                        <TextView
-                            android:id="@+id/direction"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center_vertical"
-                            android:layout_weight="3"
-                            android:fontFamily="sans-serif-condensed-medium"
-                            android:gravity="center_horizontal|bottom"
-                            android:text="--"
-                            android:textAlignment="center"
-                            android:textColor="@color/white"
-                            android:textSize="16sp"
-                            android:textStyle="bold"
-                            tools:ignore="HardcodedText" />
-
-                        <TextView
-                            android:id="@+id/timestamp"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginStart="3dp"
-                            android:layout_marginBottom="2dp"
-                            android:layout_weight="3"
-                            android:fontFamily="sans-serif-condensed-light"
-                            android:text="--'"
-                            android:textColor="@color/light_grey"
-                            android:textSize="10sp"
-                            tools:ignore="HardcodedText,SmallSp" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="2" />
-
-                    </LinearLayout>
-
-                    <!-- 2nd line with sgv-->
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="-10dp"
-                        android:layout_weight="11"
-                        android:baselineAligned="false"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/sgv"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:fontFamily="@font/roboto_slab_light"
-                            android:gravity="top|center_horizontal"
-                            android:letterSpacing="-0.05"
-                            android:lines="1"
-                            android:text="@string/svg_00_0"
-                            android:textColor="@color/white"
-                            android:textSize="20sp"
-                            android:textStyle="bold" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1.1" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2.87" />
-
-            <!-- IOB -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="20.44"
-                android:orientation="horizontal"
-                android:weightSum="13">
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="4.9" />
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="7.0"
-                    android:gravity="center_horizontal|center_vertical"
-                    android:orientation="vertical"
-                    android:weightSum="5">
-
-                    <TextView
-                        android:id="@+id/iob1"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="2"
-                        android:fontFamily="@font/roboto_slab_light"
-                        android:gravity="bottom|center_horizontal"
-                        android:text="@string/activity_IOB"
-                        android:textColor="@color/light_grey"
-                        android:textSize="10sp"
-                        tools:ignore="SmallSp, NestedWeights" />
-
-                    <TextView
-                        android:id="@+id/iob2"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="3"
-                        android:fontFamily="@font/roboto_slab_light"
-                        android:gravity="top|center_horizontal"
-                        android:letterSpacing="-0.075"
-                        android:lines="1"
-                        android:text="@string/iob_0_00u"
-                        android:textColor="@color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1.1" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="13.95" />
-
-        </LinearLayout>
-
-        <!-- right side 5/8 width  -->
-        <LinearLayout
-            android:id="@+id/chart_zoom_tap"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="5"
-            android:baselineAligned="false"
-            android:orientation="vertical"
-            android:weightSum="2">
-
-            <!-- right side 1/2 height - top half -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginStart="9dp"
-                android:layout_marginEnd="0dp"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                tools:ignore="NestedWeights">
-
-                <!--  right side top - spacer    2/10 -->
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="2" />
-
-                <!--  right side top - date    4/10 -->
-                <LinearLayout
-                    android:id="@+id/date_time"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="4"
-                    android:orientation="vertical"
-                    android:weightSum="2">
-
-                    <!-- day name (short)-->
-                    <LinearLayout
-                        android:id="@+id/date_time1"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="1"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:id="@+id/day_name"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="5"
-                            android:fontFamily="@font/roboto_condensed_regular"
-                            android:textAllCaps="true"
-                            android:textColor="@color/white"
-                            android:textFontWeight="400"
-                            android:textSize="18sp"
-                            tools:text="DDD" />
-
-                        <TextView
-                            android:id="@+id/week_number"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="4"
-                            android:fontFamily="@font/roboto_condensed_light"
-                            android:letterSpacing="-0.1"
-                            android:textAllCaps="true"
-                            android:textColor="@color/light_grey"
-                            android:textFontWeight="400"
-                            android:textSize="18sp"
-                            android:visibility="gone"
-                            tools:text="ww" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="3" />
-
-                    </LinearLayout>
-
-                    <!-- day number + month (short)-->
-                    <LinearLayout
-                        android:id="@+id/date_time2"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="1"
-                        android:orientation="horizontal">
-                        <!-- day number-->
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent">
-
-                            <TextView
-                                android:id="@+id/day"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:fontFamily="@font/roboto_condensed_regular"
-                                android:paddingStart="0dp"
-                                android:paddingEnd="4dp"
-                                android:textColor="@color/light_grey"
-                                android:textSize="18sp"
-                                tools:text="DD" />
-
-                        </LinearLayout>
-                        <!-- month short-->
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent">
-
-                            <TextView
-                                android:id="@+id/month"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="5dp"
-                                android:fontFamily="@font/roboto_condensed_regular"
-                                android:textAllCaps="true"
-                                android:textColor="@color/light_grey"
-                                android:textSize="18sp"
-                                tools:text="MMM" />
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <!--  right side top - hour minute    4/10 -->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="4"
-                    android:baselineAligned="false"
-                    android:gravity="start|center_vertical"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginTop="-5dp">
-
-                        <!-- hour -->
-                        <TextView
-                            android:id="@+id/hour"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="start"
-                            android:fontFamily="@font/roboto_condensed_bold"
-                            android:textAllCaps="true"
-                            android:textColor="@color/white"
-                            android:textSize="40sp"
-                            android:textStyle="bold"
-                            tools:text="HH" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-
-                        <!-- minute -->
-                        <TextView
-                            android:id="@+id/minute"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="start"
-                            android:layout_marginStart="6sp"
-                            android:layout_marginBottom="-8sp"
-                            android:fontFamily="@font/roboto_condensed_bold"
-                            android:textColor="@color/light_grey"
-                            android:textSize="26sp"
-                            android:textStyle="bold"
-                            tools:text="MI" />
-
-                        <!-- 12h period AM / PM -->
-                        <TextView
-                            android:id="@+id/timePeriod"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="bottom"
-                            android:layout_marginStart="8sp"
-                            android:fontFamily="@font/roboto_condensed_bold"
-                            android:textColor="@color/light_grey"
-                            android:textSize="10sp"
-                            android:textStyle="bold"
-                            tools:ignore="SmallSp"
-                            tools:text="AM" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <!-- right side 1/2 height - bottom half -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginLeft="7dp"
-                android:layout_marginRight="7dp"
-                android:layout_weight="1"
-                android:baselineAligned="false"
-                android:gravity="start|top"
-                android:orientation="vertical"
-                android:weightSum="10">
-
-                <!--  right side bottom - status bar  2/10 -->
-                <LinearLayout
-                    android:id="@+id/secondary_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="2"
-                    android:baselineAligned="false"
-                    android:gravity="center_horizontal|center_vertical"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/delta"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:gravity="center_horizontal|center_vertical"
-                        android:text="+/-"
-                        android:textColor="@color/light_grey"
-                        android:textSize="10sp"
-                        android:textStyle="bold"
-                        tools:ignore="HardcodedText, SmallSp, NestedWeights" />
-
-                    <TextView
-                        android:id="@+id/avg_delta"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:gravity="center_horizontal|center_vertical"
-                        android:text="@string/abbreviation_average"
-                        android:textColor="@color/light_grey"
-                        android:textSize="10sp"
-                        android:textStyle="bold"
-                        tools:ignore="SmallSp" />
-
-                    <TextView
-                        android:id="@+id/uploader_battery"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:gravity="center_horizontal|center_vertical"
-                        android:text="--%"
-                        android:textColor="@color/light_grey"
-                        android:textSize="10sp"
-                        android:textStyle="bold"
-                        tools:ignore="HardcodedText,SmallSp" />
-
-                    <TextView
-                        android:id="@+id/rig_battery"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:gravity="center_horizontal|center_vertical"
-                        android:text="--%"
-                        android:textColor="@color/light_grey"
-                        android:textSize="10sp"
-                        android:textStyle="bold"
-                        android:visibility="gone"
-                        tools:ignore="HardcodedText,SmallSp" />
-
-                    <TextView
-                        android:id="@+id/basalRate"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1.7"
-                        android:gravity="center_horizontal|center_vertical"
-                        android:text="@string/no_tmp_basal_u_h"
-                        android:textColor="@color/light_grey"
-                        android:textSize="10sp"
-                        android:textStyle="bold"
-                        tools:ignore="SmallSp" />
-
-                    <TextView
-                        android:id="@+id/bgi"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:gravity="center_horizontal|center_vertical"
-                        android:textColor="@color/light_grey"
-                        android:textSize="10sp"
-                        android:textStyle="bold"
-                        android:visibility="gone"
-                        tools:ignore="SmallSp"
-                        tools:text="bgi" />
-
-                </LinearLayout>
-
-                <!--  right side bottom - diagram 6/10 -->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="6"
-                    android:baselineAligned="false"
-                    android:orientation="vertical"
-                    android:weightSum="1">
-
-                    <lecho.lib.hellocharts.view.LineChartView
-                        android:id="@+id/chart"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_gravity="bottom"
-                        android:layout_weight="1"
-                        android:gravity="center_horizontal|top"
-                        tools:ignore="NestedWeights" />
-
-                </LinearLayout>
-
-                <!--  right side bottom - spacer    2/10 -->
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="2" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <!--   FLAGs   -->
-    <View
-        android:id="@+id/AAPSv2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone" />
-
-</RelativeLayout>
diff --git a/wear/src/main/res/layout-notround/activity_home.xml b/wear/src/main/res/layout-notround/activity_home.xml
deleted file mode 100644
index 657d596e3a..0000000000
--- a/wear/src/main/res/layout-notround/activity_home.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    android:weightSum="1"
-    tools:context=".watchfaces.AapsWatchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-5dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingTop="5dp"
-        android:textAlignment="center"
-        android:weightSum="1">
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="-2dp"
-            android:gravity="bottom"
-            android:paddingTop="-2dp"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="41sp"
-            tools:ignore="HardcodedText" />
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_gravity="center_horizontal"
-            android:baselineAligned="false"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:textAlignment="center"
-            android:weightSum="1">
-
-            <TextView
-                android:id="@+id/direction"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
-                android:layout_marginTop="-2dp"
-                android:layout_marginBottom="-5dp"
-                android:gravity="center_horizontal|bottom"
-                android:paddingTop="1dp"
-                android:text="--"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="30sp"
-                android:textStyle="bold"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/delta"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal|bottom"
-                android:text="@string/delta_na"
-                android:textColor="@color/white"
-                android:textSize="10sp"
-                android:textStyle="bold"
-                tools:ignore="SmallSp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/secondary_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:background="@color/light_grey"
-        android:orientation="horizontal"
-        android:padding="1dp"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/time_stamp_na_min_ago"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="10sp"
-            tools:ignore="SmallSp" />
-
-        <TextView
-            android:id="@+id/uploader_battery"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="10sp"
-            android:paddingEnd="0sp"
-            android:text="@string/uploader_na"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="10sp"
-            tools:ignore="SmallSp" />
-
-        <TextView
-            android:id="@+id/raw"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="10sp"
-            android:paddingEnd="0sp"
-            android:text=""
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="10sp"
-            tools:ignore="SmallSp" />
-
-        <TextView
-            android:id="@+id/status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="10sp"
-            android:paddingEnd="0sp"
-            android:text="@string/no_status"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="10sp"
-            tools:ignore="SmallSp" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|top"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="35sp"
-        tools:text="12:00" />
-
-    <lecho.lib.hellocharts.view.LineChartView
-        android:id="@+id/chart"
-        android:layout_width="match_parent"
-        android:layout_height="77dp"
-        android:layout_gravity="bottom"
-        android:gravity="center_horizontal|top" />
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_home_2.xml b/wear/src/main/res/layout-notround/activity_home_2.xml
deleted file mode 100644
index ec10a98944..0000000000
--- a/wear/src/main/res/layout-notround/activity_home_2.xml
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    android:weightSum="1"
-    tools:context=".watchfaces.AapsV2Watchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:id="@+id/primary_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="0px"
-        android:layout_gravity="center_horizontal"
-        android:layout_weight="0.27"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/loop"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|center"
-            android:background="@drawable/loop_grey_25"
-            android:gravity="center"
-            android:text="--'"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|bottom"
-            android:layout_marginBottom="-2dp"
-            android:gravity="bottom|end"
-            android:paddingStart="5dp"
-            android:paddingTop="-2dp"
-            android:paddingEnd="5dp"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="38sp"
-            tools:ignore="HardcodedText" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/direction"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
-                android:gravity="center_horizontal|bottom"
-                android:text="--"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="22sp"
-                android:textStyle="bold"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/timestamp"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="2dp"
-                android:gravity="center"
-                android:text="--'"
-                android:textColor="@color/white"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                tools:ignore="HardcodedText" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/secondary_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="0px"
-        android:layout_gravity="center"
-        android:layout_weight="0.10"
-        android:background="@color/light_grey"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="1dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:paddingStart="2dp"
-            android:paddingEnd="2dp"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/delta"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="+/-"
-                android:textAlignment="center"
-                android:textColor="@color/black"
-                android:textSize="12sp"
-                android:textStyle="bold"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/avg_delta"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="@string/abbreviation_average"
-                android:textAlignment="center"
-                android:textColor="@color/black"
-                android:textSize="12sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/uploader_battery"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="--%"
-                android:textAlignment="center"
-                android:textColor="@color/black"
-                android:textSize="12sp"
-                android:textStyle="bold"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/rig_battery"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="--%"
-                android:textAlignment="center"
-                android:textColor="@color/black"
-                android:textSize="12sp"
-                android:textStyle="bold"
-                android:visibility="gone"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/basal_rate"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1.7"
-                android:gravity="center"
-                android:text="@string/no_tmp_basal_u_h"
-                android:textAlignment="center"
-                android:textColor="@color/black"
-                android:textSize="12sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/bgi"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:textAlignment="center"
-                android:textColor="@color/black"
-                android:textSize="12sp"
-                android:textStyle="bold"
-                android:visibility="gone"
-                tools:text="bgi" />
-
-            <View
-                android:id="@+id/AAPSv2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/tertiary_layout"
-        android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_gravity="center"
-        android:layout_weight="0.22"
-        android:background="@color/black"
-        android:baselineAligned="false"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:padding="1dp"
-        android:weightSum="7">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:baselineAligned="false"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/cob1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="@string/activity_carb"
-                android:textColor="@color/white"
-                android:textSize="10sp"
-                android:textStyle="bold"
-                tools:ignore="SmallSp" />
-
-            <TextView
-                android:id="@+id/cob2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="@string/no_cob_g"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="14sp"
-                android:textStyle="bold" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="0px"
-            android:layout_height="match_parent"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="30sp"
-            tools:text="12:00" />
-
-        <LinearLayout
-            android:id="@+id/date_time"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:textAlignment="center"
-            android:visibility="gone">
-
-            <TextView
-                android:id="@+id/day"
-                android:layout_width="23dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="10sp"
-                tools:ignore="SmallSp"
-                tools:text="day" />
-
-            <TextView
-                android:id="@+id/month"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:textColor="@color/white"
-                android:textSize="10sp"
-                tools:ignore="SmallSp"
-                tools:text="mth" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="0px"
-            android:layout_height="match_parent"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/iob1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="@string/activity_IOB"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="10sp"
-                android:textStyle="bold"
-                tools:ignore="SmallSp" />
-
-            <TextView
-                android:id="@+id/iob2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="@string/no_iob_u"
-                android:textColor="@color/white"
-                android:textSize="14sp"
-                android:textStyle="bold" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <lecho.lib.hellocharts.view.LineChartView
-        android:id="@+id/chart"
-        android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_gravity="bottom"
-        android:layout_weight="0.41"
-        android:gravity="center_horizontal|top" />
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_home_large.xml b/wear/src/main/res/layout-notround/activity_home_large.xml
deleted file mode 100644
index c3f3dd424c..0000000000
--- a/wear/src/main/res/layout-notround/activity_home_large.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    tools:context=".watchfaces.AapsWatchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="147dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingTop="15dp"
-        android:textAlignment="center"
-        android:weightSum="1">
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="55dp"
-            android:layout_gravity="bottom"
-            android:gravity="bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="50sp"
-            tools:ignore="HardcodedText" />
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_gravity="center_horizontal"
-            android:baselineAligned="false"
-            android:orientation="vertical"
-            android:textAlignment="center"
-            android:weightSum="1">
-
-            <TextView
-                android:id="@+id/direction"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
-                android:gravity="center_horizontal|bottom"
-                android:paddingTop="1dp"
-                android:text="--"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="27sp"
-                android:textStyle="bold"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/delta"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal"
-                android:text="@string/delta_na"
-                android:textColor="@color/white"
-                android:textSize="10sp"
-                tools:ignore="SmallSp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/secondary_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:background="@color/light_grey"
-        android:orientation="horizontal"
-        android:padding="2dp"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/time_stamp_na_min_ago"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/uploader_battery"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="10sp"
-            android:paddingEnd="0sp"
-            android:text="@string/uploader_na"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/raw"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="10sp"
-            android:paddingEnd="0sp"
-            android:text=""
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="10sp"
-            android:paddingEnd="0sp"
-            android:text="@string/no_status"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="12sp" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|top"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="55sp"
-        tools:text="12:00" />
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_nochart.xml b/wear/src/main/res/layout-notround/activity_nochart.xml
deleted file mode 100644
index 278470ec07..0000000000
--- a/wear/src/main/res/layout-notround/activity_nochart.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    tools:context=".watchfaces.AapsWatchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-5dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingTop="5dp"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginEnd="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="40sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="55sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/avg_delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginStart="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="40sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        tools:text="E xU/h  IOB: x (x+x)"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="24sp" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal|bottom"
-        android:orientation="horizontal"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginEnd="6dp"
-            tools:text="12:00"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="47sp" />
-
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:text="-- '"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="35sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_nochart_small.xml b/wear/src/main/res/layout-notround/activity_nochart_small.xml
deleted file mode 100644
index ea1c8c600d..0000000000
--- a/wear/src/main/res/layout-notround/activity_nochart_small.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:gravity="center_vertical|center_horizontal"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    tools:context=".watchfaces.NoChartWatchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-5dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingTop="5dp"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/delta"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="bottom"
-            android:layout_marginEnd="5dp"
-            android:gravity="center_vertical|center_horizontal|center"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="24sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="45sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/avg_delta"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginStart="5dp"
-            android:gravity="center_vertical|center_horizontal|center"
-            android:text=" ---"
-            android:textColor="@color/white"
-            android:textSize="26sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/dummy1"
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:layout_gravity="bottom"
-        android:gravity="center_horizontal" />
-
-    <TextView
-        android:id="@+id/status"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingBottom="2dp"
-        android:text="@string/no_loop_status"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="21sp" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal|bottom"
-        android:orientation="horizontal"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginEnd="6dp"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="45sp"
-            tools:text="23:24" />
-
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:text="--'"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="24sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_steampunk.xml b/wear/src/main/res/layout-notround/activity_steampunk.xml
deleted file mode 100644
index 2ce33bdc9a..0000000000
--- a/wear/src/main/res/layout-notround/activity_steampunk.xml
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".watchfaces.SteampunkWatchface"
-    tools:deviceIds="wear_round"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/glucose_dial"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:importantForAccessibility="no"
-            android:src="@drawable/steampunk_dial_mgdl" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/secondary_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:background="@drawable/steampunk_gauge_mgdl_20"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:weightSum="1">
-
-        <ImageView
-            android:id="@+id/delta_pointer"
-            android:layout_width="wrap_content"
-            android:layout_height="0px"
-            android:layout_gravity="center"
-            android:layout_weight="0.69"
-            android:gravity="center"
-            android:src="@drawable/steampunk_pointer" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:weightSum="1">
-
-        <LinearLayout
-            android:id="@+id/main_menu_tap"
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="0.7"
-            android:orientation="vertical"
-            android:weightSum="1">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0px"
-                android:layout_weight="0.05"
-                tools:ignore="NestedWeights" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0px"
-                android:layout_gravity="center"
-                android:layout_weight="0.26"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:weightSum="1">
-
-                <TextView
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_weight="0.2"
-                    android:gravity="center"
-                    android:textSize="11sp"
-                    android:textStyle="bold" />
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.165"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/cob2"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:paddingTop="7dp"
-                        android:rotation="-28"
-                        android:text="@string/no_cob_g"
-                        android:textAlignment="center"
-                        android:textColor="@color/black_86p"
-                        android:textSize="13sp"
-                        android:textStyle="bold" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.27"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/basalRate"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:paddingBottom="14dp"
-                        android:rotation="0"
-                        android:text="@string/no_tmp_basal_u_h"
-                        android:textAlignment="center"
-                        android:textColor="@color/black_86p"
-                        android:textSize="13sp"
-                        android:textStyle="bold" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.165"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/iob2"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:paddingTop="6dp"
-                        android:rotation="28"
-                        android:text="@string/no_iob_u"
-                        android:textAlignment="center"
-                        android:textColor="@color/black_86p"
-                        android:textSize="13sp"
-                        android:textStyle="bold" />
-
-                </LinearLayout>
-
-                <TextView
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_weight="0.2"
-                    android:gravity="center"
-                    android:textSize="11sp"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/chart_zoom_tap"
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="0.27"
-            android:orientation="horizontal"
-            android:weightSum="1">
-
-            <View
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.25"
-                tools:ignore="NestedWeights" />
-
-            <lecho.lib.hellocharts.view.LineChartView
-                android:id="@+id/chart"
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.5" />
-
-            <View
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.25"
-                android:orientation="horizontal" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="0.03" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/tertiary_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:weightSum="1">
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="0.15" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_gravity="center"
-            android:layout_weight="0.21"
-            android:baselineAligned="false"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:weightSum="1">
-
-            <View
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.32"
-                tools:ignore="NestedWeights" />
-
-            <LinearLayout
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.12"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/loop"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:paddingStart="0dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="8dp"
-                    android:rotation="-24"
-                    android:text="-'"
-                    android:textAlignment="center"
-                    android:textColor="@color/black_86p"
-                    android:textSize="12sp"
-                    android:textStyle="bold"
-                    tools:ignore="HardcodedText" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:layout_weight="0.12"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/rig_battery"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:text="--%"
-                    android:textAlignment="center"
-                    android:textColor="@color/black_86p"
-                    android:textSize="12sp"
-                    android:textStyle="bold"
-                    android:visibility="gone"
-                    tools:ignore="HardcodedText" />
-
-                <TextView
-                    android:id="@+id/uploader_battery"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:text="--%"
-                    android:textAlignment="center"
-                    android:textColor="@color/black_86p"
-                    android:textSize="12sp"
-                    android:textStyle="bold"
-                    tools:ignore="HardcodedText" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.12"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/timestamp"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:paddingStart="10dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="0dp"
-                    android:rotation="24"
-                    android:text="-'"
-                    android:textAlignment="center"
-                    android:textColor="@color/black_86p"
-                    android:textSize="12sp"
-                    android:textStyle="bold"
-                    tools:ignore="HardcodedText" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="0.32" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="0.64" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/cover_plate_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/steampunk_cover_plate"
-        android:orientation="vertical" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:weightSum="1">
-
-        <ImageView
-            android:id="@+id/hour_hand"
-            android:layout_width="wrap_content"
-            android:layout_height="0px"
-            android:layout_weight="0.3"
-            android:orientation="vertical"
-            android:rotation="0"
-            android:src="@drawable/steampunk_hour_hand" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:weightSum="1">
-
-        <ImageView
-            android:id="@+id/minute_hand"
-            android:layout_width="wrap_content"
-            android:layout_height="0px"
-            android:layout_weight="0.3"
-            android:orientation="vertical"
-            android:src="@drawable/steampunk_minute_hand" />
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/AAPSv2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone" />
-
-</RelativeLayout>
diff --git a/wear/src/main/res/layout-round/activity_bigchart.xml b/wear/src/main/res/layout-round/activity_bigchart.xml
deleted file mode 100644
index 4e4a6c351b..0000000000
--- a/wear/src/main/res/layout-round/activity_bigchart.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    tools:context=".watchfaces.AapsWatchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-2dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingTop="5dp"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginEnd="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="30sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="41sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/avg_delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginStart="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="30sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-    <lecho.lib.hellocharts.view.LineChartView
-        android:id="@+id/chart"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        android:gravity="center_horizontal" />
-
-    <TextView
-        android:id="@+id/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="18sp"
-        tools:text="E xU/h  IOB: x (x+x)" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginEnd="6dp"
-            android:textColor="@color/white"
-            android:textSize="35sp"
-            tools:text="12:00" />
-
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:text="-- '"
-            android:textColor="@color/white"
-            android:textSize="26sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_bigchart_small.xml b/wear/src/main/res/layout-round/activity_bigchart_small.xml
deleted file mode 100644
index b2f56b5e38..0000000000
--- a/wear/src/main/res/layout-round/activity_bigchart_small.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    tools:context=".watchfaces.AapsWatchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-5dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingTop="5dp"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal|center"
-            android:layout_marginEnd="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="24sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="34sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/avg_delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal|center"
-            android:layout_marginStart="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="24sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-5sp"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="18sp"
-        tools:text="E xU/h  IOB: x (x+x)" />
-
-    <lecho.lib.hellocharts.view.LineChartView
-        android:id="@+id/chart"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        android:gravity="center_horizontal" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-5sp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginEnd="6dp"
-            android:paddingTop="-5sp"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="34sp"
-            tools:text="12:00" />
-
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal|center"
-            android:text="--'"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="24sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_home.xml b/wear/src/main/res/layout-round/activity_home.xml
deleted file mode 100644
index 6863c34771..0000000000
--- a/wear/src/main/res/layout-round/activity_home.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    android:weightSum="1"
-    tools:context=".watchfaces.AapsWatchface"
-    tools:deviceIds="wear_round"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-5dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingTop="15dp"
-        android:textAlignment="center"
-        android:weightSum="1">
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|bottom"
-            android:layout_marginBottom="-2dp"
-            android:gravity="bottom|end"
-            android:paddingStart="0dp"
-            android:paddingTop="-2dp"
-            android:paddingEnd="5dp"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="41sp"
-            tools:ignore="HardcodedText" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_gravity="center_horizontal"
-            android:baselineAligned="false"
-            android:orientation="vertical"
-            android:textAlignment="center"
-            android:weightSum="1">
-
-            <TextView
-                android:id="@+id/direction"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
-                android:layout_marginTop="-2dp"
-                android:layout_marginBottom="-5dp"
-                android:gravity="center_horizontal|bottom"
-                android:text="--"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="30sp"
-                android:textStyle="bold"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/delta"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal|bottom"
-                android:text="@string/delta_na"
-                android:textColor="@color/white"
-                android:textSize="10sp"
-                android:textStyle="bold"
-                tools:ignore="SmallSp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/secondary_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/light_grey"
-        android:orientation="vertical"
-        android:padding="1dp">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/timestamp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/time_stamp_na_min_ago"
-                android:textAlignment="center"
-                android:textColor="@color/black"
-                android:textSize="8sp"
-                tools:ignore="SmallSp" />
-
-            <TextView
-                android:id="@+id/uploader_battery"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="10sp"
-                android:paddingEnd="0sp"
-                android:text="@string/uploader_na"
-                android:textAlignment="center"
-                android:textColor="@color/black"
-                android:textSize="8sp"
-                tools:ignore="SmallSp" />
-
-            <TextView
-                android:id="@+id/raw"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="10sp"
-                android:paddingEnd="0sp"
-                android:text=""
-                android:textAlignment="center"
-                android:textColor="@color/black"
-                android:textSize="8sp"
-                tools:ignore="SmallSp" />
-
-            <TextView
-                android:id="@+id/status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="10sp"
-                android:paddingEnd="0sp"
-                android:text="@string/no_status"
-                android:textAlignment="center"
-                android:textColor="@color/black"
-                android:textSize="8sp"
-                tools:ignore="SmallSp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-2dp"
-        android:layout_marginBottom="-3dp"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="30sp"
-        tools:text="12:00" />
-
-    <lecho.lib.hellocharts.view.LineChartView
-        android:id="@+id/chart"
-        android:layout_width="match_parent"
-        android:layout_height="77dp"
-        android:layout_gravity="bottom"
-        android:gravity="center_horizontal|top" />
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_home_large.xml b/wear/src/main/res/layout-round/activity_home_large.xml
deleted file mode 100644
index 82809cd93b..0000000000
--- a/wear/src/main/res/layout-round/activity_home_large.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    tools:context=".watchfaces.AapsWatchface"
-    tools:deviceIds="wear_round"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="147dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:gravity="center_vertical|center_horizontal"
-        android:orientation="horizontal"
-        android:paddingTop="30dp"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="0dp"
-            android:paddingEnd="10dp"
-            android:paddingBottom="3dp"
-            android:text="8.8"
-            android:textColor="@color/white"
-            android:textSize="50sp"
-            tools:ignore="HardcodedText" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_gravity="center_horizontal"
-            android:baselineAligned="false"
-            android:orientation="vertical"
-            android:textAlignment="center"
-            android:weightSum="1">
-
-            <TextView
-                android:id="@+id/direction"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
-                android:gravity="center_horizontal|bottom"
-                android:paddingTop="1dp"
-                android:text="--"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="27sp"
-                android:textStyle="bold"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/delta"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal"
-                android:text="@string/delta_na"
-                android:textColor="@color/white"
-                android:textSize="10sp"
-                tools:ignore="SmallSp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/secondary_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:background="@color/light_grey"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:padding="2dp">
-
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="--'"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="14sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/uploader_battery"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="10sp"
-            android:paddingEnd="0sp"
-            android:text="@string/uploader_na"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/raw"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="10sp"
-            android:paddingEnd="0sp"
-            android:text=""
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="10sp"
-            android:paddingEnd="0sp"
-            android:text="@string/no_status"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|top"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="55sp"
-        tools:text="12:00" />
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_nochart.xml b/wear/src/main/res/layout-round/activity_nochart.xml
deleted file mode 100644
index a241d5319b..0000000000
--- a/wear/src/main/res/layout-round/activity_nochart.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:gravity="center_vertical|center_horizontal"
-    android:orientation="vertical"
-    android:textAlignment="center"
-    tools:context=".watchfaces.NoChartWatchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-15dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginEnd="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="40sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="55sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/avg_delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginStart="5dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="40sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="24sp"
-        tools:text="E xU/h  IOB: x (x+x)" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal|bottom"
-        android:orientation="horizontal"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginEnd="6dp"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="47sp"
-            tools:text="12:00" />
-
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:text="-- '"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="35sp"
-            tools:ignore="HardcodedText" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_nochart_small.xml b/wear/src/main/res/layout-round/activity_nochart_small.xml
deleted file mode 100644
index b721bc1424..0000000000
--- a/wear/src/main/res/layout-round/activity_nochart_small.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:gravity="center_vertical|center_horizontal"
-    android:orientation="vertical"
-    tools:context=".watchfaces.AapsWatchface"
-    tools:deviceIds="wear_square"
-    tools:ignore="MissingDefaultResource">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="-15dp"
-        android:layout_marginBottom="5dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingTop="5dp"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/delta"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="bottom"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="-15dp"
-            android:gravity="center_vertical|center_horizontal|center"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="22sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/sgv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:text="---"
-            android:textColor="@color/white"
-            android:textSize="42sp"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/avg_delta"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginStart="5dp"
-            android:layout_marginBottom="-15dp"
-            android:gravity="center_vertical|center_horizontal|center"
-            android:text=" ---"
-            android:textColor="@color/white"
-            android:textSize="22sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/dummy1"
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:layout_gravity="bottom"
-        android:gravity="center_horizontal" />
-
-    <TextView
-        android:id="@+id/status"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingBottom="2dp"
-        android:text="@string/no_loop_status"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="21sp" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal|bottom"
-        android:orientation="horizontal"
-        android:textAlignment="center">
-
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginEnd="6dp"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="43sp"
-            tools:text="23:24" />
-
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:text="--'"
-            android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="24sp"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/wear/src/main/res/layout/action_confirm_ok.xml b/wear/src/main/res/layout/action_confirm_ok.xml
index 097dc75adb..c7ac3796bc 100644
--- a/wear/src/main/res/layout/action_confirm_ok.xml
+++ b/wear/src/main/res/layout/action_confirm_ok.xml
@@ -11,11 +11,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_margin="10sp"
+        android:layout_margin="10dp"
         android:background="@drawable/circle"
         android:backgroundTint="@color/white"
         android:contentDescription="@string/action_confirm"
-        android:padding="25sp"
+        android:padding="25dp"
         android:src="@drawable/ic_confirm"
         app:tint="@color/white" />
 
diff --git a/wear/src/main/res/layout/activity_bigchart.xml b/wear/src/main/res/layout/activity_bigchart.xml
new file mode 100644
index 0000000000..b7336b5943
--- /dev/null
+++ b/wear/src/main/res/layout/activity_bigchart.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:textAlignment="center"
+    tools:context=".watchfaces.BigChartWatchface">
+
+    <LinearLayout
+        android:id="@+id/linearLayout3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/delta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:gravity="bottom"
+            android:textSize="@dimen/watch_face_big_chart_delta_text_size"
+            tools:text="---" />
+
+        <TextView
+            android:id="@+id/sgv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="4dp"
+            android:textSize="@dimen/watch_face_big_chart_svg_text_size"
+            tools:text="---" />
+
+        <TextView
+            android:id="@+id/avg_delta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:textSize="@dimen/watch_face_big_chart_delta_text_size"
+            tools:text="---" />
+
+    </LinearLayout>
+
+    <lecho.lib.hellocharts.view.LineChartView
+        android:id="@+id/chart"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="-4dp"
+        app:layout_constraintBottom_toTopOf="@+id/status"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout3" />
+
+    <TextView
+        android:id="@+id/status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="-7dp"
+        android:textSize="@dimen/watch_face_status_text_size"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="E xU/h  IOB: x (x+x)" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:paddingBottom="6dp"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <TextView
+            android:id="@+id/time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="2dp"
+            android:textSize="@dimen/watch_face_time_text_size"
+            tools:text="12:00" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/timestamp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:maxLines="1"
+                android:textSize="@dimen/watch_face_timestamp_text_size"
+                tools:text="5'" />
+
+            <TextView
+                android:id="@+id/timePeriod"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:layout_marginTop="-5dp"
+                android:textSize="@dimen/watch_face_time_period_text_size"
+                android:textStyle="bold"
+                tools:text="AM" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/wear/src/main/res/layout/activity_circle.xml b/wear/src/main/res/layout/activity_circle.xml
index 57a9c6325a..f255957ab3 100644
--- a/wear/src/main/res/layout/activity_circle.xml
+++ b/wear/src/main/res/layout/activity_circle.xml
@@ -6,7 +6,8 @@
     android:layout_alignParentStart="true"
     android:layout_alignParentTop="true"
     android:gravity="center_vertical|center_horizontal"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".watchfaces.CircleWatchface">
 
     <TextView
         android:id="@+id/agoString"
diff --git a/wear/src/main/res/layout-round/activity_cockpit.xml b/wear/src/main/res/layout/activity_cockpit.xml
similarity index 99%
rename from wear/src/main/res/layout-round/activity_cockpit.xml
rename to wear/src/main/res/layout/activity_cockpit.xml
index 2c2c947844..a9f148c673 100644
--- a/wear/src/main/res/layout-round/activity_cockpit.xml
+++ b/wear/src/main/res/layout/activity_cockpit.xml
@@ -5,9 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/airplane_cockpit_outside_clouds"
-    tools:context=".watchfaces.CockpitWatchface"
-    tools:deviceIds="wear_round"
-    tools:ignore="MissingDefaultResource">
+    tools:context=".watchfaces.CockpitWatchface">
 
     <LinearLayout
         android:id="@+id/inside"
diff --git a/wear/src/main/res/layout-round/activity_digitalstyle.xml b/wear/src/main/res/layout/activity_digitalstyle.xml
similarity index 95%
rename from wear/src/main/res/layout-round/activity_digitalstyle.xml
rename to wear/src/main/res/layout/activity_digitalstyle.xml
index 2ae05baf56..3a91b592cd 100644
--- a/wear/src/main/res/layout-round/activity_digitalstyle.xml
+++ b/wear/src/main/res/layout/activity_digitalstyle.xml
@@ -5,18 +5,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"
-    tools:deviceIds="wear_round"
-    tools:ignore="MissingDefaultResource">
+    tools:context=".watchfaces.DigitalStyleWatchface">
 
     <!-- background-image with shapes elements-->
     <LinearLayout
         android:id="@+id/shapes_elements"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/digitalstyle_bg_full_round"
-        android:contentDescription="round-shape-elements"
-        android:orientation="horizontal"
-        tools:ignore="HardcodedText"  />
+        android:background="@drawable/digital_style_bg_full"
+        android:orientation="horizontal" />
 
     <!-- root-element-->
     <LinearLayout
@@ -66,6 +63,7 @@
                         android:id="@+id/cob1"
                         android:layout_width="match_parent"
                         android:layout_height="0dp"
+                        android:layout_marginTop="1dp"
                         android:layout_weight="2"
                         android:fontFamily="@font/roboto_slab_light"
                         android:gravity="bottom|center_horizontal"
@@ -78,6 +76,7 @@
                         android:id="@+id/cob2"
                         android:layout_width="match_parent"
                         android:layout_height="0dp"
+                        android:layout_marginTop="-1dp"
                         android:layout_weight="3"
                         android:fontFamily="@font/roboto_slab_light"
                         android:gravity="top|center_horizontal"
@@ -85,7 +84,7 @@
                         android:lines="1"
                         android:text="@string/cob_000g"
                         android:textColor="@color/white"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/watch_face_digital_sub_text_size" />
 
                 </LinearLayout>
 
@@ -150,7 +149,7 @@
                             android:text="--"
                             android:textAlignment="center"
                             android:textColor="@color/white"
-                            android:textSize="16sp"
+                            android:textSize="@dimen/watch_face_digital_direction_text_size"
                             android:textStyle="bold"
                             tools:ignore="HardcodedText" />
 
@@ -163,9 +162,10 @@
                             android:layout_marginBottom="2dp"
                             android:layout_weight="3"
                             android:fontFamily="sans-serif-condensed-light"
+                            android:maxLines="1"
                             android:text="--'"
                             android:textColor="@color/light_grey"
-                            android:textSize="10sp"
+                            android:textSize="@dimen/watch_face_digital_timestamp_text_size"
                             tools:ignore="HardcodedText,SmallSp" />
 
                         <View
@@ -196,7 +196,7 @@
                             android:lines="1"
                             android:text="@string/svg_00_0"
                             android:textColor="@color/white"
-                            android:textSize="20sp"
+                            android:textSize="@dimen/watch_face_digital_svg_text_size"
                             android:textStyle="bold" />
 
                     </LinearLayout>
@@ -240,6 +240,7 @@
                         android:id="@+id/iob1"
                         android:layout_width="match_parent"
                         android:layout_height="0dp"
+                        android:layout_marginTop="1dp"
                         android:layout_weight="2"
                         android:fontFamily="@font/roboto_slab_light"
                         android:gravity="bottom|center_horizontal"
@@ -252,14 +253,16 @@
                         android:id="@+id/iob2"
                         android:layout_width="match_parent"
                         android:layout_height="0dp"
+                        android:layout_marginTop="-1dp"
                         android:layout_weight="3"
                         android:fontFamily="@font/roboto_slab_light"
                         android:gravity="top|center_horizontal"
+
                         android:letterSpacing="-0.075"
                         android:lines="1"
                         android:text="@string/iob_0_00u"
                         android:textColor="@color/white"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/watch_face_digital_sub_text_size" />
 
                 </LinearLayout>
 
@@ -342,7 +345,6 @@
                             android:textColor="@color/light_grey"
                             android:textFontWeight="400"
                             android:textSize="18sp"
-                            android:visibility="gone"
                             tools:text="ww" />
 
                         <View
@@ -439,8 +441,9 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="start"
-                            android:layout_marginStart="6sp"
-                            android:layout_marginBottom="-8sp"
+                            android:layout_marginStart="6dp"
+                            android:layout_marginTop="-2dp"
+                            android:layout_marginBottom="-8dp"
                             android:fontFamily="@font/roboto_condensed_bold"
                             android:textColor="@color/light_grey"
                             android:textSize="26sp"
@@ -452,7 +455,7 @@
                             android:id="@+id/timePeriod"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="8sp"
+                            android:layout_marginStart="8dp"
                             android:fontFamily="@font/roboto_condensed_bold"
                             android:gravity="top"
                             android:textColor="@color/light_grey"
diff --git a/wear/src/main/res/layout/activity_home.xml b/wear/src/main/res/layout/activity_home.xml
new file mode 100644
index 0000000000..6a046da239
--- /dev/null
+++ b/wear/src/main/res/layout/activity_home.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".watchfaces.AapsWatchface">
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/secondary_layout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <TextView
+            android:id="@+id/sgv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="5dp"
+            android:gravity="bottom"
+            android:textSize="41sp"
+            tools:text="---" />
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/direction"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                tools:text="--" />
+
+            <TextView
+                android:id="@+id/delta"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:textSize="11sp"
+                android:textStyle="bold"
+                tools:text="1" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/secondary_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:background="?android:colorForeground"
+        android:gravity="center_horizontal"
+        android:paddingVertical="1dp"
+        app:layout_constraintBottom_toTopOf="@+id/time">
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:textColor="?android:textColorPrimaryInverse"
+            android:textSize="11sp"
+            android:textStyle="bold"
+            tools:text="@string/time_stamp_na_min_ago" />
+
+        <TextView
+            android:id="@+id/uploader_battery"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:textAlignment="center"
+            android:textColor="?android:textColorPrimaryInverse"
+            android:textSize="11sp"
+            android:textStyle="bold"
+            tools:text="@string/uploader_na" />
+
+        <TextView
+            android:id="@+id/raw"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:textAlignment="center"
+            android:textColor="?android:textColorPrimaryInverse"
+            android:textSize="11sp"
+            android:textStyle="bold"
+            tools:text="" />
+
+        <TextView
+            android:id="@+id/status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:textAlignment="center"
+            android:textColor="?android:textColorPrimaryInverse"
+            android:textSize="11sp"
+            android:textStyle="bold"
+            tools:text="@string/no_status" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        android:textAlignment="center"
+
+        android:textSize="35sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="12:00" />
+
+    <lecho.lib.hellocharts.view.LineChartView
+        android:id="@+id/chart"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="-5dp"
+        android:paddingBottom="7dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/time" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/wear/src/main/res/layout-round/activity_home_2.xml b/wear/src/main/res/layout/activity_home_2.xml
similarity index 57%
rename from wear/src/main/res/layout-round/activity_home_2.xml
rename to wear/src/main/res/layout/activity_home_2.xml
index 31c5ebf10f..0244393e33 100644
--- a/wear/src/main/res/layout-round/activity_home_2.xml
+++ b/wear/src/main/res/layout/activity_home_2.xml
@@ -1,96 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black"
     android:orientation="vertical"
-    android:textAlignment="center"
-    android:weightSum="1.1"
-    tools:context=".watchfaces.AapsV2Watchface"
-    tools:deviceIds="wear_round"
-    tools:ignore="MissingDefaultResource">
-
-    <View
-        android:layout_width="wrap_content"
-        android:layout_height="0px"
-        android:layout_weight="0.05"
-        android:orientation="vertical" />
+    tools:context=".watchfaces.AapsV2Watchface">
 
     <LinearLayout
         android:id="@+id/primary_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="0px"
-        android:layout_gravity="center_horizontal"
-        android:layout_weight="0.27"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
         android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:textAlignment="center">
+        app:layout_constraintBottom_toTopOf="@+id/secondary_layout"
+        app:layout_constraintTop_toTopOf="parent">
 
         <TextView
             android:id="@+id/loop"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom|center"
+            android:layout_gravity="bottom"
             android:background="@drawable/loop_grey_25"
             android:gravity="center"
-            android:text="--'"
-            android:textAlignment="center"
-            android:textColor="@color/white"
             android:textSize="14sp"
             android:textStyle="bold"
-            tools:ignore="HardcodedText" />
+            tools:text="--'" />
 
         <TextView
             android:id="@+id/sgv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|bottom"
+            android:layout_gravity=""
             android:layout_marginBottom="-2dp"
-            android:gravity="bottom|end"
-            android:paddingStart="5dp"
-            android:paddingTop="-2dp"
-            android:paddingEnd="5dp"
-            android:text="---"
-            android:textColor="@color/white"
+            android:paddingHorizontal="5dp"
             android:textSize="38sp"
-            tools:ignore="HardcodedText" />
+            tools:text="---" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
-            android:layout_gravity="center_horizontal"
-            android:baselineAligned="false"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:paddingStart="0dp"
-            android:paddingEnd="4dp">
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/direction"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
-                android:gravity="center_horizontal|bottom"
-                android:text="--"
-                android:textAlignment="center"
-                android:textColor="@color/white"
                 android:textSize="22sp"
                 android:textStyle="bold"
-                tools:ignore="HardcodedText" />
+                tools:text="--" />
 
             <TextView
                 android:id="@+id/timestamp"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="2dp"
                 android:gravity="center"
-                android:text="--'"
-                android:textColor="@color/white"
                 android:textSize="14sp"
                 android:textStyle="bold"
-                tools:ignore="HardcodedText" />
+                tools:text="--'" />
 
         </LinearLayout>
 
@@ -99,50 +67,39 @@
     <LinearLayout
         android:id="@+id/secondary_layout"
         android:layout_width="fill_parent"
-        android:layout_height="0px"
-        android:layout_gravity="center"
-        android:layout_weight="0.10"
-        android:background="@color/light_grey"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="1dp">
+        android:layout_height="wrap_content"
+        android:background="?android:colorForeground"
+        android:paddingVertical="1dp"
+        app:layout_constraintBottom_toTopOf="@+id/tertiary_layout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp"
-            android:textAlignment="center">
+            android:paddingHorizontal="5dp">
 
             <TextView
                 android:id="@+id/delta"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="+/-"
-                android:textAlignment="center"
-                android:textColor="@color/black"
+                android:textColor="?android:textColorPrimaryInverse"
                 android:textSize="13sp"
                 android:textStyle="bold"
-                tools:ignore="HardcodedText" />
+                tools:text="+/-" />
 
             <TextView
                 android:id="@+id/avg_delta"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/abbreviation_average"
-                android:textAlignment="center"
-                android:textColor="@color/black"
+                android:textColor="?android:textColorPrimaryInverse"
                 android:textSize="13sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                tools:text="@string/abbreviation_average" />
 
             <TextView
                 android:id="@+id/uploader_battery"
@@ -151,12 +108,11 @@
                 android:layout_gravity="center"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="--%"
                 android:textAlignment="center"
-                android:textColor="@color/black"
+                android:textColor="?android:textColorPrimaryInverse"
                 android:textSize="13sp"
                 android:textStyle="bold"
-                tools:ignore="HardcodedText" />
+                tools:text="--%" />
 
             <TextView
                 android:id="@+id/rig_battery"
@@ -165,39 +121,34 @@
                 android:layout_gravity="center"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="--%"
                 android:textAlignment="center"
-                android:textColor="@color/black"
+                android:textColor="?android:textColorPrimaryInverse"
                 android:textSize="13sp"
                 android:textStyle="bold"
-                android:visibility="gone"
-                tools:ignore="HardcodedText" />
+                android:visibility="visible"
+                tools:text="--%" />
 
             <TextView
                 android:id="@+id/basalRate"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:layout_weight="1.7"
                 android:gravity="center"
-                android:text="@string/no_tmp_basal_u_h"
-                android:textAlignment="center"
-                android:textColor="@color/black"
+                android:textColor="?android:textColorPrimaryInverse"
                 android:textSize="13sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                tools:text="@string/no_tmp_basal_u_h" />
 
             <TextView
                 android:id="@+id/bgi"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:textAlignment="center"
-                android:textColor="@color/black"
+                android:textColor="?android:textColorPrimaryInverse"
                 android:textSize="13sp"
                 android:textStyle="bold"
-                android:visibility="gone"
+                android:visibility="visible"
                 tools:text="bgi" />
 
             <View
@@ -213,46 +164,30 @@
     <LinearLayout
         android:id="@+id/tertiary_layout"
         android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_gravity="center"
-        android:layout_weight="0.22"
-        android:background="@color/black"
-        android:baselineAligned="false"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:padding="1dp"
-        android:weightSum="7">
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:weightSum="7"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:baselineAligned="false"
             android:gravity="center"
-            android:orientation="vertical"
-            android:textAlignment="center">
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/cob1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
                 android:text="@string/activity_carb"
-                android:textColor="@color/white"
-                android:textSize="10sp"
-                android:textStyle="bold"
-                tools:ignore="SmallSp" />
+                android:textSize="11sp" />
 
             <TextView
                 android:id="@+id/cob2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
                 android:text="@string/no_cob_g"
-                android:textAlignment="center"
-                android:textColor="@color/white"
                 android:textSize="14sp"
                 android:textStyle="bold" />
 
@@ -268,10 +203,7 @@
             android:id="@+id/time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
             android:textAlignment="center"
-            android:textColor="@color/white"
             android:textSize="30sp"
             tools:text="12:00" />
 
@@ -279,10 +211,8 @@
             android:id="@+id/date_time"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_gravity="center"
             android:gravity="center"
             android:orientation="vertical"
-            android:textAlignment="center"
             android:visibility="gone">
 
             <TextView
@@ -292,7 +222,6 @@
                 android:layout_gravity="center"
                 android:gravity="center"
                 android:textAlignment="center"
-                android:textColor="@color/white"
                 android:textSize="12sp"
                 tools:text="day" />
 
@@ -302,7 +231,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:gravity="center"
-                android:textColor="@color/white"
                 android:textSize="12sp"
                 tools:text="mth" />
 
@@ -327,12 +255,9 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:gravity="center"
-                android:text="@string/activity_IOB"
                 android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="10sp"
-                android:textStyle="bold"
-                tools:ignore="SmallSp" />
+                android:textSize="11sp"
+                tools:text="@string/activity_IOB" />
 
             <TextView
                 android:id="@+id/iob2"
@@ -340,28 +265,21 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:gravity="center"
-                android:text="@string/no_iob_u"
-                android:textColor="@color/white"
                 android:textSize="14sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                tools:text="@string/no_iob_u" />
 
         </LinearLayout>
 
-
     </LinearLayout>
 
     <lecho.lib.hellocharts.view.LineChartView
         android:id="@+id/chart"
         android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_gravity="bottom"
-        android:layout_weight="0.41"
-        android:gravity="center_horizontal|top" />
+        android:layout_height="0dp"
+        android:layout_marginTop="-5dp"
+        android:layout_marginBottom="7dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tertiary_layout" />
 
-    <View
-        android:layout_width="wrap_content"
-        android:layout_height="0px"
-        android:layout_weight="0.05"
-        android:orientation="vertical" />
-
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/wear/src/main/res/layout/activity_home_large.xml b/wear/src/main/res/layout/activity_home_large.xml
new file mode 100644
index 0000000000..5fa271ba53
--- /dev/null
+++ b/wear/src/main/res/layout/activity_home_large.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".watchfaces.AapsLargeWatchface">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/secondary_layout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <TextView
+            android:id="@+id/sgv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="0dp"
+            android:paddingEnd="10dp"
+            android:textSize="50sp"
+            tools:text="18.8" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/direction"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="27sp"
+                android:textStyle="bold"
+                tools:text="--" />
+
+            <TextView
+                android:id="@+id/delta"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textSize="11sp"
+                tools:text="@string/delta_na" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/secondary_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:colorForeground"
+        android:gravity="center_horizontal"
+        android:padding="2dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:textColorPrimaryInverse"
+            android:textSize="@dimen/watch_face_large_status_size"
+            tools:text="--'" />
+
+        <TextView
+            android:id="@+id/uploader_battery"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:textColor="?android:textColorPrimaryInverse"
+            android:textSize="@dimen/watch_face_large_status_size"
+            tools:text="@string/uploader_na" />
+
+        <TextView
+            android:id="@+id/raw"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:textColor="?android:textColorPrimaryInverse"
+            android:textSize="@dimen/watch_face_large_status_size"
+            tools:text="" />
+
+        <TextView
+            android:id="@+id/status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:textColor="?android:textColorPrimaryInverse"
+            android:textSize="14sp"
+            tools:text="@string/no_status" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/secondary_layout">
+
+        <TextView
+            android:id="@+id/time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/watch_face_large_time_text_size"
+            tools:text="01:00" />
+
+        <TextView
+            android:id="@+id/timePeriod"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="15sp"
+            android:layout_gravity="start"
+            android:textSize="@dimen/watch_face_large_time_period_text_size"
+            android:textStyle="bold"
+            tools:text="AM" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/wear/src/main/res/layout/activity_nochart.xml b/wear/src/main/res/layout/activity_nochart.xml
new file mode 100644
index 0000000000..de9874145c
--- /dev/null
+++ b/wear/src/main/res/layout/activity_nochart.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".watchfaces.NoChartWatchface">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="5dp"
+        app:layout_constraintBottom_toTopOf="@+id/status"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <TextView
+            android:id="@+id/delta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:maxLines="1"
+            android:textSize="@dimen/watch_face_delta_text_size"
+            tools:text="+0.0" />
+
+        <TextView
+            android:id="@+id/sgv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:paddingHorizontal="3dp"
+            android:textSize="@dimen/watch_face_svg_text_size"
+            tools:text="10.1" />
+
+        <TextView
+            android:id="@+id/avg_delta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:maxLines="1"
+            android:textSize="@dimen/watch_face_delta_text_size"
+            tools:text="+0.0" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textSize="@dimen/watch_face_no_chart_status_size"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="E xU/h  IOB: x (x+x)" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="5dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/status">
+
+        <TextView
+            android:id="@+id/time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="6dp"
+            android:textSize="@dimen/watch_face_time_text_size"
+            tools:text="12:00" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/timestamp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="7dp"
+                android:maxLines="1"
+                android:textSize="@dimen/watch_face_timestamp_text_size"
+                tools:text="5'" />
+
+            <TextView
+                android:id="@+id/timePeriod"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="-4dp"
+                android:textSize="11sp"
+                android:textStyle="bold"
+                tools:text="AM" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/wear/src/main/res/layout-round/activity_steampunk.xml b/wear/src/main/res/layout/activity_steampunk.xml
similarity index 98%
rename from wear/src/main/res/layout-round/activity_steampunk.xml
rename to wear/src/main/res/layout/activity_steampunk.xml
index 2ce33bdc9a..df28e95d6f 100644
--- a/wear/src/main/res/layout-round/activity_steampunk.xml
+++ b/wear/src/main/res/layout/activity_steampunk.xml
@@ -4,9 +4,7 @@
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".watchfaces.SteampunkWatchface"
-    tools:deviceIds="wear_round"
-    tools:ignore="MissingDefaultResource">
+    tools:context=".watchfaces.SteampunkWatchface">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -173,14 +171,14 @@
             <View
                 android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:layout_weight="0.25"
+                android:layout_weight="0.2"
                 tools:ignore="NestedWeights" />
 
             <lecho.lib.hellocharts.view.LineChartView
                 android:id="@+id/chart"
                 android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:layout_weight="0.5" />
+                android:layout_weight="0.55" />
 
             <View
                 android:layout_width="0px"
diff --git a/wear/src/main/res/values-sw200dp/dimens.xml b/wear/src/main/res/values-sw200dp/dimens.xml
new file mode 100644
index 0000000000..e262ff890a
--- /dev/null
+++ b/wear/src/main/res/values-sw200dp/dimens.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <!-- Watch face sizes for bigger larger screen sizes   -->
+    <dimen name="watch_face_svg_text_size">50sp</dimen>
+    <dimen name="watch_face_delta_text_size">25sp</dimen>
+    <dimen name="watch_face_time_text_size">45sp</dimen>
+    <dimen name="watch_face_timestamp_text_size">23sp</dimen>
+    <dimen name="watch_face_time_period_text_size">12sp</dimen>
+    <dimen name="watch_face_status_text_size">17sp</dimen>
+
+    <!--    Watch face specific-->
+    <dimen name="watch_face_no_chart_status_size">24sp</dimen>
+    <dimen name="watch_face_big_chart_svg_text_size">35sp</dimen>
+    <dimen name="watch_face_big_chart_delta_text_size">29sp</dimen>
+    <dimen name="watch_face_digital_svg_text_size">23sp</dimen>
+    <dimen name="watch_face_digital_direction_text_size">17sp</dimen>
+    <dimen name="watch_face_digital_timestamp_text_size">14sp</dimen>
+    <dimen name="watch_face_digital_sub_text_size">15sp</dimen>
+
+    <dimen name="watch_face_large_svg_text_size">55sp</dimen>
+    <dimen name="watch_face_large_direction_text_size">29sp</dimen>
+    <dimen name="watch_face_large_delta_text_size">13sp</dimen>
+    <dimen name="watch_face_large_time_text_size">55sp</dimen>
+    <dimen name="watch_face_large_time_period_text_size">13sp</dimen>
+
+</resources>
diff --git a/wear/src/main/res/values/dimens.xml b/wear/src/main/res/values/dimens.xml
index 0eaedf5064..f0142295e0 100644
--- a/wear/src/main/res/values/dimens.xml
+++ b/wear/src/main/res/values/dimens.xml
@@ -1,8 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!--Watch Resources list of common watches with DP
+Screen density = Screen width (or height) in pixels / Screen width (or height) in inches
+dp = (width in pixels * 160) / screen density
+
+Galaxy Watch 4 40mm:  1.2", 396 x 396 px = 192 dp
+Galaxy Watch 4 44mm: 1.4", 450 x 450 px = 224 dp
+Galaxy Watch 4 Classic 42mm: 1.19", 396 x 396 px = 190 dp
+Galaxy Watch 4 Classic 46mm: 1.4", 450 x 450 px = 224 dp
+Samsung Galaxy Watch 5 40mm: 1.2", 396 x 396 px = 192 dp
+Samsung Galaxy Watch 5 44mm: 1.4", 450 x 450 px = 224 dp
+TicWatch Pro 3:  1.39", 454 x 454 px = 222.4 dp
+Fossil  Gen 5: 1.28", 416 x 416 px = 204.8
+Google Pixel Watch: 1.2", 450 x 450 px =  192 dp
+-->
+
 <resources>
     <dimen name="simple_ui_svg_text_size">50sp</dimen>
     <dimen name="simple_ui_direction_text_size">35sp</dimen>
     <dimen name="simple_ui_time_text_size">35sp</dimen>
     <dimen name="simple_ui_y_offset">5dp</dimen>
+
+    <!-- Watch face sizes for small screen sizes   -->
+    <dimen name="watch_face_svg_text_size">40sp</dimen>
+    <dimen name="watch_face_delta_text_size">20sp</dimen>
+    <dimen name="watch_face_time_text_size">35sp</dimen>
+    <dimen name="watch_face_timestamp_text_size">17sp</dimen>
+    <dimen name="watch_face_time_period_text_size">11sp</dimen>
+    <dimen name="watch_face_status_text_size">15sp</dimen>
+    <!--    Watch face specific-->
+    <dimen name="watch_face_no_chart_status_size">20sp</dimen>
+    <dimen name="watch_face_big_chart_svg_text_size">30sp</dimen>
+    <dimen name="watch_face_big_chart_delta_text_size">25sp</dimen>
+
+    <dimen name="watch_face_digital_svg_text_size">20sp</dimen>
+    <dimen name="watch_face_digital_direction_text_size">16sp</dimen>
+    <dimen name="watch_face_digital_timestamp_text_size">10sp</dimen>
+    <dimen name="watch_face_digital_sub_text_size">14sp</dimen>
+
+    <dimen name="watch_face_large_svg_text_size">50sp</dimen>
+    <dimen name="watch_face_large_direction_text_size">27sp</dimen>
+    <dimen name="watch_face_large_delta_text_size">11sp</dimen>
+    <dimen name="watch_face_large_time_text_size">50sp</dimen>
+    <dimen name="watch_face_large_time_period_text_size">11sp</dimen>
+    <dimen name="watch_face_large_status_size">14sp</dimen>
+
 </resources>
diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml
index 2c05f1d147..14a6114494 100644
--- a/wear/src/main/res/values/strings.xml
+++ b/wear/src/main/res/values/strings.xml
@@ -216,9 +216,9 @@
     <string name="no_iob_u">--U</string>
     <string name="no_cob_g">--g</string>
     <string name="no_tmp_basal_u_h">-.--U/h</string>
-    <string name="uploader_na">Uploader: ---%</string>
-    <string name="no_status">S: no status</string>
-    <string name="time_stamp_na_min_ago">-- Minutes ago</string>
+    <string name="uploader_na">U: --%</string>
+    <string name="no_status">S: --</string>
+    <string name="time_stamp_na_min_ago">-- Min. ago</string>
     <string name="delta_na">--- mg/dl</string>
     <string name="no_loop_status">No Loop Status</string>
     <string name="cob_000g">000g</string>