diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 04b178307d..eb12cc4f02 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -79,6 +79,9 @@
             <intent-filter>
                 <action android:name="android.service.wallpaper.WallpaperService" />
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
             </intent-filter>
         </service>
 
@@ -124,6 +127,9 @@
             <intent-filter>
                 <action android:name="android.service.wallpaper.WallpaperService" />
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
             </intent-filter>
         </service>
 
@@ -145,6 +151,9 @@
             <intent-filter>
                 <action android:name="android.service.wallpaper.WallpaperService" />
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
             </intent-filter>
         </service>
 
@@ -166,6 +175,9 @@
             <intent-filter>
                 <action android:name="android.service.wallpaper.WallpaperService" />
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
             </intent-filter>
         </service>
         <service
@@ -207,6 +219,9 @@
             <intent-filter>
                 <action android:name="android.service.wallpaper.WallpaperService" />
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
             </intent-filter>
         </service>
 
diff --git a/wear/src/main/res/layout/rect_activity_digitalstyle.xml b/wear/src/main/res/layout/rect_activity_digitalstyle.xml
index 8d22bc8e3d..76028d1c39 100644
--- a/wear/src/main/res/layout/rect_activity_digitalstyle.xml
+++ b/wear/src/main/res/layout/rect_activity_digitalstyle.xml
@@ -317,19 +317,21 @@
                             android:textColor="@color/white"
                             android:textFontWeight="400"
                             android:textSize="18sp" />
+
                         <TextView
                             android:id="@+id/weeknumber"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="4"
                             android:fontFamily="@font/roboto_condensed_light"
+                            android:letterSpacing="-0.1"
                             android:text="ww"
                             android:textAllCaps="true"
                             android:textColor="@color/light_grey"
                             android:textFontWeight="400"
                             android:textSize="18sp"
-                            android:letterSpacing="-0.1"
-                            android:visibility="gone"/>
+                            android:visibility="gone" />
+
                         <Space
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
@@ -529,6 +531,22 @@
                         android:layout_gravity="bottom"
                         android:layout_weight="1"
                         android:gravity="center_horizontal|top" />
+
+                    <TextView
+                        android:id="@+id/direction2"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="3"
+                        android:fontFamily="sans-serif-condensed-medium"
+                        android:gravity="center_horizontal"
+                        android:text="--"
+                        android:textAlignment="center"
+                        android:textColor="@color/white"
+                        android:textSize="40sp"
+                        android:textStyle="bold"
+                        android:visibility="gone" />
+
                 </LinearLayout>
 
                 <!--  right side bottom - spacer    2/10 -->
@@ -540,6 +558,10 @@
         </LinearLayout>
     </LinearLayout>
 
+    <include
+        android:id="@+id/simple_ui"
+        layout="@layout/simple_ui"
+        android:visibility="gone" />
 
     <!--   FLAGs   -->
 
diff --git a/wear/src/main/res/layout/rect_activity_home.xml b/wear/src/main/res/layout/rect_activity_home.xml
index a069b5ed28..1adf62fa5c 100644
--- a/wear/src/main/res/layout/rect_activity_home.xml
+++ b/wear/src/main/res/layout/rect_activity_home.xml
@@ -154,4 +154,9 @@
 
     </LinearLayout>
 
+    <include
+        android:id="@+id/simple_ui"
+        layout="@layout/simple_ui"
+        android:visibility="gone" />
+
 </RelativeLayout>
diff --git a/wear/src/main/res/layout/rect_activity_home_large.xml b/wear/src/main/res/layout/rect_activity_home_large.xml
index a6da174128..e3fd3012e0 100644
--- a/wear/src/main/res/layout/rect_activity_home_large.xml
+++ b/wear/src/main/res/layout/rect_activity_home_large.xml
@@ -136,4 +136,9 @@
 
     </LinearLayout>
 
+    <include
+        android:id="@+id/simple_ui"
+        layout="@layout/simple_ui"
+        android:visibility="gone" />
+
 </RelativeLayout>
diff --git a/wear/src/main/res/layout/rect_cockpit.xml b/wear/src/main/res/layout/rect_cockpit.xml
index cf26712258..26b0e79d64 100644
--- a/wear/src/main/res/layout/rect_cockpit.xml
+++ b/wear/src/main/res/layout/rect_cockpit.xml
@@ -488,4 +488,9 @@
 
     </LinearLayout>
 
+    <include
+        android:id="@+id/simple_ui"
+        layout="@layout/simple_ui"
+        android:visibility="gone" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/wear/src/main/res/layout/rect_steampunk.xml b/wear/src/main/res/layout/rect_steampunk.xml
index 03bad38d4d..91efff6d31 100644
--- a/wear/src/main/res/layout/rect_steampunk.xml
+++ b/wear/src/main/res/layout/rect_steampunk.xml
@@ -378,4 +378,9 @@
         android:layout_height="wrap_content"
         android:visibility="gone"/>
 
