diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt
index ca9edb95e6..facb140c27 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt
@@ -270,7 +270,7 @@ class CustomWatchface : BaseWatchFace() {
         }
         val metadataMap = ZipWatchfaceFormat.loadMetadata(json)
         val drawableDataMap: CwfResDataMap = mutableMapOf()
-        getResourceByteArray(info.nightscout.shared.impl.R.drawable.watchface_custom)?.let {
+        getResourceByteArray(app.aaps.shared.impl.R.drawable.watchface_custom)?.let {
             drawableDataMap[ResFileMap.CUSTOM_WATCHFACE.fileName] = ResData(it, ResFormat.PNG)
         }
         return EventData.ActionSetCustomWatchface(CwfData(json.toString(4), metadataMap, drawableDataMap))
@@ -288,13 +288,13 @@ class CustomWatchface : BaseWatchFace() {
     }
 
     private fun setVisibility(visibility: String, pref: Boolean = true): Int = when (visibility) {
-        JsonKeyValues.VISIBLE.key   -> pref.toVisibility()
-        else                        -> View.GONE
+        JsonKeyValues.VISIBLE.key -> pref.toVisibility()
+        else                      -> View.GONE
     }
 
     private fun getVisibility(visibility: Int): String = when (visibility) {
-        View.VISIBLE   -> JsonKeyValues.VISIBLE.key
-        else           -> JsonKeyValues.GONE.key
+        View.VISIBLE -> JsonKeyValues.VISIBLE.key
+        else         -> JsonKeyValues.GONE.key
     }
 
     private fun getResourceByteArray(resourceId: Int): ByteArray? {
@@ -366,7 +366,7 @@ class CustomWatchface : BaseWatchFace() {
         BACKGROUND(
             key = ViewKeys.BACKGROUND.key,
             id = R.id.background,
-            defaultDrawable = info.nightscout.shared.impl.R.drawable.background,
+            defaultDrawable = app.aaps.shared.impl.R.drawable.background,
             customDrawable = ResFileMap.BACKGROUND,
             customHigh = ResFileMap.BACKGROUND_HIGH,
             customLow = ResFileMap.BACKGROUND_LOW
@@ -409,7 +409,7 @@ class CustomWatchface : BaseWatchFace() {
         COVER_PLATE(
             key = ViewKeys.COVER_PLATE.key,
             id = R.id.cover_plate,
-            defaultDrawable = info.nightscout.shared.impl.R.drawable.simplified_dial,
+            defaultDrawable = app.aaps.shared.impl.R.drawable.simplified_dial,
             customDrawable = ResFileMap.COVER_PLATE,
             customHigh = ResFileMap.COVER_PLATE_HIGH,
             customLow = ResFileMap.COVER_PLATE_LOW
@@ -417,7 +417,7 @@ class CustomWatchface : BaseWatchFace() {
         HOUR_HAND(
             key = ViewKeys.HOUR_HAND.key,
             id = R.id.hour_hand,
-            defaultDrawable = info.nightscout.shared.impl.R.drawable.hour_hand,
+            defaultDrawable = app.aaps.shared.impl.R.drawable.hour_hand,
             customDrawable = ResFileMap.HOUR_HAND,
             customHigh = ResFileMap.HOUR_HAND_HIGH,
             customLow = ResFileMap.HOUR_HAND_LOW
@@ -425,7 +425,7 @@ class CustomWatchface : BaseWatchFace() {
         MINUTE_HAND(
             key = ViewKeys.MINUTE_HAND.key,
             id = R.id.minute_hand,
-            defaultDrawable = info.nightscout.shared.impl.R.drawable.minute_hand,
+            defaultDrawable = app.aaps.shared.impl.R.drawable.minute_hand,
             customDrawable = ResFileMap.MINUTE_HAND,
             customHigh = ResFileMap.MINUTE_HAND_HIGH,
             customLow = ResFileMap.MINUTE_HAND_LOW
@@ -434,13 +434,14 @@ class CustomWatchface : BaseWatchFace() {
             key = ViewKeys.SECOND_HAND.key,
             id = R.id.second_hand,
             pref = R.string.key_show_seconds,
-            defaultDrawable = info.nightscout.shared.impl.R.drawable.second_hand,
+            defaultDrawable = app.aaps.shared.impl.R.drawable.second_hand,
             customDrawable = ResFileMap.SECOND_HAND,
             customHigh = ResFileMap.SECOND_HAND_HIGH,
             customLow = ResFileMap.SECOND_HAND_LOW
         );
 
         companion object {
+
             fun init(cwf: CustomWatchface) = values().forEach { it.cwf = cwf }
             fun fromId(id: Int): ViewMap? = values().firstOrNull { it.id == id }
         }
@@ -458,7 +459,10 @@ class CustomWatchface : BaseWatchFace() {
 
                 0L   -> {
                     cwf.resDataMap[cd.fileName]?.toDrawable(cwf.resources)
-                }-1L  -> { customLow?.let { resFileMap -> cwf.resDataMap[resFileMap.fileName] }?.toDrawable(cwf.resources) ?: cwf.resDataMap[cd.fileName]?.toDrawable(cwf.resources)
+                }
+
+                -1L  -> {
+                    customLow?.let { resFileMap -> cwf.resDataMap[resFileMap.fileName] }?.toDrawable(cwf.resources) ?: cwf.resDataMap[cd.fileName]?.toDrawable(cwf.resources)
                 }
 
                 else -> cwf.resDataMap[cd.fileName]?.toDrawable(cwf.resources)