-</RelativeLayout>
\ No newline at end of file
+    <include
+        android:id="@+id/simple_ui"
+        layout="@layout/simple_ui"
+        android:visibility="gone" />
+
+</RelativeLayout>
diff --git a/wear/src/main/res/layout/round_activity_digitalstyle.xml b/wear/src/main/res/layout/round_activity_digitalstyle.xml
index 02a638d6ab..8357c48fa1 100644
--- a/wear/src/main/res/layout/round_activity_digitalstyle.xml
+++ b/wear/src/main/res/layout/round_activity_digitalstyle.xml
@@ -121,6 +121,7 @@
 
                     <!-- 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"
@@ -317,19 +318,21 @@
                             android:textColor="@color/white"
                             android:textFontWeight="400"
                             android:textSize="18sp" />
+
                         <TextView
                             android:id="@+id/weeknumber"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="4"
                             android:fontFamily="@font/roboto_condensed_light"
+                            android:letterSpacing="-0.1"
                             android:text="ww"
                             android:textAllCaps="true"
                             android:textColor="@color/light_grey"
                             android:textFontWeight="400"
                             android:textSize="18sp"
-                            android:letterSpacing="-0.1"
-                            android:visibility="gone"/>
+                            android:visibility="gone" />
+
                         <Space
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
@@ -426,12 +429,12 @@
             <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="left|top"
                 android:orientation="vertical"
-                android:layout_marginLeft="7dp"
-                android:layout_marginRight="7dp"
                 android:weightSum="10">
 
                 <!--  right side bottom - statusbar  2/10 -->
@@ -529,6 +532,21 @@
                         android:layout_gravity="bottom"
                         android:layout_weight="1"
                         android:gravity="center_horizontal|top" />
+
+                    <TextView
+                        android:id="@+id/direction2"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="3"
+                        android:fontFamily="sans-serif-condensed-medium"
+                        android:gravity="center_horizontal"
+                        android:text="--"
+                        android:textAlignment="center"
+                        android:textColor="@color/white"
+                        android:textSize="40sp"
+                        android:textStyle="bold"
+                        android:visibility="gone" />
                 </LinearLayout>
 
                 <!--  right side bottom - spacer    2/10 -->
@@ -541,7 +559,10 @@
         </LinearLayout>
     </LinearLayout>
 
-
+    <include
+        android:id="@+id/simple_ui"
+        layout="@layout/simple_ui"
+        android:visibility="gone" />
     <!--   FLAGs   -->
 
     <TextView
diff --git a/wear/src/main/res/layout/round_activity_home.xml b/wear/src/main/res/layout/round_activity_home.xml
index e647175bf4..d4831d7531 100644
--- a/wear/src/main/res/layout/round_activity_home.xml
+++ b/wear/src/main/res/layout/round_activity_home.xml
@@ -152,4 +152,9 @@
 
     </LinearLayout>
 
+    <include
+        android:id="@+id/simple_ui"
+        layout="@layout/simple_ui"
+        android:visibility="gone" />
+
 </RelativeLayout>
diff --git a/wear/src/main/res/layout/round_activity_home_2.xml b/wear/src/main/res/layout/round_activity_home_2.xml
index e2a4b31730..35c07352a2 100644
--- a/wear/src/main/res/layout/round_activity_home_2.xml
+++ b/wear/src/main/res/layout/round_activity_home_2.xml
@@ -26,7 +26,7 @@
             android:layout_width="fill_parent"
             android:layout_height="0px"
             android:layout_gravity="center_horizontal"
-            android:layout_weight="@dimen/home2_primary_layout_height"
+            android:layout_weight="0.27"
             android:gravity="center_horizontal"
             android:orientation="horizontal"
             android:textAlignment="center">
@@ -56,7 +56,7 @@
                 android:paddingRight="5dp"
                 android:text="---"
                 android:textColor="#FFFFFF"
-                android:textSize="@dimen/home2_sgv_text_size" />
+                android:textSize="38sp" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -77,7 +77,7 @@
                     android:text="--"
                     android:textAlignment="center"
                     android:textColor="#FFFFFF"
-                    android:textSize="@dimen/home2_direction_text_size"
+                    android:textSize="22sp"
                     android:textStyle="bold" />
 
                 <TextView
@@ -282,7 +282,7 @@
                     android:text="12:00"
                     android:textAlignment="center"
                     android:textColor="#FFFFFF"
-                    android:textSize="@dimen/home2_time_text_size" />
+                    android:textSize="30sp" />
 
                 <LinearLayout
                     android:id="@+id/date_time"
@@ -383,4 +383,9 @@
 
     </LinearLayout>
 
+    <include
+        android:id="@+id/simple_ui"
+        layout="@layout/simple_ui"
+        android:visibility="gone" />
+
 </RelativeLayout>
diff --git a/wear/src/main/res/layout/round_activity_home_large.xml b/wear/src/main/res/layout/round_activity_home_large.xml
index 9569d5d1ab..054584b842 100644
--- a/wear/src/main/res/layout/round_activity_home_large.xml
+++ b/wear/src/main/res/layout/round_activity_home_large.xml
@@ -135,4 +135,9 @@
 
     </LinearLayout>
 
+    <include
+        android:id="@+id/simple_ui"
+        layout="@layout/simple_ui"
+        android:visibility="gone" />
+
 </RelativeLayout>
diff --git a/wear/src/main/res/layout/round_cockpit.xml b/wear/src/main/res/layout/round_cockpit.xml
index afdecf8a43..856f2ee6a3 100644
--- a/wear/src/main/res/layout/round_cockpit.xml
+++ b/wear/src/main/res/layout/round_cockpit.xml
@@ -488,4 +488,9 @@
 
     </LinearLayout>
 
+    <include
+        android:id="@+id/simple_ui"
+        layout="@layout/simple_ui"
+        android:visibility="gone" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/wear/src/main/res/layout/round_steampunk.xml b/wear/src/main/res/layout/round_steampunk.xml
index c82caa2d4b..2d66ada9cb 100644
--- a/wear/src/main/res/layout/round_steampunk.xml
+++ b/wear/src/main/res/layout/round_steampunk.xml
@@ -378,4 +378,9 @@
         android:layout_height="wrap_content"
         android:visibility="gone"/>
 
-</RelativeLayout>
\ No newline at end of file
+    <include
+        android:id="@+id/simple_ui"
+        layout="@layout/simple_ui"
+        android:visibility="gone" />
+
+</RelativeLayout>
diff --git a/wear/src/main/res/xml/watch_face_configuration_cockpit.xml b/wear/src/main/res/xml/watch_face_configuration_cockpit.xml
index 2e45811780..2e8ef3c100 100644
--- a/wear/src/main/res/xml/watch_face_configuration_cockpit.xml
+++ b/wear/src/main/res/xml/watch_face_configuration_cockpit.xml
@@ -2,13 +2,19 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
-
-
     <CheckBoxPreference
         android:key="vibrate_Hourly"
         android:title="@string/pref_vibrate_hourly"
         android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
+
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="simplify_ui_charging"
+        android:summary="@string/pref_simplify_ui_charging_sum"
+        android:title="@string/pref_simplify_ui_charging"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on" />
+
 </PreferenceScreen>
diff --git a/wear/src/main/res/xml/watch_face_configuration_digitalstyle.xml b/wear/src/main/res/xml/watch_face_configuration_digitalstyle.xml
index 5a29f508fa..d03498d32b 100644
--- a/wear/src/main/res/xml/watch_face_configuration_digitalstyle.xml
+++ b/wear/src/main/res/xml/watch_face_configuration_digitalstyle.xml
@@ -50,4 +50,13 @@
         android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
+
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="simplify_ui_charging"
+        android:summary="@string/pref_simplify_ui_charging_sum"
+        android:title="@string/pref_simplify_ui_charging"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on" />
+
 </PreferenceScreen>
diff --git a/wear/src/main/res/xml/watch_face_configuration_home.xml b/wear/src/main/res/xml/watch_face_configuration_home.xml
index 6aae7b88eb..fbe3015eab 100644
--- a/wear/src/main/res/xml/watch_face_configuration_home.xml
+++ b/wear/src/main/res/xml/watch_face_configuration_home.xml
@@ -24,4 +24,13 @@
         android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
+
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="simplify_ui_charging"
+        android:summary="@string/pref_simplify_ui_charging_sum"
+        android:title="@string/pref_simplify_ui_charging"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on" />
+
 </PreferenceScreen>
diff --git a/wear/src/main/res/xml/watch_face_configuration_largehome.xml b/wear/src/main/res/xml/watch_face_configuration_largehome.xml
index 6aae7b88eb..fbe3015eab 100644
--- a/wear/src/main/res/xml/watch_face_configuration_largehome.xml
+++ b/wear/src/main/res/xml/watch_face_configuration_largehome.xml
@@ -24,4 +24,13 @@
         android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
+
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="simplify_ui_charging"
+        android:summary="@string/pref_simplify_ui_charging_sum"
+        android:title="@string/pref_simplify_ui_charging"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on" />
+
 </PreferenceScreen>
diff --git a/wear/src/main/res/xml/watch_face_configuration_steampunk.xml b/wear/src/main/res/xml/watch_face_configuration_steampunk.xml
index fea4e8f192..0b7358c1f6 100644
--- a/wear/src/main/res/xml/watch_face_configuration_steampunk.xml
+++ b/wear/src/main/res/xml/watch_face_configuration_steampunk.xml
@@ -16,4 +16,13 @@
         android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
+
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="simplify_ui_charging"
+        android:summary="@string/pref_simplify_ui_charging_sum"
+        android:title="@string/pref_simplify_ui_charging"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on" />
+
 </PreferenceScreen>