diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 379afabddf..785aa84c38 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -129,7 +129,14 @@ public class MainApp extends Application {
         sConstraintsChecker = new ConstraintChecker();
         sDatabaseHelper = OpenHelperManager.getHelper(sInstance, DatabaseHelper.class);
 
-        Thread.setDefaultUncaughtExceptionHandler((thread, ex) -> log.error("Uncaught exception crashing app", ex));
+        Thread.setDefaultUncaughtExceptionHandler((thread, ex) -> {
+            if (ex instanceof InternalError) {
+                // usually the app trying to spawn a thread while being killed
+                return;
+            }
+
+            log.error("Uncaught exception crashing app", ex);
+        });
 
         try {
             if (FabricPrivacy.fabricEnabled()) {
@@ -204,7 +211,7 @@ public class MainApp extends Application {
             pluginsList.add(SourcePoctechPlugin.getPlugin());
             pluginsList.add(SourceTomatoPlugin.getPlugin());
             pluginsList.add(SourceEversensePlugin.getPlugin());
-            if (!Config.NSCLIENT) pluginsList.add(SmsCommunicatorPlugin.getPlugin());
+            if (!Config.NSCLIENT) pluginsList.add(SmsCommunicatorPlugin.INSTANCE);
             pluginsList.add(FoodPlugin.getPlugin());
 
             pluginsList.add(WearPlugin.initPlugin(this));
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
index 367429dbbf..0e93a47151 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
@@ -9,27 +9,28 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
-import android.text.TextUtils;
 
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventRebuildTabs;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin;
-import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin;
-import info.nightscout.androidaps.plugins.general.tidepool.TidepoolPlugin;
-import info.nightscout.androidaps.plugins.general.tidepool.comm.TidepoolUploader;
-import info.nightscout.androidaps.plugins.insulin.InsulinOrefFreePeakPlugin;
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.aps.openAPSMA.OpenAPSMAPlugin;
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin;
+import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin;
+import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin;
+import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin;
+import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
+import info.nightscout.androidaps.plugins.general.tidepool.TidepoolPlugin;
+import info.nightscout.androidaps.plugins.general.wear.WearPlugin;
+import info.nightscout.androidaps.plugins.general.xdripStatusline.StatuslinePlugin;
+import info.nightscout.androidaps.plugins.insulin.InsulinOrefFreePeakPlugin;
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
@@ -42,14 +43,9 @@ import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref0Plugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
-import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
-import info.nightscout.androidaps.plugins.general.wear.WearPlugin;
-import info.nightscout.androidaps.plugins.general.xdripStatusline.StatuslinePlugin;
 import info.nightscout.androidaps.plugins.source.SourceDexcomPlugin;
-import info.nightscout.androidaps.utils.LocaleHelper;
 import info.nightscout.androidaps.utils.OKDialog;
 import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin;
 
 public class PreferencesActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
     MyPreferenceFragment myPreferenceFragment;
@@ -80,7 +76,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
         if (key.equals(MainApp.gs(R.string.key_openapsama_useautosens)) && SP.getBoolean(R.string.key_openapsama_useautosens, false)) {
             OKDialog.show(this, MainApp.gs(R.string.configbuilder_sensitivity), MainApp.gs(R.string.sensitivity_warning), null);
         }
-        updatePrefSummary(myPreferenceFragment.getPreference(key));
+        updatePrefSummary(myPreferenceFragment.findPreference(key));
     }
 
     private static void updatePrefSummary(Preference pref) {
@@ -92,13 +88,13 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
             EditTextPreference editTextPref = (EditTextPreference) pref;
             if (pref.getKey().contains("password") || pref.getKey().contains("secret")) {
                 pref.setSummary("******");
-            } else if (pref.getKey().equals(MainApp.gs(R.string.key_danars_name))) {
-                pref.setSummary(SP.getString(R.string.key_danars_name, ""));
             } else if (editTextPref.getText() != null) {
                 ((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage());
                 pref.setSummary(editTextPref.getText());
-            } else if (pref.getKey().contains("smscommunicator_allowednumbers") && (editTextPref.getText() == null || TextUtils.isEmpty(editTextPref.getText().trim()))) {
-                pref.setSummary(MainApp.gs(R.string.smscommunicator_allowednumbers_summary));
+            } else {
+                for (PluginBase plugin : MainApp.getPluginsList()) {
+                    plugin.updatePreferenceSummary(pref);
+                }
             }
         }
     }
@@ -188,7 +184,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
 
                 addPreferencesFromResourceIfEnabled(NSClientPlugin.getPlugin(), PluginType.GENERAL);
                 addPreferencesFromResourceIfEnabled(TidepoolPlugin.INSTANCE, PluginType.GENERAL);
-                addPreferencesFromResourceIfEnabled(SmsCommunicatorPlugin.getPlugin(), PluginType.GENERAL);
+                addPreferencesFromResourceIfEnabled(SmsCommunicatorPlugin.INSTANCE, PluginType.GENERAL);
                 addPreferencesFromResourceIfEnabled(AutomationPlugin.INSTANCE, PluginType.GENERAL);
 
                 addPreferencesFromResource(R.xml.pref_others);
@@ -198,26 +194,11 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
                 addPreferencesFromResourceIfEnabled(StatuslinePlugin.getPlugin(), PluginType.GENERAL);
             }
 
-            if (Config.NSCLIENT) {
-                PreferenceScreen scrnAdvancedSettings = (PreferenceScreen) findPreference(getString(R.string.key_advancedsettings));
-                if (scrnAdvancedSettings != null) {
-                    scrnAdvancedSettings.removePreference(getPreference(getString(R.string.key_statuslights_res_warning)));
-                    scrnAdvancedSettings.removePreference(getPreference(getString(R.string.key_statuslights_res_critical)));
-                    scrnAdvancedSettings.removePreference(getPreference(getString(R.string.key_statuslights_bat_warning)));
-                    scrnAdvancedSettings.removePreference(getPreference(getString(R.string.key_statuslights_bat_critical)));
-                    scrnAdvancedSettings.removePreference(getPreference(getString(R.string.key_show_statuslights)));
-                    scrnAdvancedSettings.removePreference(getPreference(getString(R.string.key_show_statuslights_extended)));
-                }
-            }
-
             initSummary(getPreferenceScreen());
 
-            final Preference tidepoolTestLogin = findPreference(MainApp.gs(R.string.key_tidepool_test_login));
-            if (tidepoolTestLogin != null)
-                tidepoolTestLogin.setOnPreferenceClickListener(preference -> {
-                    TidepoolUploader.INSTANCE.testLogin(getActivity());
-                    return false;
-                });
+            for (PluginBase plugin : MainApp.getPluginsList()) {
+                plugin.preprocessPreferences(this);
+            }
         }
 
         @Override
@@ -225,9 +206,5 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
             super.onSaveInstanceState(outState);
             outState.putInt("id", id);
         }
-
-        public Preference getPreference(String key) {
-            return findPreference(key);
-        }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
index 40fadff684..1c33e8f1be 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
@@ -100,8 +100,8 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
         String hours = " " + MainApp.gs(R.string.hours) + " ";
 
         if (useShortText) {
-            days = "d";
-            hours = "h";
+            days = MainApp.gs(R.string.shortday);
+            hours = MainApp.gs(R.string.shorthour);
         }
 
         return diff.get(TimeUnit.DAYS) + days + diff.get(TimeUnit.HOURS) + hours;
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
index f7c8e9ada4..8de88e1e0e 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
@@ -1,10 +1,13 @@
 package info.nightscout.androidaps.interfaces;
 
 import android.os.SystemClock;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
 
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -215,4 +218,10 @@ public abstract class PluginBase {
 
     protected void onStateChange(PluginType type, State oldState, State newState) {
     }
+
+    public void preprocessPreferences(@NotNull final PreferenceFragment preferenceFragment) {
+    }
+
+    public void updatePreferenceSummary(@NotNull final Preference pref) {
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
index b3b0c091d5..7e568af2d9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
@@ -247,7 +247,7 @@ public class APSResult {
                 }
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return array;
     }
@@ -280,7 +280,7 @@ public class APSResult {
                 }
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
         return latest;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java
index ef31ad599e..65db6e440c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java
@@ -164,7 +164,7 @@ public class OpenAPSAMAPlugin extends PluginBase implements APSInterface {
             return;
         if (!HardLimits.checkOnlyHardLimits(Profile.toMgdl(profile.getIsf(), units), "sens", HardLimits.MINISF, HardLimits.MAXISF))
             return;
-        if (!HardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.05, HardLimits.maxBasal()))
+        if (!HardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.02, HardLimits.maxBasal()))
             return;
         if (!HardLimits.checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, HardLimits.maxBasal()))
             return;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAPlugin.java
index 899c0151d8..8cac8b87cc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSMA/OpenAPSMAPlugin.java
@@ -162,7 +162,7 @@ public class OpenAPSMAPlugin extends PluginBase implements APSInterface {
             return;
         if (!checkOnlyHardLimits(Profile.toMgdl(profile.getIsf(), units), "sens", HardLimits.MINISF, HardLimits.MAXISF))
             return;
-        if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.05, HardLimits.maxBasal()))
+        if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.02, HardLimits.maxBasal()))
             return;
         if (!checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, HardLimits.maxBasal()))
             return;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
index d410eba291..c27a3f2059 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
@@ -170,7 +170,7 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
             return;
         if (!checkOnlyHardLimits(Profile.toMgdl(profile.getIsf(), units), "sens", HardLimits.MINISF, HardLimits.MAXISF))
             return;
-        if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.05, HardLimits.maxBasal()))
+        if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.02, HardLimits.maxBasal()))
             return;
         if (!checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, HardLimits.maxBasal()))
             return;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java
index 025d8dac1e..91c20b095a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java
@@ -27,6 +27,7 @@ import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.SP;
 import io.reactivex.disposables.CompositeDisposable;
@@ -75,35 +76,42 @@ public class ProfileFunctions {
     }
 
     public String getProfileName() {
-        return getProfileName(System.currentTimeMillis());
+        return getProfileName(System.currentTimeMillis(), true, false);
     }
 
     public String getProfileName(boolean customized) {
-        return getProfileName(System.currentTimeMillis(), customized);
+        return getProfileName(System.currentTimeMillis(), customized, false);
     }
 
-    public String getProfileName(long time) {
-        return getProfileName(time, true);
+    public String getProfileNameWithDuration() {
+        return getProfileName(System.currentTimeMillis(), true, true);
     }
 
-    public String getProfileName(long time, boolean customized) {
+    public String getProfileName(long time, boolean customized, boolean showRemainingTime) {
+        String profileName = MainApp.gs(R.string.noprofileselected);
+
         TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
         ProfileInterface activeProfile = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface();
 
         ProfileSwitch profileSwitch = activeTreatments.getProfileSwitchFromHistory(time);
         if (profileSwitch != null) {
             if (profileSwitch.profileJson != null) {
-                return customized ? profileSwitch.getCustomizedName() : profileSwitch.profileName;
+                profileName = customized ? profileSwitch.getCustomizedName() : profileSwitch.profileName;
             } else {
                 ProfileStore profileStore = activeProfile.getProfile();
                 if (profileStore != null) {
                     Profile profile = profileStore.getSpecificProfile(profileSwitch.profileName);
                     if (profile != null)
-                        return profileSwitch.profileName;
+                        profileName = profileSwitch.profileName;
                 }
             }
+
+            if (showRemainingTime && profileSwitch.durationInMinutes != 0) {
+                profileName += DateUtil.untilString(profileSwitch.originalEnd());
+            }
+            return profileName;
         }
-        return MainApp.gs(R.string.noprofileselected);
+        return profileName;
     }
 
     public boolean isProfileValid(String from) {
@@ -176,7 +184,7 @@ public class ProfileFunctions {
             profileSwitch = new ProfileSwitch();
             profileSwitch.date = System.currentTimeMillis();
             profileSwitch.source = Source.USER;
-            profileSwitch.profileName = getInstance().getProfileName(System.currentTimeMillis(), false);
+            profileSwitch.profileName = getInstance().getProfileName(System.currentTimeMillis(), false, false);
             profileSwitch.profileJson = getInstance().getProfile().getData().toString();
             profileSwitch.profilePlugin = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getClass().getName();
             profileSwitch.durationInMinutes = duration;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.java
index e026d6589d..828fa1b86f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.java
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 
 public class DstHelperPlugin extends PluginBase implements ConstraintsInterface {
     public static final int DISABLE_TIMEFRAME_HOURS = -3;
-    public static final int WARN_PRIOR_TIMEFRAME_HOURS = 24;
+    public static final int WARN_PRIOR_TIMEFRAME_HOURS = 12;
     private static Logger log = LoggerFactory.getLogger(L.CONSTRAINTS);
 
     static DstHelperPlugin plugin = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
index aafd877672..5edb199c9a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
@@ -204,7 +204,7 @@ class ObjectivesFragment : Fragment() {
             holder.accomplished.setTextColor(-0x3e3e3f)
             holder.verify.setOnClickListener {
                 holder.verify.visibility = View.INVISIBLE
-                NetworkChangeReceiver.fetch()
+                NetworkChangeReceiver.grabNetworkStatus(context)
                 if (objectives_fake.isChecked) {
                     objective.accomplishedOn = DateUtil.now()
                     scrollToCurrentObjective()
@@ -236,7 +236,7 @@ class ObjectivesFragment : Fragment() {
             }
             holder.start.setOnClickListener {
                 holder.start.visibility = View.INVISIBLE
-                NetworkChangeReceiver.fetch()
+                NetworkChangeReceiver.grabNetworkStatus(context)
                 if (objectives_fake.isChecked) {
                     objective.startedOn = DateUtil.now()
                     scrollToCurrentObjective()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
index ca3e1d3126..5882f84d61 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
@@ -105,7 +105,7 @@ object ObjectivesPlugin : PluginBase(PluginDescription()
         val requestCode = SP.getString(R.string.key_objectives_request_code, "")
         var url = SP.getString(R.string.key_nsclientinternal_url, "").toLowerCase()
         if (!url.endsWith("\"")) url = "$url/"
-        val hashNS = Hashing.sha1().hashString(url + BuildConfig.APPLICATION_ID + "/" + requestCode, Charsets.UTF_8).toString()
+        @Suppress("DEPRECATION") val hashNS = Hashing.sha1().hashString(url + BuildConfig.APPLICATION_ID + "/" + requestCode, Charsets.UTF_8).toString()
         if (request.equals(hashNS.substring(0, 10), ignoreCase = true)) {
             SP.putLong("Objectives_" + "openloop" + "_started", DateUtil.now())
             SP.putLong("Objectives_" + "openloop" + "_accomplished", DateUtil.now())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.java
index 6eb3be382b..4f7bb62c74 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.java
@@ -10,8 +10,11 @@ import java.util.List;
 import info.nightscout.androidaps.plugins.general.automation.actions.Action;
 import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger;
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AutomationEvent {
+    private static final Logger log = LoggerFactory.getLogger(AutomationEvent.class);
 
     private Trigger trigger = new TriggerConnector();
     private List<Action> actions = new ArrayList<>();
@@ -74,7 +77,7 @@ public class AutomationEvent {
             }
             o.put("actions", array);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -91,7 +94,7 @@ public class AutomationEvent {
                 actions.add(Action.instantiate(new JSONObject(array.getString(i))));
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.java
index 796f023f1d..ee4564fd6f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.java
@@ -11,6 +11,8 @@ import javax.annotation.Nullable;
 
 import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger;
 import info.nightscout.androidaps.queue.Callback;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /*
     Action ideas:
@@ -44,6 +46,7 @@ import info.nightscout.androidaps.queue.Callback;
 
 
 public abstract class Action {
+    private static final Logger log = LoggerFactory.getLogger(Action.class);
 
     public Trigger precondition = null;
 
@@ -65,7 +68,7 @@ public abstract class Action {
         try {
             o.put("type", this.getClass().getName());
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -84,7 +87,7 @@ public abstract class Action {
             Class clazz = Class.forName(type);
             return ((Action) clazz.newInstance()).fromJSON(data != null ? data.toString() : "");
         } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
@@ -98,7 +101,7 @@ public abstract class Action {
                 fromJSON(data.toString());
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.java
index bd221d8f81..39adbcac27 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.java
@@ -18,8 +18,12 @@ import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithE
 import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.utils.JsonHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ActionLoopSuspend extends Action {
+    private static final Logger log = LoggerFactory.getLogger(ActionLoopSuspend.class);
+
     public InputDuration minutes = new InputDuration(0, InputDuration.TimeUnit.MINUTES);
 
     @Override
@@ -59,7 +63,7 @@ public class ActionLoopSuspend extends Action {
             o.put("type", this.getClass().getName());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -70,7 +74,7 @@ public class ActionLoopSuspend extends Action {
             JSONObject o = new JSONObject(data);
             minutes.setMinutes(JsonHelper.safeGetInt(o, "minutes"));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.java
index 1f7ad543c2..7bd501b460 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.java
@@ -20,8 +20,12 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotifi
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.utils.JsonHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ActionNotification extends Action {
+    private static final Logger log = LoggerFactory.getLogger(ActionNotification.class);
+
     public InputString text = new InputString();
 
     @Override
@@ -59,7 +63,7 @@ public class ActionNotification extends Action {
             o.put("type", this.getClass().getName());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -70,7 +74,7 @@ public class ActionNotification extends Action {
             JSONObject o = new JSONObject(data);
             text.setValue(JsonHelper.safeGetString(o, "text"));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.java
index 50fbb786db..8a4762bd08 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.java
@@ -92,7 +92,7 @@ public class ActionProfileSwitch extends Action {
             data.put("profileToSwitchTo", inputProfileName.getValue());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -105,7 +105,7 @@ public class ActionProfileSwitch extends Action {
             profileName = JsonHelper.safeGetString(d, "profileToSwitchTo");
             inputProfileName.setValue(profileName);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.java
index 20b6abb081..23b54640a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.java
@@ -19,8 +19,12 @@ import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuil
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerProfilePercent;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.utils.JsonHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ActionProfileSwitchPercent extends Action {
+    private static final Logger log = LoggerFactory.getLogger(ActionProfileSwitchPercent.class);
+
     InputPercent pct = new InputPercent();
     InputDuration duration = new InputDuration(0, InputDuration.TimeUnit.MINUTES);
 
@@ -71,7 +75,7 @@ public class ActionProfileSwitchPercent extends Action {
             data.put("durationInMinutes", duration.getMinutes());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -83,7 +87,7 @@ public class ActionProfileSwitchPercent extends Action {
             pct.setValue(JsonHelper.safeGetInt(d, "percentage"));
             duration.setMinutes(JsonHelper.safeGetInt(d, "durationInMinutes"));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.java
index f8afafca75..fa9140e5f9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.java
@@ -21,6 +21,7 @@ import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.utils.JsonHelper;
 
 public class ActionSendSMS extends Action {
+    private static final Logger log = LoggerFactory.getLogger(ActionSendSMS.class);
 
     public InputString text = new InputString();
 
@@ -36,7 +37,7 @@ public class ActionSendSMS extends Action {
 
     @Override
     public void doAction(Callback callback) {
-        boolean result = SmsCommunicatorPlugin.getPlugin().sendNotificationToAllNumbers(text.getValue());
+        boolean result = SmsCommunicatorPlugin.INSTANCE.sendNotificationToAllNumbers(text.getValue());
         if (callback != null)
             callback.result(new PumpEnactResult().success(result).comment(result ? R.string.ok : R.string.danar_error)).run();
 
@@ -56,7 +57,7 @@ public class ActionSendSMS extends Action {
             o.put("type", this.getClass().getName());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -67,7 +68,7 @@ public class ActionSendSMS extends Action {
             JSONObject o = new JSONObject(data);
             text.setValue(JsonHelper.safeGetString(o, "text"));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.java
index 659bb508eb..b0ef645069 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.java
@@ -24,8 +24,12 @@ import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.JsonHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ActionStartTempTarget extends Action {
+    private static final Logger log = LoggerFactory.getLogger(ActionStartTempTarget.class);
+
     String reason = "";
     InputTempTarget value = new InputTempTarget();
     InputDuration duration = new InputDuration(0, InputDuration.TimeUnit.MINUTES);
@@ -93,7 +97,7 @@ public class ActionStartTempTarget extends Action {
             data.put("durationInMinutes", duration.getMinutes());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -107,7 +111,7 @@ public class ActionStartTempTarget extends Action {
             value.setValue(JsonHelper.safeGetDouble(d, "value"));
             duration.setMinutes(JsonHelper.safeGetInt(d, "durationInMinutes"));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.java
index de251c499e..abf354bc9c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.java
@@ -14,8 +14,12 @@ import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.JsonHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ActionStopTempTarget extends Action {
+    private static final Logger log = LoggerFactory.getLogger(ActionStopTempTarget.class);
+
     String reason = "";
     private TempTarget tempTarget;
 
@@ -54,7 +58,7 @@ public class ActionStopTempTarget extends Action {
             data.put("reason", reason);
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -65,7 +69,7 @@ public class ActionStopTempTarget extends Action {
             JSONObject d = new JSONObject(data);
             reason = JsonHelper.safeGetString(d, "reason");
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java
index f6ba6b6f67..69ac67bf07 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java
@@ -13,10 +13,13 @@ import com.google.common.base.Optional;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
 
 public abstract class Trigger {
+    private static final Logger log = LoggerFactory.getLogger(Trigger.class);
 
     TriggerConnector connector = null;
     long lastRun;
@@ -56,7 +59,7 @@ public abstract class Trigger {
         try {
             return instantiate(new JSONObject(json));
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
@@ -69,7 +72,7 @@ public abstract class Trigger {
             Class clazz = Class.forName(type);
             return ((Trigger) clazz.newInstance()).fromJSON(data.toString());
         } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.java
index da850b187d..ce0a8f63bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.java
@@ -89,7 +89,7 @@ public class TriggerAutosensValue extends Trigger {
             data.put("comparator", comparator.getValue().toString());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -102,7 +102,7 @@ public class TriggerAutosensValue extends Trigger {
             lastRun = JsonHelper.safeGetLong(d, "lastRun");
             comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java
index 1636377bf2..3733859b96 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java
@@ -104,7 +104,7 @@ public class TriggerBg extends Trigger {
             data.put("units", bg.getUnits());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -118,7 +118,7 @@ public class TriggerBg extends Trigger {
             lastRun = JsonHelper.safeGetLong(d, "lastRun");
             comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.java
index 0ad9f75ab2..0a038112e2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.java
@@ -86,7 +86,7 @@ public class TriggerBolusAgo extends Trigger {
             data.put("comparator", comparator.getValue().toString());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -99,7 +99,7 @@ public class TriggerBolusAgo extends Trigger {
             lastRun = JsonHelper.safeGetLong(d, "lastRun");
             comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.java
index 4ddeb4299a..bf17dc72d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.java
@@ -87,7 +87,7 @@ public class TriggerCOB extends Trigger {
             data.put("comparator", comparator.getValue().toString());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -100,7 +100,7 @@ public class TriggerCOB extends Trigger {
             lastRun = JsonHelper.safeGetLong(d, "lastRun");
             comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java
index ae4bd35ad5..549925528a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java
@@ -162,7 +162,7 @@ public class TriggerConnector extends Trigger {
             data.put("triggerList", array);
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -179,7 +179,7 @@ public class TriggerConnector extends Trigger {
                 add(newItem);
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.java
index a3939a60b7..eee649307b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.java
@@ -129,7 +129,7 @@ public class TriggerDelta extends Trigger {
             data.put("comparator", comparator.getValue().toString());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -144,7 +144,7 @@ public class TriggerDelta extends Trigger {
             lastRun = JsonHelper.safeGetLong(d, "lastRun");
             comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java
index c4003af861..a3935d7cec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java
@@ -82,7 +82,7 @@ public class TriggerIob extends Trigger {
             data.put("comparator", comparator.getValue().toString());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -95,7 +95,7 @@ public class TriggerIob extends Trigger {
             lastRun = JsonHelper.safeGetLong(d, "lastRun");
             comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java
index 4772d29112..19965cfc9a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java
@@ -93,7 +93,7 @@ public class TriggerLocation extends Trigger {
             data.put("lastRun", lastRun);
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -108,7 +108,7 @@ public class TriggerLocation extends Trigger {
             name.setValue(JsonHelper.safeGetString(d, "name"));
             lastRun = JsonHelper.safeGetLong(d, "lastRun");
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java
index d86bc35cb8..e4c0ae4346 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.java
@@ -88,7 +88,7 @@ public class TriggerProfilePercent extends Trigger {
             data.put("comparator", comparator.getValue().toString());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -101,7 +101,7 @@ public class TriggerProfilePercent extends Trigger {
             lastRun = JsonHelper.safeGetLong(d, "lastRun");
             comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.java
index 8cec3bdf44..ff8bb335f9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.java
@@ -82,7 +82,7 @@ public class TriggerPumpLastConnection extends Trigger {
             data.put("comparator", comparator.getValue().toString());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -95,7 +95,7 @@ public class TriggerPumpLastConnection extends Trigger {
             lastRun = JsonHelper.safeGetLong(d, "lastRun");
             comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java
index a145253b36..89c8d17085 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java
@@ -163,7 +163,7 @@ public class TriggerRecurringTime extends Trigger {
             object.put("type", TriggerRecurringTime.class.getName());
             object.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return object.toString();
     }
@@ -181,7 +181,7 @@ public class TriggerRecurringTime extends Trigger {
             minute = JsonHelper.safeGetInt(o, "minute");
             validTo = JsonHelper.safeGetLong(o, "validTo");
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java
index 378652ed2a..f45efdf4a4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java
@@ -74,7 +74,7 @@ public class TriggerTempTarget extends Trigger {
             data.put("comparator", comparator.getValue().toString());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -86,7 +86,7 @@ public class TriggerTempTarget extends Trigger {
             lastRun = JsonHelper.safeGetLong(d, "lastRun");
             comparator.setValue(ComparatorExists.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java
index 261783b99c..08f9a65aa7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java
@@ -65,7 +65,7 @@ public class TriggerTime extends Trigger {
             object.put("type", TriggerTime.class.getName());
             object.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return object.toString();
     }
@@ -78,7 +78,7 @@ public class TriggerTime extends Trigger {
             lastRun = JsonHelper.safeGetLong(o, "lastRun");
             runAt = JsonHelper.safeGetLong(o, "runAt");
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.java
index 8755c3559c..1d03871620 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.java
@@ -93,7 +93,7 @@ public class TriggerTimeRange extends Trigger {
             object.put("type", TriggerTimeRange.class.getName());
             object.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         log.debug(object.toString());
         return object.toString();
@@ -108,7 +108,7 @@ public class TriggerTimeRange extends Trigger {
             start = JsonHelper.safeGetInt(o, "start");
             end = JsonHelper.safeGetInt(o, "end");
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java
index ba10e81583..dd2c34bcb8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java
@@ -85,7 +85,7 @@ public class TriggerWifiSsid extends Trigger {
             data.put("comparator", comparator.getValue().toString());
             o.put("data", data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return o.toString();
     }
@@ -98,7 +98,7 @@ public class TriggerWifiSsid extends Trigger {
             lastRun = JsonHelper.safeGetLong(d, "lastRun");
             comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return this;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
index ae5d090211..037f91b3f0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
@@ -7,9 +7,12 @@ import android.content.ServiceConnection;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
 import android.text.Html;
 import android.text.Spanned;
 
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -89,7 +92,7 @@ public class NSClientPlugin extends PluginBase {
         }
 
         nsClientReceiverDelegate =
-                new NsClientReceiverDelegate(MainApp.instance().getApplicationContext());
+                new NsClientReceiverDelegate();
     }
 
     public boolean isAllowed() {
@@ -104,7 +107,7 @@ public class NSClientPlugin extends PluginBase {
         context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
         super.onStart();
 
-        nsClientReceiverDelegate.registerReceivers();
+        nsClientReceiverDelegate.grabReceiversState();
         disposable.add(RxBus.INSTANCE
                 .toObservable(EventNSClientStatus.class)
                 .observeOn(Schedulers.io())
@@ -129,7 +132,6 @@ public class NSClientPlugin extends PluginBase {
                 .subscribe(event -> {
                     if (nsClientService != null) {
                         MainApp.instance().getApplicationContext().unbindService(mConnection);
-                        nsClientReceiverDelegate.unregisterReceivers();
                     }
                 }, FabricPrivacy::logException)
         );
@@ -152,11 +154,27 @@ public class NSClientPlugin extends PluginBase {
     @Override
     protected void onStop() {
         MainApp.instance().getApplicationContext().unbindService(mConnection);
-        nsClientReceiverDelegate.unregisterReceivers();
         disposable.clear();
         super.onStop();
     }
 
+    @Override
+    public void preprocessPreferences(@NotNull PreferenceFragment preferenceFragment) {
+        super.preprocessPreferences(preferenceFragment);
+
+        if (Config.NSCLIENT) {
+            PreferenceScreen scrnAdvancedSettings = (PreferenceScreen) preferenceFragment.findPreference(MainApp.gs(R.string.key_advancedsettings));
+            if (scrnAdvancedSettings != null) {
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_statuslights_res_warning)));
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_statuslights_res_critical)));
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_statuslights_bat_warning)));
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_statuslights_bat_critical)));
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_show_statuslights)));
+                scrnAdvancedSettings.removePreference(preferenceFragment.findPreference(MainApp.gs(R.string.key_show_statuslights_extended)));
+            }
+        }
+    }
+
     private ServiceConnection mConnection = new ServiceConnection() {
 
         public void onServiceDisconnected(ComponentName name) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index 881593b32a..f5582b71a2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -594,7 +594,7 @@ public class NSUpload {
 
 
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
 
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
index c68750d828..fd05b133f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
@@ -18,44 +18,19 @@ import info.nightscout.androidaps.utils.SP;
 
 class NsClientReceiverDelegate {
 
-    private final Context context;
-
-    private NetworkChangeReceiver networkChangeReceiver = new NetworkChangeReceiver();
-    private ChargingStateReceiver chargingStateReceiver = new ChargingStateReceiver();
-
     private boolean allowedChargingState = true;
     private boolean allowedNetworkState = true;
     boolean allowed = true;
 
-    NsClientReceiverDelegate(Context context) {
-        this.context = context;
-    }
-
-    void registerReceivers() {
+    void grabReceiversState() {
         Context context = MainApp.instance().getApplicationContext();
-        // register NetworkChangeReceiver --> https://developer.android.com/training/monitoring-device-state/connectivity-monitoring.html
-        // Nougat is not providing Connectivity-Action anymore ;-(
-        context.registerReceiver(networkChangeReceiver,
-                new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
-        context.registerReceiver(networkChangeReceiver,
-                new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION));
 
-        EventNetworkChange event = networkChangeReceiver.grabNetworkStatus(context);
-        if (event != null)
-            RxBus.INSTANCE.send(event);
+        EventNetworkChange event = NetworkChangeReceiver.grabNetworkStatus(context);
+        if (event != null) RxBus.INSTANCE.send(event);
 
-        context.registerReceiver(chargingStateReceiver,
-                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        EventChargingState eventChargingState = ChargingStateReceiver.grabChargingState(context);
+        if (eventChargingState != null) RxBus.INSTANCE.send(eventChargingState);
 
-        EventChargingState eventChargingState = chargingStateReceiver.grabChargingState(context);
-        if (eventChargingState != null)
-            RxBus.INSTANCE.send(eventChargingState);
-
-    }
-
-    void unregisterReceivers() {
-        context.unregisterReceiver(networkChangeReceiver);
-        context.unregisterReceiver(chargingStateReceiver);
     }
 
     void onStatusEvent(EventPreferenceChange ev) {
@@ -63,11 +38,11 @@ class NsClientReceiverDelegate {
                 ev.isChanged(R.string.key_ns_wifi_ssids) ||
                 ev.isChanged(R.string.key_ns_allowroaming)
         ) {
-            EventNetworkChange event = networkChangeReceiver.grabNetworkStatus(MainApp.instance().getApplicationContext());
+            EventNetworkChange event = NetworkChangeReceiver.grabNetworkStatus(MainApp.instance().getApplicationContext());
             if (event != null)
                 RxBus.INSTANCE.send(event);
         } else if (ev.isChanged(R.string.key_ns_chargingonly)) {
-            EventChargingState event = chargingStateReceiver.grabChargingState(MainApp.instance().getApplicationContext());
+            EventChargingState event = ChargingStateReceiver.grabChargingState(MainApp.instance().getApplicationContext());
             if (event != null)
                 RxBus.INSTANCE.send(event);
         }
@@ -91,7 +66,7 @@ class NsClientReceiverDelegate {
         }
     }
 
-    void processStateChange() {
+    private void processStateChange() {
         boolean newAllowedState = allowedChargingState && allowedNetworkState;
         if (newAllowedState != allowed) {
             allowed = newAllowedState;
@@ -101,7 +76,6 @@ class NsClientReceiverDelegate {
 
     boolean calculateStatus(final EventChargingState ev) {
         boolean chargingOnly = SP.getBoolean(R.string.key_ns_chargingonly, false);
-
         boolean newAllowedState = true;
 
         if (!ev.isCharging() && chargingOnly) {
@@ -129,8 +103,6 @@ class NsClientReceiverDelegate {
             }
         }
 
-
         return newAllowedState;
     }
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index 5c2a7cac84..046290500d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -1223,7 +1223,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 extendedBolusView.setVisibility(View.VISIBLE);
         }
 
-        activeProfileView.setText(ProfileFunctions.getInstance().getProfileName());
+        activeProfileView.setText(ProfileFunctions.getInstance().getProfileNameWithDuration());
         if (profile.getPercentage() != 100 || profile.getTimeshift() != 0) {
             activeProfileView.setBackgroundColor(MainApp.gc(R.color.ribbonWarning));
             activeProfileView.setTextColor(MainApp.gc(R.color.ribbonTextWarning));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/WizardDialog.kt
index 552ab502e7..efe800bef0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/WizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/WizardDialog.kt
@@ -114,6 +114,7 @@ class WizardDialog : DialogFragment() {
                 log.debug("guarding: ok already clicked")
             } else {
                 okClicked = true
+                calculateInsulin()
                 parentContext?.let { context ->
                     wizard?.confirmAndExecute(context)
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.java
deleted file mode 100644
index 4b05072eb1..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.general.smsCommunicator;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.DateUtil;
-
-class AuthRequest {
-    private static Logger log = LoggerFactory.getLogger(L.SMS);
-
-    Sms requester;
-    String confirmCode;
-    private Runnable action;
-
-    private long date;
-
-    private boolean processed;
-    private SmsCommunicatorPlugin plugin;
-
-    AuthRequest(SmsCommunicatorPlugin plugin, Sms requester, String requestText, String confirmCode, SmsAction action) {
-        this.requester = requester;
-        this.confirmCode = confirmCode;
-        this.action = action;
-        this.plugin = plugin;
-
-        this.date = DateUtil.now();
-
-        plugin.sendSMS(new Sms(requester.phoneNumber, requestText));
-    }
-
-    void action(String codeReceived) {
-        if (processed) {
-            if (L.isEnabled(L.SMS))
-                log.debug("Already processed");
-            return;
-        }
-        if (!confirmCode.equals(codeReceived)) {
-            processed = true;
-            if (L.isEnabled(L.SMS))
-                log.debug("Wrong code");
-            plugin.sendSMS(new Sms(requester.phoneNumber, R.string.sms_wrongcode));
-            return;
-        }
-        if (DateUtil.now() - date < Constants.SMS_CONFIRM_TIMEOUT) {
-            processed = true;
-            if (L.isEnabled(L.SMS))
-                log.debug("Processing confirmed SMS: " + requester.text);
-            if (action != null)
-                action.run();
-            return;
-        }
-        if (L.isEnabled(L.SMS))
-            log.debug("Timed out SMS: " + requester.text);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
new file mode 100644
index 0000000000..48e816928f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator
+
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.utils.DateUtil
+import org.slf4j.LoggerFactory
+
+class AuthRequest internal constructor(val plugin: SmsCommunicatorPlugin, var requester: Sms, requestText: String, var confirmCode: String, val action: SmsAction) {
+    private val log = LoggerFactory.getLogger(L.SMS)
+
+    private val date = DateUtil.now()
+    private var processed = false
+
+    init {
+        plugin.sendSMS(Sms(requester.phoneNumber, requestText))
+    }
+
+    fun action(codeReceived: String) {
+        if (processed) {
+            if (L.isEnabled(L.SMS)) log.debug("Already processed")
+            return
+        }
+        if (confirmCode != codeReceived) {
+            processed = true
+            if (L.isEnabled(L.SMS)) log.debug("Wrong code")
+            plugin.sendSMS(Sms(requester.phoneNumber, R.string.sms_wrongcode))
+            return
+        }
+        if (DateUtil.now() - date < Constants.SMS_CONFIRM_TIMEOUT) {
+            processed = true
+            if (L.isEnabled(L.SMS)) log.debug("Processing confirmed SMS: " + requester.text)
+            action.run()
+            return
+        }
+        if (L.isEnabled(L.SMS)) log.debug("Timed out SMS: " + requester.text)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.java
deleted file mode 100644
index 2eedfa0a51..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.plugins.general.smsCommunicator;
-
-import android.telephony.SmsMessage;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.utils.DateUtil;
-
-class Sms {
-    String phoneNumber;
-    String text;
-    long date;
-    boolean received = false;
-    boolean sent = false;
-    boolean processed = false;
-    boolean ignored = false;
-
-    Sms(SmsMessage message) {
-        phoneNumber = message.getOriginatingAddress();
-        text = message.getMessageBody();
-        date = message.getTimestampMillis();
-        received = true;
-    }
-
-    Sms(String phoneNumber, String text) {
-        this.phoneNumber = phoneNumber;
-        this.text = text;
-        this.date = DateUtil.now();
-        sent = true;
-    }
-
-    Sms(String phoneNumber, int textId) {
-        this.phoneNumber = phoneNumber;
-        this.text = MainApp.gs(textId);
-        this.date = DateUtil.now();
-        sent = true;
-    }
-
-    public String toString() {
-        return "SMS from " + phoneNumber + ": " + text;
-    }
-}
-
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.kt
new file mode 100644
index 0000000000..868620be2e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/Sms.kt
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator
+
+import android.telephony.SmsMessage
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.utils.DateUtil
+
+class Sms {
+    var phoneNumber: String
+    var text: String
+    var date: Long
+    var received = false
+    var sent = false
+    var processed = false
+    var ignored = false
+
+    internal constructor(message: SmsMessage) {
+        phoneNumber = message.originatingAddress ?: ""
+        text = message.messageBody
+        date = message.timestampMillis
+        received = true
+    }
+
+    internal constructor(phoneNumber: String, text: String) {
+        this.phoneNumber = phoneNumber
+        this.text = text
+        date = DateUtil.now()
+        sent = true
+    }
+
+    internal constructor(phoneNumber: String, textId: Int) {
+        this.phoneNumber = phoneNumber
+        text = MainApp.gs(textId)
+        date = DateUtil.now()
+        sent = true
+    }
+
+    override fun toString(): String {
+        return "SMS from $phoneNumber: $text"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.java
deleted file mode 100644
index 6b5d5b8747..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package info.nightscout.androidaps.plugins.general.smsCommunicator;
-
-abstract class SmsAction implements Runnable {
-    Double aDouble;
-    Integer anInteger;
-    Integer secondInteger;
-    String aString;
-
-    SmsAction()  {}
-
-    SmsAction(Double aDouble) {
-        this.aDouble = aDouble;
-    }
-
-    SmsAction(Double aDouble, Integer secondInteger) {
-        this.aDouble = aDouble;
-        this.secondInteger = secondInteger;
-    }
-
-    SmsAction(String aString, Integer secondInteger) {
-        this.aString = aString;
-        this.secondInteger = secondInteger;
-    }
-
-    SmsAction(Integer anInteger) {
-        this.anInteger = anInteger;
-    }
-
-    SmsAction(Integer anInteger, Integer secondInteger) {
-        this.anInteger = anInteger;
-        this.secondInteger = secondInteger;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.kt
new file mode 100644
index 0000000000..98c892d918
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.kt
@@ -0,0 +1,68 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator
+
+abstract class SmsAction : Runnable {
+    var aDouble: Double? = null
+    var anInteger: Int? = null
+    var secondInteger: Int? = null
+    var secondLong: Long? = null
+    var aString: String? = null
+
+    internal constructor()
+    internal constructor(aDouble: Double) {
+        this.aDouble = aDouble
+    }
+
+    internal constructor(aDouble: Double, secondInteger: Int) {
+        this.aDouble = aDouble
+        this.secondInteger = secondInteger
+    }
+
+    internal constructor(aString: String, secondInteger: Int) {
+        this.aString = aString
+        this.secondInteger = secondInteger
+    }
+
+    internal constructor(anInteger: Int) {
+        this.anInteger = anInteger
+    }
+
+    internal constructor(anInteger: Int, secondInteger: Int) {
+        this.anInteger = anInteger
+        this.secondInteger = secondInteger
+    }
+
+    internal constructor(anInteger: Int, secondLong: Long) {
+        this.anInteger = anInteger
+        this.secondLong = secondLong
+    }
+
+    fun aDouble(): Double {
+        return aDouble?.let {
+            aDouble
+        } ?: throw IllegalStateException()
+    }
+
+    fun anInteger(): Int {
+        return anInteger?.let {
+            anInteger
+        } ?: throw IllegalStateException()
+    }
+
+    fun secondInteger(): Int {
+        return secondInteger?.let {
+            secondInteger
+        } ?: throw IllegalStateException()
+    }
+
+    fun secondLong(): Long {
+        return secondLong?.let {
+            secondLong
+        } ?: throw IllegalStateException()
+    }
+
+    fun aString(): String {
+        return aString?.let {
+            aString
+        } ?: throw IllegalStateException()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.java
deleted file mode 100644
index 31f335a7cf..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package info.nightscout.androidaps.plugins.general.smsCommunicator;
-
-
-import android.os.Bundle;
-import android.text.Html;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.fragment.app.Fragment;
-
-import java.util.Collections;
-import java.util.Comparator;
-
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-
-public class SmsCommunicatorFragment extends Fragment {
-    private CompositeDisposable disposable = new CompositeDisposable();
-    TextView logView;
-
-    public SmsCommunicatorFragment() {
-        super();
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.smscommunicator_fragment, container, false);
-
-        logView = (TextView) view.findViewById(R.id.smscommunicator_log);
-
-        return view;
-    }
-
-    @Override
-    public synchronized void onResume() {
-        super.onResume();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventSmsCommunicatorUpdateGui.class)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(event -> updateGui(), FabricPrivacy::logException)
-        );
-        updateGui();
-    }
-
-    @Override
-    public synchronized void onPause() {
-        super.onPause();
-        disposable.clear();
-    }
-
-    protected void updateGui() {
-        class CustomComparator implements Comparator<Sms> {
-            public int compare(Sms object1, Sms object2) {
-                return (int) (object1.date - object2.date);
-            }
-        }
-        Collections.sort(SmsCommunicatorPlugin.getPlugin().messages, new CustomComparator());
-        int messagesToShow = 40;
-
-        int start = Math.max(0, SmsCommunicatorPlugin.getPlugin().messages.size() - messagesToShow);
-
-        String logText = "";
-        for (int x = start; x < SmsCommunicatorPlugin.getPlugin().messages.size(); x++) {
-            Sms sms = SmsCommunicatorPlugin.getPlugin().messages.get(x);
-            if (sms.ignored) {
-                logText += DateUtil.timeString(sms.date) + " &lt;&lt;&lt; " + "░ " + sms.phoneNumber + " <b>" + sms.text + "</b><br>";
-            } else if (sms.received) {
-                logText += DateUtil.timeString(sms.date) + " &lt;&lt;&lt; " + (sms.processed ? "● " : "○ ") + sms.phoneNumber + " <b>" + sms.text + "</b><br>";
-            } else if (sms.sent) {
-                logText += DateUtil.timeString(sms.date) + " &gt;&gt;&gt; " + (sms.processed ? "● " : "○ ") + sms.phoneNumber + " <b>" + sms.text + "</b><br>";
-            }
-        }
-        logView.setText(Html.fromHtml(logText));
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
new file mode 100644
index 0000000000..90ec078931
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
@@ -0,0 +1,70 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.bus.RxBus.toObservable
+import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.HtmlHelper
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.smscommunicator_fragment.*
+import java.util.*
+import kotlin.math.max
+
+class SmsCommunicatorFragment : Fragment() {
+    private val disposable = CompositeDisposable()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.smscommunicator_fragment, container, false)
+    }
+
+    @Synchronized
+    override fun onResume() {
+        super.onResume()
+        disposable.add(toObservable(EventSmsCommunicatorUpdateGui::class.java)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe({ updateGui() }) { FabricPrivacy.logException(it) }
+        )
+        updateGui()
+    }
+
+    @Synchronized
+    override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    fun updateGui() {
+        class CustomComparator : Comparator<Sms> {
+            override fun compare(object1: Sms, object2: Sms): Int {
+                return (object1.date - object2.date).toInt()
+            }
+        }
+        Collections.sort(SmsCommunicatorPlugin.messages, CustomComparator())
+        val messagesToShow = 40
+        val start = max(0, SmsCommunicatorPlugin.messages.size - messagesToShow)
+        var logText = ""
+        for (x in start until SmsCommunicatorPlugin.messages.size) {
+            val sms = SmsCommunicatorPlugin.messages[x]
+            when {
+                sms.ignored -> {
+                    logText += DateUtil.timeString(sms.date) + " &lt;&lt;&lt; " + "░ " + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
+                }
+                sms.received -> {
+                    logText += DateUtil.timeString(sms.date) + " &lt;&lt;&lt; " + (if (sms.processed) "● " else "○ ") + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
+                }
+                sms.sent -> {
+                    logText += DateUtil.timeString(sms.date) + " &gt;&gt;&gt; " + (if (sms.processed) "● " else "○ ") + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
+                }
+            }
+        }
+        smscommunicator_log?.text = HtmlHelper.fromHtml(logText)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java
deleted file mode 100644
index 264d7c3e52..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package info.nightscout.androidaps.plugins.general.smsCommunicator;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.telephony.SmsManager;
-import android.telephony.SmsMessage;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.Normalizer;
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.ProfileInterface;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.SP;
-import info.nightscout.androidaps.utils.SafeParse;
-import info.nightscout.androidaps.utils.XdripCalibrations;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-/**
- * Created by mike on 05.08.2016.
- */
-public class SmsCommunicatorPlugin extends PluginBase {
-    private static Logger log = LoggerFactory.getLogger(L.SMS);
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private static SmsCommunicatorPlugin smsCommunicatorPlugin;
-
-    public static SmsCommunicatorPlugin getPlugin() {
-
-        if (smsCommunicatorPlugin == null) {
-            smsCommunicatorPlugin = new SmsCommunicatorPlugin();
-        }
-        return smsCommunicatorPlugin;
-    }
-
-    List<String> allowedNumbers = new ArrayList<>();
-
-    AuthRequest messageToConfirm = null;
-
-    long lastRemoteBolusTime = 0;
-
-    ArrayList<Sms> messages = new ArrayList<>();
-
-    SmsCommunicatorPlugin() {
-        super(new PluginDescription()
-                .mainType(PluginType.GENERAL)
-                .fragmentClass(SmsCommunicatorFragment.class.getName())
-                .pluginName(R.string.smscommunicator)
-                .shortName(R.string.smscommunicator_shortname)
-                .preferencesId(R.xml.pref_smscommunicator)
-                .description(R.string.description_sms_communicator)
-        );
-        processSettings(null);
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        disposable.add(RxBus.INSTANCE
-                .toObservable(EventPreferenceChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    processSettings(event);
-                }, FabricPrivacy::logException)
-        );
-    }
-
-    @Override
-    protected void onStop() {
-        disposable.clear();
-        super.onStop();
-    }
-
-    private void processSettings(final EventPreferenceChange ev) {
-        if (ev == null || ev.isChanged(R.string.key_smscommunicator_allowednumbers)) {
-            String settings = SP.getString(R.string.key_smscommunicator_allowednumbers, "");
-
-            allowedNumbers.clear();
-            String[] substrings = settings.split(";");
-            for (String number : substrings) {
-                String cleaned = number.replaceAll("\\s+", "");
-                allowedNumbers.add(cleaned);
-                log.debug("Found allowed number: " + cleaned);
-            }
-        }
-    }
-
-    boolean isCommand(String command, String number) {
-        switch (command.toUpperCase()) {
-            case "BG":
-            case "LOOP":
-            case "TREATMENTS":
-            case "NSCLIENT":
-            case "PUMP":
-            case "BASAL":
-            case "BOLUS":
-            case "EXTENDED":
-            case "CAL":
-            case "PROFILE":
-                return true;
-        }
-        if (messageToConfirm != null && messageToConfirm.requester.phoneNumber.equals(number))
-            return true;
-        return false;
-    }
-
-    boolean isAllowedNumber(String number) {
-        for (String num : allowedNumbers) {
-            if (num.equals(number)) return true;
-        }
-        return false;
-    }
-
-    public void handleNewData(Intent intent) {
-        Bundle bundle = intent.getExtras();
-        if (bundle == null) return;
-
-        Object[] pdus = (Object[]) bundle.get("pdus");
-        if (pdus != null) {
-            // For every SMS message received
-            for (Object pdu : pdus) {
-                SmsMessage message = SmsMessage.createFromPdu((byte[]) pdu);
-                processSms(new Sms(message));
-            }
-        }
-    }
-
-    void processSms(final Sms receivedSms) {
-        if (!isEnabled(PluginType.GENERAL)) {
-            log.debug("Ignoring SMS. Plugin disabled.");
-            return;
-        }
-        if (!isAllowedNumber(receivedSms.phoneNumber)) {
-            log.debug("Ignoring SMS from: " + receivedSms.phoneNumber + ". Sender not allowed");
-            receivedSms.ignored = true;
-            messages.add(receivedSms);
-            RxBus.INSTANCE.send(new EventSmsCommunicatorUpdateGui());
-            return;
-        }
-
-        messages.add(receivedSms);
-        log.debug(receivedSms.toString());
-
-        String[] splitted = receivedSms.text.split("\\s+");
-        boolean remoteCommandsAllowed = SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false);
-
-        if (splitted.length > 0 && isCommand(splitted[0].toUpperCase(), receivedSms.phoneNumber)) {
-            switch (splitted[0].toUpperCase()) {
-                case "BG":
-                    processBG(splitted, receivedSms);
-                    break;
-                case "LOOP":
-                    if (!remoteCommandsAllowed)
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
-                    else if (splitted.length == 2 || splitted.length == 3)
-                        processLOOP(splitted, receivedSms);
-                    else
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-                    break;
-                case "TREATMENTS":
-                    if (splitted.length == 2)
-                        processTREATMENTS(splitted, receivedSms);
-                    else
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-                    break;
-                case "NSCLIENT":
-                    if (splitted.length == 2)
-                        processNSCLIENT(splitted, receivedSms);
-                    else
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-                    break;
-                case "PUMP":
-                    processPUMP(splitted, receivedSms);
-                    break;
-                case "PROFILE":
-                    if (!remoteCommandsAllowed)
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
-                    else if (splitted.length == 2 || splitted.length == 3)
-                        processPROFILE(splitted, receivedSms);
-                    else
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-                    break;
-                case "BASAL":
-                    if (!remoteCommandsAllowed)
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
-                    else if (splitted.length == 2 || splitted.length == 3)
-                        processBASAL(splitted, receivedSms);
-                    else
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-                    break;
-                case "EXTENDED":
-                    if (!remoteCommandsAllowed)
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
-                    else if (splitted.length == 2 || splitted.length == 3)
-                        processEXTENDED(splitted, receivedSms);
-                    else
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-                    break;
-                case "BOLUS":
-                    if (!remoteCommandsAllowed)
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
-                    else if (splitted.length == 2 && DateUtil.now() - lastRemoteBolusTime < Constants.remoteBolusMinDistance)
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotebolusnotallowed));
-                    else if (splitted.length == 2 && ConfigBuilderPlugin.getPlugin().getActivePump().isSuspended())
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.pumpsuspended));
-                    else if (splitted.length == 2)
-                        processBOLUS(splitted, receivedSms);
-                    else
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-                    break;
-                case "CAL":
-                    if (!remoteCommandsAllowed)
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed));
-                    else if (splitted.length == 2)
-                        processCAL(splitted, receivedSms);
-                    else
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-                    break;
-                default: // expect passCode here
-                    if (messageToConfirm != null && messageToConfirm.requester.phoneNumber.equals(receivedSms.phoneNumber)) {
-                        messageToConfirm.action(splitted[0]);
-                        messageToConfirm = null;
-                    } else
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_unknowncommand));
-                    break;
-            }
-        }
-
-        RxBus.INSTANCE.send(new EventSmsCommunicatorUpdateGui());
-    }
-
-    @SuppressWarnings("unused")
-    private void processBG(String[] splitted, Sms receivedSms) {
-        BgReading actualBG = DatabaseHelper.actualBg();
-        BgReading lastBG = DatabaseHelper.lastBg();
-
-        String reply = "";
-
-        String units = ProfileFunctions.getInstance().getProfileUnits();
-
-        if (actualBG != null) {
-            reply = MainApp.gs(R.string.sms_actualbg) + " " + actualBG.valueToUnitsToString(units) + ", ";
-        } else if (lastBG != null) {
-            Long agoMsec = System.currentTimeMillis() - lastBG.date;
-            int agoMin = (int) (agoMsec / 60d / 1000d);
-            reply = MainApp.gs(R.string.sms_lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(MainApp.gs(R.string.sms_minago), agoMin) + ", ";
-        }
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
-        if (glucoseStatus != null)
-            reply += MainApp.gs(R.string.sms_delta) + " " + Profile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", ";
-
-        TreatmentsPlugin.getPlugin().updateTotalIOBTreatments();
-        IobTotal bolusIob = TreatmentsPlugin.getPlugin().getLastCalculationTreatments().round();
-        TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals();
-        IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals().round();
-
-        String cobText = MainApp.gs(R.string.value_unavailable_short);
-        CobInfo cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "SMS COB");
-
-        reply += MainApp.gs(R.string.sms_iob) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
-                + MainApp.gs(R.string.sms_bolus) + " " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
-                + MainApp.gs(R.string.sms_basal) + " " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U), "
-                + MainApp.gs(R.string.cob) + ": " + cobInfo.generateCOBString();
-
-        sendSMS(new Sms(receivedSms.phoneNumber, reply));
-        receivedSms.processed = true;
-    }
-
-    private void processLOOP(String[] splitted, Sms receivedSms) {
-        String reply;
-        switch (splitted[1].toUpperCase()) {
-            case "DISABLE":
-            case "STOP":
-                LoopPlugin loopPlugin = LoopPlugin.getPlugin();
-                if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                    loopPlugin.setPluginEnabled(PluginType.LOOP, false);
-                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
-                        @Override
-                        public void run() {
-                            RxBus.INSTANCE.send(new EventRefreshOverview("SMS_LOOP_STOP"));
-                            String reply = MainApp.gs(R.string.smscommunicator_loophasbeendisabled) + " " +
-                                    MainApp.gs(result.success ? R.string.smscommunicator_tempbasalcanceled : R.string.smscommunicator_tempbasalcancelfailed);
-                            sendSMS(new Sms(receivedSms.phoneNumber, reply));
-                        }
-                    });
-                } else {
-                    sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopisdisabled));
-                }
-                receivedSms.processed = true;
-                break;
-            case "ENABLE":
-            case "START":
-                loopPlugin = LoopPlugin.getPlugin();
-                if (!loopPlugin.isEnabled(PluginType.LOOP)) {
-                    loopPlugin.setPluginEnabled(PluginType.LOOP, true);
-                    sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_loophasbeenenabled));
-                    RxBus.INSTANCE.send(new EventRefreshOverview("SMS_LOOP_START"));
-                } else {
-                    sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopisenabled));
-                }
-                receivedSms.processed = true;
-                break;
-            case "STATUS":
-                loopPlugin = LoopPlugin.getPlugin();
-                if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                    if (loopPlugin.isSuspended())
-                        reply = String.format(MainApp.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend());
-                    else
-                        reply = MainApp.gs(R.string.smscommunicator_loopisenabled);
-                } else {
-                    reply = MainApp.gs(R.string.smscommunicator_loopisdisabled);
-                }
-                sendSMS(new Sms(receivedSms.phoneNumber, reply));
-                receivedSms.processed = true;
-                break;
-            case "RESUME":
-                LoopPlugin.getPlugin().suspendTo(0);
-                RxBus.INSTANCE.send(new EventRefreshOverview("SMS_LOOP_RESUME"));
-                NSUpload.uploadOpenAPSOffline(0);
-                sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopresumed));
-                break;
-            case "SUSPEND":
-                int duration = 0;
-                if (splitted.length == 3)
-                    duration = SafeParse.stringToInt(splitted[2]);
-                duration = Math.max(0, duration);
-                duration = Math.min(180, duration);
-                if (duration == 0) {
-                    receivedSms.processed = true;
-                    sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_wrongduration));
-                    return;
-                } else {
-                    String passCode = generatePasscode();
-                    reply = String.format(MainApp.gs(R.string.smscommunicator_suspendreplywithcode), duration, passCode);
-                    receivedSms.processed = true;
-                    messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(duration) {
-                        @Override
-                        public void run() {
-                            ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
-                                @Override
-                                public void run() {
-                                    if (result.success) {
-                                        LoopPlugin.getPlugin().suspendTo(System.currentTimeMillis() + anInteger * 60L * 1000);
-                                        NSUpload.uploadOpenAPSOffline(anInteger * 60);
-                                        RxBus.INSTANCE.send(new EventRefreshOverview("SMS_LOOP_SUSPENDED"));
-                                        String reply = MainApp.gs(R.string.smscommunicator_loopsuspended) + " " +
-                                                MainApp.gs(result.success ? R.string.smscommunicator_tempbasalcanceled : R.string.smscommunicator_tempbasalcancelfailed);
-                                        sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
-                                    } else {
-                                        String reply = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed);
-                                        reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
-                                        sendSMS(new Sms(receivedSms.phoneNumber, reply));
-                                    }
-                                }
-                            });
-
-                        }
-                    });
-                }
-                break;
-            default:
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-                break;
-        }
-    }
-
-    private void processTREATMENTS(String[] splitted, Sms receivedSms) {
-        if (splitted[1].toUpperCase().equals("REFRESH")) {
-            TreatmentsPlugin.getPlugin().getService().resetTreatments();
-            RxBus.INSTANCE.send(new EventNSClientRestart());
-            sendSMS(new Sms(receivedSms.phoneNumber, "TREATMENTS REFRESH SENT"));
-            receivedSms.processed = true;
-        } else
-            sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-    }
-
-    private void processNSCLIENT(String[] splitted, Sms receivedSms) {
-        if (splitted[1].toUpperCase().equals("RESTART")) {
-            RxBus.INSTANCE.send(new EventNSClientRestart());
-            sendSMS(new Sms(receivedSms.phoneNumber, "NSCLIENT RESTART SENT"));
-            receivedSms.processed = true;
-        } else
-            sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-    }
-
-    @SuppressWarnings("unused")
-    private void processPUMP(String[] splitted, Sms receivedSms) {
-        ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("SMS", new Callback() {
-            @Override
-            public void run() {
-                PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-                if (result.success) {
-                    if (pump != null) {
-                        String reply = pump.shortStatus(true);
-                        sendSMS(new Sms(receivedSms.phoneNumber, reply));
-                    }
-                } else {
-                    String reply = MainApp.gs(R.string.readstatusfailed);
-                    sendSMS(new Sms(receivedSms.phoneNumber, reply));
-                }
-            }
-        });
-        receivedSms.processed = true;
-    }
-
-    private void processPROFILE(String[] splitted, Sms receivedSms) {
-        // load profiles
-        ProfileInterface anInterface = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface();
-        if (anInterface == null) {
-            sendSMS(new Sms(receivedSms.phoneNumber, R.string.notconfigured));
-            receivedSms.processed = true;
-            return;
-        }
-        ProfileStore store = anInterface.getProfile();
-        if (store == null) {
-            sendSMS(new Sms(receivedSms.phoneNumber, R.string.notconfigured));
-            receivedSms.processed = true;
-            return;
-        }
-        final ArrayList<CharSequence> list = store.getProfileList();
-
-        if (splitted[1].toUpperCase().equals("STATUS")) {
-            sendSMS(new Sms(receivedSms.phoneNumber, ProfileFunctions.getInstance().getProfileName()));
-        } else if (splitted[1].toUpperCase().equals("LIST")) {
-            if (list.isEmpty())
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.invalidprofile));
-            else {
-                String reply = "";
-                for (int i = 0; i < list.size(); i++) {
-                    if (i > 0)
-                        reply += "\n";
-                    reply += (i + 1) + ". ";
-                    reply += list.get(i);
-                }
-                sendSMS(new Sms(receivedSms.phoneNumber, reply));
-            }
-        } else {
-
-            int pindex = SafeParse.stringToInt(splitted[1]);
-            int percentage = 100;
-            if (splitted.length > 2)
-                percentage = SafeParse.stringToInt(splitted[2]);
-
-            if (pindex > list.size())
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-            else if (percentage == 0)
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-            else if (pindex == 0)
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-            else {
-                final Profile profile = store.getSpecificProfile((String) list.get(pindex - 1));
-                if (profile == null)
-                    sendSMS(new Sms(receivedSms.phoneNumber, R.string.noprofile));
-                else {
-                    String passCode = generatePasscode();
-                    String reply = String.format(MainApp.gs(R.string.smscommunicator_profilereplywithcode), list.get(pindex - 1), percentage, passCode);
-                    receivedSms.processed = true;
-                    int finalPercentage = percentage;
-                    messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction((String) list.get(pindex - 1), finalPercentage) {
-                        @Override
-                        public void run() {
-                            ProfileFunctions.doProfileSwitch(store, (String) list.get(pindex - 1), 0, finalPercentage, 0);
-                            sendSMS(new Sms(receivedSms.phoneNumber, R.string.profileswitchcreated));
-                        }
-                    });
-                }
-            }
-        }
-        receivedSms.processed = true;
-    }
-
-    private void processBASAL(String[] splitted, Sms receivedSms) {
-        if (splitted[1].toUpperCase().equals("CANCEL") || splitted[1].toUpperCase().equals("STOP")) {
-            String passCode = generatePasscode();
-            String reply = String.format(MainApp.gs(R.string.smscommunicator_basalstopreplywithcode), passCode);
-            receivedSms.processed = true;
-            messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction() {
-                @Override
-                public void run() {
-                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
-                        @Override
-                        public void run() {
-                            if (result.success) {
-                                String reply = MainApp.gs(R.string.smscommunicator_tempbasalcanceled);
-                                reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
-                                sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
-                            } else {
-                                String reply = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed);
-                                reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
-                                sendSMS(new Sms(receivedSms.phoneNumber, reply));
-                            }
-                        }
-                    });
-                }
-            });
-        } else if (splitted[1].endsWith("%")) {
-            int tempBasalPct = SafeParse.stringToInt(StringUtils.removeEnd(splitted[1], "%"));
-            int duration = 30;
-            if (splitted.length > 2)
-                duration = SafeParse.stringToInt(splitted[2]);
-            final Profile profile = ProfileFunctions.getInstance().getProfile();
-
-            if (profile == null)
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.noprofile));
-            else if (tempBasalPct == 0 && !splitted[1].equals("0%"))
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-            else if (duration == 0)
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-            else {
-                tempBasalPct = MainApp.getConstraintChecker().applyBasalPercentConstraints(new Constraint<>(tempBasalPct), profile).value();
-                String passCode = generatePasscode();
-                String reply = String.format(MainApp.gs(R.string.smscommunicator_basalpctreplywithcode), tempBasalPct, duration, passCode);
-                receivedSms.processed = true;
-                messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(tempBasalPct, duration) {
-                    @Override
-                    public void run() {
-                        ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(anInteger, secondInteger, true, profile, new Callback() {
-                            @Override
-                            public void run() {
-                                if (result.success) {
-                                    String reply;
-                                    if (result.isPercent)
-                                        reply = String.format(MainApp.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration);
-                                    else
-                                        reply = String.format(MainApp.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration);
-                                    reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
-                                    sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
-                                } else {
-                                    String reply = MainApp.gs(R.string.smscommunicator_tempbasalfailed);
-                                    reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
-                                    sendSMS(new Sms(receivedSms.phoneNumber, reply));
-                                }
-                            }
-                        });
-                    }
-                });
-            }
-        } else {
-            Double tempBasal = SafeParse.stringToDouble(splitted[1]);
-            int duration = 30;
-            if (splitted.length > 2)
-                duration = SafeParse.stringToInt(splitted[2]);
-            final Profile profile = ProfileFunctions.getInstance().getProfile();
-            if (profile == null)
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.noprofile));
-            else if (tempBasal == 0 && !splitted[1].equals("0"))
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-            else if (duration == 0)
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-            else {
-                tempBasal = MainApp.getConstraintChecker().applyBasalConstraints(new Constraint<>(tempBasal), profile).value();
-                String passCode = generatePasscode();
-                String reply = String.format(MainApp.gs(R.string.smscommunicator_basalreplywithcode), tempBasal, duration, passCode);
-                receivedSms.processed = true;
-                messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(tempBasal, duration) {
-                    @Override
-                    public void run() {
-                        ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalAbsolute(aDouble, secondInteger, true, profile, new Callback() {
-                            @Override
-                            public void run() {
-                                if (result.success) {
-                                    String reply;
-                                    if (result.isPercent)
-                                        reply = String.format(MainApp.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration);
-                                    else
-                                        reply = String.format(MainApp.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration);
-                                    reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
-                                    sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
-                                } else {
-                                    String reply = MainApp.gs(R.string.smscommunicator_tempbasalfailed);
-                                    reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
-                                    sendSMS(new Sms(receivedSms.phoneNumber, reply));
-                                }
-                            }
-                        });
-                    }
-                });
-            }
-        }
-    }
-
-    private void processEXTENDED(String[] splitted, Sms receivedSms) {
-        if (splitted[1].toUpperCase().equals("CANCEL") || splitted[1].toUpperCase().equals("STOP")) {
-            String passCode = generatePasscode();
-            String reply = String.format(MainApp.gs(R.string.smscommunicator_extendedstopreplywithcode), passCode);
-            receivedSms.processed = true;
-            messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction() {
-                @Override
-                public void run() {
-                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelExtended(new Callback() {
-                        @Override
-                        public void run() {
-                            if (result.success) {
-                                String reply = MainApp.gs(R.string.smscommunicator_extendedcanceled);
-                                reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
-                                sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
-                            } else {
-                                String reply = MainApp.gs(R.string.smscommunicator_extendedcancelfailed);
-                                reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
-                                sendSMS(new Sms(receivedSms.phoneNumber, reply));
-                            }
-                        }
-                    });
-                }
-            });
-        } else if (splitted.length != 3) {
-            sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-        } else {
-            Double extended = SafeParse.stringToDouble(splitted[1]);
-            int duration = SafeParse.stringToInt(splitted[2]);
-            extended = MainApp.getConstraintChecker().applyExtendedBolusConstraints(new Constraint<>(extended)).value();
-            if (extended == 0 || duration == 0)
-                sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-            else {
-                String passCode = generatePasscode();
-                String reply = String.format(MainApp.gs(R.string.smscommunicator_extendedreplywithcode), extended, duration, passCode);
-                receivedSms.processed = true;
-                messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(extended, duration) {
-                    @Override
-                    public void run() {
-                        ConfigBuilderPlugin.getPlugin().getCommandQueue().extendedBolus(aDouble, secondInteger, new Callback() {
-                            @Override
-                            public void run() {
-                                if (result.success) {
-                                    String reply = String.format(MainApp.gs(R.string.smscommunicator_extendedset), aDouble, duration);
-                                    reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
-                                    sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
-                                } else {
-                                    String reply = MainApp.gs(R.string.smscommunicator_extendedfailed);
-                                    reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
-                                    sendSMS(new Sms(receivedSms.phoneNumber, reply));
-                                }
-                            }
-                        });
-                    }
-                });
-            }
-        }
-    }
-
-
-    private void processBOLUS(String[] splitted, Sms receivedSms) {
-        Double bolus = SafeParse.stringToDouble(splitted[1]);
-        bolus = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(bolus)).value();
-        if (bolus > 0d) {
-            String passCode = generatePasscode();
-            String reply = String.format(MainApp.gs(R.string.smscommunicator_bolusreplywithcode), bolus, passCode);
-            receivedSms.processed = true;
-            messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(bolus) {
-                @Override
-                public void run() {
-                    DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-                    detailedBolusInfo.insulin = aDouble;
-                    detailedBolusInfo.source = Source.USER;
-                    ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
-                        @Override
-                        public void run() {
-                            final boolean resultSuccess = result.success;
-                            final double resultBolusDelivered = result.bolusDelivered;
-                            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("SMS", new Callback() {
-                                @Override
-                                public void run() {
-                                    PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-                                    if (resultSuccess) {
-                                        String reply = String.format(MainApp.gs(R.string.smscommunicator_bolusdelivered), resultBolusDelivered);
-                                        if (pump != null)
-                                            reply += "\n" + pump.shortStatus(true);
-                                        lastRemoteBolusTime = DateUtil.now();
-                                        sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply));
-                                    } else {
-                                        String reply = MainApp.gs(R.string.smscommunicator_bolusfailed);
-                                        if (pump != null)
-                                            reply += "\n" + pump.shortStatus(true);
-                                        sendSMS(new Sms(receivedSms.phoneNumber, reply));
-                                    }
-                                }
-                            });
-                        }
-                    });
-                }
-            });
-        } else
-            sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-    }
-
-    private void processCAL(String[] splitted, Sms receivedSms) {
-        Double cal = SafeParse.stringToDouble(splitted[1]);
-        if (cal > 0d) {
-            String passCode = generatePasscode();
-            String reply = String.format(MainApp.gs(R.string.smscommunicator_calibrationreplywithcode), cal, passCode);
-            receivedSms.processed = true;
-            messageToConfirm = new AuthRequest(this, receivedSms, reply, passCode, new SmsAction(cal) {
-                @Override
-                public void run() {
-                    boolean result = XdripCalibrations.sendIntent(aDouble);
-                    if (result)
-                        sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_calibrationsent));
-                    else
-                        sendSMS(new Sms(receivedSms.phoneNumber, R.string.smscommunicator_calibrationfailed));
-                }
-            });
-        } else
-            sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
-    }
-
-    public boolean sendNotificationToAllNumbers(String text) {
-        boolean result = true;
-        for (int i = 0; i < allowedNumbers.size(); i++) {
-            Sms sms = new Sms(allowedNumbers.get(i), text);
-            result = result && sendSMS(sms);
-        }
-        return result;
-    }
-
-    private void sendSMSToAllNumbers(Sms sms) {
-        for (String number : allowedNumbers) {
-            sms.phoneNumber = number;
-            sendSMS(sms);
-        }
-    }
-
-    boolean sendSMS(Sms sms) {
-        SmsManager smsManager = SmsManager.getDefault();
-        sms.text = stripAccents(sms.text);
-
-        try {
-            if (L.isEnabled(L.SMS))
-                log.debug("Sending SMS to " + sms.phoneNumber + ": " + sms.text);
-            if (sms.text.getBytes().length <= 140)
-                smsManager.sendTextMessage(sms.phoneNumber, null, sms.text, null, null);
-            else {
-                ArrayList<String> parts = smsManager.divideMessage(sms.text);
-                smsManager.sendMultipartTextMessage(sms.phoneNumber, null, parts,
-                        null, null);
-            }
-
-            messages.add(sms);
-        } catch (IllegalArgumentException e) {
-            if (e.getMessage().equals("Invalid message body")) {
-                Notification notification = new Notification(Notification.INVALID_MESSAGE_BODY, MainApp.gs(R.string.smscommunicator_messagebody), Notification.NORMAL);
-                RxBus.INSTANCE.send(new EventNewNotification(notification));
-                return false;
-            } else {
-                Notification notification = new Notification(Notification.INVALID_PHONE_NUMBER, MainApp.gs(R.string.smscommunicator_invalidphonennumber), Notification.NORMAL);
-                RxBus.INSTANCE.send(new EventNewNotification(notification));
-                return false;
-            }
-        } catch (java.lang.SecurityException e) {
-            Notification notification = new Notification(Notification.MISSING_SMS_PERMISSION, MainApp.gs(R.string.smscommunicator_missingsmspermission), Notification.NORMAL);
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-            return false;
-        }
-        RxBus.INSTANCE.send(new EventSmsCommunicatorUpdateGui());
-        return true;
-    }
-
-    private String generatePasscode() {
-        int startChar1 = 'A'; // on iphone 1st char is uppercase :)
-        String passCode = Character.toString((char) (startChar1 + Math.random() * ('z' - 'a' + 1)));
-        int startChar2 = Math.random() > 0.5 ? 'a' : 'A';
-        passCode += Character.toString((char) (startChar2 + Math.random() * ('z' - 'a' + 1)));
-        int startChar3 = Math.random() > 0.5 ? 'a' : 'A';
-        passCode += Character.toString((char) (startChar3 + Math.random() * ('z' - 'a' + 1)));
-        passCode = passCode.replace('l', 'k').replace('I', 'J');
-        return passCode;
-    }
-
-    private static String stripAccents(String s) {
-        s = Normalizer.normalize(s, Normalizer.Form.NFD);
-        s = s.replaceAll("[\\p{InCombiningDiacriticalMarks}]", "");
-        return s;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
new file mode 100644
index 0000000000..e40ed8b1df
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -0,0 +1,922 @@
+package info.nightscout.androidaps.plugins.general.smsCommunicator
+
+import android.content.Intent
+import android.preference.EditTextPreference
+import android.preference.Preference
+import android.preference.Preference.OnPreferenceChangeListener
+import android.preference.PreferenceFragment
+import android.telephony.SmsManager
+import android.telephony.SmsMessage
+import android.text.TextUtils
+import com.andreabaccega.widget.ValidatingEditTextPreference
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.db.DatabaseHelper
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.db.TempTarget
+import info.nightscout.androidaps.events.EventPreferenceChange
+import info.nightscout.androidaps.events.EventRefreshOverview
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBus.send
+import info.nightscout.androidaps.plugins.bus.RxBus.toObservable
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.*
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import org.apache.commons.lang3.StringUtils
+import org.slf4j.LoggerFactory
+import java.text.Normalizer
+import java.util.*
+
+object SmsCommunicatorPlugin : PluginBase(PluginDescription()
+        .mainType(PluginType.GENERAL)
+        .fragmentClass(SmsCommunicatorFragment::class.java.name)
+        .pluginName(R.string.smscommunicator)
+        .shortName(R.string.smscommunicator_shortname)
+        .preferencesId(R.xml.pref_smscommunicator)
+        .description(R.string.description_sms_communicator)
+) {
+    private val log = LoggerFactory.getLogger(L.SMS)
+    private val disposable = CompositeDisposable()
+    var allowedNumbers: MutableList<String> = ArrayList()
+    var messageToConfirm: AuthRequest? = null
+    var lastRemoteBolusTime: Long = 0
+    var messages = ArrayList<Sms>()
+
+    val commands = mapOf(
+            "BG" to "BG",
+            "LOOP" to "LOOP STOP/DISABLE/START/ENABLE/RESUME/STATUS\nLOOP SUSPEND 20",
+            "TREATMENTS" to "TREATMENTS REFRESH",
+            "NSCLIENT" to "NSCLIENT RESTART",
+            "PUMP" to "PUMP",
+            "BASAL" to "BASAL STOP/CANCEL\nBASAL 0.3\nBASAL 0.3 20\nBASAL 30%\nBASAL 30% 20\n",
+            "BOLUS" to "BOLUS 1.2\nBOLUS 1.2 MEAL",
+            "EXTENDED" to "EXTENDED STOP/CANCEL\nEXTENDED 2 120",
+            "CAL" to "CAL 5.6",
+            "PROFILE" to "PROFILE STATUS/LIST\nPROFILE 1\nPROFILE 2 30",
+            "TARGET" to "TARGET MEAL/ACTIVITY/HYPO/STOP",
+            "SMS" to "SMS DISABLE/STOP",
+            "CARBS" to "CARBS 12\nCARBS 12 23:05\nCARBS 12 11:05PM",
+            "HELP" to "HELP\nHELP command"
+    )
+
+    init {
+        processSettings(null)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        disposable.add(toObservable(EventPreferenceChange::class.java)
+                .observeOn(Schedulers.io())
+                .subscribe({ event: EventPreferenceChange? -> processSettings(event) }) { throwable: Throwable? -> FabricPrivacy.logException(throwable) }
+        )
+    }
+
+    override fun onStop() {
+        disposable.clear()
+        super.onStop()
+    }
+
+    override fun preprocessPreferences(preferenceFragment: PreferenceFragment) {
+        super.preprocessPreferences(preferenceFragment)
+        val distance = preferenceFragment.findPreference(MainApp.gs(R.string.key_smscommunicator_remotebolusmindistance)) as ValidatingEditTextPreference?
+                ?: return
+        val allowedNumbers = preferenceFragment.findPreference(MainApp.gs(R.string.key_smscommunicator_allowednumbers)) as EditTextPreference?
+                ?: return
+        if (!areMoreNumbers(allowedNumbers.text)) {
+            distance.title = (MainApp.gs(R.string.smscommunicator_remotebolusmindistance)
+                    + ".\n"
+                    + MainApp.gs(R.string.smscommunicator_remotebolusmindistance_caveat))
+            distance.isEnabled = false
+        } else {
+            distance.title = MainApp.gs(R.string.smscommunicator_remotebolusmindistance)
+            distance.isEnabled = true
+        }
+        allowedNumbers.onPreferenceChangeListener = OnPreferenceChangeListener { _: Preference?, newValue: Any ->
+            if (!areMoreNumbers(newValue as String)) {
+                distance.text = (Constants.remoteBolusMinDistance / (60 * 1000L)).toString()
+                distance.title = (MainApp.gs(R.string.smscommunicator_remotebolusmindistance)
+                        + ".\n"
+                        + MainApp.gs(R.string.smscommunicator_remotebolusmindistance_caveat))
+                distance.isEnabled = false
+            } else {
+                distance.title = MainApp.gs(R.string.smscommunicator_remotebolusmindistance)
+                distance.isEnabled = true
+            }
+            true
+        }
+    }
+
+    override fun updatePreferenceSummary(pref: Preference) {
+        super.updatePreferenceSummary(pref)
+        if (pref is EditTextPreference) {
+            val editTextPref = pref
+            if (pref.getKey().contains("smscommunicator_allowednumbers") && (editTextPref.text == null || TextUtils.isEmpty(editTextPref.text.trim { it <= ' ' }))) {
+                pref.setSummary(MainApp.gs(R.string.smscommunicator_allowednumbers_summary))
+            }
+        }
+    }
+
+    private fun processSettings(ev: EventPreferenceChange?) {
+        if (ev == null || ev.isChanged(R.string.key_smscommunicator_allowednumbers)) {
+            val settings = SP.getString(R.string.key_smscommunicator_allowednumbers, "")
+            allowedNumbers.clear()
+            val substrings = settings.split(";").toTypedArray()
+            for (number in substrings) {
+                val cleaned = number.replace("\\s+".toRegex(), "")
+                allowedNumbers.add(cleaned)
+                log.debug("Found allowed number: $cleaned")
+            }
+        }
+    }
+
+    fun isCommand(command: String, number: String): Boolean {
+        var found = false
+        commands.forEach { (k, _) ->
+            if (k == command) found = true
+        }
+        return found || messageToConfirm?.requester?.phoneNumber == number
+    }
+
+    fun isAllowedNumber(number: String): Boolean {
+        for (num in allowedNumbers) {
+            if (num == number) return true
+        }
+        return false
+    }
+
+    fun handleNewData(intent: Intent) {
+        val bundle = intent.extras ?: return
+        val format = bundle.getString("format") ?: return
+        val pdus = bundle["pdus"] as Array<*>
+        for (pdu in pdus) {
+            val message = SmsMessage.createFromPdu(pdu as ByteArray, format)
+            processSms(Sms(message))
+        }
+    }
+
+    fun processSms(receivedSms: Sms) {
+        if (!isEnabled(PluginType.GENERAL)) {
+            log.debug("Ignoring SMS. Plugin disabled.")
+            return
+        }
+        if (!isAllowedNumber(receivedSms.phoneNumber)) {
+            log.debug("Ignoring SMS from: " + receivedSms.phoneNumber + ". Sender not allowed")
+            receivedSms.ignored = true
+            messages.add(receivedSms)
+            send(EventSmsCommunicatorUpdateGui())
+            return
+        }
+        val pump = ConfigBuilderPlugin.getPlugin().activePump ?: return
+        messages.add(receivedSms)
+        log.debug(receivedSms.toString())
+        val splitted = receivedSms.text.split(Regex("\\s+")).toTypedArray()
+        val remoteCommandsAllowed = SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)
+        if (splitted.isNotEmpty() && isCommand(splitted[0].toUpperCase(Locale.getDefault()), receivedSms.phoneNumber)) {
+            when (splitted[0].toUpperCase(Locale.getDefault())) {
+                "BG" ->
+                    if (splitted.size == 1) processBG(receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "LOOP" ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else if (splitted.size == 2 || splitted.size == 3) processLOOP(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "TREATMENTS" ->
+                    if (splitted.size == 2) processTREATMENTS(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "NSCLIENT" ->
+                    if (splitted.size == 2) processNSCLIENT(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "PUMP" ->
+                    if (splitted.size == 1) processPUMP(receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "PROFILE" ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else if (splitted.size == 2 || splitted.size == 3) processPROFILE(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "BASAL" ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else if (splitted.size == 2 || splitted.size == 3) processBASAL(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "EXTENDED" ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else if (splitted.size == 2 || splitted.size == 3) processEXTENDED(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "BOLUS" ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else if (splitted.size == 2 && DateUtil.now() - lastRemoteBolusTime < Constants.remoteBolusMinDistance) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotebolusnotallowed))
+                    else if (splitted.size == 2 && pump.isSuspended) sendSMS(Sms(receivedSms.phoneNumber, R.string.pumpsuspended))
+                    else if (splitted.size == 2 || splitted.size == 3) processBOLUS(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "CARBS" ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else if (splitted.size == 2 || splitted.size == 3) processCARBS(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "CAL" ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else if (splitted.size == 2) processCAL(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "TARGET" ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else if (splitted.size == 2) processTARGET(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "SMS" ->
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_remotecommandnotallowed))
+                    else if (splitted.size == 2) processSMS(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                "HELP" ->
+                    if (splitted.size == 1 || splitted.size == 2) processHELP(splitted, receivedSms)
+                    else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                else ->
+                    if (messageToConfirm?.requester?.phoneNumber == receivedSms.phoneNumber) {
+                        messageToConfirm?.action(splitted[0])
+                        messageToConfirm = null
+                    } else sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_unknowncommand))
+            }
+        }
+        send(EventSmsCommunicatorUpdateGui())
+    }
+
+    private fun processBG(receivedSms: Sms) {
+        val actualBG = DatabaseHelper.actualBg()
+        val lastBG = DatabaseHelper.lastBg()
+        var reply = ""
+        val units = ProfileFunctions.getInstance().profileUnits
+        if (actualBG != null) {
+            reply = MainApp.gs(R.string.sms_actualbg) + " " + actualBG.valueToUnitsToString(units) + ", "
+        } else if (lastBG != null) {
+            val agoMsec = System.currentTimeMillis() - lastBG.date
+            val agoMin = (agoMsec / 60.0 / 1000.0).toInt()
+            reply = MainApp.gs(R.string.sms_lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(MainApp.gs(R.string.sms_minago), agoMin) + ", "
+        }
+        val glucoseStatus = GlucoseStatus.getGlucoseStatusData()
+        if (glucoseStatus != null) reply += MainApp.gs(R.string.sms_delta) + " " + Profile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", "
+        TreatmentsPlugin.getPlugin().updateTotalIOBTreatments()
+        val bolusIob = TreatmentsPlugin.getPlugin().lastCalculationTreatments.round()
+        TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals()
+        val basalIob = TreatmentsPlugin.getPlugin().lastCalculationTempBasals.round()
+        val cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "SMS COB")
+        reply += (MainApp.gs(R.string.sms_iob) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
+                + MainApp.gs(R.string.sms_bolus) + " " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
+                + MainApp.gs(R.string.sms_basal) + " " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U), "
+                + MainApp.gs(R.string.cob) + ": " + cobInfo.generateCOBString())
+        sendSMS(Sms(receivedSms.phoneNumber, reply))
+        receivedSms.processed = true
+    }
+
+    private fun processLOOP(splitted: Array<String>, receivedSms: Sms) {
+        when (splitted[1].toUpperCase(Locale.getDefault())) {
+            "DISABLE", "STOP" -> {
+                val loopPlugin = LoopPlugin.getPlugin()
+                if (loopPlugin.isEnabled(PluginType.LOOP)) {
+                    loopPlugin.setPluginEnabled(PluginType.LOOP, false)
+                    ConfigBuilderPlugin.getPlugin().commandQueue.cancelTempBasal(true, object : Callback() {
+                        override fun run() {
+                            send(EventRefreshOverview("SMS_LOOP_STOP"))
+                            val replyText = MainApp.gs(R.string.smscommunicator_loophasbeendisabled) + " " +
+                                    MainApp.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
+                            sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                        }
+                    })
+                } else
+                    sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopisdisabled))
+                receivedSms.processed = true
+            }
+            "ENABLE", "START" -> {
+                val loopPlugin = LoopPlugin.getPlugin()
+                if (!loopPlugin.isEnabled(PluginType.LOOP)) {
+                    loopPlugin.setPluginEnabled(PluginType.LOOP, true)
+                    sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_loophasbeenenabled))
+                    send(EventRefreshOverview("SMS_LOOP_START"))
+                } else
+                    sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopisenabled))
+                receivedSms.processed = true
+            }
+            "STATUS" -> {
+                val loopPlugin = LoopPlugin.getPlugin()
+                val reply = if (loopPlugin.isEnabled(PluginType.LOOP)) {
+                    if (loopPlugin.isSuspended()) String.format(MainApp.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend())
+                    else MainApp.gs(R.string.smscommunicator_loopisenabled)
+                } else
+                    MainApp.gs(R.string.smscommunicator_loopisdisabled)
+                sendSMS(Sms(receivedSms.phoneNumber, reply))
+                receivedSms.processed = true
+            }
+            "RESUME" -> {
+                LoopPlugin.getPlugin().suspendTo(0)
+                send(EventRefreshOverview("SMS_LOOP_RESUME"))
+                NSUpload.uploadOpenAPSOffline(0.0)
+                sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopresumed))
+            }
+            "SUSPEND" -> {
+                var duration = 0
+                if (splitted.size == 3) duration = SafeParse.stringToInt(splitted[2])
+                duration = Math.max(0, duration)
+                duration = Math.min(180, duration)
+                if (duration == 0) {
+                    receivedSms.processed = true
+                    sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_wrongduration))
+                    return
+                } else {
+                    val passCode = generatePasscode()
+                    val reply = String.format(MainApp.gs(R.string.smscommunicator_suspendreplywithcode), duration, passCode)
+                    receivedSms.processed = true
+                    messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(duration) {
+                        override fun run() {
+                            ConfigBuilderPlugin.getPlugin().commandQueue.cancelTempBasal(true, object : Callback() {
+                                override fun run() {
+                                    if (result.success) {
+                                        LoopPlugin.getPlugin().suspendTo(System.currentTimeMillis() + anInteger() * 60L * 1000)
+                                        NSUpload.uploadOpenAPSOffline(anInteger() * 60.toDouble())
+                                        send(EventRefreshOverview("SMS_LOOP_SUSPENDED"))
+                                        val replyText = MainApp.gs(R.string.smscommunicator_loopsuspended) + " " +
+                                                MainApp.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
+                                        sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                                    } else {
+                                        var replyText = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed)
+                                        replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                        sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                                    }
+                                }
+                            })
+                        }
+                    })
+                }
+            }
+            else -> sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+        }
+    }
+
+    private fun processTREATMENTS(splitted: Array<String>, receivedSms: Sms) {
+        if (splitted[1].toUpperCase(Locale.getDefault()) == "REFRESH") {
+            TreatmentsPlugin.getPlugin().service.resetTreatments()
+            send(EventNSClientRestart())
+            sendSMS(Sms(receivedSms.phoneNumber, "TREATMENTS REFRESH SENT"))
+            receivedSms.processed = true
+        } else
+            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+    }
+
+    private fun processNSCLIENT(splitted: Array<String>, receivedSms: Sms) {
+        if (splitted[1].toUpperCase(Locale.getDefault()) == "RESTART") {
+            send(EventNSClientRestart())
+            sendSMS(Sms(receivedSms.phoneNumber, "NSCLIENT RESTART SENT"))
+            receivedSms.processed = true
+        } else
+            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+    }
+
+    private fun processHELP(splitted: Array<String>, receivedSms: Sms) {
+        if (splitted.size == 1) {
+            sendSMS(Sms(receivedSms.phoneNumber, commands.keys.toString().replace("[", "").replace("]", "")))
+            receivedSms.processed = true
+        } else if (isCommand(splitted[1].toUpperCase(Locale.getDefault()), receivedSms.phoneNumber)) {
+            commands[splitted[1].toUpperCase(Locale.getDefault())]?.let {
+                sendSMS(Sms(receivedSms.phoneNumber, it))
+                receivedSms.processed = true
+            }
+        } else
+            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+    }
+
+    private fun processPUMP(receivedSms: Sms) {
+        ConfigBuilderPlugin.getPlugin().commandQueue.readStatus("SMS", object : Callback() {
+            override fun run() {
+                val pump = ConfigBuilderPlugin.getPlugin().activePump
+                if (result.success) {
+                    if (pump != null) {
+                        val reply = pump.shortStatus(true)
+                        sendSMS(Sms(receivedSms.phoneNumber, reply))
+                    }
+                } else {
+                    val reply = MainApp.gs(R.string.readstatusfailed)
+                    sendSMS(Sms(receivedSms.phoneNumber, reply))
+                }
+            }
+        })
+        receivedSms.processed = true
+    }
+
+    private fun processPROFILE(splitted: Array<String>, receivedSms: Sms) { // load profiles
+        val anInterface = ConfigBuilderPlugin.getPlugin().activeProfileInterface
+        if (anInterface == null) {
+            sendSMS(Sms(receivedSms.phoneNumber, R.string.notconfigured))
+            receivedSms.processed = true
+            return
+        }
+        val store = anInterface.profile
+        if (store == null) {
+            sendSMS(Sms(receivedSms.phoneNumber, R.string.notconfigured))
+            receivedSms.processed = true
+            return
+        }
+        val list = store.profileList
+        if (splitted[1].toUpperCase(Locale.getDefault()) == "STATUS") {
+            sendSMS(Sms(receivedSms.phoneNumber, ProfileFunctions.getInstance().profileName))
+        } else if (splitted[1].toUpperCase(Locale.getDefault()) == "LIST") {
+            if (list.isEmpty()) sendSMS(Sms(receivedSms.phoneNumber, R.string.invalidprofile))
+            else {
+                var reply = ""
+                for (i in list.indices) {
+                    if (i > 0) reply += "\n"
+                    reply += (i + 1).toString() + ". "
+                    reply += list[i]
+                }
+                sendSMS(Sms(receivedSms.phoneNumber, reply))
+            }
+        } else {
+            val pindex = SafeParse.stringToInt(splitted[1])
+            var percentage = 100
+            if (splitted.size > 2) percentage = SafeParse.stringToInt(splitted[2])
+            if (pindex > list.size) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            else if (percentage == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            else if (pindex == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            else {
+                val profile = store.getSpecificProfile(list[pindex - 1] as String)
+                if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, R.string.noprofile))
+                else {
+                    val passCode = generatePasscode()
+                    val reply = String.format(MainApp.gs(R.string.smscommunicator_profilereplywithcode), list[pindex - 1], percentage, passCode)
+                    receivedSms.processed = true
+                    val finalPercentage = percentage
+                    messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(list[pindex - 1] as String, finalPercentage) {
+                        override fun run() {
+                            ProfileFunctions.doProfileSwitch(store, list[pindex - 1] as String, 0, finalPercentage, 0)
+                            sendSMS(Sms(receivedSms.phoneNumber, R.string.profileswitchcreated))
+                        }
+                    })
+                }
+            }
+        }
+        receivedSms.processed = true
+    }
+
+    private fun processBASAL(splitted: Array<String>, receivedSms: Sms) {
+        if (splitted[1].toUpperCase(Locale.getDefault()) == "CANCEL" || splitted[1].toUpperCase(Locale.getDefault()) == "STOP") {
+            val passCode = generatePasscode()
+            val reply = String.format(MainApp.gs(R.string.smscommunicator_basalstopreplywithcode), passCode)
+            receivedSms.processed = true
+            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction() {
+                override fun run() {
+                    ConfigBuilderPlugin.getPlugin().commandQueue.cancelTempBasal(true, object : Callback() {
+                        override fun run() {
+                            if (result.success) {
+                                var replyText = MainApp.gs(R.string.smscommunicator_tempbasalcanceled)
+                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                            } else {
+                                var replyText = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed)
+                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                            }
+                        }
+                    })
+                }
+            })
+        } else if (splitted[1].endsWith("%")) {
+            var tempBasalPct = SafeParse.stringToInt(StringUtils.removeEnd(splitted[1], "%"))
+            var duration = 30
+            if (splitted.size > 2) duration = SafeParse.stringToInt(splitted[2])
+            val profile = ProfileFunctions.getInstance().profile
+            if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, R.string.noprofile))
+            else if (tempBasalPct == 0 && splitted[1] != "0%") sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            else if (duration == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            else {
+                tempBasalPct = MainApp.getConstraintChecker().applyBasalPercentConstraints(Constraint(tempBasalPct), profile).value()
+                val passCode = generatePasscode()
+                val reply = String.format(MainApp.gs(R.string.smscommunicator_basalpctreplywithcode), tempBasalPct, duration, passCode)
+                receivedSms.processed = true
+                messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(tempBasalPct, duration) {
+                    override fun run() {
+                        ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalPercent(anInteger(), secondInteger(), true, profile, object : Callback() {
+                            override fun run() {
+                                if (result.success) {
+                                    var replyText: String
+                                    replyText = if (result.isPercent) String.format(MainApp.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration) else String.format(MainApp.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration)
+                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                                } else {
+                                    var replyText = MainApp.gs(R.string.smscommunicator_tempbasalfailed)
+                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        } else {
+            var tempBasal = SafeParse.stringToDouble(splitted[1])
+            var duration = 30
+            if (splitted.size > 2) duration = SafeParse.stringToInt(splitted[2])
+            val profile = ProfileFunctions.getInstance().profile
+            if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, R.string.noprofile))
+            else if (tempBasal == 0.0 && splitted[1] != "0") sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            else if (duration == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            else {
+                tempBasal = MainApp.getConstraintChecker().applyBasalConstraints(Constraint(tempBasal), profile).value()
+                val passCode = generatePasscode()
+                val reply = String.format(MainApp.gs(R.string.smscommunicator_basalreplywithcode), tempBasal, duration, passCode)
+                receivedSms.processed = true
+                messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(tempBasal, duration) {
+                    override fun run() {
+                        ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalAbsolute(aDouble(), secondInteger(), true, profile, object : Callback() {
+                            override fun run() {
+                                if (result.success) {
+                                    var replyText = if (result.isPercent) String.format(MainApp.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration)
+                                    else String.format(MainApp.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration)
+                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                                } else {
+                                    var replyText = MainApp.gs(R.string.smscommunicator_tempbasalfailed)
+                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+    }
+
+    private fun processEXTENDED(splitted: Array<String>, receivedSms: Sms) {
+        if (splitted[1].toUpperCase(Locale.getDefault()) == "CANCEL" || splitted[1].toUpperCase(Locale.getDefault()) == "STOP") {
+            val passCode = generatePasscode()
+            val reply = String.format(MainApp.gs(R.string.smscommunicator_extendedstopreplywithcode), passCode)
+            receivedSms.processed = true
+            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction() {
+                override fun run() {
+                    ConfigBuilderPlugin.getPlugin().commandQueue.cancelExtended(object : Callback() {
+                        override fun run() {
+                            if (result.success) {
+                                var replyText = MainApp.gs(R.string.smscommunicator_extendedcanceled)
+                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                            } else {
+                                var replyText = MainApp.gs(R.string.smscommunicator_extendedcancelfailed)
+                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                            }
+                        }
+                    })
+                }
+            })
+        } else if (splitted.size != 3) {
+            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+        } else {
+            var extended = SafeParse.stringToDouble(splitted[1])
+            val duration = SafeParse.stringToInt(splitted[2])
+            extended = MainApp.getConstraintChecker().applyExtendedBolusConstraints(Constraint(extended)).value()
+            if (extended == 0.0 || duration == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+            else {
+                val passCode = generatePasscode()
+                val reply = String.format(MainApp.gs(R.string.smscommunicator_extendedreplywithcode), extended, duration, passCode)
+                receivedSms.processed = true
+                messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(extended, duration) {
+                    override fun run() {
+                        ConfigBuilderPlugin.getPlugin().commandQueue.extendedBolus(aDouble(), secondInteger(), object : Callback() {
+                            override fun run() {
+                                if (result.success) {
+                                    var replyText = String.format(MainApp.gs(R.string.smscommunicator_extendedset), aDouble, duration)
+                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                                } else {
+                                    var replyText = MainApp.gs(R.string.smscommunicator_extendedfailed)
+                                    replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                    sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                                }
+                            }
+                        })
+                    }
+                })
+            }
+        }
+    }
+
+    private fun processBOLUS(splitted: Array<String>, receivedSms: Sms) {
+        var bolus = SafeParse.stringToDouble(splitted[1])
+        val isMeal = splitted.size > 2 && splitted[2].equals("MEAL", ignoreCase = true)
+        bolus = MainApp.getConstraintChecker().applyBolusConstraints(Constraint(bolus)).value()
+        if (splitted.size == 3 && !isMeal) {
+            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+        } else if (bolus > 0.0) {
+            val passCode = generatePasscode()
+            val reply = if (isMeal)
+                String.format(MainApp.gs(R.string.smscommunicator_mealbolusreplywithcode), bolus, passCode)
+            else
+                String.format(MainApp.gs(R.string.smscommunicator_bolusreplywithcode), bolus, passCode)
+            receivedSms.processed = true
+            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(bolus) {
+                override fun run() {
+                    val detailedBolusInfo = DetailedBolusInfo()
+                    detailedBolusInfo.insulin = aDouble()
+                    detailedBolusInfo.source = Source.USER
+                    ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                        override fun run() {
+                            val resultSuccess = result.success
+                            val resultBolusDelivered = result.bolusDelivered
+                            ConfigBuilderPlugin.getPlugin().commandQueue.readStatus("SMS", object : Callback() {
+                                override fun run() {
+                                    if (resultSuccess) {
+                                        var replyText = if (isMeal)
+                                            String.format(MainApp.gs(R.string.smscommunicator_mealbolusdelivered), resultBolusDelivered)
+                                        else
+                                            String.format(MainApp.gs(R.string.smscommunicator_bolusdelivered), resultBolusDelivered)
+                                        replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                        lastRemoteBolusTime = DateUtil.now()
+                                        if (isMeal) {
+                                            ProfileFunctions.getInstance().profile?.let { currentProfile ->
+                                                var eatingSoonTTDuration = SP.getInt(R.string.key_eatingsoon_duration, Constants.defaultEatingSoonTTDuration)
+                                                eatingSoonTTDuration =
+                                                        if (eatingSoonTTDuration > 0) eatingSoonTTDuration
+                                                        else Constants.defaultEatingSoonTTDuration
+                                                var eatingSoonTT = SP.getDouble(R.string.key_eatingsoon_target, if (currentProfile.units == Constants.MMOL) Constants.defaultEatingSoonTTmmol else Constants.defaultEatingSoonTTmgdl)
+                                                eatingSoonTT =
+                                                        if (eatingSoonTT > 0) eatingSoonTT
+                                                        else if (currentProfile.units == Constants.MMOL) Constants.defaultEatingSoonTTmmol
+                                                        else Constants.defaultEatingSoonTTmgdl
+                                                val tempTarget = TempTarget()
+                                                        .date(System.currentTimeMillis())
+                                                        .duration(eatingSoonTTDuration)
+                                                        .reason(MainApp.gs(R.string.eatingsoon))
+                                                        .source(Source.USER)
+                                                        .low(Profile.toMgdl(eatingSoonTT, currentProfile.units))
+                                                        .high(Profile.toMgdl(eatingSoonTT, currentProfile.units))
+                                                TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
+                                                val tt = if (currentProfile.units == Constants.MMOL) {
+                                                    DecimalFormatter.to1Decimal(eatingSoonTT)
+                                                } else DecimalFormatter.to0Decimal(eatingSoonTT)
+                                                replyText += "\n" + String.format(MainApp.gs(R.string.smscommunicator_mealbolusdelivered_tt), tt, eatingSoonTTDuration)
+                                            }
+                                        }
+                                        sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                                    } else {
+                                        var replyText = MainApp.gs(R.string.smscommunicator_bolusfailed)
+                                        replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                        sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                                    }
+                                }
+                            })
+                        }
+                    })
+                }
+            })
+        } else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+    }
+
+    private fun processCARBS(splitted: Array<String>, receivedSms: Sms) {
+        var grams = SafeParse.stringToInt(splitted[1])
+        var time = DateUtil.now()
+        if (splitted.size > 2) {
+            val seconds = DateUtil.toSeconds(splitted[2].toUpperCase(Locale.getDefault()))
+            val midnight = MidnightTime.calc()
+            if (seconds == 0 && (!splitted[2].startsWith("00:00") || !splitted[2].startsWith("12:00"))) {
+                sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+                return
+            }
+            time = midnight + T.secs(seconds.toLong()).msecs()
+        }
+        grams = MainApp.getConstraintChecker().applyCarbsConstraints(Constraint(grams)).value()
+        if (grams == 0) sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+        else {
+            val passCode = generatePasscode()
+            val reply = String.format(MainApp.gs(R.string.smscommunicator_carbsreplywithcode), grams, DateUtil.timeString(time), passCode)
+            receivedSms.processed = true
+            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(grams, time) {
+                override fun run() {
+                    val detailedBolusInfo = DetailedBolusInfo()
+                    detailedBolusInfo.carbs = anInteger().toDouble()
+                    detailedBolusInfo.date = secondLong()
+                    ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
+                        override fun run() {
+                            if (result.success) {
+                                var replyText = String.format(MainApp.gs(R.string.smscommunicator_carbsset), anInteger)
+                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                            } else {
+                                var replyText = MainApp.gs(R.string.smscommunicator_carbsfailed)
+                                replyText += "\n" + ConfigBuilderPlugin.getPlugin().activePump?.shortStatus(true)
+                                sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                            }
+                        }
+                    })
+                }
+            })
+        }
+    }
+
+    private fun processTARGET(splitted: Array<String>, receivedSms: Sms) {
+        val isMeal = splitted[1].equals("MEAL", ignoreCase = true)
+        val isActivity = splitted[1].equals("ACTIVITY", ignoreCase = true)
+        val isHypo = splitted[1].equals("HYPO", ignoreCase = true)
+        val isStop = splitted[1].equals("STOP", ignoreCase = true) || splitted[1].equals("CANCEL", ignoreCase = true)
+        if (isMeal || isActivity || isHypo) {
+            val passCode = generatePasscode()
+            val reply = String.format(MainApp.gs(R.string.smscommunicator_temptargetwithcode), splitted[1].toUpperCase(Locale.getDefault()), passCode)
+            receivedSms.processed = true
+            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction() {
+                override fun run() {
+                    val currentProfile = ProfileFunctions.getInstance().profile
+                    if (currentProfile != null) {
+                        var keyDuration = 0
+                        var defaultTargetDuration = 0
+                        var keyTarget = 0
+                        var defaultTargetMMOL = 0.0
+                        var defaultTargetMGDL = 0.0
+                        if (isMeal) {
+                            keyDuration = R.string.key_eatingsoon_duration
+                            defaultTargetDuration = Constants.defaultEatingSoonTTDuration
+                            keyTarget = R.string.key_eatingsoon_target
+                            defaultTargetMMOL = Constants.defaultEatingSoonTTmmol
+                            defaultTargetMGDL = Constants.defaultEatingSoonTTmgdl
+                        } else if (isActivity) {
+                            keyDuration = R.string.key_activity_duration
+                            defaultTargetDuration = Constants.defaultActivityTTDuration
+                            keyTarget = R.string.key_activity_target
+                            defaultTargetMMOL = Constants.defaultActivityTTmmol
+                            defaultTargetMGDL = Constants.defaultActivityTTmgdl
+                        } else if (isHypo) {
+                            keyDuration = R.string.key_hypo_duration
+                            defaultTargetDuration = Constants.defaultHypoTTDuration
+                            keyTarget = R.string.key_hypo_target
+                            defaultTargetMMOL = Constants.defaultHypoTTmmol
+                            defaultTargetMGDL = Constants.defaultHypoTTmgdl
+                        }
+                        var ttDuration = SP.getInt(keyDuration, defaultTargetDuration)
+                        ttDuration = if (ttDuration > 0) ttDuration else defaultTargetDuration
+                        var tt = SP.getDouble(keyTarget, if (currentProfile.units == Constants.MMOL) defaultTargetMMOL else defaultTargetMGDL)
+                        tt = if (tt > 0) tt else if (currentProfile.units == Constants.MMOL) defaultTargetMMOL else defaultTargetMGDL
+                        val tempTarget = TempTarget()
+                                .date(System.currentTimeMillis())
+                                .duration(ttDuration)
+                                .reason(MainApp.gs(R.string.eatingsoon))
+                                .source(Source.USER)
+                                .low(Profile.toMgdl(tt, currentProfile.units))
+                                .high(Profile.toMgdl(tt, currentProfile.units))
+                        TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
+                        val ttString = if (currentProfile.units == Constants.MMOL) DecimalFormatter.to1Decimal(tt) else DecimalFormatter.to0Decimal(tt)
+                        val replyText = String.format(MainApp.gs(R.string.smscommunicator_tt_set), ttString, ttDuration)
+                        sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                    } else {
+                        sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_unknowncommand))
+                    }
+                }
+            })
+        } else if (isStop) {
+            val passCode = generatePasscode()
+            val reply = String.format(MainApp.gs(R.string.smscommunicator_temptargetcancel), passCode)
+            receivedSms.processed = true
+            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction() {
+                override fun run() {
+                    val currentProfile = ProfileFunctions.getInstance().profile
+                    if (currentProfile != null) {
+                        val tempTarget = TempTarget()
+                                .source(Source.USER)
+                                .date(DateUtil.now())
+                                .duration(0)
+                                .low(0.0)
+                                .high(0.0)
+                        TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
+                        val replyText = String.format(MainApp.gs(R.string.smscommunicator_tt_canceled))
+                        sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                    } else {
+                        sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_unknowncommand))
+                    }
+                }
+            })
+        } else
+            sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+    }
+
+    private fun processSMS(splitted: Array<String>, receivedSms: Sms) {
+        val isStop = (splitted[1].equals("STOP", ignoreCase = true)
+                || splitted[1].equals("DISABLE", ignoreCase = true))
+        if (isStop) {
+            val passCode = generatePasscode()
+            val reply = String.format(MainApp.gs(R.string.smscommunicator_stopsmswithcode), passCode)
+            receivedSms.processed = true
+            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction() {
+                override fun run() {
+                    SP.putBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)
+                    val replyText = String.format(MainApp.gs(R.string.smscommunicator_stoppedsms))
+                    sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
+                }
+            })
+        } else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+    }
+
+    private fun processCAL(splitted: Array<String>, receivedSms: Sms) {
+        val cal = SafeParse.stringToDouble(splitted[1])
+        if (cal > 0.0) {
+            val passCode = generatePasscode()
+            val reply = String.format(MainApp.gs(R.string.smscommunicator_calibrationreplywithcode), cal, passCode)
+            receivedSms.processed = true
+            messageToConfirm = AuthRequest(this, receivedSms, reply, passCode, object : SmsAction(cal) {
+                override fun run() {
+                    val result = XdripCalibrations.sendIntent(aDouble)
+                    if (result) sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, R.string.smscommunicator_calibrationsent)) else sendSMS(Sms(receivedSms.phoneNumber, R.string.smscommunicator_calibrationfailed))
+                }
+            })
+        } else sendSMS(Sms(receivedSms.phoneNumber, R.string.wrongformat))
+    }
+
+    fun sendNotificationToAllNumbers(text: String): Boolean {
+        var result = true
+        for (i in allowedNumbers.indices) {
+            val sms = Sms(allowedNumbers[i], text)
+            result = result && sendSMS(sms)
+        }
+        return result
+    }
+
+    private fun sendSMSToAllNumbers(sms: Sms) {
+        for (number in allowedNumbers) {
+            sms.phoneNumber = number
+            sendSMS(sms)
+        }
+    }
+
+    fun sendSMS(sms: Sms): Boolean {
+        val smsManager = SmsManager.getDefault()
+        sms.text = stripAccents(sms.text)
+        try {
+            if (L.isEnabled(L.SMS)) log.debug("Sending SMS to " + sms.phoneNumber + ": " + sms.text)
+            if (sms.text.toByteArray().size <= 140) smsManager.sendTextMessage(sms.phoneNumber, null, sms.text, null, null)
+            else {
+                val parts = smsManager.divideMessage(sms.text)
+                smsManager.sendMultipartTextMessage(sms.phoneNumber, null, parts,
+                        null, null)
+            }
+            messages.add(sms)
+        } catch (e: IllegalArgumentException) {
+            return if (e.message == "Invalid message body") {
+                val notification = Notification(Notification.INVALID_MESSAGE_BODY, MainApp.gs(R.string.smscommunicator_messagebody), Notification.NORMAL)
+                send(EventNewNotification(notification))
+                false
+            } else {
+                val notification = Notification(Notification.INVALID_PHONE_NUMBER, MainApp.gs(R.string.smscommunicator_invalidphonennumber), Notification.NORMAL)
+                send(EventNewNotification(notification))
+                false
+            }
+        } catch (e: SecurityException) {
+            val notification = Notification(Notification.MISSING_SMS_PERMISSION, MainApp.gs(R.string.smscommunicator_missingsmspermission), Notification.NORMAL)
+            send(EventNewNotification(notification))
+            return false
+        }
+        send(EventSmsCommunicatorUpdateGui())
+        return true
+    }
+
+    private fun generatePasscode(): String {
+        val startChar1 = 'A'.toInt() // on iphone 1st char is uppercase :)
+        var passCode = Character.toString((startChar1 + Math.random() * ('z' - 'a' + 1)).toChar())
+        val startChar2: Int = if (Math.random() > 0.5) 'a'.toInt() else 'A'.toInt()
+        passCode += Character.toString((startChar2 + Math.random() * ('z' - 'a' + 1)).toChar())
+        val startChar3: Int = if (Math.random() > 0.5) 'a'.toInt() else 'A'.toInt()
+        passCode += Character.toString((startChar3 + Math.random() * ('z' - 'a' + 1)).toChar())
+        passCode = passCode.replace('l', 'k').replace('I', 'J')
+        return passCode
+    }
+
+    private fun stripAccents(str: String): String {
+        var s = str
+        s = Normalizer.normalize(s, Normalizer.Form.NFD)
+        s = s.replace("[\\p{InCombiningDiacriticalMarks}]".toRegex(), "")
+        return s
+    }
+
+    fun areMoreNumbers(allowednumbers: String?): Boolean {
+        return allowednumbers?.let {
+            var countNumbers = 0
+            val substrings = it.split(";").toTypedArray()
+            for (number in substrings) {
+                var cleaned = number.replace(Regex("\\s+"), "")
+                if (cleaned.length < 4) continue
+                cleaned = cleaned.replace("+", "")
+                cleaned = cleaned.replace("-", "")
+                if (!cleaned.matches(Regex("[0-9]+"))) continue
+                countNumbers++
+            }
+            countNumbers > 1
+        } ?: false
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
index 78ad0ab37d..e8971ab9d5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.tidepool
 
+import android.preference.PreferenceFragment
 import android.text.Spanned
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
@@ -34,7 +35,6 @@ object TidepoolPlugin : PluginBase(PluginDescription()
         .preferencesId(R.xml.pref_tidepool)
         .description(R.string.description_tidepool)
 ) {
-
     private val log = LoggerFactory.getLogger(L.TIDEPOOL)
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -111,6 +111,16 @@ object TidepoolPlugin : PluginBase(PluginDescription()
         super.onStop()
     }
 
+    override fun preprocessPreferences(preferenceFragment: PreferenceFragment) {
+        super.preprocessPreferences(preferenceFragment)
+
+        val tidepoolTestLogin = preferenceFragment.findPreference(MainApp.gs(R.string.key_tidepool_test_login))
+        tidepoolTestLogin?.setOnPreferenceClickListener {
+            TidepoolUploader.testLogin(preferenceFragment.getActivity())
+            false
+        }
+    }
+
     private fun doUpload() =
         when (TidepoolUploader.connectionStatus) {
             TidepoolUploader.ConnectionStatus.FAILED -> {}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
index 3e551b6ccf..a7b005b9b8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
@@ -16,6 +16,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
  */
 
 public class Encoding4b6bLoop extends Encoding4b6bAbstract {
+    private static final Logger log = LoggerFactory.getLogger(Encoding4b6bLoop.class);
 
     public static final Logger LOG = LoggerFactory.getLogger(Encoding4b6bLoop.class);
     public Map<Integer, Byte> codesRev = null;
@@ -108,9 +109,8 @@ public class Encoding4b6bLoop extends Encoding4b6bAbstract {
                     int index2 = ((bitAccumulator >> (availBits - 12)) & 0b111111);
                     hiNibble = codesRev.get((bitAccumulator >> (availBits - 6)));
                     loNibble = codesRev.get(((bitAccumulator >> (availBits - 12)) & 0b111111));
-                } catch (Exception ex) {
-                    System.out.println("Exception: " + ex.getMessage());
-                    ex.printStackTrace();
+                } catch (Exception e) {
+                    log.error("Unhandled exception", e);
                     return null;
                 }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
index 0801d8a173..dba3b4ca77 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
@@ -383,7 +383,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                     try {
                         o.wait();
                     } catch (InterruptedException e) {
-                        e.printStackTrace();
+                        log.error("Unhandled exception", e);
                     }
                 }
             } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index 7b2668d45c..55be88996b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -5,10 +5,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
+import android.preference.Preference;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
 
+import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
@@ -110,6 +112,14 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
         }
     }
 
+    @Override
+    public void updatePreferenceSummary(@NotNull Preference pref) {
+        super.updatePreferenceSummary(pref);
+
+        if (pref.getKey().equals(MainApp.gs(R.string.key_danars_name)))
+            pref.setSummary(SP.getString(R.string.key_danars_name, ""));
+    }
+
     @Override
     protected void onStart() {
         Context context = MainApp.instance().getApplicationContext();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
index 3d59b34e16..55a2e0c51e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
@@ -4,11 +4,15 @@ import android.annotation.TargetApi;
 import android.os.Build;
 
 import com.cozmo.danar.util.BleCommandUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 
 public class DanaRS_Packet {
+    private static final Logger log = LoggerFactory.getLogger(DanaRS_Packet.class);
+
     protected static final int TYPE_START = 0;
     protected static final int OPCODE_START = 1;
     protected static final int DATA_START = 2;
@@ -73,7 +77,7 @@ public class DanaRS_Packet {
 
             return ret;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
         return null;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
index 8a43d6e35a..253b861811 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
@@ -551,7 +551,7 @@ public class BLEComm {
                             break;
                     }
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    log.error("Unhandled exception", e);
                 }
                 startSignatureFound = false;
                 packetIsValid = false;
@@ -635,7 +635,7 @@ public class BLEComm {
                 message.wait(5000);
             } catch (InterruptedException e) {
                 log.error("sendMessage InterruptedException", e);
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 7baf9458c9..5104e70fe8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -1526,7 +1526,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             data.put("notes", note);
             NSUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
@@ -1554,7 +1554,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             data.put("eventType", event);
             NSUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            log.error("Unhandled exception", e);
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
index 874c908ca5..f6b3dc588c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
@@ -3,8 +3,11 @@ package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.histor
 import info.nightscout.androidaps.plugins.pump.insight.ids.HistoryEventIDs;
 import info.nightscout.androidaps.plugins.pump.insight.utils.BOCUtil;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HistoryEvent implements Comparable<HistoryEvent> {
+    private static final Logger log = LoggerFactory.getLogger(HistoryEvent.class);
 
     private int eventYear;
     private int eventMonth;
@@ -22,10 +25,8 @@ public class HistoryEvent implements Comparable<HistoryEvent> {
         else {
             try {
                 event = eventClass.newInstance();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (InstantiationException e) {
-                e.printStackTrace();
+            } catch (IllegalAccessException | InstantiationException e) {
+                log.error("Unhandled exception", e);
             }
         }
         event.parseHeader(byteBuf);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
index ae6d754493..f0d10e0370 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
@@ -48,6 +48,7 @@ import info.nightscout.androidaps.plugins.general.overview.dialogs.ErrorHelperAc
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.pump.common.PumpPluginAbstract;
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
@@ -372,7 +373,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
             refreshAnyStatusThatNeedsToBeRefreshed();
         }
 
-       RxBus.INSTANCE.send(new EventMedtronicPumpValuesChanged());
+        RxBus.INSTANCE.send(new EventMedtronicPumpValuesChanged());
     }
 
 
@@ -386,7 +387,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
         RileyLinkServiceState rileyLinkServiceState = MedtronicUtil.getServiceState();
 
-        if (rileyLinkServiceState==null) {
+        if (rileyLinkServiceState == null) {
             LOG.error("RileyLink unreachable. RileyLinkServiceState is null.");
             return false;
         }
@@ -744,13 +745,13 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
         ClockDTO clock = MedtronicUtil.getPumpTime();
 
-        if (clock==null) { // retry
+        if (clock == null) { // retry
             medtronicUIComm.executeCommand(MedtronicCommandType.GetRealTimeClock);
 
             clock = MedtronicUtil.getPumpTime();
         }
 
-        if (clock==null)
+        if (clock == null)
             return;
 
         int timeDiff = Math.abs(clock.timeDifference);
@@ -866,6 +867,11 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                     }).start();
                 }
 
+                long now = System.currentTimeMillis();
+
+                detailedBolusInfo.date = now;
+                detailedBolusInfo.deliverAt = now; // not sure about that one
+
                 TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true);
 
                 // we subtract insulin, exact amount will be visible with next remainingInsulin update.
@@ -877,7 +883,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
                 // calculate time for bolus and set driver to busy for that time
                 int bolusTime = (int) (detailedBolusInfo.insulin * 42.0d);
-                long time = System.currentTimeMillis() + (bolusTime * 1000);
+                long time = now + (bolusTime * 1000);
 
                 this.busyTimestamps.add(time);
                 setEnableCustomAction(MedtronicCustomActionType.ClearBolusBlock, true);
@@ -1065,10 +1071,10 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
     @Override
     public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile,
                                                boolean enforceNew) {
-        if (percent==0) {
+        if (percent == 0) {
             return setTempBasalAbsolute(0.0d, durationInMinutes, profile, enforceNew);
         } else {
-            double absoluteValue = profile.getBasal() * (percent /100.0d);
+            double absoluteValue = profile.getBasal() * (percent / 100.0d);
             getMDTPumpStatus();
             absoluteValue = pumpStatusLocal.pumpType.determineCorrectBasalSize(absoluteValue);
             LOG.warn("setTempBasalPercent [MedtronicPumpPlugin] - You are trying to use setTempBasalPercent with percent other then 0% (%d). This will start setTempBasalAbsolute, with calculated value (%.3f). Result might not be 100% correct.", percent, absoluteValue);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
index 32ca320de2..71f387d176 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
@@ -412,25 +412,18 @@ public class MedtronicPumpHistoryDecoder extends MedtronicHistoryDecoder<PumpHis
             rate = body[1] * 0.025f;
         }
 
-        LOG.info("Basal Profile Start: offset={}, rate={}, index={}, body_raw={}", offset, rate, index,
-                body);
+        //LOG.info("Basal Profile Start: offset={}, rate={}, index={}, body_raw={}", offset, rate, index, body);
 
         if (rate == null) {
             LOG.warn("Basal Profile Start (ERROR): offset={}, rate={}, index={}, body_raw={}", offset, rate, index,
                     body);
             return RecordDecodeStatus.Error;
         } else {
-            // writeData(PumpBaseType.Basal, PumpBasalType.ValueChange, getFormattedFloat(rate, 3),
-            // entry.getATechDate());
             entry.addDecodedData("Value", getFormattedFloat(rate, 3));
             entry.setDisplayableValue(getFormattedFloat(rate, 3));
             return RecordDecodeStatus.OK;
         }
 
-//        profileIndex = asUINT8(data[1]);
-//        offset = asUINT8(data[7]) * 30 * 1000 * 60;
-//        rate = (double)(asUINT8(data[8])) / 40.0;
-
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
index 5017d50059..58c9b77d6b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
@@ -10,12 +10,10 @@ import java.util.List;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 
-/**
- * Created by andy on 9/23/18.
- */
-
 /**
  * History page contains data, sorted from newest to oldest (0=newest..n=oldest)
+ *
+ * Created by andy on 9/23/18.
  */
 public class PumpHistoryResult {
 
@@ -29,8 +27,6 @@ public class PumpHistoryResult {
     public List<PumpHistoryEntry> validEntries;
 
 
-    // private Object validValues;
-
     public PumpHistoryResult(PumpHistoryEntry searchEntry, Long targetDate) {
         if (searchEntry != null) {
             /*
@@ -109,9 +105,8 @@ public class PumpHistoryResult {
                     if (unprocessedEntry.isAfter(this.searchDate)) {
                         this.validEntries.add(unprocessedEntry);
                     } else {
-                        LOG.debug("PE. PumpHistoryResult. Not after.. Unprocessed Entry [year={},entry={}]",
-                                DateTimeUtil.getYear(unprocessedEntry.atechDateTime), unprocessedEntry);
-
+//                        LOG.debug("PE. PumpHistoryResult. Not after.. Unprocessed Entry [year={},entry={}]",
+//                                DateTimeUtil.getYear(unprocessedEntry.atechDateTime), unprocessedEntry);
                         if (DateTimeUtil.getYear(unprocessedEntry.atechDateTime) > 2015)
                             olderEntries++;
                     }
@@ -131,14 +126,6 @@ public class PumpHistoryResult {
     }
 
 
-    private void clearOrPrepareList() {
-        if (this.validEntries == null)
-            this.validEntries = new ArrayList<>();
-        else
-            this.validEntries.clear();
-    }
-
-
     public String toString() {
         return "PumpHistoryResult [unprocessed=" + (unprocessedEntries != null ? "" + unprocessedEntries.size() : "0") + //
                 ", valid=" + (validEntries != null ? "" + validEntries.size() : "0") + //
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
index 1eed440cdc..2e23d2a955 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
@@ -49,6 +49,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpSta
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.plugins.treatments.TreatmentService;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.SP;
@@ -67,7 +68,6 @@ import info.nightscout.androidaps.utils.SP;
 // All things marked with "TODO: Fix db code" needs to be updated in new 2.5 database code
 
 public class MedtronicHistoryData {
-
     private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
 
     private List<PumpHistoryEntry> allHistory = null;
@@ -77,6 +77,7 @@ public class MedtronicHistoryData {
     private boolean isInit = false;
 
     private Gson gson;
+    private Gson gsonCore;
 
     private DatabaseHelper databaseHelper = MainApp.getDbHelper();
     private ClockDTO pumpTime;
@@ -94,10 +95,15 @@ public class MedtronicHistoryData {
     public MedtronicHistoryData() {
         this.allHistory = new ArrayList<>();
         this.gson = MedtronicUtil.gsonInstance;
+        this.gsonCore = MedtronicUtil.getGsonInstanceCore();
 
         if (this.gson == null) {
             this.gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
         }
+
+        if (this.gsonCore == null) {
+            this.gsonCore = new GsonBuilder().create();
+        }
     }
 
 
@@ -523,7 +529,7 @@ public class MedtronicHistoryData {
             data.put("eventType", event);
             NSUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
-            e.printStackTrace();
+            LOG.error("Unhandled exception", e);
         }
     }
 
@@ -597,7 +603,7 @@ public class MedtronicHistoryData {
 
         if (doubleBolusDebug)
             LOG.debug("DoubleBolusDebug: List (before filter): {}, FromDb={}", gson.toJson(entryList),
-                    gson.toJson(entriesFromHistory));
+                    gsonCore.toJson(entriesFromHistory));
 
         filterOutAlreadyAddedEntries(entryList, entriesFromHistory);
 
@@ -609,7 +615,7 @@ public class MedtronicHistoryData {
 
         if (doubleBolusDebug)
             LOG.debug("DoubleBolusDebug: List (after filter): {}, FromDb={}", gson.toJson(entryList),
-                    gson.toJson(entriesFromHistory));
+                    gsonCore.toJson(entriesFromHistory));
 
         if (isCollectionEmpty(entriesFromHistory)) {
             for (PumpHistoryEntry treatment : entryList) {
@@ -862,6 +868,7 @@ public class MedtronicHistoryData {
             return;
 
         List<DbObjectBase> removeTreatmentsFromHistory = new ArrayList<>();
+        List<PumpHistoryEntry> removeTreatmentsFromPH = new ArrayList<>();
 
         for (DbObjectBase treatment : treatmentsFromHistory) {
 
@@ -879,11 +886,17 @@ public class MedtronicHistoryData {
                 if (selectedBolus != null) {
                     entryList.remove(selectedBolus);
 
+                    removeTreatmentsFromPH.add(selectedBolus);
                     removeTreatmentsFromHistory.add(treatment);
                 }
             }
         }
 
+        if (doubleBolusDebug)
+            LOG.debug("DoubleBolusDebug: filterOutAlreadyAddedEntries: PumpHistory={}, Treatments={}",
+                    gson.toJson(removeTreatmentsFromPH),
+                    gsonCore.toJson(removeTreatmentsFromHistory));
+
         treatmentsFromHistory.removeAll(removeTreatmentsFromHistory);
     }
 
@@ -947,36 +960,23 @@ public class MedtronicHistoryData {
 
         } else {
 
-            DetailedBolusInfo detailedBolusInfo = DetailedBolusInfoStorage.INSTANCE.findDetailedBolusInfo(treatment.date, bolusDTO.getDeliveredAmount());
+            if (doubleBolusDebug)
+                LOG.debug("DoubleBolusDebug: addBolus(OldTreatment={}): Bolus={}", treatment, bolusDTO);
+
+            treatment.source = Source.PUMP;
+            treatment.pumpId = bolus.getPumpId();
+            treatment.insulin = bolusDTO.getDeliveredAmount();
+
+            TreatmentService.UpdateReturn updateReturn = TreatmentsPlugin.getPlugin().getService().createOrUpdateMedtronic(treatment, false);
 
             if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: addBolus(tretament={}): Bolus={}, DetailedBolusInfo={}", treatment, bolusDTO, detailedBolusInfo);
-
-            if (detailedBolusInfo == null) {
-                detailedBolusInfo = new DetailedBolusInfo();
-
-                if (doubleBolusDebug)
-                    LOG.debug("DoubleBolusDebug: detailedBolusInfoCouldNotBeRetrived !");
-            }
-
-            detailedBolusInfo.date = treatment.date;
-            detailedBolusInfo.source = Source.PUMP;
-            detailedBolusInfo.pumpId = bolus.getPumpId();
-            detailedBolusInfo.insulin = bolusDTO.getDeliveredAmount();
-            detailedBolusInfo.carbs = treatment.carbs;
-
-            addCarbsFromEstimate(detailedBolusInfo, bolus);
-
-            if (doubleBolusDebug)
-                LOG.debug("DoubleBolusDebug: addBolus(tretament!=null): DetailedBolusInfo(New)={}", detailedBolusInfo);
-
-            boolean newRecord = TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
-
-            bolus.setLinkedObject(detailedBolusInfo);
+                LOG.debug("DoubleBolusDebug: addBolus(tretament!=null): NewTreatment={}, UpdateReturn={}", treatment, updateReturn);
 
             if (isLogEnabled())
-                LOG.debug("editBolus - [date={},pumpId={}, insulin={}, newRecord={}]", detailedBolusInfo.date,
-                        detailedBolusInfo.pumpId, detailedBolusInfo.insulin, newRecord);
+                LOG.debug("editBolus - [date={},pumpId={}, insulin={}, newRecord={}]", treatment.date,
+                        treatment.pumpId, treatment.insulin, updateReturn.toString());
+
+            bolus.setLinkedObject(treatment);
 
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
index 96bf0a5d44..2c7ee69c2f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
@@ -61,8 +61,7 @@ public class MedtronicUtil extends RileyLinkUtil {
     private static int doneBit = 1 << 7;
     private static ClockDTO pumpTime;
     public static Gson gsonInstance = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-    public static Gson gsonInstancePretty = new GsonBuilder().excludeFieldsWithoutExposeAnnotation()
-            .setPrettyPrinting().create();
+    public static Gson gsonInstanceCore = new GsonBuilder().create();
     private static BatteryType batteryType = BatteryType.None;
 
 
@@ -70,8 +69,9 @@ public class MedtronicUtil extends RileyLinkUtil {
         return gsonInstance;
     }
 
-    public static Gson getGsonInstancePretty() {
-        return gsonInstancePretty;
+
+    public static Gson getGsonInstanceCore() {
+        return gsonInstanceCore;
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
index dfbe2fff39..633f16cf10 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
@@ -17,6 +17,7 @@ import info.nightscout.androidaps.logging.L
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.utils.T
 import org.json.JSONObject
 import org.slf4j.LoggerFactory
 
@@ -51,7 +52,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
     }
 
     fun findDexcomPackageName(): String? {
-        val packageManager = MainApp.instance().packageManager;
+        val packageManager = MainApp.instance().packageManager
         for (packageInfo in packageManager.getInstalledPackages(0)) {
             if (PACKAGE_NAMES.contains(packageInfo.packageName)) return packageInfo.packageName
         }
@@ -64,43 +65,53 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
             val sensorType = intent.getStringExtra("sensorType") ?: ""
             val glucoseValues = intent.getBundleExtra("glucoseValues")
             for (i in 0 until glucoseValues.size()) {
-                val glucoseValue = glucoseValues.getBundle(i.toString())
-                val bgReading = BgReading()
-                bgReading.value = glucoseValue!!.getInt("glucoseValue").toDouble()
-                bgReading.direction = glucoseValue.getString("trendArrow")
-                bgReading.date = glucoseValue.getLong("timestamp") * 1000
-                bgReading.raw = 0.0
-                if (MainApp.getDbHelper().createIfNotExists(bgReading, "Dexcom$sensorType")) {
-                    if (SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
-                        NSUpload.uploadBg(bgReading, "AndroidAPS-Dexcom$sensorType")
-                    }
-                    if (SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
-                        NSUpload.sendToXdrip(bgReading)
+                glucoseValues.getBundle(i.toString())?.let { glucoseValue ->
+                    val bgReading = BgReading()
+                    bgReading.value = glucoseValue.getInt("glucoseValue").toDouble()
+                    bgReading.direction = glucoseValue.getString("trendArrow")
+                    bgReading.date = glucoseValue.getLong("timestamp") * 1000
+                    bgReading.raw = 0.0
+                    if (MainApp.getDbHelper().createIfNotExists(bgReading, "Dexcom$sensorType")) {
+                        if (SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
+                            NSUpload.uploadBg(bgReading, "AndroidAPS-Dexcom$sensorType")
+                        }
+                        if (SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
+                            NSUpload.sendToXdrip(bgReading)
+                        }
                     }
                 }
             }
             val meters = intent.getBundleExtra("meters")
             for (i in 0 until meters.size()) {
                 val meter = meters.getBundle(i.toString())
-                val timestamp = meter!!.getLong("timestamp") * 1000
-                if (MainApp.getDbHelper().getCareportalEventFromTimestamp(timestamp) != null) continue
-                val jsonObject = JSONObject()
-                jsonObject.put("enteredBy", "AndroidAPS-Dexcom$sensorType")
-                jsonObject.put("created_at", DateUtil.toISOString(timestamp))
-                jsonObject.put("eventType", CareportalEvent.BGCHECK)
-                jsonObject.put("glucoseType", "Finger")
-                jsonObject.put("glucose", meter.getInt("meterValue"))
-                jsonObject.put("units", Constants.MGDL)
-                NSUpload.uploadCareportalEntryToNS(jsonObject)
+                meter?.let {
+                    val timestamp = it.getLong("timestamp") * 1000
+                    val now = DateUtil.now()
+                    if (timestamp > now - T.months(1).msecs() && timestamp < now)
+                        if (MainApp.getDbHelper().getCareportalEventFromTimestamp(timestamp) == null) {
+                            val jsonObject = JSONObject()
+                            jsonObject.put("enteredBy", "AndroidAPS-Dexcom$sensorType")
+                            jsonObject.put("created_at", DateUtil.toISOString(timestamp))
+                            jsonObject.put("eventType", CareportalEvent.BGCHECK)
+                            jsonObject.put("glucoseType", "Finger")
+                            jsonObject.put("glucose", meter.getInt("meterValue"))
+                            jsonObject.put("units", Constants.MGDL)
+                            NSUpload.uploadCareportalEntryToNS(jsonObject)
+                        }
+                }
             }
             if (SP.getBoolean(R.string.key_dexcom_lognssensorchange, false) && intent.hasExtra("sensorInsertionTime")) {
-                val sensorInsertionTime = intent.extras!!.getLong("sensorInsertionTime") * 1000
-                if (MainApp.getDbHelper().getCareportalEventFromTimestamp(sensorInsertionTime) == null) {
-                    val jsonObject = JSONObject()
-                    jsonObject.put("enteredBy", "AndroidAPS-Dexcom$sensorType")
-                    jsonObject.put("created_at", DateUtil.toISOString(sensorInsertionTime))
-                    jsonObject.put("eventType", CareportalEvent.SENSORCHANGE)
-                    NSUpload.uploadCareportalEntryToNS(jsonObject)
+                intent.extras?.let {
+                    val sensorInsertionTime = it.getLong("sensorInsertionTime") * 1000
+                    val now = DateUtil.now()
+                    if (sensorInsertionTime > now - T.months(1).msecs() && sensorInsertionTime < now)
+                        if (MainApp.getDbHelper().getCareportalEventFromTimestamp(sensorInsertionTime) == null) {
+                            val jsonObject = JSONObject()
+                            jsonObject.put("enteredBy", "AndroidAPS-Dexcom$sensorType")
+                            jsonObject.put("created_at", DateUtil.toISOString(sensorInsertionTime))
+                            jsonObject.put("eventType", CareportalEvent.SENSORCHANGE)
+                            NSUpload.uploadCareportalEntryToNS(jsonObject)
+                        }
                 }
             }
         } catch (e: Exception) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index 7123b6c96b..1331c8eedf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -133,7 +133,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
             try {
                 getDao().executeRaw("ALTER TABLE `" + Treatment.TABLE_TREATMENTS + "` ADD COLUMN boluscalc STRING;");
             } catch (SQLException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         } else {
             if (L.isEnabled(L.DATATREATMENTS))
@@ -147,7 +147,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
             try {
                 getDao().executeRaw("ALTER TABLE `" + Treatment.TABLE_TREATMENTS + "` DROP COLUMN boluscalc STRING;");
             } catch (SQLException e) {
-                e.printStackTrace();
+                log.error("Unhandled exception", e);
             }
         }
     }
@@ -736,6 +736,14 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
 
         boolean newRecord;
         boolean success;
+
+        @Override
+        public String toString() {
+            return "UpdateReturn [" +
+                    "newRecord=" + newRecord +
+                    ", success=" + success +
+                    ']';
+        }
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 28181da190..004f44858d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -349,7 +349,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         long time = System.currentTimeMillis();
         synchronized (treatments) {
             if (MedtronicHistoryData.doubleBolusDebug)
-                log.debug("DoubleBolusDebug: AllTreatmentsInDb: {}", MedtronicUtil.getGsonInstance().toJson(treatments));
+                log.debug("DoubleBolusDebug: AllTreatmentsInDb: {}", MedtronicUtil.getGsonInstanceCore().toJson(treatments));
 
             for (Treatment t : treatments) {
                 if (t.date <= time && t.date >= fromTimestamp)
@@ -357,7 +357,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             }
 
             if (MedtronicHistoryData.doubleBolusDebug)
-                log.debug("DoubleBolusDebug: FilteredTreatments: AfterTime={}, Items={}", fromTimestamp, MedtronicUtil.getGsonInstance().toJson(in5minback));
+                log.debug("DoubleBolusDebug: FilteredTreatments: AfterTime={}, Items={}", fromTimestamp, MedtronicUtil.getGsonInstanceCore().toJson(in5minback));
 
             return in5minback;
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.java
index 62e14285eb..b69f3f4dc7 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.java
@@ -50,7 +50,7 @@ public class CommandSetProfile extends Command {
         // Send SMS notification if ProfileSwitch is comming from NS
         ProfileSwitch profileSwitch = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(System.currentTimeMillis());
         if (profileSwitch != null && r.enacted && profileSwitch.source == Source.NIGHTSCOUT) {
-            SmsCommunicatorPlugin smsCommunicatorPlugin = SmsCommunicatorPlugin.getPlugin();
+            SmsCommunicatorPlugin smsCommunicatorPlugin = SmsCommunicatorPlugin.INSTANCE;
             if (smsCommunicatorPlugin.isEnabled(PluginType.GENERAL)) {
                 smsCommunicatorPlugin.sendNotificationToAllNumbers(MainApp.gs(R.string.profile_set_ok));
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.java
index 9af15e9ddc..cb49d8cf4e 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.java
@@ -21,7 +21,7 @@ public class ChargingStateReceiver extends BroadcastReceiver {
         lastEvent = event;
     }
 
-    public EventChargingState grabChargingState(Context context) {
+    public static EventChargingState grabChargingState(Context context) {
         BatteryManager bm = (BatteryManager) context.getSystemService(Context.BATTERY_SERVICE);
 
         if (bm == null)
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
index 3f12d75fce..19cf12bc8a 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
@@ -26,11 +26,6 @@ public class NetworkChangeReceiver extends BroadcastReceiver {
 
     public static final NetworkChangeReceiver instance = new NetworkChangeReceiver();
 
-    // TODO: Split NSClient into network state component that can be used by several plugins and logic for plugin
-    public static void fetch() {
-            new NetworkChangeReceiver().grabNetworkStatus(MainApp.instance().getApplicationContext());
-    }
-
     @Override
     public void onReceive(final Context context, final Intent intent) {
         EventNetworkChange event = grabNetworkStatus(context);
@@ -39,7 +34,7 @@ public class NetworkChangeReceiver extends BroadcastReceiver {
     }
 
     @Nullable
-    public EventNetworkChange grabNetworkStatus(final Context context) {
+    public static EventNetworkChange grabNetworkStatus(final Context context) {
         EventNetworkChange event = new EventNetworkChange();
 
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
diff --git a/app/src/main/java/info/nightscout/androidaps/services/DataService.java b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
index 80a42e145a..44050ece35 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
@@ -103,7 +103,7 @@ public class DataService extends IntentService {
         ) {
             handleNewDataFromNSClient(intent);
         } else if (Telephony.Sms.Intents.SMS_RECEIVED_ACTION.equals(action)) {
-            SmsCommunicatorPlugin.getPlugin().handleNewData(intent);
+            SmsCommunicatorPlugin.INSTANCE.handleNewData(intent);
         }
 
         if (L.isEnabled(L.DATASERVICE))
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java b/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
index d592347d1b..98c4d3a071 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -93,15 +93,15 @@ public class DateUtil {
     }
 
     public static int toSeconds(String hh_colon_mm) {
-        Pattern p = Pattern.compile("(\\d+):(\\d+)( a.m.| p.m.| AM | PM|)");
+        Pattern p = Pattern.compile("(\\d+):(\\d+)( a.m.| p.m.| AM| PM|AM|PM|)");
         Matcher m = p.matcher(hh_colon_mm);
         int retval = 0;
 
         if (m.find()) {
             retval = SafeParse.stringToInt(m.group(1)) * 60 * 60 + SafeParse.stringToInt(m.group(2)) * 60;
-            if ((m.group(3).equals(" a.m.") || m.group(3).equals(" AM")) && m.group(1).equals("12"))
+            if ((m.group(3).equals(" a.m.") || m.group(3).equals(" AM") || m.group(3).equals("AM")) && m.group(1).equals("12"))
                 retval -= 12 * 60 * 60;
-            if ((m.group(3).equals(" p.m.") || m.group(3).equals(" PM")) && !(m.group(1).equals("12")))
+            if ((m.group(3).equals(" p.m.") || m.group(3).equals(" PM") || m.group(3).equals("PM")) && !(m.group(1).equals("12")))
                 retval += 12 * 60 * 60;
         }
         return retval;
@@ -185,7 +185,7 @@ public class DateUtil {
         long remainingTimeMinutes = timeInMillis / (1000 * 60);
         long remainingTimeHours = remainingTimeMinutes / 60;
         remainingTimeMinutes = remainingTimeMinutes % 60;
-        return "(" + ((remainingTimeHours > 0) ? (remainingTimeHours + "h ") : "") + remainingTimeMinutes + "')";
+        return "(" + ((remainingTimeHours > 0) ? (remainingTimeHours + MainApp.gs(R.string.shorthour) + " ") : "") + remainingTimeMinutes + "')";
     }
 
     public static String sinceString(long timestamp) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/Round.java b/app/src/main/java/info/nightscout/androidaps/utils/Round.java
index ba7f7e3f86..3e312a20a9 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/Round.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/Round.java
@@ -1,14 +1,23 @@
 package info.nightscout.androidaps.utils;
 
+import java.math.BigDecimal;
+
 /**
  * Created by mike on 20.06.2016.
  */
 public class Round {
     public static Double roundTo(double x, Double step) {
-        if (x != 0d) {
-            return Math.round(x / step) * step;
+        if (x == 0d) {
+            return 0d;
         }
-        return 0d;
+
+        //Double oldCalc = Math.round(x / step) * step;
+        Double newCalc = BigDecimal.valueOf(Math.round(x / step)).multiply(BigDecimal.valueOf(step)).doubleValue();
+
+        // just for the tests, forcing failures
+        //newCalc = oldCalc;
+
+        return newCalc;
     }
     public static Double floorTo(Double x, Double step) {
         if (x != 0d) {
diff --git a/app/src/main/res/values/objectives.xml b/app/src/main/res/values/objectives.xml
index 469db88006..d5ffbc2e3a 100644
--- a/app/src/main/res/values/objectives.xml
+++ b/app/src/main/res/values/objectives.xml
@@ -47,7 +47,7 @@
     <string name="objectives_useloop">Display content of Loop plugin</string>
     <string name="objectives_usescale">Use scale function by long-pressing BG chart</string>
     <string name="objectives_button_enter">Enter</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Enter code obtained from developers to bypass the rest of objectives</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">If you were OpenAPS user before and your NS has at least 3 months of looping data, you can send an email to objectives@androidaps.org with your NS address and request code to bypass the rest of objectives. Enter code obtained from developers</string>
     <string name="codeaccepted">Code accepted</string>
     <string name="codeinvalid">Code invalid</string>
     <string name="objectives_exam_objective">Prove your knowledge</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4c43ba1193..e357e6fc5f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -292,11 +292,24 @@
     <string name="smscommunicator_allowednumbers">Allowed phone numbers</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">To deliver bolus %1$.2fU reply with code %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">To deliver meal bolus %1$.2fU reply with code %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">To set the Temp Target %1$s reply with code %2$s</string>
+    <string name="smscommunicator_temptargetcancel">To cancel Temp Target reply with code %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">To disable the SMS Remote Service reply with code %1$s.\n\nKeep in mind that you\'ll able to reactivate it directly from the AAPS master smartphone only.</string>
+    <string name="smscommunicator_stoppedsms">SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone.</string>
     <string name="smscommunicator_calibrationreplywithcode">To send calibration %1$.2f reply with code %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolus failed</string>
+    <string name="key_smscommunicator_remotebolusmindistance" translatable="false">smscommunicator_remotebolusmindistance</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Minimum number of minutes that must elapse between one remote bolus and the next</string>
+    <string name="smscommunicator_remotebolusmindistance">How many minutes must elapse, at least, between one bolus and the next</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">For your safety, to edit this preference you need to add at least 2 phone numbers.</string>
     <string name="bolusdelivered">Bolus %1$.2fU delivered successfully</string>
     <string name="bolusrequested">Going to deliver %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU delivered successfully</string>
+    <string name="smscommunicator_mealbolusdelivered">Meal Bolus %1$.2fU delivered successfully</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Target %1$s for %2$d minutes</string>
+    <string name="smscommunicator_tt_set">Target %1$s for %2$d minutes set successfully</string>
+    <string name="smscommunicator_tt_canceled">Temp Target canceled successfully</string>
     <string name="bolusdelivering">Delivering %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Allow remote commands via SMS</string>
     <string name="glucosetype_finger">Finger</string>
@@ -356,10 +369,13 @@
     <string name="smscommunicator_basalreplywithcode">To start basal %1$.2fU/h for %2$d min reply with code %3$s</string>
     <string name="smscommunicator_profilereplywithcode">To switch profile to %1$s %2$d%% reply with code %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">To start extended bolus %1$.2fU for %2$d min reply with code %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">To enter %1$dg at %2$s reply with code %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">To start basal %1$d%% for %2$d min reply with code %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">To suspend loop for %1$d minutes reply with code %2$s</string>
     <string name="smscommunicator_tempbasalset">Temp basal %1$.2fU/h for %2$d min started successfully</string>
     <string name="smscommunicator_extendedset">Extended bolus %1$.2fU for %2$d min started successfully</string>
+    <string name="smscommunicator_carbsset">Carbs %1$dg entered successfully</string>
+    <string name="smscommunicator_carbsfailed">Entering %1$dg of carbs failed</string>
     <string name="smscommunicator_tempbasalset_percent">Temp basal %1$d%% for %2$d min started successfully</string>
     <string name="smscommunicator_tempbasalfailed">Temp basal start failed</string>
     <string name="smscommunicator_extendedfailed">Extended bolus start failed</string>
@@ -778,6 +794,7 @@
     <string name="shortgramm">g</string>
     <string name="shortminute">m</string>
     <string name="shorthour">h</string>
+    <string name="shortday">d</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
@@ -814,7 +831,7 @@
     <string name="bgsource_upload">BG upload settings</string>
     <string name="wear_detailed_delta_title">Show detailed delta</string>
     <string name="wear_detailed_delta_summary">Show delta with one more decimal place</string>
-    <string name="smbmaxminutes" translatable="false">45 60 75 90 105 120</string>
+    <string name="smbmaxminutes">SMB max minutes</string>
     <string name="smbmaxminutes_summary">Max minutes of basal to limit SMB to</string>
     <string name="unsupportedfirmware">Unsupported pump firmware</string>
     <string name="dexcomg5_xdripupload_title">Send BG data to xDrip+</string>
diff --git a/app/src/main/res/xml/pref_smscommunicator.xml b/app/src/main/res/xml/pref_smscommunicator.xml
index 202e7348c5..e76b1b15b2 100644
--- a/app/src/main/res/xml/pref_smscommunicator.xml
+++ b/app/src/main/res/xml/pref_smscommunicator.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         android:key="smscommunicator"
         android:title="@string/smscommunicator">
@@ -8,6 +9,16 @@
             android:key="@string/key_smscommunicator_allowednumbers"
             android:summary="@string/smscommunicator_allowednumbers_summary"
             android:title="@string/smscommunicator_allowednumbers" />
+        <com.andreabaccega.widget.ValidatingEditTextPreference
+            android:key="@string/key_smscommunicator_remotebolusmindistance"
+            android:defaultValue="15"
+            android:summary="@string/smscommunicator_remotebolusmindistance_summary"
+            android:title="@string/smscommunicator_remotebolusmindistance"
+            validate:minNumber="3"
+            validate:maxNumber="60"
+            validate:testType="numericRange"
+            android:singleLineTitle="false"
+            />
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_smscommunicator_remotecommandsallowed"
diff --git a/app/src/test/java/info/AAPSMocker.java b/app/src/test/java/info/AAPSMocker.java
index a36c989b11..4f0fe231a4 100644
--- a/app/src/test/java/info/AAPSMocker.java
+++ b/app/src/test/java/info/AAPSMocker.java
@@ -37,6 +37,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -107,6 +108,8 @@ public class AAPSMocker {
         when(MainApp.gs(R.string.configbuilder_insulin)).thenReturn("Insulin");
         when(MainApp.gs(R.string.bolusdelivering)).thenReturn("Delivering 0.0U");
         when(MainApp.gs(R.string.profile_per_unit)).thenReturn("/U");
+        when(MainApp.gs(R.string.shortday)).thenReturn("d");
+        when(MainApp.gs(R.string.shorthour)).thenReturn("h");
         when(MainApp.gs(R.string.profile_carbs_per_unit)).thenReturn("g/U");
         when(MainApp.gs(R.string.profile_ins_units_per_hour)).thenReturn("U/h");
         when(MainApp.gs(R.string.sms_wrongcode)).thenReturn("Wrong code. Command cancelled.");
@@ -114,6 +117,13 @@ public class AAPSMocker {
         when(MainApp.gs(R.string.sms_lastbg)).thenReturn("Last BG:");
         when(MainApp.gs(R.string.sms_minago)).thenReturn("%1$dmin ago");
         when(MainApp.gs(R.string.smscommunicator_remotecommandnotallowed)).thenReturn("Remote command is not allowed");
+        when(MainApp.gs(R.string.smscommunicator_stopsmswithcode)).thenReturn("To disable the SMS Remote Service reply with code %1$s.\\n\\nKeep in mind that you\\'ll able to reactivate it directly from the AAPS master smartphone only.");
+        when(MainApp.gs(R.string.smscommunicator_mealbolusreplywithcode)).thenReturn("To deliver meal bolus %1$.2fU reply with code %2$s.");
+        when(MainApp.gs(R.string.smscommunicator_temptargetwithcode)).thenReturn("To set the Temp Target %1$s reply with code %2$s");
+        when(MainApp.gs(R.string.smscommunicator_temptargetcancel)).thenReturn("To cancel Temp Target reply with code %1$s");
+        when(MainApp.gs(R.string.smscommunicator_stoppedsms)).thenReturn("SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone.");
+        when(MainApp.gs(R.string.smscommunicator_tt_set)).thenReturn("Target %1$s for %2$d minutes set successfully");
+        when(MainApp.gs(R.string.smscommunicator_tt_canceled)).thenReturn("Temp Target canceled successfully");
         when(MainApp.gs(R.string.loopsuspendedfor)).thenReturn("Suspended (%1$d m)");
         when(MainApp.gs(R.string.smscommunicator_loopisdisabled)).thenReturn("Loop is disabled");
         when(MainApp.gs(R.string.smscommunicator_loopisenabled)).thenReturn("Loop is enabled");
@@ -155,6 +165,11 @@ public class AAPSMocker {
         when(MainApp.gs(R.string.pumpNotInitialized)).thenReturn("Pump not initialized!");
         when(MainApp.gs(R.string.increasingmaxbasal)).thenReturn("Increasing max basal value because setting is lower than your max basal in profile");
         when(MainApp.gs(R.string.overview_bolusprogress_delivered)).thenReturn("Delivered");
+        when(MainApp.gs(R.string.smscommunicator_mealbolusreplywithcode)).thenReturn("To deliver meal bolus %1$.2fU reply with code %2$s");
+        when(MainApp.gs(R.string.smscommunicator_mealbolusdelivered)).thenReturn("Meal Bolus %1$.2fU delivered successfully");
+        when(MainApp.gs(R.string.smscommunicator_mealbolusdelivered_tt)).thenReturn("Target %1$s for %2$d minutes");
+        when(MainApp.gs(R.string.smscommunicator_carbsreplywithcode)).thenReturn("To enter %1$dg at %2$s reply with code %3$s");
+        when(MainApp.gs(R.string.smscommunicator_carbsset)).thenReturn("Carbs %1$dg entered successfully");
     }
 
     public static MainApp mockMainApp() {
@@ -183,6 +198,7 @@ public class AAPSMocker {
         when(SP.getLong(anyInt(), anyLong())).thenReturn(0L);
         when(SP.getBoolean(anyInt(), anyBoolean())).thenReturn(false);
         when(SP.getInt(anyInt(), anyInt())).thenReturn(0);
+        when(SP.getString(anyInt(), anyString())).thenReturn("");
     }
 
     public static void mockL() {
diff --git a/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.java b/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.java
index bda66cc121..820e8d34b1 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.java
@@ -30,7 +30,7 @@ public class QuickWizardTest {
         try {
             array = new JSONArray("[" + data1 + "," + data2 + "]");
         } catch (JSONException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.java
index a090058cd3..1fb94492c9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.java
@@ -124,7 +124,7 @@ public class TriggerBgTest {
         try {
             list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":214,\"mills\":" + (now - 1) + ",\"direction\":\"Flat\"}"))));
         } catch (JSONException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
         return list;
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.java
index c09af0f5b1..3d36968cec 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.java
@@ -152,7 +152,7 @@ public class TriggerDeltaTest {
             list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":226,\"mills\":1514765100000,\"direction\":\"Flat\"}"))));
             list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))));
         } catch (JSONException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
         return list;
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.java
index ad172f13e9..b0fde44b08 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.java
@@ -33,9 +33,7 @@ public class NsClientReceiverDelegateTest {
         AAPSMocker.mockMainApp();
         AAPSMocker.mockApplicationContext();
 
-        Context context = MainApp.instance().getApplicationContext();
-
-        sut = new NsClientReceiverDelegate(context);
+        sut = new NsClientReceiverDelegate();
     }
 
     @Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.java
index dd41f9873a..4d0ed00415 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.java
@@ -8,8 +8,6 @@ import org.mockito.stubbing.Answer;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
@@ -28,9 +26,9 @@ import static org.powermock.api.mockito.PowerMockito.when;
 @PrepareForTest({SmsCommunicatorPlugin.class, L.class, SP.class, MainApp.class, DateUtil.class})
 
 public class AuthRequestTest {
-    SmsCommunicatorPlugin smsCommunicatorPlugin;
-    Sms sentSms;
-    boolean actionCalled = false;
+    private SmsCommunicatorPlugin smsCommunicatorPlugin;
+    private Sms sentSms;
+    private boolean actionCalled = false;
 
     @Test
     public void doTests() {
@@ -45,14 +43,14 @@ public class AuthRequestTest {
         // Check if SMS requesting code is sent
         AuthRequest authRequest = new AuthRequest(smsCommunicatorPlugin, requester, "Request text", "ABC", action);
 
-        Assert.assertEquals(sentSms.phoneNumber, "aNumber");
-        Assert.assertEquals(sentSms.text, "Request text");
+        Assert.assertEquals(sentSms.getPhoneNumber(), "aNumber");
+        Assert.assertEquals(sentSms.getText(), "Request text");
 
         // wrong reply
         actionCalled = false;
         authRequest.action("EFG");
-        Assert.assertEquals(sentSms.phoneNumber, "aNumber");
-        Assert.assertEquals(sentSms.text, "Wrong code. Command cancelled.");
+        Assert.assertEquals(sentSms.getPhoneNumber(), "aNumber");
+        Assert.assertEquals(sentSms.getText(), "Wrong code. Command cancelled.");
         Assert.assertFalse(actionCalled);
 
         // correct reply
@@ -77,12 +75,6 @@ public class AuthRequestTest {
 
     @Before
     public void prepareTests() {
-        smsCommunicatorPlugin = mock(SmsCommunicatorPlugin.class);
-        doAnswer((Answer) invocation -> {
-            sentSms = invocation.getArgument(0);
-            return null;
-        }).when(smsCommunicatorPlugin).sendSMS(any(Sms.class));
-
         AAPSMocker.mockMainApp();
         AAPSMocker.mockApplicationContext();
         AAPSMocker.mockSP();
@@ -90,5 +82,12 @@ public class AuthRequestTest {
         AAPSMocker.mockStrings();
 
         mockStatic(DateUtil.class);
+
+        smsCommunicatorPlugin = mock(SmsCommunicatorPlugin.class);
+        doAnswer((Answer) invocation -> {
+            sentSms = invocation.getArgument(0);
+            return null;
+        }).when(smsCommunicatorPlugin).sendSMS(any(Sms.class));
+
     }
 }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.java
index f4d61e56eb..f6a4712b72 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.java
@@ -41,7 +41,7 @@ public class SmsActionTest {
         };
         smsAction.run();
         Assert.assertEquals(result, "B");
-        Assert.assertEquals(smsAction.aDouble, 1d, 0.000001d);
+        Assert.assertEquals(smsAction.aDouble(), 1d, 0.000001d);
 
         smsAction = new SmsAction(1d, 2) {
             @Override
@@ -51,8 +51,8 @@ public class SmsActionTest {
         };
         smsAction.run();
         Assert.assertEquals(result, "C");
-        Assert.assertEquals(smsAction.aDouble, 1d, 0.000001d);
-        Assert.assertEquals(smsAction.secondInteger.intValue(), 2);
+        Assert.assertEquals(smsAction.aDouble(), 1d, 0.000001d);
+        Assert.assertEquals(smsAction.secondInteger(), 2);
 
         smsAction = new SmsAction("aString", 3) {
             @Override
@@ -62,8 +62,8 @@ public class SmsActionTest {
         };
         smsAction.run();
         Assert.assertEquals(result, "D");
-        Assert.assertEquals(smsAction.aString, "aString");
-        Assert.assertEquals(smsAction.secondInteger.intValue(), 3);
+        Assert.assertEquals(smsAction.aString(), "aString");
+        Assert.assertEquals(smsAction.secondInteger(), 3);
 
         smsAction = new SmsAction(4) {
             @Override
@@ -73,7 +73,7 @@ public class SmsActionTest {
         };
         smsAction.run();
         Assert.assertEquals(result, "E");
-        Assert.assertEquals(smsAction.anInteger.intValue(), 4);
+        Assert.assertEquals(smsAction.anInteger(), 4);
 
         smsAction = new SmsAction(5, 6) {
             @Override
@@ -83,8 +83,8 @@ public class SmsActionTest {
         };
         smsAction.run();
         Assert.assertEquals(result, "F");
-        Assert.assertEquals(smsAction.anInteger.intValue(), 5);
-        Assert.assertEquals(smsAction.secondInteger.intValue(), 6);
+        Assert.assertEquals(smsAction.anInteger(), 5);
+        Assert.assertEquals(smsAction.secondInteger(), 6);
     }
 
 }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java
index bc928ded85..c757840c1f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java
@@ -25,7 +25,6 @@ import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
-import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
@@ -50,6 +49,7 @@ import static org.mockito.ArgumentMatchers.anyString;
 import static org.powermock.api.mockito.PowerMockito.doAnswer;
 import static org.powermock.api.mockito.PowerMockito.mock;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
+import static org.powermock.api.mockito.PowerMockito.spy;
 import static org.powermock.api.mockito.PowerMockito.when;
 
 @RunWith(PowerMockRunner.class)
@@ -67,27 +67,29 @@ public class SmsCommunicatorPluginTest {
 
     private boolean hasBeenRun = false;
 
+    private VirtualPumpPlugin virtualPumpPlugin;
+
     @Test
     public void processSettingsTest() {
         // called from constructor
-        Assert.assertEquals("1234", smsCommunicatorPlugin.allowedNumbers.get(0));
-        Assert.assertEquals("5678", smsCommunicatorPlugin.allowedNumbers.get(1));
-        Assert.assertEquals(2, smsCommunicatorPlugin.allowedNumbers.size());
+        Assert.assertEquals("1234", smsCommunicatorPlugin.getAllowedNumbers().get(0));
+        Assert.assertEquals("5678", smsCommunicatorPlugin.getAllowedNumbers().get(1));
+        Assert.assertEquals(2, smsCommunicatorPlugin.getAllowedNumbers().size());
     }
 
     @Test
     public void isCommandTest() {
         Assert.assertTrue(smsCommunicatorPlugin.isCommand("BOLUS", ""));
-        smsCommunicatorPlugin.messageToConfirm = null;
+        smsCommunicatorPlugin.setMessageToConfirm(null);
         Assert.assertFalse(smsCommunicatorPlugin.isCommand("BLB", ""));
-        smsCommunicatorPlugin.messageToConfirm = new AuthRequest(smsCommunicatorPlugin, new Sms("1234", "ddd"), "RequestText", "ccode", new SmsAction() {
+        smsCommunicatorPlugin.setMessageToConfirm(new AuthRequest(smsCommunicatorPlugin, new Sms("1234", "ddd"), "RequestText", "ccode", new SmsAction() {
             @Override
             public void run() {
             }
-        });
+        }));
         Assert.assertTrue(smsCommunicatorPlugin.isCommand("BLB", "1234"));
         Assert.assertFalse(smsCommunicatorPlugin.isCommand("BLB", "2345"));
-        smsCommunicatorPlugin.messageToConfirm = null;
+        smsCommunicatorPlugin.setMessageToConfirm(null);
     }
 
     @Test
@@ -101,82 +103,82 @@ public class SmsCommunicatorPluginTest {
         Sms sms;
 
         // SMS from not allowed number should be ignored
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("12", "aText");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertTrue(sms.ignored);
-        Assert.assertEquals("aText", smsCommunicatorPlugin.messages.get(0).text);
+        Assert.assertTrue(sms.getIgnored());
+        Assert.assertEquals("aText", smsCommunicatorPlugin.getMessages().get(0).getText());
 
         //UNKNOWN
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "UNKNOWN");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("UNKNOWN", smsCommunicatorPlugin.messages.get(0).text);
+        Assert.assertEquals("UNKNOWN", smsCommunicatorPlugin.getMessages().get(0).getText());
 
         //BG
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BG");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BG", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("IOB:"));
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("Last BG: 100"));
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("COB: 10(2)g"));
+        Assert.assertEquals("BG", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("IOB:"));
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("Last BG: 100"));
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("COB: 10(2)g"));
 
         // LOOP : test remote control disabled
         when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(false);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP STATUS");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("Remote command is not allowed"));
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("Remote command is not allowed"));
         when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
 
         //LOOP STATUS : disabled
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP STATUS");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Loop is disabled", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Loop is disabled", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //LOOP STATUS : suspended
         when(loopPlugin.minutesToEndOfSuspend()).thenReturn(10);
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
         when(loopPlugin.isSuspended()).thenReturn(true);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP STATUS");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Suspended (10 m)", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Suspended (10 m)", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //LOOP STATUS : enabled
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
         when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP STATUS");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Loop is enabled", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP STATUS", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Loop is enabled", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //LOOP : wrong format
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //LOOP DISABLE : already disabled
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP DISABLE");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP DISABLE", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Loop is disabled", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP DISABLE", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Loop is disabled", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //LOOP DISABLE : from enabled
         hasBeenRun = false;
@@ -185,22 +187,22 @@ public class SmsCommunicatorPluginTest {
             hasBeenRun = true;
             return null;
         }).when(loopPlugin).setPluginEnabled(PluginType.LOOP, false);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP DISABLE");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP DISABLE", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Loop has been disabled Temp basal canceled", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP DISABLE", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Loop has been disabled Temp basal canceled", smsCommunicatorPlugin.getMessages().get(1).getText());
         Assert.assertTrue(hasBeenRun);
 
         //LOOP ENABLE : already enabled
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP ENABLE");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP ENABLE", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Loop is enabled", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP ENABLE", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Loop is enabled", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //LOOP ENABLE : from disabled
         hasBeenRun = false;
@@ -209,143 +211,205 @@ public class SmsCommunicatorPluginTest {
             hasBeenRun = true;
             return null;
         }).when(loopPlugin).setPluginEnabled(PluginType.LOOP, true);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP ENABLE");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP ENABLE", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Loop has been enabled", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP ENABLE", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Loop has been enabled", smsCommunicatorPlugin.getMessages().get(1).getText());
         Assert.assertTrue(hasBeenRun);
 
         //LOOP RESUME : already enabled
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP RESUME");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP RESUME", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Loop resumed", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP RESUME", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Loop resumed", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //LOOP SUSPEND 1 2: wrong format
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP SUSPEND 1 2");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP SUSPEND 1 2", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP SUSPEND 1 2", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //LOOP SUSPEND 0 : wrong duration
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP SUSPEND 0");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP SUSPEND 0", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong duration", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP SUSPEND 0", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong duration", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //LOOP SUSPEND 100 : suspend for 100 min + correct answer
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP SUSPEND 100");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP SUSPEND 100", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To suspend loop for 100 minutes reply with code "));
-        String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP SUSPEND 100", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To suspend loop for 100 minutes reply with code "));
+        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
         smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
-        Assert.assertEquals("Loop suspended Temp basal canceled", smsCommunicatorPlugin.messages.get(3).text);
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertEquals("Loop suspended Temp basal canceled", smsCommunicatorPlugin.getMessages().get(3).getText());
 
         //LOOP SUSPEND 200 : limit to 180 min + wrong answer
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP SUSPEND 200");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP SUSPEND 200", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To suspend loop for 180 minutes reply with code "));
-        passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP SUSPEND 200", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To suspend loop for 180 minutes reply with code "));
+        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
         // ignore from other number
         smsCommunicatorPlugin.processSms(new Sms("5678", passCode));
         smsCommunicatorPlugin.processSms(new Sms("1234", "XXXX"));
-        Assert.assertEquals("XXXX", smsCommunicatorPlugin.messages.get(3).text);
-        Assert.assertEquals("Wrong code. Command cancelled.", smsCommunicatorPlugin.messages.get(4).text);
+        Assert.assertEquals("XXXX", smsCommunicatorPlugin.getMessages().get(3).getText());
+        Assert.assertEquals("Wrong code. Command cancelled.", smsCommunicatorPlugin.getMessages().get(4).getText());
         //then correct code should not work
         smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(5).text);
-        Assert.assertEquals(6, smsCommunicatorPlugin.messages.size()); // processed as common message
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(5).getText());
+        Assert.assertEquals(6, smsCommunicatorPlugin.getMessages().size()); // processed as common message
 
         //LOOP BLABLA
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "LOOP BLABLA");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("LOOP BLABLA", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("LOOP BLABLA", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //TREATMENTS REFRESH
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
         when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "TREATMENTS REFRESH");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("TREATMENTS REFRESH", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("TREATMENTS REFRESH"));
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("TREATMENTS REFRESH", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("TREATMENTS REFRESH"));
 
         //TREATMENTS BLA BLA
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
         when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "TREATMENTS BLA BLA");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("TREATMENTS BLA BLA", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("TREATMENTS BLA BLA", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //TREATMENTS BLABLA
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
         when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "TREATMENTS BLABLA");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("TREATMENTS BLABLA", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("TREATMENTS BLABLA", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //NSCLIENT RESTART
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
         when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "NSCLIENT RESTART");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("NSCLIENT RESTART", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("NSCLIENT RESTART"));
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("NSCLIENT RESTART", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("NSCLIENT RESTART"));
 
         //NSCLIENT BLA BLA
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
         when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "NSCLIENT BLA BLA");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("NSCLIENT BLA BLA", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("NSCLIENT BLA BLA", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //NSCLIENT BLABLA
         when(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true);
         when(loopPlugin.isSuspended()).thenReturn(false);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "NSCLIENT BLABLA");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertFalse(sms.ignored);
-        Assert.assertEquals("NSCLIENT BLABLA", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("NSCLIENT BLABLA", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //PUMP
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PUMP");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PUMP", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Virtual Pump", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("PUMP", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Virtual Pump", smsCommunicatorPlugin.getMessages().get(1).getText());
 
+        //HELP
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "HELP");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("HELP", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("PUMP"));
+
+        //HELP PUMP
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "HELP PUMP");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("HELP PUMP", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("PUMP"));
+
+        //SMS : wrong format
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "SMS");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("SMS", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
+
+        //SMS STOP
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "SMS DISABLE");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("SMS DISABLE", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To disable the SMS Remote Service reply with code"));
+        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
+        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone."));
+
+        //TARGET : wrong format
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "TARGET");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertFalse(sms.getIgnored());
+        Assert.assertEquals("TARGET", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
+
+        //TARGET MEAL
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "TARGET MEAL");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("TARGET MEAL", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To set the Temp Target"));
+        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
+        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("set successfully"));
+
+        //TARGET STOP/CANCEL
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "TARGET STOP");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("TARGET STOP", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To cancel Temp Target reply with code"));
+        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
+        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("Temp Target canceled successfully"));
     }
 
     @Test
@@ -353,92 +417,92 @@ public class SmsCommunicatorPluginTest {
         Sms sms;
 
         //PROFILE
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PROFILE");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("PROFILE", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
 
         //PROFILE
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PROFILE");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("PROFILE", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //PROFILE LIST (no profile interface)
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PROFILE LIST");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Not configured", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Not configured", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         ProfileInterface profileInterface = mock(SimpleProfilePlugin.class);
         when(ConfigBuilderPlugin.getPlugin().getActiveProfileInterface()).thenReturn(profileInterface);
 
         //PROFILE LIST (no profile defined)
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PROFILE LIST");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Not configured", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Not configured", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(profileInterface.getProfile()).thenReturn(AAPSMocker.getValidProfileStore());
 
         //PROFILE STATUS
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PROFILE STATUS");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE STATUS", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals(AAPSMocker.TESTPROFILENAME, smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("PROFILE STATUS", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals(AAPSMocker.TESTPROFILENAME, smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //PROFILE LIST
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PROFILE LIST");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("1. " + AAPSMocker.TESTPROFILENAME, smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("PROFILE LIST", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("1. " + AAPSMocker.TESTPROFILENAME, smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //PROFILE 2 (non existing)
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PROFILE 2");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE 2", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("PROFILE 2", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //PROFILE 1 0(wrong percentage)
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PROFILE 1 0");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE 1 0", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("PROFILE 1 0", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //PROFILE 0(wrong index)
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PROFILE 0");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE 0", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("PROFILE 0", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //PROFILE 1(OK)
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PROFILE 1");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE 1", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To switch profile to someProfile 100% reply with code"));
+        Assert.assertEquals("PROFILE 1", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To switch profile to someProfile 100% reply with code"));
 
         //PROFILE 1 90(OK)
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "PROFILE 1 90");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("PROFILE 1 90", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To switch profile to someProfile 90% reply with code"));
-        String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+        Assert.assertEquals("PROFILE 1 90", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To switch profile to someProfile 90% reply with code"));
+        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
         smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
-        Assert.assertEquals("Profile switch created", smsCommunicatorPlugin.messages.get(3).text);
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertEquals("Profile switch created", smsCommunicatorPlugin.getMessages().get(3).getText());
     }
 
     @Test
@@ -446,85 +510,85 @@ public class SmsCommunicatorPluginTest {
         Sms sms;
 
         //BASAL
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BASAL");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("BASAL", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
 
         //BASAL
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BASAL");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("BASAL", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //BASAL CANCEL
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BASAL CANCEL");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL CANCEL", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To stop temp basal reply with code"));
-        String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+        Assert.assertEquals("BASAL CANCEL", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To stop temp basal reply with code"));
+        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
         smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
-        Assert.assertEquals("Temp basal canceled\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("Temp basal canceled"));
 
         //BASAL a%
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BASAL a%");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL a%", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("BASAL a%", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //BASAL 10% 0
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BASAL 10% 0");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL 10% 0", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("BASAL 10% 0", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(MainApp.getConstraintChecker().applyBasalPercentConstraints(any(), any())).thenReturn(new Constraint<>(20));
 
         //BASAL 20% 20
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BASAL 20% 20");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL 20% 20", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To start basal 20% for 20 min reply with code"));
-        passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+        Assert.assertEquals("BASAL 20% 20", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To start basal 20% for 20 min reply with code"));
+        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
         smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
-        Assert.assertEquals("Temp basal 20% for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertEquals("Temp basal 20% for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.getMessages().get(3).getText());
 
         //BASAL a
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BASAL a");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL a", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("BASAL a", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //BASAL 1 0
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BASAL 1 0");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL 1 0", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("BASAL 1 0", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(MainApp.getConstraintChecker().applyBasalConstraints(any(), any())).thenReturn(new Constraint<>(1d));
 
         //BASAL 1 20
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BASAL 1 20");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BASAL 1 20", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To start basal 1.00U/h for 20 min reply with code"));
-        passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+        Assert.assertEquals("BASAL 1 20", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To start basal 1.00U/h for 20 min reply with code"));
+        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
         smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
-        Assert.assertEquals("Temp basal 1.00U/h for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertEquals("Temp basal 1.00U/h for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.getMessages().get(3).getText());
 
     }
 
@@ -533,58 +597,58 @@ public class SmsCommunicatorPluginTest {
         Sms sms;
 
         //EXTENDED
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "EXTENDED");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("EXTENDED", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
 
         //EXTENDED
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "EXTENDED");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("EXTENDED", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //EXTENDED CANCEL
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "EXTENDED CANCEL");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED CANCEL", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To stop extended bolus reply with code"));
-        String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+        Assert.assertEquals("EXTENDED CANCEL", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To stop extended bolus reply with code"));
+        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
         smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
-        Assert.assertEquals("Extended bolus canceled\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("Extended bolus canceled"));
 
         //EXTENDED a%
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "EXTENDED a%");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED a%", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("EXTENDED a%", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(MainApp.getConstraintChecker().applyExtendedBolusConstraints(any())).thenReturn(new Constraint<>(1d));
 
         //EXTENDED 1 0
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "EXTENDED 1 0");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED 1 0", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("EXTENDED 1 0", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //EXTENDED 1 20
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "EXTENDED 1 20");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("EXTENDED 1 20", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To start extended bolus 1.00U for 20 min reply with code"));
-        passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+        Assert.assertEquals("EXTENDED 1 20", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To start extended bolus 1.00U for 20 min reply with code"));
+        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
         smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
-        Assert.assertEquals("Extended bolus 1.00U for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertEquals("Extended bolus 1.00U for 20 min started successfully\nVirtual Pump", smsCommunicatorPlugin.getMessages().get(3).getText());
     }
 
     @Test
@@ -592,75 +656,91 @@ public class SmsCommunicatorPluginTest {
         Sms sms;
 
         //BOLUS
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BOLUS");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("BOLUS", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
 
         //BOLUS
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BOLUS");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("BOLUS", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(MainApp.getConstraintChecker().applyBolusConstraints(any())).thenReturn(new Constraint<>(1d));
 
         when(DateUtil.now()).thenReturn(1000L);
         //BOLUS 1
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BOLUS 1");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Remote bolus not available. Try again later.", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Remote bolus not available. Try again later.", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(MainApp.getConstraintChecker().applyBolusConstraints(any())).thenReturn(new Constraint<>(0d));
 
         when(DateUtil.now()).thenReturn(Constants.remoteBolusMinDistance + 1002L);
 
         //BOLUS 0
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BOLUS 0");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS 0", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("BOLUS 0", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //BOLUS a
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BOLUS a");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS a", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("BOLUS a", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(MainApp.getConstraintChecker().applyExtendedBolusConstraints(any())).thenReturn(new Constraint<>(1d));
 
         when(MainApp.getConstraintChecker().applyBolusConstraints(any())).thenReturn(new Constraint<>(1d));
 
         //BOLUS 1
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BOLUS 1");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To deliver bolus 1.00U reply with code"));
-        String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To deliver bolus 1.00U reply with code"));
+        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
         smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
-        Assert.assertEquals("Bolus 1.00U delivered successfully\nVirtual Pump", smsCommunicatorPlugin.messages.get(3).text);
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().contains("Bolus 1.00U delivered successfully"));
 
         //BOLUS 1 (Suspended pump)
-        smsCommunicatorPlugin.lastRemoteBolusTime = 0;
-        PumpInterface pump = mock(VirtualPumpPlugin.class);
-        when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(pump);
-        when(pump.isSuspended()).thenReturn(true);
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setLastRemoteBolusTime(0);
+        when(virtualPumpPlugin.isSuspended()).thenReturn(true);
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "BOLUS 1");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Pump suspended", smsCommunicatorPlugin.messages.get(1).text);
-        when(pump.isSuspended()).thenReturn(false);
+        Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Pump suspended", smsCommunicatorPlugin.getMessages().get(1).getText());
+        when(virtualPumpPlugin.isSuspended()).thenReturn(false);
+
+        //BOLUS 1 a
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "BOLUS 1 a");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("BOLUS 1 a", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
+
+        //BOLUS 1 MEAL
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "BOLUS 1 MEAL");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("BOLUS 1 MEAL", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To deliver meal bolus 1.00U reply with code"));
+        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
+        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertEquals("Meal Bolus 1.00U delivered successfully\nVirtual Pump\nTarget 5.0 for 45 minutes", smsCommunicatorPlugin.getMessages().get(3).getText());
     }
 
     @Test
@@ -668,47 +748,128 @@ public class SmsCommunicatorPluginTest {
         Sms sms;
 
         //CAL
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "CAL");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CAL", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("CAL", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
 
         //CAL
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "CAL");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CAL", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("CAL", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         //CAL 0
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "CAL 0");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CAL 0", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("CAL 0", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
 
         when(XdripCalibrations.sendIntent(any())).thenReturn(true);
         //CAL 1
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         sms = new Sms("1234", "CAL 1");
         smsCommunicatorPlugin.processSms(sms);
-        Assert.assertEquals("CAL 1", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertTrue(smsCommunicatorPlugin.messages.get(1).text.contains("To send calibration 1.00 reply with code"));
-        String passCode = smsCommunicatorPlugin.messageToConfirm.confirmCode;
+        Assert.assertEquals("CAL 1", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To send calibration 1.00 reply with code"));
+        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
         smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
-        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages.get(2).text);
-        Assert.assertEquals("Calibration sent. Receiving must be enabled in xDrip.", smsCommunicatorPlugin.messages.get(3).text);
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertEquals("Calibration sent. Receiving must be enabled in xDrip.", smsCommunicatorPlugin.getMessages().get(3).getText());
+    }
+
+    @Test
+    public void processCarbsTest() {
+        Sms sms;
+
+        when(DateUtil.now()).thenReturn(1000000L);
+        when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(false);
+        //CAL
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "CARBS");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("CARBS", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Remote command is not allowed", smsCommunicatorPlugin.getMessages().get(1).getText());
+
+        when(SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true);
+
+        //CARBS
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "CARBS");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("CARBS", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
+
+        when(MainApp.getConstraintChecker().applyCarbsConstraints(any())).thenReturn(new Constraint<>(0));
+
+        //CARBS 0
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "CARBS 0");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("CARBS 0", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.getMessages().get(1).getText());
+
+        when(MainApp.getConstraintChecker().applyCarbsConstraints(any())).thenReturn(new Constraint<>(1));
+
+        //CARBS 1
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "CARBS 1");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("CARBS 1", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To enter 1g at"));
+        String passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
+        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().startsWith("Carbs 1g entered successfully"));
+
+        //CARBS 1 a
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "CARBS 1 a");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("CARBS 1 a", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("Wrong format"));
+
+        //CARBS 1 00
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "CARBS 1 00");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("CARBS 1 00", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("Wrong format"));
+
+        //CARBS 1 12:01
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "CARBS 1 12:01");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("CARBS 1 12:01", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To enter 1g at 12:01PM reply with code"));
+        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
+        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().startsWith("Carbs 1g entered successfully"));
+
+        //CARBS 1 3:01AM
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
+        sms = new Sms("1234", "CARBS 1 3:01AM");
+        smsCommunicatorPlugin.processSms(sms);
+        Assert.assertEquals("CARBS 1 3:01AM", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(1).getText().contains("To enter 1g at 03:01AM reply with code"));
+        passCode = smsCommunicatorPlugin.getMessageToConfirm().getConfirmCode();
+        smsCommunicatorPlugin.processSms(new Sms("1234", passCode));
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.getMessages().get(2).getText());
+        Assert.assertTrue(smsCommunicatorPlugin.getMessages().get(3).getText().startsWith("Carbs 1g entered successfully"));
     }
 
     @Test
     public void sendNotificationToAllNumbers() {
-        smsCommunicatorPlugin.messages = new ArrayList<>();
+        smsCommunicatorPlugin.setMessages(new ArrayList<>());
         smsCommunicatorPlugin.sendNotificationToAllNumbers("abc");
-        Assert.assertEquals("abc", smsCommunicatorPlugin.messages.get(0).text);
-        Assert.assertEquals("abc", smsCommunicatorPlugin.messages.get(1).text);
+        Assert.assertEquals("abc", smsCommunicatorPlugin.getMessages().get(0).getText());
+        Assert.assertEquals("abc", smsCommunicatorPlugin.getMessages().get(1).getText());
     }
 
     @Before
@@ -735,13 +896,13 @@ public class SmsCommunicatorPluginTest {
         PowerMockito.when(IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "SMS COB")).thenReturn(new CobInfo(10d, 2d));
 
         mockStatic(XdripCalibrations.class);
-        mockStatic(DateUtil.class);
+        spy(DateUtil.class);
         mockStatic(SmsManager.class);
         SmsManager smsManager = mock(SmsManager.class);
         when(SmsManager.getDefault()).thenReturn(smsManager);
 
         when(SP.getString(R.string.key_smscommunicator_allowednumbers, "")).thenReturn("1234;5678");
-        smsCommunicatorPlugin = SmsCommunicatorPlugin.getPlugin();
+        smsCommunicatorPlugin = SmsCommunicatorPlugin.INSTANCE;
         smsCommunicatorPlugin.setPluginEnabled(PluginType.GENERAL, true);
 
         mockStatic(LoopPlugin.class);
@@ -797,8 +958,10 @@ public class SmsCommunicatorPluginTest {
             return null;
         }).when(AAPSMocker.queue).extendedBolus(anyDouble(), anyInt(), any(Callback.class));
 
-        VirtualPumpPlugin virtualPumpPlugin = VirtualPumpPlugin.getPlugin();
+        virtualPumpPlugin = mock(VirtualPumpPlugin.class);
         when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(virtualPumpPlugin);
+        when(virtualPumpPlugin.shortStatus(anyBoolean())).thenReturn("Virtual Pump");
+        when(virtualPumpPlugin.isSuspended()).thenReturn(false);
     }
 
 }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.java
index 5f7af11a67..a406a35f9d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.java
@@ -28,19 +28,19 @@ public class SmsTest {
         when(smsMessage.getMessageBody()).thenReturn("aBody");
 
         Sms sms = new Sms(smsMessage);
-        Assert.assertEquals(sms.phoneNumber, "aNumber");
-        Assert.assertEquals(sms.text, "aBody");
-        Assert.assertTrue(sms.received);
+        Assert.assertEquals(sms.getPhoneNumber(), "aNumber");
+        Assert.assertEquals(sms.getText(), "aBody");
+        Assert.assertTrue(sms.getReceived());
 
         sms = new Sms("aNumber", "aBody");
-        Assert.assertEquals(sms.phoneNumber, "aNumber");
-        Assert.assertEquals(sms.text, "aBody");
-        Assert.assertTrue(sms.sent);
+        Assert.assertEquals(sms.getPhoneNumber(), "aNumber");
+        Assert.assertEquals(sms.getText(), "aBody");
+        Assert.assertTrue(sms.getSent());
 
         sms = new Sms("aNumber", R.string.insulin_unit_shortname);
-        Assert.assertEquals(sms.phoneNumber, "aNumber");
-        Assert.assertEquals(sms.text, MainApp.gs(R.string.insulin_unit_shortname));
-        Assert.assertTrue(sms.sent);
+        Assert.assertEquals(sms.getPhoneNumber(), "aNumber");
+        Assert.assertEquals(sms.getText(), MainApp.gs(R.string.insulin_unit_shortname));
+        Assert.assertTrue(sms.getSent());
 
         Assert.assertEquals(sms.toString(), "SMS from aNumber: U");
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.java
index 19e497b834..6d91bea911 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.java
@@ -153,7 +153,7 @@ public class GlucoseStatusTest {
             list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":226,\"mills\":1514765100000,\"direction\":\"Flat\"}"))));
             list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))));
         } catch (JSONException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
         return list;
     }
@@ -165,7 +165,7 @@ public class GlucoseStatusTest {
             list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":216,\"mills\":1514766800000,\"direction\":\"Flat\"}")))); // +2
             list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}"))));
         } catch (JSONException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
         return list;
     }
@@ -180,7 +180,7 @@ public class GlucoseStatusTest {
         try {
             list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))));
         } catch (JSONException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
         return list;
     }
@@ -190,7 +190,7 @@ public class GlucoseStatusTest {
         try {
             list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))));
         } catch (JSONException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
         return list;
     }
@@ -211,7 +211,7 @@ public class GlucoseStatusTest {
                 list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":" + (latest_reading + (i*2)) + ",\"mills\":" + (end_time - (1000 * 60 * i)) + ",\"direction\":\"Flat\"}"))));
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
         return list;
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/RoundTest.java b/app/src/test/java/info/nightscout/androidaps/utils/RoundTest.java
index fb444804bc..568b67057e 100644
--- a/app/src/test/java/info/nightscout/androidaps/utils/RoundTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/RoundTest.java
@@ -12,9 +12,16 @@ public class RoundTest {
 
     @Test
     public void roundToTest() throws Exception {
-        assertEquals( 0.55d, Round.roundTo(0.54d, 0.05d), 0.00000001d );
-        assertEquals( 1d, Round.roundTo(1.49d, 1d), 0.00000001d );
-        assertEquals( 0d, Round.roundTo(0d, 1d), 0.00000001d );
+        assertEquals( 0.55d, Round.roundTo(0.54d, 0.05d), 0.00000000000000000001d );
+        assertEquals( -3.26d, Round.roundTo(-3.2553715764602713d, 0.01d), 0.00000000000000000001d );
+        assertEquals( 0.816d, Round.roundTo(0.8156666666666667d, 0.001d), 0.00000000000000000001d );
+        assertEquals( 0.235d, Round.roundTo(0.235d, 0.001d), 0.00000000000000000001d );
+        assertEquals( 0.3d, Round.roundTo(0.3d, 0.1d), 0.00000000000000001d );
+        assertEquals( 0.0017d, Round.roundTo(0.0016960652144170627d, 0.0001d), 0.00000000000000000001d );
+        assertEquals( 0.0078d, Round.roundTo(0.007804436682291013d, 0.0001d), 0.00000000000000000001d );
+        assertEquals( 0.6d, Round.roundTo(0.6d, 0.05d), 0.00000000000000000001d );
+        assertEquals( 1d, Round.roundTo(1.49d, 1d), 0.00000000000000000001d );
+        assertEquals( 0d, Round.roundTo(0d, 1d), 0.00000000000000000001d );
     }
 
     @Test
diff --git a/build.gradle b/build.gradle
index 31658346b6..f8456a8971 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,9 +8,9 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
-        classpath 'com.google.gms:google-services:4.3.2'
-        classpath 'io.fabric.tools:gradle:1.31.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'io.fabric.tools:gradle:1.31.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/icons/battery-burnin/battery-charging-wireless-10-burnin.svg b/icons/battery-burnin/battery-charging-wireless-10-burnin.svg
new file mode 100644
index 0000000000..2888abf209
--- /dev/null
+++ b/icons/battery-burnin/battery-charging-wireless-10-burnin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v14h-2v-1.5h-2v1.5h-2v-1.5h-2zm13.24 1.7598-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
diff --git a/icons/battery-burnin/battery-charging-wireless-20-burnin.svg b/icons/battery-burnin/battery-charging-wireless-20-burnin.svg
new file mode 100644
index 0000000000..77d52751d7
--- /dev/null
+++ b/icons/battery-burnin/battery-charging-wireless-20-burnin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v11h-2v1h2v2h-2v-2h-2v2h-2v-2h-2zm2 12h2v-1h-2zm11.24-10.24-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
diff --git a/icons/battery-burnin/battery-charging-wireless-30-burnin.svg b/icons/battery-burnin/battery-charging-wireless-30-burnin.svg
new file mode 100644
index 0000000000..9ffa356436
--- /dev/null
+++ b/icons/battery-burnin/battery-charging-wireless-30-burnin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v10h-2v2h2v2h-2v-2h-2v2h-2v-2h-2zm2 12h2v-2h-2zm11.24-10.24-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
diff --git a/icons/battery-burnin/battery-charging-wireless-40-burnin.svg b/icons/battery-burnin/battery-charging-wireless-40-burnin.svg
new file mode 100644
index 0000000000..d9ccc46027
--- /dev/null
+++ b/icons/battery-burnin/battery-charging-wireless-40-burnin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v10h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-1.5h-2zm2 10v2h2v-2zm2 0h2v-1.5h-2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
diff --git a/icons/battery-burnin/battery-charging-wireless-50-burnin.svg b/icons/battery-burnin/battery-charging-wireless-50-burnin.svg
new file mode 100644
index 0000000000..4d4905046c
--- /dev/null
+++ b/icons/battery-burnin/battery-charging-wireless-50-burnin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v7h-2v1h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2zm2 8h2v-1h-2zm2 0v2h2v-2zm0 2h-2v2h2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
diff --git a/icons/battery-burnin/battery-charging-wireless-60-burnin.svg b/icons/battery-burnin/battery-charging-wireless-60-burnin.svg
new file mode 100644
index 0000000000..e3c4ba5c44
--- /dev/null
+++ b/icons/battery-burnin/battery-charging-wireless-60-burnin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v6h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-.40039h-2zm2 6v2h2v-2zm2 0h2v-.40039h-2zm0 2v2h2v-2zm0 2h-2v2h2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
diff --git a/icons/battery-burnin/battery-charging-wireless-70-burnin.svg b/icons/battery-burnin/battery-charging-wireless-70-burnin.svg
new file mode 100644
index 0000000000..fe26b5e93d
--- /dev/null
+++ b/icons/battery-burnin/battery-charging-wireless-70-burnin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v6h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2zm2 6v2h2v-2zm2 0h2v-2h-2zm0 2v2h2v-2zm0 2h-2v2h2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
diff --git a/icons/battery-burnin/battery-charging-wireless-80-burnin.svg b/icons/battery-burnin/battery-charging-wireless-80-burnin.svg
new file mode 100644
index 0000000000..c949afb1c8
--- /dev/null
+++ b/icons/battery-burnin/battery-charging-wireless-80-burnin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v3h-2v1h2v2h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2zm2 4h2v-1h-2zm2 0v2h2v-2zm0 2h-2v2h2zm0 2v2h2v-2zm0 2h-2v2h2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
diff --git a/icons/battery-burnin/battery-charging-wireless-90-burnin.svg b/icons/battery-burnin/battery-charging-wireless-90-burnin.svg
new file mode 100644
index 0000000000..13677dc328
--- /dev/null
+++ b/icons/battery-burnin/battery-charging-wireless-90-burnin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v2h-2v2h2v2h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2v-.5h-2zm2 2v2h2v-2zm2 0h2v-.5h-2zm0 2v2h2v-2zm0 2h-2v2h2zm0 2v2h2v-2zm0 2h-2v2h2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
diff --git a/icons/battery-burnin/battery-charging-wireless-burnin.svg b/icons/battery-burnin/battery-charging-wireless-burnin.svg
new file mode 100644
index 0000000000..f074b89d34
--- /dev/null
+++ b/icons/battery-burnin/battery-charging-wireless-burnin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2a1 1 0 0 0-1 1v16a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1v-16a1 1 0 0 0-1-1h-2v-2h-6zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-14.07 1.0703h2v2h2v-2h2v2h-2v2h2v2h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2v-2zm0 2v2h2v-2h-2zm2 2v2h2v-2h-2zm0 2h-2v2h2v-2zm0 2v2h2v-2h-2zm0 2h-2v2h2v-2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
diff --git a/icons/battery-burnin/battery-unknown-burnin.svg b/icons/battery-burnin/battery-unknown-burnin.svg
new file mode 100644
index 0000000000..b0cc3bba40
--- /dev/null
+++ b/icons/battery-burnin/battery-unknown-burnin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m9 2v2h-1.6699a1.33 1.33 0 0 0-1.3301 1.3301v15.34c0 .73.60008 1.3301 1.3301 1.3301h9.3398a1.33 1.33 0 0 0 1.3301-1.3301v-15.34c0-.73-.60008-1.3301-1.3301-1.3301h-1.6699v-2h-6zm-1 4h8v14h-8v-14zm3.9922 1.6348c-.20776.0001459-.41627.012296-.53906.035156-.40487.075377-.87711.27315-1.1992.50391-.6162.44145-1.052 1.0995-1.2012 1.8145-.036974.17724-.068135.43288-.068359.54883v.076172h.75.75v-.09375c.0014-.40911.27856-.88798.66211-1.1445.27527-.18413.51594-.25465.85547-.25195.42432.00337.77536.15218 1.0664.45312.18687.19323.29535.3781.37695.64648.041091.13522.045052.18127.044922.39648-.00018.27125-.03153.43084-.12695.63476-.09497.20296-.18126.30868-.59375.72852-.74662.75992-.86069.88539-.99219 1.082-.13974.20897-.2684.46308-.34766.68945-.05321.15199-.14258.52203-.14258.58984v.037109h.75977.75781l.009765-.048828c.03414-.15494.12253-.39847.19141-.5332.15368-.3006.29355-.46626 1.0293-1.2148.18393-.18714.36832-.38472.41211-.4375.25761-.31052.44302-.7197.51172-1.1309.04095-.24512.02889-.73384-.02539-.98828-.12115-.568-.37976-1.0577-.77734-1.4727-.45238-.47215-.98198-.76014-1.6328-.88672-.11668-.022692-.32349-.03335-.53125-.033203zm-.75781 8.2637v.75.75h.75.75195v-.75-.75h-.75195-.75z"/>
+</svg>
diff --git a/icons/battery-source/mask-burnin-battery-raw.svg b/icons/battery-source/mask-burnin-battery-raw.svg
new file mode 100644
index 0000000000..e2ab79f2a1
--- /dev/null
+++ b/icons/battery-source/mask-burnin-battery-raw.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="mask-burnin-battery-raw.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="33.379557"
+     inkscape:cx="5.9350871"
+     inkscape:cy="13.348904"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     style="opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+     d="M 6 6 L 6 8 L 8 8 L 8 6 L 6 6 z M 8 8 L 8 10 L 10 10 L 10 8 L 8 8 z M 10 8 L 12 8 L 12 6 L 10 6 L 10 8 z M 10 10 L 10 12 L 12 12 L 12 10 L 10 10 z M 10 12 L 8 12 L 8 14 L 10 14 L 10 12 z M 10 14 L 10 16 L 12 16 L 12 14 L 10 14 z M 10 16 L 8 16 L 8 18 L 10 18 L 10 16 z M 10 18 L 10 20 L 12 20 L 12 18 L 10 18 z M 8 18 L 6 18 L 6 20 L 8 20 L 8 18 z M 6 18 L 6 16 L 4 16 L 4 18 L 6 18 z M 6 16 L 8 16 L 8 14 L 6 14 L 6 16 z M 6 14 L 6 12 L 4 12 L 4 14 L 6 14 z M 6 12 L 8 12 L 8 10 L 6 10 L 6 12 z M 6 10 L 6 8 L 4 8 L 4 10 L 6 10 z "
+     id="rect824-9" />
+</svg>
diff --git a/icons/battery-source/mask-burnin-battery.svg b/icons/battery-source/mask-burnin-battery.svg
new file mode 100644
index 0000000000..09be5da8a9
--- /dev/null
+++ b/icons/battery-source/mask-burnin-battery.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="mask-burnin-battery.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="33.379557"
+     inkscape:cx="5.9350871"
+     inkscape:cy="13.348904"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <g
+     id="g1106"
+     transform="translate(-9.526788,-0.134268)">
+    <g
+       transform="translate(9.526789,4.1342669)"
+       id="g933">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 4,2 H 6 V 4 H 4 Z"
+         id="rect824"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 6,2 H 8 V 4 H 6 Z"
+         id="rect824-9" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 8,2 H 9.9999996 V 4 H 8 Z"
+         id="rect824-2" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10,2 h 2 v 2 h -2 z"
+         id="rect824-9-1" />
+    </g>
+    <g
+       transform="rotate(180,16.253008,7.0403444)"
+       id="g927">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-8"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 12.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 14.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-2-0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 16.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-1-8" />
+    </g>
+    <g
+       transform="translate(9.526789,8.1342669)"
+       id="g933-9">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 4,2 H 6 V 4 H 4 Z"
+         id="rect824-6"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 6,2 H 8 V 4 H 6 Z"
+         id="rect824-9-18" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 8,2 H 9.9999996 V 4 H 8 Z"
+         id="rect824-2-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10,2 h 2 v 2 h -2 z"
+         id="rect824-9-1-0" />
+    </g>
+    <g
+       transform="rotate(180,16.253008,9.0403445)"
+       id="g927-9">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-8-0"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 12.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-8-6" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 14.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-2-0-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 16.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-1-8-4" />
+    </g>
+    <g
+       transform="translate(9.526789,12.134267)"
+       id="g933-1">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 4,2 H 6 V 4 H 4 Z"
+         id="rect824-3"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 6,2 H 8 V 4 H 6 Z"
+         id="rect824-9-16" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 8,2 H 9.9999996 V 4 H 8 Z"
+         id="rect824-2-83" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10,2 h 2 v 2 h -2 z"
+         id="rect824-9-1-1" />
+    </g>
+    <g
+       transform="rotate(180,16.253008,11.040345)"
+       id="g927-4">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-8-4"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 12.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-8-1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 14.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-2-0-0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 16.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-1-8-8" />
+    </g>
+    <g
+       transform="translate(9.526788,16.134268)"
+       id="g933-0">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 4,2 H 6 V 4 H 4 Z"
+         id="rect824-63"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 6,2 H 8 V 4 H 6 Z"
+         id="rect824-9-85" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 8,2 H 9.9999996 V 4 H 8 Z"
+         id="rect824-2-87" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10,2 h 2 v 2 h -2 z"
+         id="rect824-9-1-7" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/battery/battery-charging-wireless-10.svg b/icons/battery/battery-charging-wireless-10.svg
new file mode 100644
index 0000000000..d6dbd7febc
--- /dev/null
+++ b/icons/battery/battery-charging-wireless-10.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,18.5H4V6H12V18.5Z" /></svg>
\ No newline at end of file
diff --git a/icons/battery/battery-charging-wireless-20.svg b/icons/battery/battery-charging-wireless-20.svg
new file mode 100644
index 0000000000..9e4badedc9
--- /dev/null
+++ b/icons/battery/battery-charging-wireless-20.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,17H4V6H12V17Z" /></svg>
\ No newline at end of file
diff --git a/icons/battery/battery-charging-wireless-30.svg b/icons/battery/battery-charging-wireless-30.svg
new file mode 100644
index 0000000000..7da87ce966
--- /dev/null
+++ b/icons/battery/battery-charging-wireless-30.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,16H4V6H12V16Z" /></svg>
\ No newline at end of file
diff --git a/icons/battery/battery-charging-wireless-40.svg b/icons/battery/battery-charging-wireless-40.svg
new file mode 100644
index 0000000000..b9aaad2b0f
--- /dev/null
+++ b/icons/battery/battery-charging-wireless-40.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,14.5H4V6H12V14.5Z" /></svg>
\ No newline at end of file
diff --git a/icons/battery/battery-charging-wireless-50.svg b/icons/battery/battery-charging-wireless-50.svg
new file mode 100644
index 0000000000..705a61c55b
--- /dev/null
+++ b/icons/battery/battery-charging-wireless-50.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,13H4V6H12V13Z" /></svg>
\ No newline at end of file
diff --git a/icons/battery/battery-charging-wireless-60.svg b/icons/battery/battery-charging-wireless-60.svg
new file mode 100644
index 0000000000..b2cd9f7734
--- /dev/null
+++ b/icons/battery/battery-charging-wireless-60.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,11.6H4V6H12V11.6Z" /></svg>
\ No newline at end of file
diff --git a/icons/battery/battery-charging-wireless-70.svg b/icons/battery/battery-charging-wireless-70.svg
new file mode 100644
index 0000000000..608a404882
--- /dev/null
+++ b/icons/battery/battery-charging-wireless-70.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,10H4V6H12V10Z" /></svg>
\ No newline at end of file
diff --git a/icons/battery/battery-charging-wireless-80.svg b/icons/battery/battery-charging-wireless-80.svg
new file mode 100644
index 0000000000..c604743cc3
--- /dev/null
+++ b/icons/battery/battery-charging-wireless-80.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,9H4V6H12V9Z" /></svg>
\ No newline at end of file
diff --git a/icons/battery/battery-charging-wireless-90.svg b/icons/battery/battery-charging-wireless-90.svg
new file mode 100644
index 0000000000..246886ad08
--- /dev/null
+++ b/icons/battery/battery-charging-wireless-90.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,7.5H4V6H12V7.5Z" /></svg>
\ No newline at end of file
diff --git a/icons/battery/battery-charging-wireless.svg b/icons/battery/battery-charging-wireless.svg
new file mode 100644
index 0000000000..b36143c4c2
--- /dev/null
+++ b/icons/battery/battery-charging-wireless.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76Z" /></svg>
\ No newline at end of file
diff --git a/icons/battery/battery-outline.svg b/icons/battery/battery-outline.svg
new file mode 100644
index 0000000000..e05e71b288
--- /dev/null
+++ b/icons/battery/battery-outline.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,20H8V6H16M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.67C6,21.4 6.6,22 7.33,22H16.67A1.33,1.33 0 0,0 18,20.67V5.33C18,4.6 17.4,4 16.67,4Z" /></svg>
\ No newline at end of file
diff --git a/icons/battery/battery-unknown.svg b/icons/battery/battery-unknown.svg
new file mode 100644
index 0000000000..8e117be5cb
--- /dev/null
+++ b/icons/battery/battery-unknown.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M15.07,12.25L14.17,13.17C13.63,13.71 13.25,14.18 13.09,15H11.05C11.16,14.1 11.56,13.28 12.17,12.67L13.41,11.41C13.78,11.05 14,10.55 14,10C14,8.89 13.1,8 12,8A2,2 0 0,0 10,10H8A4,4 0 0,1 12,6A4,4 0 0,1 16,10C16,10.88 15.64,11.68 15.07,12.25M13,19H11V17H13M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.66C6,21.4 6.6,22 7.33,22H16.67C17.4,22 18,21.4 18,20.66V5.33C18,4.59 17.4,4 16.67,4Z" /></svg>
\ No newline at end of file
diff --git a/icons/complications-source/ic_br_cob_iob_orig.svg b/icons/complications-source/ic_br_cob_iob_orig.svg
new file mode 100644
index 0000000000..f650e12d99
--- /dev/null
+++ b/icons/complications-source/ic_br_cob_iob_orig.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="ic_br_cob_iob_orig.svg">
+  <defs
+     id="defs6576" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="20.48"
+     inkscape:cx="21.368628"
+     inkscape:cy="7.6899364"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="7.0150757,3.6431885"
+       orientation="0,1"
+       id="guide7239"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="6.110738,1.9637045"
+       orientation="0,1"
+       id="guide4515"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <path
+       style="fill:#000000;stroke-width:0.99999988"
+       d="m 0.03622667,296.52928 c -0.05573246,-0.0616 -0.05418386,-0.0663 0.0545402,-0.1676 0.0615457,-0.0574 0.11915314,-0.12579 0.12801621,-0.15212 0.008863,-0.0264 -0.0358645,-0.14128 -0.0993956,-0.25541 -0.11006156,-0.19773 -0.11551067,-0.22183 -0.11551067,-0.51082 0,-0.27606 0.0084459,-0.31854 0.09406667,-0.47311 0.11396967,-0.20573 0.29667962,-0.37806 0.34723811,-0.32749 0.0650151,0.065 0.10430015,0.034 0.18887001,-0.14919 0.13241088,-0.28679 0.24662218,-0.40499 0.3924149,-0.40611 0.1141555,-8.6e-4 0.1239478,-0.009 0.1669233,-0.13767 0.025367,-0.0759 0.1153545,-0.21076 0.2025129,-0.3033 l 0.1568592,-0.16657 0.1259147,0.14214 c 0.069253,0.0782 0.1514296,0.18951 0.1826144,0.24742 0.031184,0.0579 0.074962,0.10528 0.097285,0.10528 0.022322,0 0.1232137,-0.0641 0.2242032,-0.1424 0.2551499,-0.19787 0.4707024,-0.26368 0.8024812,-0.24499 0.073924,0.003 0.075677,0.0105 0.060668,0.2203 -0.018902,0.2642 -0.1054117,0.46835 -0.2776124,0.65516 -0.071801,0.0779 -0.1305487,0.15755 -0.1305487,0.177 0,0.0194 0.075424,0.0848 0.1676113,0.14531 0.092186,0.0605 0.2081383,0.1437 0.2576717,0.18495 l 0.090061,0.075 -0.1219865,0.1237 c -0.067093,0.0681 -0.2010031,0.16002 -0.2975793,0.2044 -0.199175,0.0915 -0.2308085,0.12454 -0.1908675,0.19916 0.036351,0.068 -0.1489458,0.25209 -0.3518735,0.34972 -0.2420168,0.11644 -0.2399953,0.11454 -0.2300318,0.21521 0.00753,0.076 -0.014618,0.1162 -0.1102841,0.2002 -0.065833,0.0578 -0.1972437,0.14059 -0.2920236,0.18399 -0.1511967,0.0692 -0.2052261,0.0771 -0.4406271,0.0648 -0.23174967,-0.0122 -0.29885754,-0.0301 -0.49261315,-0.13125 l -0.22431318,-0.11718 -0.13823523,0.12743 c -0.0760293,0.0701 -0.14517698,0.12742 -0.15366134,0.12742 -0.008483,0 -0.0412387,-0.0284 -0.0727873,-0.0634 z m 1.47652803,-0.19404 c 0.074834,-0.0322 0.1454948,-0.0831 0.157023,-0.1132 0.05126,-0.13358 -0.38361,-0.32453 -0.6545159,-0.2874 -0.18637946,0.0257 -0.42075507,0.16129 -0.42075507,0.24369 0,0.12311 0.41715077,0.267 0.67044497,0.23125 0.061457,-0.009 0.1729686,-0.0421 0.247803,-0.0743 z m -0.95860832,-0.48265 c 0.0758147,-0.11469 0.0881196,-0.16528 0.0873291,-0.35916 -0.001169,-0.28626 -0.11548526,-0.54494 -0.24081925,-0.54494 -0.17348331,0 -0.28704584,0.48479 -0.18397596,0.7854 0.0980628,0.28599 0.20256607,0.32275 0.33746611,0.1187 z m 1.38140422,-0.0292 c 0.1856471,-0.0398 0.339672,-0.15275 0.3108314,-0.22791 -0.036872,-0.0961 -0.3571185,-0.22243 -0.5638097,-0.22243 -0.2049092,0 -0.4262288,0.0935 -0.4945342,0.2089 -0.041951,0.071 0.034352,0.1341 0.2645597,0.21918 0.1753201,0.0648 0.2652676,0.0689 0.4829528,0.0223 z m -0.8639771,-0.44935 c 0.1737466,-0.1865 0.2053776,-0.55083 0.070735,-0.81476 -0.1284641,-0.25181 -0.21204859,-0.2578 -0.32554745,-0.0234 -0.12087975,0.2497 -0.0886573,0.57245 0.0834178,0.83551 0.0586103,0.0896 0.0898824,0.0901 0.17139505,0.003 z m 1.5901381,-0.16903 c 0.176478,-0.0822 0.2038657,-0.13507 0.1117407,-0.21585 -0.2457795,-0.21549 -0.6736019,-0.23825 -0.9418152,-0.0501 -0.1378586,0.0967 -0.1129176,0.16431 0.095778,0.25956 0.2460525,0.11232 0.5019589,0.11452 0.7342967,0.006 z m -0.9395138,-0.52788 c 0.074142,-0.14449 0.087995,-0.20668 0.078224,-0.35117 -0.012903,-0.19079 -0.13139,-0.46543 -0.2216396,-0.51373 -0.078974,-0.0422 -0.1770734,0.0737 -0.237132,0.28028 -0.056866,0.19561 -0.026219,0.43452 0.083271,0.64914 0.094132,0.18452 0.1789426,0.16611 0.2972777,-0.0645 z m 0.6441989,-0.15798 c 0.1891937,-0.0821 0.3202273,-0.20649 0.4125549,-0.39177 0.1512249,-0.30347 0.097564,-0.40563 -0.1711463,-0.32584 -0.2829441,0.0841 -0.5846126,0.43186 -0.5846126,0.67407 0,0.14794 0.079282,0.158 0.343204,0.0435 z"
+       id="path7219"
+       inkscape:connector-curvature="0" />
+    <g
+       id="layer1-1"
+       transform="matrix(0.58700842,0,0,0.58700842,1.7392457,119.14951)"
+       style="fill:#000000;stroke-width:1.70355296">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.90146357;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="M 0.62430507,292.16017 V 295.604 H -1.4578422 v 0.65081 h 2.7329683 v -3.44383 h 1.0710931 v 1.66668 h 1.6138442 v 1.77715 H 6.3496096 V 295.604 h -1.738725 v -1.77475 H 2.9970403 v -1.66908 z"
+         id="path6563"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:#000000;stroke-width:1"
+       d="m 2.7360592,296.16852 c 0.035985,-0.0266 0.079014,-0.0464 0.095561,-0.0439 0.028453,0.004 0.1012562,0.0628 0.1998654,0.16077 0.042618,0.0422 0.050276,0.0379 0.2271026,-0.13015 0.1006543,-0.0957 0.1837529,-0.17894 0.1846679,-0.18509 7.368e-4,-0.005 -0.080243,-0.0992 -0.1803661,-0.20667 -0.1001149,-0.10752 -0.1858963,-0.21293 -0.1906298,-0.23422 -0.01591,-0.0715 0.00672,-0.14361 0.055248,-0.17596 0.052777,-0.0351 0.1863359,-0.0256 0.2035889,0.0146 0.00599,0.0138 0.028459,0.0383 0.049986,0.0543 0.034199,0.0255 0.1469599,-0.0773 0.8921084,-0.81307 0.4959648,-0.48972 0.8786622,-0.84956 0.9143988,-0.85984 0.057272,-0.0164 0.1193571,-0.006 0.4656563,0.0774 l 0.1179261,0.0284 0.2688188,-0.25067 c 0.4071733,-0.37969 0.4103449,-0.37495 0.026669,0.0399 l -0.2462072,0.26615 0.042598,0.25476 c 0.023426,0.14012 0.037869,0.28652 0.032094,0.3253 -0.00841,0.0565 -0.1829859,0.24089 -0.871827,0.92127 l -0.8613178,0.85072 0.056621,0.0699 c 0.080472,0.0992 0.086441,0.16909 0.02003,0.23528 -0.099061,0.0988 -0.169502,0.0709 -0.3691134,-0.14606 -0.097862,-0.10638 -0.1875382,-0.19485 -0.1992942,-0.1966 -0.01811,-0.003 -0.2766334,0.23868 -0.346337,0.3234 -0.014924,0.0182 0.00872,0.0666 0.069195,0.14254 0.1016878,0.12757 0.1059961,0.18332 0.020346,0.26412 -0.09641,0.0909 -0.1470079,0.0616 -0.4406566,-0.25571 -0.1491273,-0.16113 -0.2817818,-0.31113 -0.2947946,-0.33331 -0.037247,-0.0635 -0.013228,-0.14534 0.058107,-0.19819 z m 1.2661739,-0.0595 c 0.00508,7.5e-4 0.024809,0.009 0.042796,0.0201 0.02401,0.0137 0.2623398,-0.20766 0.8700641,-0.80776 0.4603218,-0.45456 0.839611,-0.84429 0.8428512,-0.86604 0.00323,-0.0217 -0.00965,-0.1319 -0.028692,-0.24474 -0.040702,-0.24158 -0.049455,-0.24932 -0.328551,-0.29089 -0.1607045,-0.0239 -0.2000044,-0.0227 -0.2397059,0.0103 -0.026037,0.0213 -0.043089,0.049 -0.037808,0.0615 0.00526,0.0126 0.079361,0.0959 0.1645424,0.18593 0.1467729,0.15491 0.1751347,0.20713 0.124336,0.22895 -0.012216,0.005 -0.096829,-0.0721 -0.1880173,-0.17197 -0.1747009,-0.19129 -0.1974008,-0.19898 -0.2757157,-0.0937 -0.024291,0.0327 -0.00304,0.0658 0.1358708,0.21208 0.090572,0.0953 0.1627979,0.18582 0.1605287,0.20105 -0.00998,0.067 -0.060365,0.0359 -0.2143205,-0.1314 -0.090441,-0.0983 -0.1694681,-0.1795 -0.175613,-0.18042 -0.00636,-9.4e-4 -0.037769,0.0259 -0.070354,0.0598 l -0.059172,0.0615 0.1595191,0.17024 c 0.087744,0.0935 0.1607166,0.18409 0.1621791,0.201 0.00675,0.0776 -0.058967,0.0374 -0.2140684,-0.13126 l -0.1681788,-0.18284 -0.051111,0.0492 c -0.028143,0.0272 -0.052465,0.057 -0.054123,0.0659 -0.00176,0.01 0.095906,0.12352 0.2167832,0.25426 0.1208911,0.13069 0.2213029,0.24481 0.2231458,0.25359 0.002,0.008 -0.2203961,0.23363 -0.4938623,0.49971 -0.4231911,0.41178 -0.5536869,0.55846 -0.5034353,0.56594 z"
+       id="path825"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/icons/complications-source/ic_cob_detailed_orig.svg b/icons/complications-source/ic_cob_detailed_orig.svg
new file mode 100644
index 0000000000..e599774c5d
--- /dev/null
+++ b/icons/complications-source/ic_cob_detailed_orig.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="ic_cob_detailed_orig.svg">
+  <defs
+     id="defs6576" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.24"
+     inkscape:cx="15.646632"
+     inkscape:cy="-12.499983"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="5.3485108,-2.2479248"
+       orientation="0,1"
+       id="guide7239"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="7.4930827,-2.2479248"
+       orientation="0,1"
+       id="guide4515"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <path
+       style="fill:#000000;stroke-width:0.99999994"
+       d="m 0.05089598,294.93416 c -0.07830027,-0.0866 -0.07612459,-0.0931 0.07662521,-0.23546 0.0864674,-0.0807 0.16740192,-0.17673 0.17985392,-0.21372 0.0124519,-0.0371 -0.0503872,-0.19849 -0.13964395,-0.35883 -0.15462889,-0.27779 -0.1622845,-0.31166 -0.1622845,-0.71767 0,-0.38785 0.01186591,-0.44752 0.13215717,-0.66469 0.16011951,-0.28904 0.41681436,-0.53114 0.48784554,-0.4601 0.0913417,0.0914 0.1465345,0.0477 0.26534931,-0.2096 0.18602812,-0.40291 0.34648712,-0.56898 0.55131572,-0.57056 0.1603807,-0.001 0.1741382,-0.0125 0.2345157,-0.1934 0.035639,-0.10668 0.1620652,-0.29611 0.2845168,-0.42613 l 0.2203763,-0.23402 0.1769015,0.1997 c 0.097295,0.10979 0.212748,0.26624 0.2565605,0.34761 0.043811,0.0814 0.1053167,0.14791 0.1366786,0.14791 0.031361,0 0.1731067,-0.09 0.3149901,-0.20006 0.358468,-0.278 0.6613044,-0.37046 1.1274306,-0.34419 0.1038581,0.004 0.1063214,0.0148 0.085235,0.3095 -0.026556,0.37118 -0.1480962,0.65799 -0.3900263,0.92046 -0.1008754,0.10945 -0.1834119,0.22134 -0.1834119,0.24866 0,0.0273 0.1059661,0.11915 0.2354823,0.20416 0.1295149,0.085 0.2924199,0.20189 0.362011,0.25984 l 0.1265294,0.10535 -0.1713826,0.17378 c -0.094261,0.0957 -0.2823955,0.22482 -0.4180783,0.28717 -0.2798272,0.12855 -0.3242699,0.17497 -0.2681556,0.27981 0.051071,0.0956 -0.2092585,0.35418 -0.4943581,0.49132 -0.3400167,0.16361 -0.3371767,0.16094 -0.3231787,0.30237 0.010579,0.10678 -0.020536,0.16325 -0.1549416,0.28125 -0.092491,0.0813 -0.2771137,0.19753 -0.4102729,0.25852 -0.2124209,0.0972 -0.2883285,0.10823 -0.6190505,0.091 -0.3255924,-0.0172 -0.4198742,-0.0423 -0.69208754,-0.18441 l -0.31514452,-0.16462 -0.19421093,0.17903 c -0.1068159,0.0985 -0.20396363,0.17902 -0.21588358,0.17902 -0.011918,0 -0.05793753,-0.0399 -0.10226112,-0.0891 z m 2.07441972,-0.27261 c 0.1051369,-0.0453 0.2044102,-0.11674 0.2206066,-0.15904 0.072017,-0.18766 -0.5389456,-0.45594 -0.9195496,-0.40378 -0.2618503,0.0361 -0.59113182,0.2266 -0.59113182,0.34238 0,0.17295 0.58606802,0.37512 0.94192882,0.3249 0.086342,-0.0127 0.2430089,-0.0592 0.348146,-0.10435 z m -1.34677832,-0.6781 c 0.1065144,-0.16113 0.12380194,-0.2322 0.12269135,-0.50459 -0.001642,-0.40217 -0.16224881,-0.76561 -0.3383344,-0.76561 -0.24373207,0 -0.40327958,0.68111 -0.25847353,1.10345 0.13777147,0.4018 0.28459134,0.45344 0.47411658,0.16675 z m 1.94077752,-0.0411 c 0.2608212,-0.0559 0.4772157,-0.2146 0.4366965,-0.3202 -0.051801,-0.13501 -0.5017268,-0.3125 -0.7921136,-0.3125 -0.2878833,0 -0.598822,0.13137 -0.6947864,0.29349 -0.058938,0.0998 0.048262,0.18841 0.3716881,0.30794 0.2463126,0.091 0.3726826,0.0968 0.6785154,0.0313 z m -1.2138282,-0.6313 c 0.244102,-0.26202 0.2885414,-0.77388 0.099378,-1.14469 -0.1804831,-0.35378 -0.2979135,-0.36219 -0.4573717,-0.033 -0.16982766,0.35082 -0.1245573,0.80425 0.1171964,1.17383 0.082343,0.12588 0.1262785,0.12658 0.2407982,0.004 z m 2.2340342,-0.23749 c 0.2479394,-0.11543 0.2864171,-0.18975 0.1569879,-0.30324 -0.3453032,-0.30275 -0.9463641,-0.33474 -1.3231853,-0.0704 -0.1936818,0.13585 -0.1586414,0.23084 0.1345615,0.36465 0.3456868,0.15781 0.7052176,0.1609 1.0316361,0.008 z m -1.319952,-0.74162 c 0.1041645,-0.203 0.1236269,-0.29037 0.1098991,-0.49337 -0.018127,-0.26805 -0.1845938,-0.6539 -0.3113883,-0.72176 -0.1109526,-0.0593 -0.248776,0.10357 -0.3331541,0.39378 -0.079893,0.27482 -0.036837,0.61047 0.1169895,0.912 0.1322489,0.25923 0.251402,0.23337 0.4176547,-0.0907 z m 0.9050549,-0.22195 c 0.2658041,-0.11532 0.4498971,-0.29011 0.5796111,-0.55042 0.2124605,-0.42634 0.1370707,-0.56987 -0.2404487,-0.45778 -0.397517,0.11816 -0.8213403,0.60673 -0.8213403,0.94702 0,0.20785 0.1113854,0.22198 0.4821779,0.0612 z"
+       id="path7219"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.42386249;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 2.9588068,295.12302 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 h 1.861385 a 0.21195244,0.21195244 0 1 0 0,-0.42374 h -1.861385 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m 2.4784015,0 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 H 6.132256 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 5.4583956 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m -2.4784015,0.72657 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 h 0.8030516 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 2.9799941 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m 1.4273029,0 a 0.21218709,0.21218709 0 0 0 0.021704,0.42374 h 1.7244425 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 4.4078138 a 0.21195244,0.21195244 0 0 0 -0.021704,0 z m -1.4273029,0.72657 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 H 6.132256 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 2.9799941 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z"
+       id="path819-9"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/icons/complications-source/ic_cob_iob_orig.svg b/icons/complications-source/ic_cob_iob_orig.svg
new file mode 100644
index 0000000000..98c1764554
--- /dev/null
+++ b/icons/complications-source/ic_cob_iob_orig.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="ic_cob_iob_orig.svg">
+  <defs
+     id="defs6576" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="20.48"
+     inkscape:cx="11.749487"
+     inkscape:cy="7.6899364"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="5.3485108,-2.2479248"
+       orientation="0,1"
+       id="guide7239"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="7.4930827,-2.2479248"
+       orientation="0,1"
+       id="guide4515"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <path
+       style="fill:#000000;stroke-width:0.99999988"
+       d="m 0.04584936,294.50936 c -0.07053636,-0.078 -0.06857641,-0.0839 0.06902739,-0.21211 0.0778937,-0.0727 0.15080309,-0.15921 0.1620204,-0.19253 0.0112172,-0.0334 -0.045391,-0.17881 -0.12579747,-0.32325 -0.13929657,-0.25025 -0.14619309,-0.28076 -0.14619309,-0.64651 0,-0.34939 0.01068934,-0.40315 0.11905305,-0.59878 0.14424277,-0.26038 0.37548489,-0.47848 0.43947293,-0.41448 0.0822847,0.0823 0.13200479,0.043 0.23903845,-0.18882 0.16758237,-0.36296 0.31213098,-0.51256 0.49664968,-0.51398 0.1444781,-0.001 0.1568714,-0.0113 0.2112622,-0.17423 0.032105,-0.0961 0.1459955,-0.26675 0.2563053,-0.38387 l 0.1985248,-0.21082 0.1593607,0.1799 c 0.087648,0.0989 0.1916529,0.23984 0.2311211,0.31314 0.039467,0.0733 0.094874,0.13325 0.1231262,0.13325 0.028251,0 0.1559422,-0.0811 0.283757,-0.18023 0.3229239,-0.25043 0.5957324,-0.33372 1.0156396,-0.31006 0.09356,0.004 0.095779,0.0133 0.076783,0.27881 -0.023923,0.33438 -0.1334116,0.59275 -0.351353,0.82919 -0.090873,0.0986 -0.1652256,0.1994 -0.1652256,0.22401 0,0.0246 0.095459,0.10733 0.2121329,0.18391 0.1166728,0.0766 0.2634249,0.18188 0.3261156,0.23408 l 0.1139833,0.0949 -0.154389,0.15655 c -0.084915,0.0862 -0.2543944,0.20253 -0.3766235,0.2587 -0.2520808,0.1158 -0.2921168,0.15762 -0.2415665,0.25206 0.046007,0.0861 -0.1885094,0.31906 -0.4453397,0.44261 -0.3063022,0.14738 -0.3037438,0.14498 -0.2911338,0.27238 0.00953,0.0962 -0.0185,0.14707 -0.1395782,0.25337 -0.08332,0.0732 -0.2496364,0.17794 -0.3695921,0.23288 -0.1913582,0.0876 -0.2597391,0.0975 -0.5576682,0.082 -0.2933081,-0.0155 -0.3782413,-0.0381 -0.62346317,-0.16613 l -0.28389618,-0.14829 -0.17495384,0.16127 c -0.0962245,0.0887 -0.18373949,0.16127 -0.19447751,0.16127 -0.0107363,0 -0.0521927,-0.0359 -0.09212136,-0.0803 z m 1.86872944,-0.24558 c 0.094712,-0.0408 0.1841418,-0.10516 0.1987322,-0.14327 0.064876,-0.16905 -0.4855061,-0.41073 -0.8283711,-0.36374 -0.2358864,0.0325 -0.53251782,0.20413 -0.53251782,0.30843 0,0.1558 0.52795612,0.33792 0.84853132,0.29268 0.077781,-0.0114 0.2189132,-0.0533 0.3136254,-0.094 z m -1.21323775,-0.61086 c 0.0959529,-0.14515 0.11152629,-0.20918 0.11052582,-0.45456 -0.001479,-0.36229 -0.14616094,-0.68969 -0.30478666,-0.68969 -0.21956467,0 -0.36329215,0.61357 -0.23284443,0.99403 0.12411066,0.36196 0.25637252,0.40848 0.42710527,0.15022 z m 1.74833855,-0.037 c 0.2349594,-0.0504 0.4298971,-0.19332 0.3933956,-0.28845 -0.046665,-0.12162 -0.4519777,-0.28151 -0.7135711,-0.28151 -0.259338,0 -0.5394454,0.11834 -0.6258944,0.26439 -0.053094,0.0899 0.043477,0.16972 0.3348331,0.2774 0.2218894,0.082 0.3357291,0.0872 0.6112368,0.0282 z m -1.0934703,-0.5687 c 0.2198979,-0.23604 0.2599309,-0.69715 0.089524,-1.03119 -0.1625872,-0.3187 -0.2683737,-0.32628 -0.4120207,-0.0297 -0.15298833,0.31603 -0.11220682,0.7245 0.1055757,1.05744 0.074178,0.1134 0.1137573,0.11403 0.2169217,0.004 z m 2.0125172,-0.21394 c 0.2233548,-0.10399 0.2580173,-0.17094 0.1414217,-0.27318 -0.3110645,-0.27273 -0.8525268,-0.30154 -1.1919841,-0.0634 -0.1744772,0.12238 -0.1429112,0.20795 0.121219,0.3285 0.31141,0.14216 0.6352913,0.14494 0.9293436,0.007 z m -1.1890714,-0.66809 c 0.093836,-0.18287 0.1113686,-0.26158 0.099002,-0.44445 -0.01633,-0.24147 -0.1662903,-0.58906 -0.2805124,-0.65019 -0.099951,-0.0534 -0.2241085,0.0933 -0.30012,0.35473 -0.071971,0.24757 -0.033184,0.54994 0.1053893,0.82157 0.1191357,0.23353 0.2264741,0.21023 0.3762419,-0.0817 z m 0.8153137,-0.19994 c 0.2394481,-0.10389 0.4052873,-0.26134 0.5221394,-0.49584 0.1913939,-0.38407 0.1234794,-0.51337 -0.2166069,-0.41239 -0.3581009,0.10644 -0.7398998,0.54657 -0.7398998,0.85312 0,0.18724 0.1003409,0.19997 0.4343673,0.0551 z"
+       id="path7219"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;stroke-width:1"
+       d="m 1.7447878,295.94036 c 0.045855,-0.0339 0.1006869,-0.0591 0.1217726,-0.0559 0.036257,0.005 0.1290298,0.08 0.2546866,0.20487 0.054308,0.0538 0.064066,0.0483 0.2893948,-0.16585 0.1282628,-0.12195 0.2341546,-0.22802 0.2353206,-0.23586 9.389e-4,-0.006 -0.1022529,-0.12641 -0.2298389,-0.26336 -0.1275755,-0.13701 -0.2368859,-0.27133 -0.2429178,-0.29846 -0.020274,-0.0911 0.00856,-0.183 0.070402,-0.22423 0.067253,-0.0447 0.2374462,-0.0326 0.2594315,0.0186 0.00763,0.0176 0.036265,0.0488 0.063697,0.0692 0.043579,0.0325 0.1872697,-0.0985 1.1368056,-1.03609 0.6320035,-0.62404 1.1196713,-1.08258 1.1652101,-1.09568 0.072981,-0.0209 0.1520957,-0.008 0.5933816,0.0986 l 0.1502722,0.0362 0.3425533,-0.31943 c 0.5188572,-0.48383 0.5228988,-0.47779 0.033984,0.0509 l -0.3137396,0.33915 0.054282,0.32464 c 0.029852,0.17855 0.048256,0.36511 0.040897,0.41452 -0.010717,0.072 -0.2331773,0.30697 -1.1109612,1.17397 l -1.0975694,1.08406 0.072152,0.0891 c 0.1025447,0.12641 0.110151,0.21547 0.025524,0.29981 -0.1262325,0.1259 -0.2159948,0.0904 -0.4703578,-0.18612 -0.1247047,-0.13556 -0.2389782,-0.2483 -0.2539588,-0.25053 -0.023077,-0.004 -0.3525114,0.30415 -0.4413341,0.41211 -0.019017,0.0232 0.011112,0.0849 0.088175,0.18164 0.1295798,0.16256 0.1350698,0.2336 0.025927,0.33656 -0.1228544,0.11584 -0.1873308,0.0785 -0.5615247,-0.32585 -0.1900316,-0.20532 -0.359072,-0.39647 -0.3756541,-0.42473 -0.047464,-0.0809 -0.016856,-0.18521 0.074045,-0.25255 z m 1.6134739,-0.0758 c 0.00647,9.6e-4 0.031614,0.0115 0.054535,0.0256 0.030596,0.0175 0.3342972,-0.26462 1.1087147,-1.02932 0.5865839,-0.57924 1.0699087,-1.07587 1.0740377,-1.10358 0.00412,-0.0277 -0.012297,-0.16808 -0.036562,-0.31187 -0.051866,-0.30785 -0.06302,-0.31771 -0.4186696,-0.37068 -0.2047842,-0.0305 -0.2548637,-0.0289 -0.305455,0.0131 -0.033179,0.0271 -0.054908,0.0624 -0.048178,0.0784 0.0067,0.0161 0.101129,0.12221 0.2096749,0.23693 0.1870314,0.1974 0.2231725,0.26394 0.1584402,0.29175 -0.015567,0.006 -0.1233883,-0.0919 -0.2395887,-0.21914 -0.2226198,-0.24376 -0.2515461,-0.25356 -0.351342,-0.1194 -0.030954,0.0417 -0.00387,0.0838 0.1731389,0.27025 0.1154151,0.12144 0.2074519,0.23679 0.2045603,0.2562 -0.012717,0.0854 -0.076923,0.0457 -0.2731067,-0.16745 -0.1152481,-0.12526 -0.2159517,-0.22873 -0.223782,-0.2299 -0.0081,-0.001 -0.048129,0.033 -0.089651,0.0762 l -0.075402,0.0784 0.2032737,0.21693 c 0.1118114,0.11915 0.2047997,0.23459 0.2066633,0.25614 0.0086,0.0989 -0.075141,0.0476 -0.2727854,-0.16727 l -0.2143087,-0.23299 -0.06513,0.0627 c -0.035862,0.0347 -0.066856,0.0726 -0.068968,0.084 -0.00224,0.0127 0.1222121,0.1574 0.2762448,0.324 0.1540505,0.16654 0.2820043,0.31196 0.2843527,0.32315 0.00255,0.0102 -0.2808487,0.29771 -0.6293242,0.63678 -0.5392686,0.52472 -0.7055582,0.71164 -0.641523,0.72117 z"
+       id="path825"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/icons/complications-source/ic_ins_burnin_orig.svg b/icons/complications-source/ic_ins_burnin_orig.svg
new file mode 100644
index 0000000000..c5bcdfe0ff
--- /dev/null
+++ b/icons/complications-source/ic_ins_burnin_orig.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24"
+   sodipodi:docname="ic_ins_burnin_orig.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="9.8333334"
+     inkscape:cx="-16.577819"
+     inkscape:cy="-13.406881"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6582" />
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:#000000;stroke-width:1"
+     d="m 5.2032286,5.5871636 c -0.04934,-0.04934 -0.08964,-0.111011 -0.08957,-0.137051 1.52e-4,-0.04479 0.07357,-0.17029 0.201637,-0.344565 0.05534,-0.07532 0.04685,-0.08608 -0.252444,-0.319785 -0.170344,-0.133015 -0.317626,-0.241845 -0.327294,-0.241845 -0.0097,0 -0.134233,0.146285 -0.276812,0.325077 -0.14258,0.178792 -0.285173,0.33503 -0.316874,0.347195 -0.106583,0.0409 -0.222631,0.0226 -0.28355,-0.04472 -0.06622,-0.07318 -0.08206,-0.280988 -0.02413,-0.316785 0.01999,-0.01236 0.05248,-0.05261 0.0722,-0.08944 0.03132,-0.05851 -0.152744,-0.208523 -1.45636,-1.186943 -0.867679,-0.65123 -1.50947501,-1.157865 -1.53346701,-1.210523 -0.03847,-0.08443 -0.03669,-0.182385 0.01334,-0.734653 l 0.01703,-0.188057 -0.447569,-0.356365 c -0.677916,-0.53977105 -0.671352,-0.54573805 0.05517,-0.05015 l 0.46618901,0.318004 0.382456,-0.124018 c 0.210351,-0.06821 0.432408,-0.124018 0.49346,-0.124018 0.08878,0 0.412826,0.226458 1.618266,1.1309 l 1.507261,1.1309 0.09444,-0.1032 c 0.13419,-0.146644 0.240524,-0.171859 0.357656,-0.08481 0.174744,0.129864 0.147971,0.244692 -0.140308,0.601765 -0.141329,0.175055 -0.256962,0.333412 -0.256962,0.351903 0,0.02852 0.430933,0.371143 0.577336,0.459025 0.03126,0.01877 0.100589,-0.02865 0.203562,-0.139225 0.173028,-0.185803 0.257926,-0.205222 0.401944,-0.09194 0.162187,0.127576 0.128598,0.212191 -0.292577,0.737056 -0.21388,0.266535 -0.414377,0.505167 -0.445547,0.530293 -0.08919,0.07189 -0.220737,0.05371 -0.318466,-0.04402 z m -0.38208,-1.935654 c 0,-0.0084 0.0095,-0.04015 0.0212,-0.07054 0.0154,-0.04012 -0.379863,-0.35625 -1.443129,-1.154214 -0.805383,-0.604426 -1.492346,-1.098957 -1.526584,-1.098957 -0.03424,0 -0.200846,0.04514 -0.37024,0.100301 -0.362556,0.118072 -0.37248,0.133324 -0.37248,0.57253 0,0.252909 0.01163,0.313126 0.07079,0.36667 0.03893,0.03524 0.08535,0.05506 0.103151,0.04406 0.0178,-0.011 0.12963,-0.144179 0.248515,-0.295954 0.204828,-0.261494 0.278719,-0.31713 0.323961,-0.243927 0.01089,0.01762 -0.08884,0.165617 -0.221625,0.328891 -0.254408,0.312833 -0.261065,0.349543 -0.08088,0.445977 0.05584,0.02989 0.101998,-0.01041 0.295319,-0.257823 0.126023,-0.161285 0.248747,-0.293246 0.27272,-0.293246 0.1052,0 0.06917,0.08472 -0.153163,0.360085 -0.130623,0.161786 -0.237497,0.30207 -0.237497,0.311742 0,0.0097 0.04864,0.05222 0.108097,0.09456 l 0.108096,0.07697 0.225527,-0.284627 c 0.12404,-0.156545 0.246547,-0.28965 0.272238,-0.295788 0.118009,-0.0282 0.07105,0.08224 -0.152949,0.359672 l -0.242907,0.300856 2.0068089,1.5336611 z"
+     id="path825"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccscccccsccccccssscccsscccccccccsscsccscccsscsccsccccc" />
+</svg>
diff --git a/icons/complications-source/ic_ins_orig.svg b/icons/complications-source/ic_ins_orig.svg
new file mode 100644
index 0000000000..7601867f58
--- /dev/null
+++ b/icons/complications-source/ic_ins_orig.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24"
+   sodipodi:docname="ic_ins_orig.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="764"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-24.10281"
+     inkscape:cy="-2.764539"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6582" />
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:#000000;stroke-width:1"
+     d="m 5.2032286,5.5871636 c -0.04934,-0.04934 -0.08964,-0.111011 -0.08957,-0.137051 1.52e-4,-0.04479 0.07357,-0.17029 0.201637,-0.344565 0.05534,-0.07532 0.04685,-0.08608 -0.252444,-0.319785 -0.170344,-0.133015 -0.317626,-0.241845 -0.327294,-0.241845 -0.0097,0 -0.134233,0.146285 -0.276812,0.325077 -0.14258,0.178792 -0.285173,0.33503 -0.316874,0.347195 -0.106583,0.0409 -0.222631,0.0226 -0.28355,-0.04472 -0.06622,-0.07318 -0.08206,-0.280988 -0.02413,-0.316785 0.01999,-0.01236 0.05248,-0.05261 0.0722,-0.08944 0.03132,-0.05851 -0.152744,-0.208523 -1.45636,-1.186943 -0.867679,-0.65123 -1.50947501,-1.157865 -1.53346701,-1.210523 -0.03847,-0.08443 -0.03669,-0.182385 0.01334,-0.734653 l 0.01703,-0.188057 -0.447569,-0.356365 c -0.677916,-0.53977105 -0.671352,-0.54573805 0.05517,-0.05015 l 0.46618901,0.318004 0.382456,-0.124018 c 0.210351,-0.06821 0.432408,-0.124018 0.49346,-0.124018 0.08878,0 0.412826,0.226458 1.618266,1.1309 l 1.507261,1.1309 0.09444,-0.1032 c 0.13419,-0.146644 0.240524,-0.171859 0.357656,-0.08481 0.174744,0.129864 0.147971,0.244692 -0.140308,0.601765 -0.141329,0.175055 -0.256962,0.333412 -0.256962,0.351903 0,0.02852 0.430933,0.371143 0.577336,0.459025 0.03126,0.01877 0.100589,-0.02865 0.203562,-0.139225 0.173028,-0.185803 0.257926,-0.205222 0.401944,-0.09194 0.162187,0.127576 0.128598,0.212191 -0.292577,0.737056 -0.21388,0.266535 -0.414377,0.505167 -0.445547,0.530293 -0.08919,0.07189 -0.220737,0.05371 -0.318466,-0.04402 z m -0.38208,-1.935654 c 0,-0.0084 0.0095,-0.04015 0.0212,-0.07054 0.0154,-0.04012 -0.379863,-0.35625 -1.443129,-1.154214 -0.805383,-0.604426 -1.492346,-1.098957 -1.526584,-1.098957 -0.03424,0 -0.200846,0.04514 -0.37024,0.100301 -0.362556,0.118072 -0.37248,0.133324 -0.37248,0.57253 0,0.252909 0.01163,0.313126 0.07079,0.36667 0.03893,0.03524 0.08535,0.05506 0.103151,0.04406 0.0178,-0.011 0.12963,-0.144179 0.248515,-0.295954 0.204828,-0.261494 0.278719,-0.31713 0.323961,-0.243927 0.01089,0.01762 -0.08884,0.165617 -0.221625,0.328891 -0.254408,0.312833 -0.261065,0.349543 -0.08088,0.445977 0.05584,0.02989 0.101998,-0.01041 0.295319,-0.257823 0.126023,-0.161285 0.248747,-0.293246 0.27272,-0.293246 0.1052,0 0.06917,0.08472 -0.153163,0.360085 -0.130623,0.161786 -0.237497,0.30207 -0.237497,0.311742 0,0.0097 0.04864,0.05222 0.108097,0.09456 l 0.108096,0.07697 0.225527,-0.284627 c 0.12404,-0.156545 0.246547,-0.28965 0.272238,-0.295788 0.118009,-0.0282 0.07105,0.08224 -0.152949,0.359672 l -0.242907,0.300856 0.08764,0.06738 c 0.0482,0.03706 0.09946,0.06775 0.11391,0.06819 0.01445,4.42e-4 0.168222,-0.175983 0.341718,-0.392066 0.173497,-0.216083 0.326136,-0.396847 0.339198,-0.401698 0.01306,-0.0049 0.410233,0.285716 0.882601,0.645702 0.73098,0.557073 0.986764,0.72433 0.986764,0.645245 z"
+     id="path825"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/icons/complications-source/ic_iob_detailed_orig.svg b/icons/complications-source/ic_iob_detailed_orig.svg
new file mode 100644
index 0000000000..3479a78565
--- /dev/null
+++ b/icons/complications-source/ic_iob_detailed_orig.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="ic_iob_detailed_orig.svg">
+  <defs
+     id="defs6576" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.24"
+     inkscape:cx="34.884913"
+     inkscape:cy="-12.499983"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="5.3485108,-2.2479248"
+       orientation="0,1"
+       id="guide7239"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="7.4930827,-2.2479248"
+       orientation="0,1"
+       id="guide4515"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="8.2940674,-11.575521"
+       orientation="0,1"
+       id="guide950"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <path
+       style="fill:#000000;stroke-width:0.99999994"
+       d="m 0.10358636,294.55177 c 0.0493981,-0.0365 0.10846679,-0.0637 0.13118174,-0.0602 0.0390585,0.005 0.13899969,0.0862 0.27436575,0.2207 0.0585043,0.058 0.0690163,0.052 0.31175579,-0.17867 0.13817342,-0.13137 0.25224726,-0.24563 0.25350336,-0.25408 0.00101,-0.006 -0.11015378,-0.13618 -0.2475981,-0.28371 -0.13743302,-0.1476 -0.25518963,-0.29229 -0.2616876,-0.32152 -0.0218405,-0.0981 0.009221,-0.19714 0.0758418,-0.24156 0.0724495,-0.0481 0.25579322,-0.0351 0.27947728,0.02 0.00822,0.019 0.0390671,0.0526 0.0686187,0.0746 0.0469462,0.035 0.20173962,-0.10611 1.22464432,-1.11615 0.6808372,-0.67226 1.2061862,-1.16623 1.2552437,-1.18034 0.07862,-0.0225 0.1638478,-0.009 0.6392311,0.10622 l 0.1618834,0.039 0.3690218,-0.34412 c 0.5589482,-0.52121 0.563302,-0.5147 0.03661,0.0548 l -0.3379816,0.36535 0.058476,0.34973 c 0.032159,0.19234 0.051985,0.39332 0.044057,0.44655 -0.011545,0.0776 -0.2511945,0.33069 -1.1968031,1.26468 l -1.1823765,1.16782 0.077727,0.096 c 0.1104681,0.13618 0.1186621,0.23212 0.027496,0.32298 -0.1359863,0.13563 -0.2326844,0.0974 -0.5067015,-0.2005 -0.1343404,-0.14604 -0.2574436,-0.26749 -0.2735817,-0.26989 -0.02486,-0.004 -0.3797493,0.32765 -0.47543506,0.44395 -0.0204864,0.025 0.0119706,0.0915 0.0949881,0.19568 0.1395922,0.17512 0.1455064,0.25165 0.02793,0.36256 -0.13234709,0.12479 -0.20180545,0.0846 -0.60491261,-0.35102 -0.20471498,-0.22119 -0.38681681,-0.42711 -0.40468017,-0.45755 -0.05113146,-0.0871 -0.01815844,-0.19952 0.07976631,-0.27207 z m 1.73814394,-0.0817 c 0.00697,10e-4 0.034057,0.0124 0.058749,0.0276 0.03296,0.0189 0.3601277,-0.28507 1.194383,-1.10885 0.6319081,-0.624 1.1525785,-1.159 1.1570265,-1.18885 0.00444,-0.0299 -0.013247,-0.18107 -0.039387,-0.33597 -0.055874,-0.33164 -0.06789,-0.34226 -0.4510194,-0.39932 -0.2206075,-0.0329 -0.2745566,-0.0311 -0.329057,0.0141 -0.035743,0.0292 -0.059151,0.0672 -0.051901,0.0845 0.00722,0.0173 0.1089431,0.13165 0.2258761,0.25523 0.201483,0.21266 0.2404166,0.28434 0.1706826,0.3143 -0.01677,0.006 -0.1329223,-0.099 -0.2581013,-0.23608 -0.2398212,-0.26259 -0.2709826,-0.27315 -0.3784895,-0.12862 -0.033346,0.0449 -0.00417,0.0903 0.186517,0.29113 0.124333,0.13082 0.2234813,0.25509 0.2203663,0.276 -0.0137,0.092 -0.082867,0.0492 -0.2942092,-0.18039 -0.1241531,-0.13494 -0.2326378,-0.24641 -0.2410732,-0.24767 -0.00873,-10e-4 -0.051848,0.0356 -0.096578,0.0821 l -0.081228,0.0845 0.2189803,0.23369 c 0.1204508,0.12836 0.2206241,0.25272 0.2226317,0.27593 0.00926,0.10654 -0.080947,0.0513 -0.293863,-0.18019 l -0.2308679,-0.251 -0.070162,0.0675 c -0.038633,0.0374 -0.072022,0.0782 -0.074297,0.0905 -0.00241,0.0137 0.1316552,0.16956 0.2975897,0.34903 0.1659537,0.17941 0.3037943,0.33607 0.3063241,0.34812 0.00275,0.011 -0.3025493,0.32072 -0.6779509,0.68599 -0.5809368,0.56526 -0.7600753,0.76662 -0.6910922,0.77689 z"
+       id="path825"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.42386249;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 2.9588068,295.12302 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 h 1.861385 a 0.21195244,0.21195244 0 1 0 0,-0.42374 h -1.861385 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m 2.4784015,0 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 H 6.132256 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 5.4583956 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m -2.4784015,0.72657 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 h 0.8030516 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 2.9799941 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m 1.4273029,0 a 0.21218709,0.21218709 0 0 0 0.021704,0.42374 h 1.7244425 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 4.4078138 a 0.21195244,0.21195244 0 0 0 -0.021704,0 z m -1.4273029,0.72657 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 H 6.132256 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 2.9799941 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z"
+       id="path819-9"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/icons/complications/ic_aaps_full.svg b/icons/complications/ic_aaps_full.svg
new file mode 100644
index 0000000000..4e005a8228
--- /dev/null
+++ b/icons/complications/ic_aaps_full.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg4879"
+   version="1.1"
+   viewBox="-0.1 0 38.4175 38.4175"
+   height="38.4175mm"
+   width="38.4175mm">
+  <defs
+     id="defs4873" />
+  <metadata
+     id="metadata4876">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(267.81708,63.899226)"
+     id="layer1">
+    <path
+       id="path197"
+       transform="matrix(0.26458333,0,0,0.26458333,-267.91708,-63.899226)"
+       d="M 72.599609 0 C 62.799597 0 53.499969 1.9003894 45 5.4003906 C 27.099969 12.800392 12.800365 27.099999 5.4003906 45 C 1.9003591 53.499999 0 62.799608 0 72.599609 C 0 82.399611 1.9003591 91.69922 5.4003906 100.19922 C 12.800365 118.09922 27.099969 132.40078 45 139.80078 C 53.499969 143.30078 62.799597 145.19922 72.599609 145.19922 C 82.399584 145.19922 91.699212 143.30078 100.19922 139.80078 C 118.09921 132.40078 132.40077 118.09922 139.80078 100.19922 C 143.30077 91.69922 145.19922 82.399611 145.19922 72.599609 C 145.19922 62.799608 143.30077 53.499999 139.80078 45 C 132.40077 27.099999 118.09921 12.800392 100.19922 5.4003906 C 91.699212 1.9003894 82.399584 0 72.599609 0 z M 72.5 11.300781 C 106.29997 11.300781 133.69922 38.799997 133.69922 72.5 C 133.69922 84.099997 130.5004 94.899219 124.90039 104.19922 L 124.90039 72.699219 C 125.00055 62.899221 122.6996 53.900781 118.09961 45.800781 C 113.49958 37.700781 107.19963 31.39922 99.099609 26.699219 C 95.599616 24.699217 91.899584 23.100001 88.099609 22 C 83.899609 20.700001 79.599609 24.099999 79.599609 28.5 C 79.599609 31.5 81.600403 34.000391 84.400391 34.900391 C 87.000403 35.700392 89.400781 36.799221 91.800781 38.199219 C 97.600769 41.69922 102.19998 46.400391 105.5 52.400391 C 108.79998 58.400391 110.5 65.099609 110.5 72.599609 C 110.5 80.099609 108.79998 86.800781 105.5 92.800781 C 102.09997 98.800781 97.600769 103.50039 91.800781 106.90039 C 90.200756 107.80039 88.600384 108.60078 86.900391 109.30078 L 86.900391 106.09961 L 86.900391 98.900391 L 86.900391 92.900391 L 86.900391 82.400391 C 86.900391 80.300391 86.200794 78.499611 84.800781 77.099609 C 83.400806 75.699608 81.699987 75 79.5 75 C 77.499987 75 75.800762 75.699608 74.300781 77.099609 C 72.900769 78.499611 72.099609 80.200388 72.099609 82.400391 L 72.099609 92.900391 L 72.099609 98.900391 L 72.099609 106.5 L 72.099609 112.40039 L 72.099609 117.19922 C 72.099609 119.19922 72.800762 120.90039 74.300781 122.40039 C 75.700756 123.80039 77.499987 124.59961 79.5 124.59961 C 80.599994 124.59961 81.69959 124.39999 82.599609 124 C 86.299616 123.1 89.899238 121.89961 93.199219 120.09961 C 99.999231 116.59961 105.59963 111.90078 110.09961 105.80078 L 110.09961 117.19922 C 110.09961 118.39922 110.29916 119.40078 110.69922 120.30078 C 100.19924 128.70078 86.9 133.69922 72.5 133.69922 C 38.699987 133.69922 11.300781 106.2 11.300781 72.5 C 11.300781 38.799997 38.799994 11.300781 72.5 11.300781 z M 64.900391 20.300781 C 64.00041 20.300781 63.200365 20.499233 62.400391 20.699219 C 56.400391 21.699217 50.700384 23.699219 45.400391 26.699219 C 37.400378 31.299217 31.100384 37.700781 26.400391 45.800781 C 21.800365 53.900781 19.5 62.899221 19.5 72.699219 C 19.5 82.49922 21.6992 91.499999 26.199219 99.5 C 30.6992 107.5 36.799609 113.8 44.599609 118.5 C 48.199609 120.7 51.999616 122.30039 56.099609 123.40039 C 60.499622 124.60039 64.900391 121.40078 64.900391 116.80078 C 64.900391 113.70078 62.800384 111.19922 59.900391 110.19922 C 57.400384 109.39922 54.899603 108.30039 52.599609 106.90039 C 46.699616 103.50039 42.100762 98.800781 38.800781 92.800781 C 35.400794 86.800781 33.800781 80.099609 33.800781 72.599609 C 33.800781 65.099609 35.500762 58.400391 38.800781 52.400391 C 42.100762 46.400391 46.799622 41.69922 52.599609 38.199219 C 54.199597 37.299219 55.899578 36.500784 57.599609 35.800781 L 57.599609 38 L 57.599609 44 L 57.599609 51.599609 L 57.599609 57.5 L 57.599609 62.300781 C 57.599609 64.300779 58.300762 66 59.800781 67.5 C 61.200794 68.900001 63.000025 69.699219 65 69.699219 C 67.100019 69.699219 68.900806 69 70.300781 67.5 C 71.700794 66.099999 72.400391 64.300779 72.400391 62.300781 L 72.400391 57.5 L 72.400391 51.199219 L 72.400391 44 L 72.400391 38 L 72.400391 27.5 C 72.400391 25.4 71.700794 23.59922 70.300781 22.199219 C 68.8008 20.999219 67.100416 20.300781 64.900391 20.300781 z "
+       style="stroke-width:0.99999994;fill:#ffffff" />
+  </g>
+</svg>
diff --git a/icons/complications/ic_basal.svg b/icons/complications/ic_basal.svg
new file mode 100644
index 0000000000..0491265177
--- /dev/null
+++ b/icons/complications/ic_basal.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-290.64998)"
+     id="layer1">
+    <path
+       id="path6563"
+       d="m 1.6933594,292.16016 v 2.80078 H 0 v 0.52929 h 2.2226562 v -2.80078 H 3.09375 v 1.35547 h 1.3125 v 1.44531 h 1.9433594 v -0.52929 H 4.9355469 v -1.44336 h -1.3125 v -1.35742 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/icons/complications/ic_br_cob_iob.svg b/icons/complications/ic_br_cob_iob.svg
new file mode 100644
index 0000000000..b340c42187
--- /dev/null
+++ b/icons/complications/ic_br_cob_iob.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-290.64998)"
+     id="layer1">
+    <path
+       id="path7219"
+       transform="matrix(0.26458333,0,0,0.26458333,0,290.64998)"
+       d="M 7.9589844 0 L 7.9589844 7.640625 L 3.3398438 7.640625 L 3.3398438 9.0839844 L 9.4023438 9.0839844 L 9.4023438 1.4433594 L 11.779297 1.4433594 L 11.779297 5.1425781 L 15.359375 5.1425781 L 15.359375 9.0839844 L 20.660156 9.0839844 L 20.660156 7.640625 L 16.802734 7.640625 L 16.802734 3.703125 L 13.222656 3.703125 L 13.222656 0 L 7.9589844 0 z M 24 10.115234 C 23.985902 10.094145 23.597586 10.448491 22.828125 11.166016 L 21.8125 12.113281 L 21.367188 12.005859 C 20.05834 11.690647 19.823883 11.652859 19.607422 11.714844 C 19.472354 11.753697 18.024903 13.11198 16.150391 14.962891 C 13.334081 17.743754 12.908553 18.133487 12.779297 18.037109 C 12.697935 17.976637 12.612483 17.884189 12.589844 17.832031 C 12.524636 17.680094 12.019785 17.642729 11.820312 17.775391 C 11.6369 17.897658 11.551196 18.17117 11.611328 18.441406 C 11.629219 18.521872 11.953644 18.919797 12.332031 19.326172 C 12.710449 19.732358 13.016457 20.088524 13.013672 20.107422 C 13.010214 20.130666 12.696832 20.44494 12.316406 20.806641 C 11.648085 21.44179 11.618107 21.458324 11.457031 21.298828 C 11.084335 20.928548 10.810664 20.706524 10.703125 20.691406 C 10.640585 20.681957 10.477803 20.756886 10.341797 20.857422 C 10.073095 21.057197 9.9805223 21.363864 10.121094 21.603516 C 10.170276 21.687346 10.672697 22.254286 11.236328 22.863281 C 12.346181 24.062563 12.536006 24.173637 12.900391 23.830078 C 13.224108 23.524692 13.208551 23.314186 12.824219 22.832031 C 12.595652 22.545014 12.506094 22.361756 12.5625 22.292969 C 12.825947 21.972767 13.802647 21.058974 13.871094 21.070312 C 13.915526 21.076927 14.255128 21.412387 14.625 21.814453 C 15.379437 22.634459 15.645127 22.738652 16.019531 22.365234 C 16.270533 22.115067 16.249459 21.851492 15.945312 21.476562 L 15.730469 21.212891 L 18.986328 17.998047 C 21.589822 15.426532 22.249464 14.729168 22.28125 14.515625 C 22.303077 14.369055 22.248695 13.814744 22.160156 13.285156 L 21.998047 12.322266 L 22.929688 11.316406 C 23.654744 10.532438 24.014098 10.136324 24 10.115234 z M 5.8691406 10.695312 L 5.2753906 11.326172 C 4.9459731 11.675929 4.6056409 12.183837 4.5097656 12.470703 C 4.3473385 12.957015 4.3103601 12.988937 3.8789062 12.992188 C 3.3278786 12.996421 2.8969349 13.443413 2.3964844 14.527344 C 2.0768503 15.219715 1.927367 15.335513 1.6816406 15.089844 C 1.4905534 14.898713 0.80184526 15.550563 0.37109375 16.328125 C 0.04748769 16.912327 0.015625 17.073811 0.015625 18.117188 C 0.015625 19.209433 0.035191176 19.299549 0.45117188 20.046875 C 0.69128942 20.478232 0.85966983 20.911939 0.82617188 21.011719 C 0.79267366 21.111234 0.57636367 21.370946 0.34375 21.587891 C -0.067175581 21.970757 -0.073923619 21.987884 0.13671875 22.220703 C 0.25595755 22.352987 0.38004764 22.460938 0.41210938 22.460938 C 0.44417625 22.460938 0.70483267 22.243461 0.9921875 21.978516 L 1.515625 21.498047 L 2.3632812 21.939453 C 3.0955859 22.321752 3.3487051 22.389437 4.2246094 22.435547 C 5.1143139 22.482035 5.3191729 22.45295 5.890625 22.191406 C 6.2488482 22.027375 6.745323 21.71455 6.9941406 21.496094 C 7.3557133 21.178613 7.4386161 21.027478 7.4101562 20.740234 C 7.3724989 20.359749 7.3645877 20.365869 8.2792969 19.925781 C 9.0462677 19.556786 9.7467646 18.860523 9.609375 18.603516 C 9.4584169 18.321487 9.5792438 18.197389 10.332031 17.851562 C 10.697044 17.683827 11.203451 17.335511 11.457031 17.078125 L 11.917969 16.611328 L 11.576172 16.328125 C 11.388959 16.172219 10.951935 15.857568 10.603516 15.628906 C 10.255091 15.400207 9.96875 15.153401 9.96875 15.080078 C 9.96875 15.006566 10.191517 14.704581 10.462891 14.410156 C 11.113728 13.704103 11.440278 12.932145 11.511719 11.933594 C 11.568446 11.140649 11.562601 11.112901 11.283203 11.101562 C 10.029236 11.030923 9.2143461 11.279489 8.25 12.027344 C 7.8683074 12.323281 7.4867104 12.566406 7.4023438 12.566406 C 7.3179734 12.566406 7.153017 12.386803 7.0351562 12.167969 C 6.9172924 11.949096 6.6054936 11.527981 6.34375 11.232422 L 5.8691406 10.695312 z M 10.466797 11.814453 C 10.925502 11.849589 10.932575 12.282348 10.503906 13.142578 C 10.154952 13.842849 9.6584222 14.312748 8.9433594 14.623047 C 7.9458589 15.055803 7.6464844 15.018128 7.6464844 14.458984 C 7.6464844 13.543545 8.7860737 12.229968 9.8554688 11.912109 C 10.109368 11.836717 10.313895 11.802741 10.466797 11.814453 z M 5.8515625 11.919922 C 5.89071 11.921683 5.9294863 11.931235 5.9667969 11.951172 C 6.3078977 12.133723 6.7559203 13.171482 6.8046875 13.892578 C 6.8416173 14.438682 6.7899874 14.674599 6.5097656 15.220703 C 6.0625149 16.0923 5.7405401 16.162242 5.3847656 15.464844 C 4.9709452 14.653682 4.8553859 13.751032 5.0703125 13.011719 C 5.2689315 12.328541 5.5775303 11.907592 5.8515625 11.919922 z M 19.787109 12.296875 C 19.918923 12.291442 20.108416 12.312257 20.412109 12.357422 C 21.46696 12.514537 21.500463 12.543973 21.654297 13.457031 C 21.726267 13.883513 21.773927 14.300797 21.761719 14.382812 C 21.749472 14.465017 20.315971 15.938228 18.576172 17.65625 C 16.279261 19.924344 15.379809 20.760764 15.289062 20.708984 C 15.22108 20.667032 15.146153 20.635647 15.126953 20.632812 C 14.937026 20.604542 15.429834 20.050474 17.029297 18.494141 C 18.06287 17.488484 18.90209 16.635705 18.894531 16.605469 C 18.887566 16.572284 18.509646 16.140431 18.052734 15.646484 C 17.595876 15.152349 17.22577 14.723342 17.232422 14.685547 C 17.238688 14.651909 17.331133 14.540303 17.4375 14.4375 L 17.630859 14.25 L 18.265625 14.941406 C 18.851835 15.578861 19.099731 15.730791 19.074219 15.4375 C 19.068691 15.373588 18.794521 15.03112 18.462891 14.677734 L 17.859375 14.035156 L 18.082031 13.802734 C 18.205187 13.674608 18.325572 13.572619 18.349609 13.576172 C 18.372834 13.579649 18.669894 13.886285 19.011719 14.257812 C 19.593598 14.890127 19.784546 15.007135 19.822266 14.753906 C 19.830842 14.696344 19.559116 14.35433 19.216797 13.994141 C 18.69178 13.441271 18.611316 13.31695 18.703125 13.193359 C 18.999118 12.795451 19.083854 12.823889 19.744141 13.546875 C 20.088789 13.924336 20.408907 14.216163 20.455078 14.197266 C 20.647073 14.114796 20.539107 13.917518 19.984375 13.332031 C 19.66243 12.99176 19.383162 12.676528 19.363281 12.628906 C 19.343322 12.581662 19.407452 12.476988 19.505859 12.396484 C 19.580886 12.334122 19.655296 12.302308 19.787109 12.296875 z M 3.6816406 14.041016 C 3.8749313 14.054901 4.0755926 14.299529 4.3183594 14.775391 C 4.8272448 15.772921 4.7074613 17.150587 4.0507812 17.855469 C 3.7427019 18.184666 3.623863 18.182396 3.4023438 17.84375 C 2.7519812 16.849507 2.6310223 15.631248 3.0878906 14.6875 C 3.3023767 14.244539 3.4883499 14.027131 3.6816406 14.041016 z M 8.734375 15.732422 C 9.3814479 15.766844 10.017957 15.993165 10.482422 16.400391 C 10.830611 16.705701 10.72755 16.90612 10.060547 17.216797 L 10.060547 17.214844 C 9.1824198 17.624998 8.2151185 17.615923 7.2851562 17.191406 C 6.4963855 16.831406 6.4008346 16.576418 6.921875 16.210938 C 7.4287348 15.855378 8.0873021 15.698 8.734375 15.732422 z M 1.5136719 16.246094 C 1.9873751 16.246094 2.4194099 17.224713 2.4238281 18.306641 C 2.4268158 19.039415 2.3802937 19.230588 2.09375 19.664062 C 1.5838916 20.435275 1.1889904 20.295751 0.81835938 19.214844 C 0.42880392 18.07868 0.85798692 16.246094 1.5136719 16.246094 z M 6.359375 17.851562 C 7.1405701 17.851562 8.3508756 18.328194 8.4902344 18.691406 C 8.5992382 18.975476 8.0180646 19.402309 7.3164062 19.552734 C 6.493659 19.72886 6.1528615 19.713663 5.4902344 19.46875 C 4.620158 19.147188 4.3316794 18.908971 4.4902344 18.640625 C 4.7483965 18.204468 5.584915 17.851562 6.359375 17.851562 z M 4.2460938 19.958984 C 5.2439714 20.010012 6.4800681 20.618786 6.3105469 21.060547 C 6.2669757 21.174311 5.999634 21.36658 5.7167969 21.488281 C 5.4339582 21.609982 5.0135284 21.735516 4.78125 21.769531 C 3.8239176 21.904649 2.2460938 21.359829 2.2460938 20.894531 C 2.2460938 20.583098 3.1334643 20.06979 3.8378906 19.972656 C 3.9658777 19.955115 4.1035398 19.951695 4.2460938 19.958984 z "
+       style="fill:#ffffff;stroke-width:3.77952719" />
+    <g
+       style="fill:#000000;stroke-width:1.70355296"
+       transform="matrix(0.58700842,0,0,0.58700842,1.7392457,119.14951)"
+       id="layer1-1" />
+  </g>
+</svg>
diff --git a/icons/complications/ic_carbs.svg b/icons/complications/ic_carbs.svg
new file mode 100644
index 0000000000..0785741d47
--- /dev/null
+++ b/icons/complications/ic_carbs.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-290.64998)"
+     id="layer1">
+    <path
+       id="path7219"
+       d="m 0.07295798,296.83173 c -0.1122387,-0.12403 -0.10912,-0.13361 0.1098377,-0.33755 0.123946,-0.11545 0.2399605,-0.2533 0.2578097,-0.30635 0.017849,-0.053 -0.072227,-0.28451 -0.2001711,-0.51436 -0.2216511,-0.3982 -0.232625,-0.44673 -0.232625,-1.02872 0,-0.55596 0.01701,-0.64151 0.1894393,-0.95278 0.2295216,-0.41433 0.5974781,-0.76138 0.699297,-0.65956 0.13093292,0.13093 0.21004832,0.0684 0.38036222,-0.30044 0.26666,-0.57755 0.4966683,-0.81559 0.7902781,-0.81787 0.2298957,-0.002 0.2496163,-0.0181 0.3361639,-0.27725 0.051087,-0.15301 0.2323105,-0.42442 0.4078375,-0.61081 l 0.3158958,-0.33544 0.2535776,0.28625 c 0.1394675,0.15744 0.3049613,0.38166 0.367764,0.49829 0.062802,0.11662 0.150967,0.21203 0.1959215,0.21203 0.044954,0 0.2481379,-0.12905 0.4515189,-0.28678 0.5138423,-0.3985 0.9479397,-0.53103 1.6161036,-0.49339 0.1488754,0.008 0.1524038,0.0212 0.1221769,0.44366 -0.038067,0.53204 -0.2122871,0.9432 -0.5590789,1.31942 -0.1446004,0.15688 -0.2629099,0.31727 -0.2629099,0.35643 0,0.0392 0.1518971,0.17085 0.3375495,0.29265 0.185652,0.1218 0.4191662,0.2894 0.5189208,0.37247 l 0.1813712,0.15102 -0.2456665,0.24913 c -0.1351167,0.13703 -0.4047968,0.32226 -0.5992897,0.41164 -0.4011153,0.18432 -0.4648215,0.2508 -0.3843851,0.40109 0.073206,0.13678 -0.2999593,0.50766 -0.708632,0.70428 -0.4873936,0.23449 -0.4833225,0.23068 -0.4632573,0.43341 0.015149,0.15308 -0.029439,0.23403 -0.222099,0.40318 -0.1325804,0.11641 -0.3972262,0.28315 -0.5881017,0.37054 -0.3044925,0.13941 -0.4133015,0.1554 -0.8873715,0.13052 -0.466717,-0.0245 -0.6018643,-0.0605 -0.9920655,-0.26433 l -0.45174132,-0.23597 -0.2783896,0.25662 c -0.1531142,0.14114 -0.2923695,0.25661 -0.309456,0.25661 -0.017086,0 -0.08305,-0.0574 -0.1465851,-0.12764 z M 3.046513,296.44094 c 0.1507077,-0.0649 0.2930096,-0.16746 0.3162261,-0.22796 0.1032308,-0.26902 -0.7725458,-0.65358 -1.3181185,-0.5788 -0.3753467,0.0515 -0.8473517,0.32482 -0.8473517,0.49076 0,0.24793 0.8400929,0.5377 1.3501978,0.46571 0.1237678,-0.0175 0.3483389,-0.0848 0.4990463,-0.14971 z m -1.9305252,-0.972 c 0.1526821,-0.23095 0.1774628,-0.33287 0.1758706,-0.72332 -0.00236,-0.57649 -0.2325739,-1.09745 -0.48498192,-1.09745 -0.3493751,0 -0.5780768,0.97634 -0.3705061,1.58171 0.1974871,0.57597 0.4079444,0.64999 0.67961742,0.23906 z m 2.7819869,-0.0587 c 0.3738715,-0.0802 0.6840596,-0.30762 0.625978,-0.45898 -0.074257,-0.19351 -0.719195,-0.44794 -1.1354468,-0.44794 -0.4126632,0 -0.858375,0.18827 -0.9959339,0.42069 -0.084486,0.14275 0.069181,0.27006 0.5327922,0.4414 0.3530742,0.1305 0.534218,0.13884 0.9726105,0.0448 z M 2.1580258,294.5053 c 0.3499054,-0.37558 0.4136063,-1.10931 0.1424518,-1.64082 -0.2587115,-0.50712 -0.4270412,-0.51919 -0.6556148,-0.047 -0.2434377,0.50288 -0.1785456,1.15285 0.1679929,1.68264 0.1180344,0.18046 0.1810123,0.18141 0.3451701,0.005 z m 3.2023524,-0.34041 c 0.355406,-0.16547 0.4105616,-0.27201 0.2250328,-0.43468 -0.4949714,-0.43399 -1.3565556,-0.47981 -1.896706,-0.10086 -0.277631,0.19477 -0.2274028,0.33089 0.1928854,0.52273 0.495521,0.22618 1.0108864,0.23064 1.4787878,0.0128 z m -1.8920711,-1.06321 c 0.1493138,-0.29099 0.1772115,-0.41624 0.157532,-0.70724 -0.025984,-0.38422 -0.264604,-0.93731 -0.4463561,-1.03458 -0.1590461,-0.0851 -0.3566052,0.14839 -0.4775562,0.56444 -0.114522,0.39395 -0.052801,0.87509 0.1676979,1.3073 0.1895712,0.3716 0.3603694,0.33453 0.5986824,-0.12992 z m 1.2973412,-0.31818 c 0.3810141,-0.16525 0.6449005,-0.41584 0.8308376,-0.78896 0.3045492,-0.61116 0.1964826,-0.81689 -0.3446688,-0.65619 -0.5698163,0.16922 -1.1773414,0.8697 -1.1773414,1.35748 0,0.29794 0.1596627,0.31819 0.6911726,0.0877 z"
+       style="fill:#ffffff;stroke-width:1" />
+  </g>
+</svg>
diff --git a/icons/complications/ic_cob_detailed.svg b/icons/complications/ic_cob_detailed.svg
new file mode 100644
index 0000000000..5132260c3c
--- /dev/null
+++ b/icons/complications/ic_cob_detailed.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-290.64998)"
+     id="layer1">
+    <path
+       id="path7219"
+       transform="matrix(0.26458333,0,0,0.26458333,0,290.64998)"
+       d="M 8.2460938 0 L 7.4121094 0.88476562 C 6.9493002 1.3761798 6.4706361 2.0909406 6.3359375 2.4941406 C 6.1077391 3.1778572 6.0573352 3.222783 5.4511719 3.2265625 C 4.6770165 3.2325342 4.0702859 3.8600031 3.3671875 5.3828125 C 2.9181237 6.3552849 2.7085097 6.5192769 2.3632812 6.1738281 C 2.0948169 5.9053305 1.1247074 6.8216279 0.51953125 7.9140625 C 0.064887118 8.7348625 0.021484375 8.9598915 0.021484375 10.425781 C 0.021484375 11.960307 0.050341474 12.088757 0.63476562 13.138672 C 0.97211397 13.744681 1.2091717 14.35392 1.1621094 14.494141 C 1.1150467 14.633945 0.8092278 14.997727 0.48242188 15.302734 C -0.094900204 15.840788 -0.10453178 15.864099 0.19140625 16.191406 C 0.35892848 16.377359 0.53308059 16.529297 0.578125 16.529297 C 0.62317678 16.529297 0.99081761 16.223846 1.3945312 15.851562 L 2.1289062 15.175781 L 3.3203125 15.796875 C 4.3491503 16.333984 4.7049614 16.429133 5.9355469 16.494141 C 7.1855198 16.559262 7.47254 16.517761 8.2753906 16.150391 C 8.7786695 15.919877 9.4765996 15.481104 9.8261719 15.173828 C 10.334162 14.727844 10.452093 14.514906 10.412109 14.111328 C 10.359204 13.57679 10.34771 13.585165 11.632812 12.966797 C 12.710354 12.448472 13.694977 11.472651 13.501953 11.111328 C 13.289868 10.715082 13.45801 10.538593 14.515625 10.052734 C 15.028442 9.8170808 15.739441 9.3284977 16.095703 8.9667969 L 16.742188 8.3105469 L 16.265625 7.9121094 C 16.002604 7.6930858 15.38599 7.2529005 14.896484 6.9316406 C 14.406974 6.610343 14.005859 6.2613842 14.005859 6.1582031 C 14.005859 6.0549464 14.317957 5.6324193 14.699219 5.21875 C 15.6136 4.2267374 16.073459 3.1431194 16.173828 1.7402344 C 16.253525 0.6264076 16.244097 0.58543061 15.851562 0.5703125 C 14.089826 0.47102431 12.944683 0.82038509 11.589844 1.8710938 C 11.053592 2.2870686 10.51892 2.6269531 10.400391 2.6269531 C 10.281857 2.6269531 10.048397 2.3760129 9.8828125 2.0683594 C 9.7172219 1.7608192 9.2817916 1.1688606 8.9140625 0.75390625 L 8.2460938 0 z M 14.705078 1.5722656 C 15.349526 1.6216434 15.35811 2.2289772 14.755859 3.4375 C 14.265602 4.4213488 13.57102 5.081723 12.566406 5.5175781 C 11.164986 6.1252506 10.742188 6.0726842 10.742188 5.2871094 C 10.742188 4.0009739 12.34523 2.1536202 13.847656 1.7070312 C 14.204367 1.6011194 14.490262 1.5558064 14.705078 1.5722656 z M 8.2226562 1.71875 C 8.2776556 1.7212252 8.3303939 1.7356561 8.3828125 1.7636719 C 8.8620358 2.0201506 9.4920354 3.4790851 9.5605469 4.4921875 C 9.6124315 5.2594316 9.5382238 5.5901778 9.1445312 6.3574219 C 8.5161746 7.5822534 8.0662446 7.6789857 7.5664062 6.6992188 C 6.9850148 5.5595778 6.8230422 4.2906429 7.125 3.2519531 C 7.4040457 2.2922035 7.8376606 1.7014234 8.2226562 1.71875 z M 5.171875 4.7011719 C 5.443435 4.7207357 5.7253358 5.0619081 6.0664062 5.7304688 C 6.7813545 7.1319554 6.6120434 9.0663288 5.6894531 10.056641 L 5.6894531 10.058594 C 5.2566228 10.521888 5.0905145 10.518736 4.7792969 10.042969 C 3.8655821 8.646131 3.6960223 6.9333557 4.3378906 5.6074219 C 4.639229 4.9853305 4.900315 4.6816081 5.171875 4.7011719 z M 12.271484 7.0761719 C 13.180577 7.1245451 14.074021 7.4415459 14.726562 8.0136719 C 15.215744 8.4426105 15.069906 8.7238854 14.132812 9.1601562 L 14.132812 9.15625 C 12.899105 9.7341398 11.540908 9.7234004 10.234375 9.1269531 C 9.1262066 8.6212145 8.9945368 8.2614957 9.7265625 7.7480469 C 10.438666 7.2485067 11.362392 7.0277986 12.271484 7.0761719 z M 2.1269531 7.7988281 C 2.7924735 7.7988281 3.400044 9.1713937 3.40625 10.691406 C 3.4104475 11.720912 3.3459335 11.990614 2.9433594 12.599609 C 2.2270435 13.683162 1.6711017 13.487364 1.1503906 11.96875 C 0.60309217 10.372504 1.205761 7.7988281 2.1269531 7.7988281 z M 8.9335938 10.052734 C 10.031119 10.052734 11.731951 10.722148 11.927734 11.232422 C 12.080878 11.63154 11.263125 12.232084 10.277344 12.443359 C 9.1214403 12.690918 8.6438359 12.670109 7.7128906 12.326172 C 6.4904928 11.874405 6.085836 11.539306 6.3085938 11.162109 C 6.6712938 10.549372 7.8455309 10.052734 8.9335938 10.052734 z M 5.9648438 13.013672 C 7.366793 13.085381 9.105354 13.939939 8.8671875 14.560547 C 8.8059728 14.720421 8.4305709 14.990897 8.0332031 15.162109 C 7.6358346 15.332755 7.0431288 15.508641 6.7167969 15.556641 C 5.3718112 15.746448 3.15625 14.981794 3.15625 14.328125 C 3.15625 13.890531 4.4009546 13.171597 5.390625 13.035156 C 5.5704379 13.010514 5.7645653 13.003428 5.9648438 13.013672 z M 11.183594 16.90625 A 0.80196695 0.80196695 0 0 0 11.263672 18.507812 L 18.298828 18.507812 A 0.80108009 0.80108009 0 1 0 18.298828 16.90625 L 11.263672 16.90625 A 0.80108009 0.80108009 0 0 0 11.183594 16.90625 z M 20.550781 16.90625 A 0.80196695 0.80196695 0 0 0 20.630859 18.507812 L 23.177734 18.507812 A 0.80108009 0.80108009 0 1 0 23.177734 16.90625 L 20.630859 16.90625 A 0.80108009 0.80108009 0 0 0 20.550781 16.90625 z M 11.183594 19.652344 A 0.80196695 0.80196695 0 0 0 11.263672 21.253906 L 14.298828 21.253906 A 0.80108009 0.80108009 0 1 0 14.298828 19.652344 L 11.263672 19.652344 A 0.80108009 0.80108009 0 0 0 11.183594 19.652344 z M 16.578125 19.652344 A 0.80196695 0.80196695 0 0 0 16.660156 21.253906 L 23.177734 21.253906 A 0.80108009 0.80108009 0 1 0 23.177734 19.652344 L 16.660156 19.652344 A 0.80108009 0.80108009 0 0 0 16.578125 19.652344 z M 11.183594 22.398438 A 0.80196695 0.80196695 0 0 0 11.263672 24 L 23.177734 24 A 0.80108009 0.80108009 0 1 0 23.177734 22.398438 L 11.263672 22.398438 A 0.80108009 0.80108009 0 0 0 11.183594 22.398438 z "
+       style="fill:#ffffff;stroke-width:3.77952743" />
+  </g>
+</svg>
diff --git a/icons/complications/ic_cob_iob.svg b/icons/complications/ic_cob_iob.svg
new file mode 100644
index 0000000000..81a2e9250f
--- /dev/null
+++ b/icons/complications/ic_cob_iob.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-290.64998)"
+     id="layer1">
+    <path
+       id="path7219"
+       transform="matrix(0.26458333,0,0,0.26458333,0,290.64998)"
+       d="M 7.4277344 0 L 6.6777344 0.796875 C 6.2608154 1.2395333 5.8303261 1.8848343 5.7089844 2.2480469 C 5.5034128 2.8638453 5.4562152 2.9024705 4.9101562 2.90625 C 4.2127627 2.9116169 3.6665853 3.4777921 3.0332031 4.8496094 C 2.6286665 5.7257795 2.4399035 5.8735551 2.1289062 5.5625 C 1.8870617 5.3206102 1.0139195 6.1447929 0.46875 7.1289062 C 0.059186372 7.8682952 0.017578125 8.072049 0.017578125 9.3925781 C 0.017578125 10.77494 0.043837275 10.890111 0.5703125 11.835938 C 0.87421097 12.381852 1.0892707 12.930404 1.046875 13.056641 C 1.0044789 13.182574 0.72799514 13.510385 0.43359375 13.785156 C -0.086483604 14.269729 -0.092765992 14.291134 0.17382812 14.585938 C 0.3247396 14.753749 0.48090623 14.890625 0.52148438 14.890625 C 0.56206902 14.890625 0.89217623 14.614541 1.2558594 14.279297 L 1.9179688 13.669922 L 2.9902344 14.230469 C 3.9170572 14.714362 4.2390902 14.800792 5.3476562 14.859375 C 6.4736875 14.917958 6.7318345 14.879915 7.4550781 14.548828 C 7.908454 14.341181 8.5366523 13.94463 8.8515625 13.667969 C 9.3091809 13.266205 9.4149251 13.074528 9.3789062 12.710938 C 9.3312464 12.229426 9.3227911 12.238667 10.480469 11.681641 C 11.451166 11.21468 12.335994 10.335183 12.162109 10.009766 C 11.971053 9.652827 12.123426 9.4943099 13.076172 9.0566406 C 13.53814 8.8443446 14.179061 8.4039203 14.5 8.078125 L 15.082031 7.4863281 L 14.652344 7.1289062 C 14.415403 6.9316149 13.86089 6.5336524 13.419922 6.2441406 C 12.97895 5.9547044 12.617188 5.6418045 12.617188 5.5488281 C 12.617187 5.455814 12.89873 5.0738333 13.242188 4.7011719 C 14.065903 3.8075404 14.479895 2.8321578 14.570312 1.5683594 C 14.642108 0.56485701 14.632909 0.52878999 14.279297 0.51367188 C 12.692246 0.42424825 11.661906 0.73903979 10.441406 1.6855469 C 9.9583267 2.0602114 9.4759161 2.3671875 9.3691406 2.3671875 C 9.2623607 2.3671875 9.0534635 2.1403206 8.9042969 1.8632812 C 8.7551257 1.5862419 8.3605649 1.0534828 8.0292969 0.6796875 L 7.4277344 0 z M 13.246094 1.4160156 C 13.826642 1.460493 13.835503 2.0089539 13.292969 3.0976562 C 12.851323 3.9839555 12.225313 4.578048 11.320312 4.9707031 C 10.057851 5.5182433 9.6777344 5.4713506 9.6777344 4.7636719 C 9.6777344 3.6050577 11.121157 1.9413554 12.474609 1.5390625 C 12.795951 1.4436483 13.052578 1.4011898 13.246094 1.4160156 z M 7.40625 1.5488281 C 7.4557959 1.5510528 7.5055134 1.5646154 7.5527344 1.5898438 C 7.9844399 1.8208863 8.5496084 3.1342325 8.6113281 4.046875 C 8.658068 4.7380372 8.592937 5.0354003 8.2382812 5.7265625 C 7.6722297 6.82992 7.2666829 6.9177893 6.8164062 6.0351562 C 6.2926646 5.0085232 6.1459524 3.8653851 6.4179688 2.9296875 C 6.6693454 2.0651158 7.0594288 1.5332554 7.40625 1.5488281 z M 4.6582031 4.234375 C 4.9028364 4.2519876 5.1575923 4.5598417 5.4648438 5.1621094 C 6.1089013 6.4246228 5.9561102 8.1684272 5.125 9.0605469 L 5.125 9.0625 C 4.7350873 9.4783614 4.5869984 9.4754734 4.3066406 9.046875 C 3.4835256 7.7885191 3.3280264 6.2452253 3.90625 5.0507812 C 4.1777089 4.4903151 4.4135698 4.2167624 4.6582031 4.234375 z M 24 6.3066406 C 23.982035 6.2797398 23.48833 6.73216 22.507812 7.6464844 L 21.212891 8.8535156 L 20.644531 8.7167969 C 18.976679 8.3138992 18.678177 8.2647579 18.402344 8.34375 C 18.230229 8.3932618 16.386722 10.125799 13.998047 12.484375 C 10.40925 16.028022 9.8658799 16.523225 9.7011719 16.400391 C 9.5974919 16.323288 9.4897753 16.205192 9.4609375 16.138672 C 9.3778435 15.94516 8.7346533 15.899414 8.4804688 16.068359 C 8.2467352 16.224189 8.1362645 16.571701 8.2128906 16.916016 C 8.2356884 17.018554 8.6486843 17.527089 9.1308594 18.044922 C 9.6130742 18.562528 10.003549 19.016385 10 19.039062 C 9.9955931 19.068694 9.5961009 19.470727 9.1113281 19.931641 C 8.2596917 20.741026 8.2228367 20.761932 8.0175781 20.558594 C 7.5426548 20.086644 7.1917218 19.802101 7.0546875 19.783203 C 6.9749935 19.771109 6.7670602 19.867968 6.59375 19.996094 L 6.59375 19.992188 C 6.2501872 20.246701 6.1350616 20.641502 6.3144531 20.947266 C 6.3771256 21.054075 7.0161453 21.776722 7.734375 22.552734 C 9.1486512 24.080986 9.3930903 24.221024 9.8574219 23.783203 C 10.26993 23.394063 10.249516 23.126119 9.7597656 22.511719 C 9.4685039 22.146087 9.353906 21.913857 9.4257812 21.826172 C 9.7614891 21.418134 11.00653 20.25246 11.09375 20.267578 C 11.15037 20.276006 11.58141 20.702491 12.052734 21.214844 C 13.014106 22.259959 13.354932 22.393811 13.832031 21.917969 C 14.151881 21.599203 14.121946 21.262926 13.734375 20.785156 L 13.462891 20.447266 L 17.611328 16.351562 C 20.928937 13.074712 21.768089 12.186188 21.808594 11.914062 C 21.836407 11.727316 21.767123 11.022491 21.654297 10.347656 L 21.449219 9.1210938 L 22.634766 7.8378906 C 23.558699 6.8387914 24.017965 6.3335414 24 6.3066406 z M 11.054688 6.375 C 11.873639 6.4185638 12.67974 6.7033547 13.267578 7.21875 C 13.708254 7.6051689 13.576597 7.8589201 12.732422 8.2519531 L 12.732422 8.2480469 C 11.621043 8.7693949 10.395733 8.7580008 9.21875 8.2207031 C 8.2204626 7.7650811 8.1022774 7.4430073 8.7617188 6.9804688 C 9.4032129 6.5304404 10.235736 6.3314362 11.054688 6.375 z M 1.9160156 7.0253906 C 2.5155459 7.0253906 3.0627695 8.2615743 3.0683594 9.6308594 C 3.0721407 10.55828 3.0130473 10.801011 2.6503906 11.349609 C 2.0051015 12.32571 1.506189 12.149288 1.0371094 10.78125 C 0.54407862 9.3432909 1.0861649 7.0253906 1.9160156 7.0253906 z M 8.0488281 9.0566406 C 9.0375276 9.0566406 10.569722 9.6594745 10.746094 10.119141 C 10.884052 10.478687 10.145848 11.018496 9.2578125 11.208984 L 9.2578125 11.210938 C 8.2165236 11.43393 7.7878559 11.413437 6.9492188 11.103516 C 5.8480303 10.696536 5.4829235 10.394467 5.6835938 10.054688 C 6.0103301 9.5026875 7.068653 9.0566406 8.0488281 9.0566406 z M 18.632812 9.0859375 C 18.800782 9.0789926 19.040741 9.1064247 19.427734 9.1640625 C 20.771922 9.3642641 20.813737 9.4009256 21.009766 10.564453 C 21.101476 11.107911 21.164009 11.639448 21.148438 11.744141 C 21.132832 11.848871 19.306854 13.726762 17.089844 15.916016 C 14.162911 18.80622 13.014076 19.870829 12.898438 19.804688 C 12.811807 19.751396 12.717813 19.712613 12.693359 19.708984 L 12.691406 19.708984 C 12.449383 19.672965 13.079007 18.965616 15.117188 16.982422 C 16.43426 15.700897 17.505732 14.614723 17.496094 14.576172 C 17.487218 14.533879 17.00216 13.984911 16.419922 13.355469 C 15.837751 12.725799 15.368487 12.178859 15.376953 12.130859 C 15.384935 12.087773 15.501177 11.94365 15.636719 11.8125 L 15.882812 11.576172 L 16.693359 12.457031 C 17.440362 13.269138 17.757113 13.463639 17.724609 13.089844 C 17.717566 13.008395 17.365954 12.571424 16.943359 12.121094 L 16.175781 11.300781 L 16.458984 11.003906 C 16.615918 10.840631 16.768214 10.713017 16.798828 10.716797 C 16.828423 10.721219 17.208948 11.112514 17.644531 11.585938 C 18.386013 12.391544 18.62967 12.541522 18.677734 12.21875 C 18.688663 12.145389 18.340511 11.708986 17.904297 11.25 C 17.235287 10.545307 17.133009 10.386122 17.25 10.228516 C 17.627181 9.7214542 17.736727 9.7583899 18.578125 10.679688 C 19.017308 11.160595 19.423586 11.53049 19.482422 11.507812 C 19.727079 11.402704 19.591656 11.152329 18.884766 10.40625 C 18.474513 9.9726626 18.11712 9.570616 18.091797 9.5097656 C 18.066361 9.4492932 18.148037 9.3153158 18.273438 9.2128906 C 18.369043 9.1335205 18.464843 9.0928824 18.632812 9.0859375 z M 5.3730469 11.724609 C 6.6359849 11.789204 8.2028318 12.558125 7.9882812 13.117188 C 7.9331364 13.261225 7.5942947 13.503998 7.2363281 13.658203 C 6.8783608 13.81203 6.3447567 13.970585 6.0507812 14.013672 C 4.8391584 14.184658 2.84375 13.497054 2.84375 12.908203 C 2.84375 12.513998 3.9658827 11.865022 4.8574219 11.742188 C 5.0194053 11.719988 5.1926272 11.715382 5.3730469 11.724609 z "
+       style="fill:#ffffff;stroke-width:3.77952719" />
+  </g>
+</svg>
diff --git a/icons/complications/ic_ins.svg b/icons/complications/ic_ins.svg
new file mode 100644
index 0000000000..e5d1b3e147
--- /dev/null
+++ b/icons/complications/ic_ins.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path825"
+     d="m 5.2032286,5.5871636 c -0.04934,-0.04934 -0.08964,-0.111011 -0.08957,-0.137051 1.52e-4,-0.04479 0.07357,-0.17029 0.201637,-0.344565 0.05534,-0.07532 0.04685,-0.08608 -0.252444,-0.319785 -0.170344,-0.133015 -0.317626,-0.241845 -0.327294,-0.241845 -0.0097,0 -0.134233,0.146285 -0.276812,0.325077 -0.14258,0.178792 -0.285173,0.33503 -0.316874,0.347195 -0.106583,0.0409 -0.222631,0.0226 -0.28355,-0.04472 -0.06622,-0.07318 -0.08206,-0.280988 -0.02413,-0.316785 0.01999,-0.01236 0.05248,-0.05261 0.0722,-0.08944 0.03132,-0.05851 -0.152744,-0.208523 -1.45636,-1.186943 -0.867679,-0.65123 -1.50947501,-1.157865 -1.53346701,-1.210523 -0.03847,-0.08443 -0.03669,-0.182385 0.01334,-0.734653 l 0.01703,-0.188057 -0.447569,-0.356365 c -0.677916,-0.53977105 -0.671352,-0.54573805 0.05517,-0.05015 l 0.46618901,0.318004 0.382456,-0.124018 c 0.210351,-0.06821 0.432408,-0.124018 0.49346,-0.124018 0.08878,0 0.412826,0.226458 1.618266,1.1309 l 1.507261,1.1309 0.09444,-0.1032 c 0.13419,-0.146644 0.240524,-0.171859 0.357656,-0.08481 0.174744,0.129864 0.147971,0.244692 -0.140308,0.601765 -0.141329,0.175055 -0.256962,0.333412 -0.256962,0.351903 0,0.02852 0.430933,0.371143 0.577336,0.459025 0.03126,0.01877 0.100589,-0.02865 0.203562,-0.139225 0.173028,-0.185803 0.257926,-0.205222 0.401944,-0.09194 0.162187,0.127576 0.128598,0.212191 -0.292577,0.737056 -0.21388,0.266535 -0.414377,0.505167 -0.445547,0.530293 -0.08919,0.07189 -0.220737,0.05371 -0.318466,-0.04402 z m -0.38208,-1.935654 c 0,-0.0084 0.0095,-0.04015 0.0212,-0.07054 0.0154,-0.04012 -0.379863,-0.35625 -1.443129,-1.154214 -0.805383,-0.604426 -1.492346,-1.098957 -1.526584,-1.098957 -0.03424,0 -0.200846,0.04514 -0.37024,0.100301 -0.362556,0.118072 -0.37248,0.133324 -0.37248,0.57253 0,0.252909 0.01163,0.313126 0.07079,0.36667 0.03893,0.03524 0.08535,0.05506 0.103151,0.04406 0.0178,-0.011 0.12963,-0.144179 0.248515,-0.295954 0.204828,-0.261494 0.278719,-0.31713 0.323961,-0.243927 0.01089,0.01762 -0.08884,0.165617 -0.221625,0.328891 -0.254408,0.312833 -0.261065,0.349543 -0.08088,0.445977 0.05584,0.02989 0.101998,-0.01041 0.295319,-0.257823 0.126023,-0.161285 0.248747,-0.293246 0.27272,-0.293246 0.1052,0 0.06917,0.08472 -0.153163,0.360085 -0.130623,0.161786 -0.237497,0.30207 -0.237497,0.311742 0,0.0097 0.04864,0.05222 0.108097,0.09456 l 0.108096,0.07697 0.225527,-0.284627 c 0.12404,-0.156545 0.246547,-0.28965 0.272238,-0.295788 0.118009,-0.0282 0.07105,0.08224 -0.152949,0.359672 l -0.242907,0.300856 0.08764,0.06738 c 0.0482,0.03706 0.09946,0.06775 0.11391,0.06819 0.01445,4.42e-4 0.168222,-0.175983 0.341718,-0.392066 0.173497,-0.216083 0.326136,-0.396847 0.339198,-0.401698 0.01306,-0.0049 0.410233,0.285716 0.882601,0.645702 0.73098,0.557073 0.986764,0.72433 0.986764,0.645245 z"
+     style="fill:#ffffff;stroke-width:1" />
+</svg>
diff --git a/icons/complications/ic_ins_burnin.svg b/icons/complications/ic_ins_burnin.svg
new file mode 100644
index 0000000000..623db41e5b
--- /dev/null
+++ b/icons/complications/ic_ins_burnin.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path825"
+     d="m 5.2032286,5.5871636 c -0.04934,-0.04934 -0.08964,-0.111011 -0.08957,-0.137051 1.52e-4,-0.04479 0.07357,-0.17029 0.201637,-0.344565 0.05534,-0.07532 0.04685,-0.08608 -0.252444,-0.319785 -0.170344,-0.133015 -0.317626,-0.241845 -0.327294,-0.241845 -0.0097,0 -0.134233,0.146285 -0.276812,0.325077 -0.14258,0.178792 -0.285173,0.33503 -0.316874,0.347195 -0.106583,0.0409 -0.222631,0.0226 -0.28355,-0.04472 -0.06622,-0.07318 -0.08206,-0.280988 -0.02413,-0.316785 0.01999,-0.01236 0.05248,-0.05261 0.0722,-0.08944 0.03132,-0.05851 -0.152744,-0.208523 -1.45636,-1.186943 -0.867679,-0.65123 -1.50947501,-1.157865 -1.53346701,-1.210523 -0.03847,-0.08443 -0.03669,-0.182385 0.01334,-0.734653 l 0.01703,-0.188057 -0.447569,-0.356365 c -0.677916,-0.53977105 -0.671352,-0.54573805 0.05517,-0.05015 l 0.46618901,0.318004 0.382456,-0.124018 c 0.210351,-0.06821 0.432408,-0.124018 0.49346,-0.124018 0.08878,0 0.412826,0.226458 1.618266,1.1309 l 1.507261,1.1309 0.09444,-0.1032 c 0.13419,-0.146644 0.240524,-0.171859 0.357656,-0.08481 0.174744,0.129864 0.147971,0.244692 -0.140308,0.601765 -0.141329,0.175055 -0.256962,0.333412 -0.256962,0.351903 0,0.02852 0.430933,0.371143 0.577336,0.459025 0.03126,0.01877 0.100589,-0.02865 0.203562,-0.139225 0.173028,-0.185803 0.257926,-0.205222 0.401944,-0.09194 0.162187,0.127576 0.128598,0.212191 -0.292577,0.737056 -0.21388,0.266535 -0.414377,0.505167 -0.445547,0.530293 -0.08919,0.07189 -0.220737,0.05371 -0.318466,-0.04402 z m -0.38208,-1.935654 c 0,-0.0084 0.0095,-0.04015 0.0212,-0.07054 0.0154,-0.04012 -0.379863,-0.35625 -1.443129,-1.154214 -0.805383,-0.604426 -1.492346,-1.098957 -1.526584,-1.098957 -0.03424,0 -0.200846,0.04514 -0.37024,0.100301 -0.362556,0.118072 -0.37248,0.133324 -0.37248,0.57253 0,0.252909 0.01163,0.313126 0.07079,0.36667 0.03893,0.03524 0.08535,0.05506 0.103151,0.04406 0.0178,-0.011 0.12963,-0.144179 0.248515,-0.295954 0.204828,-0.261494 0.278719,-0.31713 0.323961,-0.243927 0.01089,0.01762 -0.08884,0.165617 -0.221625,0.328891 -0.254408,0.312833 -0.261065,0.349543 -0.08088,0.445977 0.05584,0.02989 0.101998,-0.01041 0.295319,-0.257823 0.126023,-0.161285 0.248747,-0.293246 0.27272,-0.293246 0.1052,0 0.06917,0.08472 -0.153163,0.360085 -0.130623,0.161786 -0.237497,0.30207 -0.237497,0.311742 0,0.0097 0.04864,0.05222 0.108097,0.09456 l 0.108096,0.07697 0.225527,-0.284627 c 0.12404,-0.156545 0.246547,-0.28965 0.272238,-0.295788 0.118009,-0.0282 0.07105,0.08224 -0.152949,0.359672 l -0.242907,0.300856 2.0068089,1.5336611 z"
+     style="fill:#ffffff;stroke-width:1" />
+</svg>
diff --git a/icons/complications/ic_iob_detailed.svg b/icons/complications/ic_iob_detailed.svg
new file mode 100644
index 0000000000..8bd9aabc0e
--- /dev/null
+++ b/icons/complications/ic_iob_detailed.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-290.64998)"
+     id="layer1">
+    <path
+       id="path825"
+       transform="matrix(0.26458333,0,0,0.26458333,0,290.64998)"
+       d="M 19.140625 0.001953125 C 19.121272 -0.027012229 18.589483 0.4583956 17.533203 1.4433594 L 16.138672 2.7441406 L 15.527344 2.5976562 C 13.730619 2.1621791 13.408475 2.1102731 13.111328 2.1953125 C 12.925914 2.2486416 10.94043 4.1154248 8.3671875 6.65625 C 4.501091 10.473724 3.9157157 11.007283 3.7382812 10.875 C 3.6265902 10.79185 3.5095833 10.665561 3.4785156 10.59375 C 3.3890011 10.385498 2.6956999 10.335783 2.421875 10.517578 C 2.1700799 10.685465 2.054172 11.058916 2.1367188 11.429688 C 2.161278 11.540163 2.6055681 12.088626 3.125 12.646484 C 3.6444746 13.204078 4.0643642 13.696073 4.0605469 13.71875 C 4.0557994 13.750687 3.6257459 14.181218 3.1035156 14.677734 C 2.186075 15.549558 2.1449467 15.572728 1.9238281 15.353516 C 1.4122084 14.845169 1.0343414 14.538429 0.88671875 14.519531 C 0.80121122 14.506356 0.57686699 14.608976 0.390625 14.746094 C 0.022338157 15.020354 -0.10299958 15.442985 0.08984375 15.771484 C 0.15735881 15.886533 0.84541472 16.665959 1.6191406 17.501953 C 3.1426952 19.148391 3.4060405 19.299772 3.90625 18.828125 C 4.3506332 18.408938 4.3283738 18.120855 3.8007812 17.458984 C 3.4870143 17.065233 3.3639773 16.813238 3.4414062 16.71875 C 3.8030532 16.279191 5.1443222 15.025898 5.2382812 15.041016 C 5.2992756 15.050086 5.7637411 15.508585 6.2714844 16.060547 C 7.3071396 17.186468 7.673536 17.330977 8.1875 16.818359 C 8.5320648 16.474952 8.5015016 16.112352 8.0839844 15.597656 L 7.7890625 15.234375 L 12.257812 10.820312 C 15.831766 7.2902716 16.737615 6.334307 16.78125 6.0410156 C 16.811214 5.8398314 16.73678 5.08047 16.615234 4.3535156 L 16.394531 3.03125 L 17.671875 1.6503906 C 18.667198 0.57417015 19.159978 0.030918479 19.140625 0.001953125 z M 13.359375 2.9960938 C 13.540323 2.9885819 13.799901 3.0179049 14.216797 3.0800781 C 15.664845 3.295738 15.710698 3.3344481 15.921875 4.5878906 C 16.020672 5.1733394 16.087094 5.744414 16.070312 5.8574219 C 16.053501 5.9702408 14.08558 7.9931373 11.697266 10.351562 C 8.5441747 13.465062 7.308167 14.614402 7.1835938 14.542969 C 7.0902697 14.48552 6.9872808 14.44128 6.9609375 14.4375 L 6.9609375 14.439453 C 6.700214 14.400637 7.376599 13.638369 9.5722656 11.501953 C 10.991106 10.121405 12.145159 8.9517311 12.134766 8.9101562 C 12.125204 8.8646129 11.603789 8.271835 10.976562 7.59375 C 10.349408 6.9154382 9.8424538 6.3271702 9.8515625 6.2753906 C 9.8601609 6.2289024 9.986798 6.0749481 10.132812 5.9335938 L 10.398438 5.6777344 L 11.271484 6.6269531 C 12.076206 7.501876 12.415858 7.7093115 12.380859 7.3066406 C 12.373272 7.2189178 11.99431 6.748812 11.539062 6.2636719 L 10.712891 5.3808594 L 11.019531 5.0625 C 11.18859 4.886752 11.35177 4.7481736 11.384766 4.7519531 C 11.416647 4.7567153 11.825682 5.1774906 12.294922 5.6875 C 13.093696 6.5552417 13.356424 6.7168572 13.408203 6.3691406 C 13.419976 6.2901107 13.044139 5.8206097 12.574219 5.3261719 C 11.853512 4.5671294 11.743108 4.3962633 11.869141 4.2265625 C 12.275466 3.6803074 12.39437 3.7204245 13.300781 4.7128906 C 13.773899 5.2309883 14.212008 5.6261928 14.275391 5.6035156 C 14.538952 5.490281 14.39237 5.21977 13.630859 4.4160156 C 13.188908 3.9489416 12.804632 3.5165577 12.777344 3.4511719 C 12.749942 3.385786 12.837565 3.2431747 12.972656 3.1328125 C 13.075649 3.0473952 13.178427 3.0036056 13.359375 2.9960938 z M 11.183594 16.90625 A 0.80196695 0.80196695 0 0 0 11.263672 18.507812 L 18.298828 18.507812 A 0.80108009 0.80108009 0 1 0 18.298828 16.90625 L 11.263672 16.90625 A 0.80108009 0.80108009 0 0 0 11.183594 16.90625 z M 20.550781 16.90625 A 0.80196695 0.80196695 0 0 0 20.630859 18.507812 L 23.177734 18.507812 A 0.80108009 0.80108009 0 1 0 23.177734 16.90625 L 20.630859 16.90625 A 0.80108009 0.80108009 0 0 0 20.550781 16.90625 z M 11.183594 19.652344 A 0.80196695 0.80196695 0 0 0 11.263672 21.253906 L 14.298828 21.253906 A 0.80108009 0.80108009 0 1 0 14.298828 19.652344 L 11.263672 19.652344 A 0.80108009 0.80108009 0 0 0 11.183594 19.652344 z M 16.578125 19.652344 A 0.80196695 0.80196695 0 0 0 16.660156 21.253906 L 23.177734 21.253906 A 0.80108009 0.80108009 0 1 0 23.177734 19.652344 L 16.660156 19.652344 A 0.80108009 0.80108009 0 0 0 16.578125 19.652344 z M 11.183594 22.398438 A 0.80196695 0.80196695 0 0 0 11.263672 24 L 23.177734 24 A 0.80108009 0.80108009 0 1 0 23.177734 22.398438 L 11.263672 22.398438 A 0.80108009 0.80108009 0 0 0 11.183594 22.398438 z "
+       style="fill:#ffffff;stroke-width:3.77952743" />
+  </g>
+</svg>
diff --git a/icons/complications/ic_sgv.svg b/icons/complications/ic_sgv.svg
new file mode 100644
index 0000000000..1dc46d403b
--- /dev/null
+++ b/icons/complications/ic_sgv.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-290.64998)"
+     id="layer1">
+    <path
+       id="path7206"
+       d="m 2.6709439,296.94599 c -0.564202,-0.13292 -1.10932,-0.57834 -1.395458,-1.14023 -0.209976,-0.41234 -0.255,-1.03331 -0.115079,-1.58719 0.192881,-0.76352 1.199054,-2.58796 1.865321,-3.38228 l 0.156223,-0.18625 0.127394,0.15521 c 0.255954,0.31183 1.051728,1.53363 1.300101,1.99612 0.140327,0.2613 0.343099,0.70829 0.450605,0.99333 0.251656,0.66721 0.280223,1.46003 0.06928,1.9227 -0.424912,0.93195 -1.479804,1.45914 -2.458384,1.22859 z m 0.0041,-1.00028 c 0.121194,-0.12119 0.08718,-0.27576 -0.138214,-0.62811 -0.319446,-0.49937 -0.421499,-0.87437 -0.397534,-1.46074 0.01125,-0.27533 0.003,-0.48091 -0.01834,-0.45684 -0.120721,0.13615 -0.385751,0.96774 -0.411897,1.29242 -0.03899,0.4842 0.107815,0.95289 0.366713,1.17073 0.198622,0.16713 0.476417,0.2054 0.599268,0.0825 z"
+       style="fill:#ffffff;stroke-width:0.99999994" />
+  </g>
+</svg>
diff --git a/wear/build.gradle b/wear/build.gradle
index 7e6500fe56..3a2277e2fe 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -1,8 +1,23 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+    }
+}
 apply plugin: 'com.android.application'
+apply plugin: 'jacoco-android'
+
+jacoco {
+    toolVersion = "0.8.3"
+}
 
 ext {
     wearableVersion = "2.4.0"
     playServicesWearable = "17.0.0"
+    powermockVersion = "1.7.3"
 }
 
 def generateGitBuild = { ->
@@ -92,6 +107,10 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //implementation files("libs/hellocharts-library-1.5.5.jar")
     //compile "com.ustwo.android:clockwise-wearable:1.0.2"
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+
     compileOnly "com.google.android.wearable:wearable:${wearableVersion}"
     implementation "com.google.android.support:wearable:${wearableVersion}"
     implementation "com.google.android.gms:play-services-wearable:${playServicesWearable}"
@@ -101,4 +120,27 @@ dependencies {
     implementation 'androidx.wear:wear:1.0.0'
     implementation('me.denley.wearpreferenceactivity:wearpreferenceactivity:0.5.0')
     implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
+    
+    testImplementation "junit:junit:4.12"
+    testImplementation "org.json:json:20140107"
+    testImplementation ("org.mockito:mockito-core:2.8.47") {
+        exclude group: 'net.bytebuddy', module: 'byte-buddy'
+        exclude group: 'net.bytebuddy', module: 'byte-buddy-android'
+        exclude group: 'net.bytebuddy', module: 'byte-buddy-agent'
+    }
+    // to fix org.mockito:mockito-core dependency issues, fixed in mockito 3+
+    testImplementation 'net.bytebuddy:byte-buddy:1.8.22'
+    testImplementation 'net.bytebuddy:byte-buddy-android:1.8.22'
+    testImplementation 'net.bytebuddy:byte-buddy-agent:1.8.22'
+
+    testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
+    testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"
+    testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}"
+    testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
+    testImplementation "joda-time:joda-time:2.9.9"
+    testImplementation("com.google.truth:truth:0.39") {
+        exclude group: "com.google.guava", module: "guava"
+    }
+    testImplementation "org.skyscreamer:jsonassert:1.5.0"
+    testImplementation "org.hamcrest:hamcrest-all:1.3"
 }
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 874a9c8763..1097be80be 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
 
 
     <application
+        android:name=".aaps"
         android:allowBackup="true"
         android:icon="@drawable/ic_icon"
         android:label="@string/app_name"
@@ -231,6 +232,229 @@
             </intent-filter>
         </service>
 
+        <service
+            android:name=".complications.LongStatusComplication"
+            android:icon="@drawable/ic_aaps_full"
+            android:label="Full Status"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+        <intent-filter>
+            <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+        </intent-filter>
+
+        <meta-data
+            android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+            android:value="LONG_TEXT" />
+        <meta-data
+            android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+            android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.LongStatusFlippedComplication"
+            android:icon="@drawable/ic_aaps_full"
+            android:label="Full Status (flipped)"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="LONG_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.SgvComplication"
+            android:icon="@drawable/ic_sgv"
+            android:label="Blood Glucose"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.BrCobIobComplication"
+            android:icon="@drawable/ic_br_cob_iob"
+            android:label="BR, CoB &amp; IoB"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.CobIobComplication"
+            android:icon="@drawable/ic_cob_iob"
+            android:label="CoB &amp; IoB"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.CobIconComplication"
+            android:icon="@drawable/ic_carbs"
+            android:label="CoB Icon"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.CobDetailedComplication"
+            android:icon="@drawable/ic_cob_detailed"
+            android:label="CoB Detailed"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.IobIconComplication"
+            android:icon="@drawable/ic_ins"
+            android:label="IoB Icon"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.IobDetailedComplication"
+            android:icon="@drawable/ic_iob_detailed"
+            android:label="IoB Detailed"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.UploaderBattery"
+            android:icon="@drawable/ic_battery_charging_wireless_50"
+            android:label="Uploader/Phone Battery"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="RANGED_VALUE,SHORT_TEXT,ICON" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.WallpaperLightComplication"
+            android:icon="@drawable/ic_aaps_light"
+            android:label="Light Walpaper"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="LARGE_IMAGE"/>
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="0"/>
+        </service>
+
+        <service
+            android:name=".complications.WallpaperDarkComplication"
+            android:icon="@drawable/ic_aaps_dark"
+            android:label="Dark Walpaper"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="LARGE_IMAGE"/>
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="0"/>
+        </service>
+
+        <service
+            android:name=".complications.WallpaperGrayComplication"
+            android:icon="@drawable/ic_aaps_gray"
+            android:label="Gray Walpaper"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="LARGE_IMAGE"/>
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="0"/>
+        </service>
+
+        <receiver android:name=".complications.ComplicationTapBroadcastReceiver"/>
+
         <activity
             android:name=".interaction.menus.MainMenuActivity"
             android:label="@string/label_actions_activity">
diff --git a/wear/src/main/assets/watch_dark.jpg b/wear/src/main/assets/watch_dark.jpg
new file mode 100644
index 0000000000..54cd4dc1dc
Binary files /dev/null and b/wear/src/main/assets/watch_dark.jpg differ
diff --git a/wear/src/main/assets/watch_gray.jpg b/wear/src/main/assets/watch_gray.jpg
new file mode 100644
index 0000000000..2cb3778b6b
Binary files /dev/null and b/wear/src/main/assets/watch_gray.jpg differ
diff --git a/wear/src/main/assets/watch_light.jpg b/wear/src/main/assets/watch_light.jpg
new file mode 100644
index 0000000000..a8183304d6
Binary files /dev/null and b/wear/src/main/assets/watch_light.jpg differ
diff --git a/wear/src/main/java/info/nightscout/androidaps/aaps.java b/wear/src/main/java/info/nightscout/androidaps/aaps.java
new file mode 100644
index 0000000000..f05f032f2e
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/aaps.java
@@ -0,0 +1,75 @@
+package info.nightscout.androidaps;
+
+import android.annotation.SuppressLint;
+import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.preference.PreferenceManager;
+
+import androidx.annotation.StringRes;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import info.nightscout.androidaps.interaction.utils.Persistence;
+
+/**
+ * Created for xDrip+ by Emma Black on 3/21/15.
+ * Adapted for AAPS by dlvoy 2019-11-06.
+ */
+
+public class aaps extends Application implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+    @SuppressLint("StaticFieldLeak")
+    private static Context context;
+    private static Boolean unicodeComplications = true;
+    private static String complicationTapAction = "default";
+
+    @Override
+    public void onCreate() {
+        aaps.context = getApplicationContext();
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        sharedPrefs.registerOnSharedPreferenceChangeListener(this);
+        updatePrefs(sharedPrefs);
+        super.onCreate();
+    }
+
+    private void updatePrefs(SharedPreferences sharedPrefs) {
+        unicodeComplications = sharedPrefs.getBoolean("complication_unicode", true);
+        complicationTapAction = sharedPrefs.getString("complication_tap_action", "default");
+    }
+
+    public static Context getAppContext() {
+        return aaps.context;
+    }
+
+    private static boolean isWear2OrAbove() {
+        return Build.VERSION.SDK_INT > 23;
+    }
+
+    public static String gs(@StringRes final int id) {
+        return getAppContext().getString(id);
+    }
+
+    public static String gs(@StringRes final int id, String... args) {
+        return getAppContext().getString(id, (Object[]) args);
+    }
+
+    public static Boolean areComplicationsUnicode() {
+        return unicodeComplications;
+    }
+
+    public static String getComplicationTapAction() {
+        return complicationTapAction;
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        updatePrefs(sharedPrefs);
+
+        // we trigger update on Complications
+        Intent messageIntent = new Intent();
+        messageIntent.setAction(Intent.ACTION_SEND);
+        LocalBroadcastManager.getInstance(this).sendBroadcast(messageIntent);
+    }
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/BaseComplicationProviderService.java b/wear/src/main/java/info/nightscout/androidaps/complications/BaseComplicationProviderService.java
new file mode 100644
index 0000000000..49f8f82837
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/BaseComplicationProviderService.java
@@ -0,0 +1,411 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.drawable.Icon;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationManager;
+import android.support.wearable.complications.ComplicationProviderService;
+import android.support.wearable.complications.ComplicationText;
+import android.support.wearable.complications.ProviderUpdateRequester;
+import android.util.Log;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.data.ListenerService;
+import info.nightscout.androidaps.interaction.utils.Constants;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+import info.nightscout.androidaps.interaction.utils.Inevitable;
+import info.nightscout.androidaps.interaction.utils.Persistence;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+
+/**
+ * Base class for all complications
+ *
+ * Created by dlvoy on 2019-11-12
+ */
+public abstract class BaseComplicationProviderService extends ComplicationProviderService {
+
+    private static final String TAG = BaseComplicationProviderService.class.getSimpleName();
+
+    private static final String KEY_COMPLICATIONS = "complications";
+    private static final String KEY_LAST_SHOWN_SINCE_VALUE = "lastSince";
+    private static final String KEY_STALE_REPORTED = "staleReported";
+    private static final String TASK_ID_REFRESH_COMPLICATION = "refresh-complication";
+
+
+    private LocalBroadcastManager localBroadcastManager;
+    private MessageReceiver messageReceiver;
+
+    public static void turnOff() {
+        Log.d(TAG, "TURNING OFF all active complications");
+        final Persistence persistence = new Persistence();
+        persistence.putString(KEY_COMPLICATIONS, "");
+    }
+
+    //==============================================================================================
+    // ABSTRACT COMPLICATION INTERFACE
+    //==============================================================================================
+
+    public abstract ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent);
+    public abstract String getProviderCanonicalName();
+
+    public ComplicationAction getComplicationAction() { return ComplicationAction.MENU; };
+
+    //----------------------------------------------------------------------------------------------
+    // DEFAULT BEHAVIOURS
+    //----------------------------------------------------------------------------------------------
+
+    public ComplicationData buildNoSyncComplicationData(int dataType,
+                                                        RawDisplayData raw,
+                                                        PendingIntent complicationPendingIntent,
+                                                        PendingIntent exceptionalPendingIntent,
+                                                        long since) {
+
+
+        final ComplicationData.Builder builder = new ComplicationData.Builder(dataType);
+        if (dataType != ComplicationData.TYPE_LARGE_IMAGE) {
+            builder.setIcon(Icon.createWithResource(this, R.drawable.ic_sync_alert));
+        }
+
+        if (dataType ==  ComplicationData.TYPE_RANGED_VALUE) {
+            builder.setMinValue(0);
+            builder.setMaxValue(100);
+            builder.setValue(0);
+        }
+
+        switch (dataType) {
+            case ComplicationData.TYPE_ICON:
+            case ComplicationData.TYPE_SHORT_TEXT:
+            case ComplicationData.TYPE_RANGED_VALUE:
+                if (since > 0) {
+                    builder.setShortText(ComplicationText.plainText(DisplayFormat.shortTimeSince(since) + " old"));
+                } else {
+                    builder.setShortText(ComplicationText.plainText("!err!"));
+                }
+                break;
+            case ComplicationData.TYPE_LONG_TEXT:
+                builder.setLongTitle(ComplicationText.plainText(aaps.gs(R.string.label_warning_sync)));
+                if (since > 0) {
+                    builder.setLongText(ComplicationText.plainText(String.format(aaps.gs(R.string.label_warning_since), DisplayFormat.shortTimeSince(since))));
+                } else {
+                    builder.setLongText(ComplicationText.plainText(aaps.gs(R.string.label_warning_sync_aaps)));
+                }
+                break;
+            case ComplicationData.TYPE_LARGE_IMAGE:
+                return buildComplicationData(dataType, raw, complicationPendingIntent);
+            default:
+                if (Log.isLoggable(TAG, Log.WARN)) {
+                    Log.w(TAG, "Unexpected complication type " + dataType);
+                }
+                break;
+        }
+
+        builder.setTapAction(exceptionalPendingIntent);
+        return builder.build();
+    }
+
+    public ComplicationData buildOutdatedComplicationData(int dataType,
+                                                          RawDisplayData raw,
+                                                          PendingIntent complicationPendingIntent,
+                                                          PendingIntent exceptionalPendingIntent,
+                                                          long since) {
+
+        final ComplicationData.Builder builder = new ComplicationData.Builder(dataType);
+        if (dataType != ComplicationData.TYPE_LARGE_IMAGE) {
+            builder.setIcon(Icon.createWithResource(this, R.drawable.ic_alert));
+            builder.setBurnInProtectionIcon(Icon.createWithResource(this, R.drawable.ic_alert_burnin));
+        }
+
+        if (dataType ==  ComplicationData.TYPE_RANGED_VALUE) {
+            builder.setMinValue(0);
+            builder.setMaxValue(100);
+            builder.setValue(0);
+        }
+
+        switch (dataType) {
+            case ComplicationData.TYPE_ICON:
+            case ComplicationData.TYPE_SHORT_TEXT:
+            case ComplicationData.TYPE_RANGED_VALUE:
+                if (since > 0) {
+                    builder.setShortText(ComplicationText.plainText(DisplayFormat.shortTimeSince(since) + " old"));
+                } else {
+                    builder.setShortText(ComplicationText.plainText("!old!"));
+                }
+                break;
+            case ComplicationData.TYPE_LONG_TEXT:
+                builder.setLongTitle(ComplicationText.plainText(aaps.gs(R.string.label_warning_old)));
+                if (since > 0) {
+                    builder.setLongText(ComplicationText.plainText(String.format(aaps.gs(R.string.label_warning_since), DisplayFormat.shortTimeSince(since))));
+                } else {
+                    builder.setLongText(ComplicationText.plainText(aaps.gs(R.string.label_warning_sync_aaps)));
+                }
+                break;
+            case ComplicationData.TYPE_LARGE_IMAGE:
+                return buildComplicationData(dataType, raw, complicationPendingIntent);
+            default:
+                if (Log.isLoggable(TAG, Log.WARN)) {
+                    Log.w(TAG, "Unexpected complication type " + dataType);
+                }
+                break;
+        }
+
+        builder.setTapAction(exceptionalPendingIntent);
+        return builder.build();
+    }
+
+    /**
+     * If Complication depend on "since" field and need to be updated every minute or not
+     * and need only update when new DisplayRawData arrive
+     */
+    protected boolean usesSinceField() {
+        return false;
+    }
+
+    //==============================================================================================
+    // COMPLICATION LIFECYCLE
+    //==============================================================================================
+
+    /*
+     * Called when a complication has been activated. The method is for any one-time
+     * (per complication) set-up.
+     *
+     * You can continue sending data for the active complicationId until onComplicationDeactivated()
+     * is called.
+     */
+    @Override
+    public void onComplicationActivated(
+            int complicationId, int dataType, ComplicationManager complicationManager) {
+        Log.d(TAG, "onComplicationActivated(): " + complicationId + " of kind: "+getProviderCanonicalName());
+
+        Persistence persistence = new Persistence();
+        persistence.putString("complication_"+complicationId, getProviderCanonicalName());
+        persistence.putBoolean("complication_"+complicationId+"_since", usesSinceField());
+        persistence.addToSet(KEY_COMPLICATIONS, "complication_"+complicationId);
+
+        IntentFilter messageFilter = new IntentFilter(Intent.ACTION_SEND);
+
+        messageReceiver = new BaseComplicationProviderService.MessageReceiver();
+        localBroadcastManager = LocalBroadcastManager.getInstance(this);
+        localBroadcastManager.registerReceiver(messageReceiver, messageFilter);
+
+        ListenerService.requestData(this);
+        checkIfUpdateNeeded();
+    }
+
+    /*
+     * Called when the complication needs updated data from your provider. There are four scenarios
+     * when this will happen:
+     *
+     *   1. An active watch face complication is changed to use this provider
+     *   2. A complication using this provider becomes active
+     *   3. The period of time you specified in the manifest has elapsed (UPDATE_PERIOD_SECONDS)
+     *   4. You triggered an update from your own class via the
+     *       ProviderUpdateRequester.requestUpdate() method.
+     */
+    @Override
+    public void onComplicationUpdate(
+            int complicationId, int dataType, ComplicationManager complicationManager) {
+        Log.d(TAG, "onComplicationUpdate() id: " + complicationId + " of class: "+getProviderCanonicalName());
+
+        // Create Tap Action so that the user can checkIfUpdateNeeded an update by tapping the complication.
+        final ComponentName thisProvider = new ComponentName(this, getProviderCanonicalName());
+
+        // We pass the complication id, so we can only update the specific complication tapped.
+        final PendingIntent complicationPendingIntent =
+                ComplicationTapBroadcastReceiver.getTapActionIntent(
+                        aaps.getAppContext(), thisProvider, complicationId, getComplicationAction());
+
+        final Persistence persistence = new Persistence();
+
+        final RawDisplayData raw = new RawDisplayData();
+        raw.updateForComplicationsFromPersistence(persistence);
+        Log.d(TAG, "Complication data: " + raw.toDebugString());
+
+        // store what is currently rendered in 'SGV since' field, to detect if it was changed and need update
+        persistence.putString(KEY_LAST_SHOWN_SINCE_VALUE, DisplayFormat.shortTimeSince(raw.datetime));
+
+        // by each render we clear stale flag to ensure it is re-rendered at next refresh detection round
+        persistence.putBoolean(KEY_STALE_REPORTED, false);
+
+        ComplicationData complicationData;
+
+        if (WearUtil.msSince(persistence.whenDataUpdated()) > Constants.STALE_MS) {
+            // no new data arrived - probably configuration or connection error
+            final PendingIntent infoToast = ComplicationTapBroadcastReceiver.getTapWarningSinceIntent(
+                    aaps.getAppContext(), thisProvider, complicationId, ComplicationAction.WARNING_SYNC, persistence.whenDataUpdated());
+            complicationData = buildNoSyncComplicationData(dataType, raw, complicationPendingIntent, infoToast, persistence.whenDataUpdated());
+        } else if (WearUtil.msSince(raw.datetime) > Constants.STALE_MS) {
+            // data arriving from phone AAPS, but it is outdated (uploader/NS/xDrip/Sensor error)
+            final PendingIntent infoToast = ComplicationTapBroadcastReceiver.getTapWarningSinceIntent(
+                    aaps.getAppContext(), thisProvider, complicationId, ComplicationAction.WARNING_OLD, raw.datetime);
+            complicationData = buildOutdatedComplicationData(dataType, raw, complicationPendingIntent, infoToast, raw.datetime);
+        } else {
+            // data is up-to-date, we can render standard complication
+            complicationData = buildComplicationData(dataType, raw, complicationPendingIntent);
+        }
+
+        if (complicationData != null) {
+            complicationManager.updateComplicationData(complicationId, complicationData);
+        } else {
+            // If no data is sent, we still need to inform the ComplicationManager, so the update
+            // job can finish and the wake lock isn't held any longer than necessary.
+            complicationManager.noUpdateRequired(complicationId);
+        }
+    }
+
+    /*
+     * Called when the complication has been deactivated.
+     */
+    @Override
+    public void onComplicationDeactivated(int complicationId) {
+        Log.d(TAG, "onComplicationDeactivated(): " + complicationId);
+
+        Persistence persistence = new Persistence();
+        persistence.removeFromSet(KEY_COMPLICATIONS, "complication_"+complicationId);
+
+        if (localBroadcastManager != null && messageReceiver != null) {
+            localBroadcastManager.unregisterReceiver(messageReceiver);
+        }
+        Inevitable.kill(TASK_ID_REFRESH_COMPLICATION);
+    }
+
+    //==============================================================================================
+    // UPDATE AND REFRESH LOGIC
+    //==============================================================================================
+
+    /*
+     * Schedule check for field update
+     */
+    public static void checkIfUpdateNeeded() {
+
+        Persistence p = new Persistence();
+
+        Log.d(TAG, "Pending check if update needed - "+p.getString(KEY_COMPLICATIONS, ""));
+
+        Inevitable.task(TASK_ID_REFRESH_COMPLICATION, 15 * Constants.SECOND_IN_MS, () -> {
+            if (WearUtil.isBelowRateLimit("complication-checkIfUpdateNeeded", 5)) {
+                Log.d(TAG, "Checking if update needed");
+                requestUpdateIfSinceChanged();
+                // We reschedule need for check - to make sure next check will Inevitable go in next 15s
+                checkIfUpdateNeeded();
+            }
+        });
+
+    }
+
+    /*
+     * Check if displayed since field (field that shows how old, in minutes, is reading)
+     * is up-to-date or need to be changed (a minute or more elapsed)
+     */
+    private static void requestUpdateIfSinceChanged() {
+        final Persistence persistence = new Persistence();
+
+        final RawDisplayData raw = new RawDisplayData();
+        raw.updateForComplicationsFromPersistence(persistence);
+
+        final String lastSince = persistence.getString(KEY_LAST_SHOWN_SINCE_VALUE, "-");
+        final String calcSince = DisplayFormat.shortTimeSince(raw.datetime);
+        final boolean isStale = (WearUtil.msSince(persistence.whenDataUpdated()) > Constants.STALE_MS)
+                ||(WearUtil.msSince(raw.datetime) > Constants.STALE_MS);
+
+        final boolean staleWasRefreshed = persistence.getBoolean(KEY_STALE_REPORTED, false);
+        final boolean sinceWasChanged = !lastSince.equals(calcSince);
+
+        if (sinceWasChanged|| (isStale && !staleWasRefreshed)) {
+            persistence.putString(KEY_LAST_SHOWN_SINCE_VALUE, calcSince);
+            persistence.putBoolean(KEY_STALE_REPORTED, isStale);
+
+            Log.d(TAG, "Detected refresh of time needed! Reason: "
+                    + (isStale ? "- stale detected": "")
+                    + (sinceWasChanged ? "- since changed from: "+lastSince+" to: "+calcSince : ""));
+
+            if (isStale) {
+                // all complications should update to show offline/old warning
+                requestUpdate(getActiveProviderClasses());
+            } else {
+                // ... but only some require update due to 'since' field change
+                requestUpdate(getSinceDependingProviderClasses());
+            }
+        }
+    }
+
+    /*
+     * Request update for specified list of providers
+     */
+    private static void requestUpdate(Set<String> providers) {
+        for (String provider: providers) {
+            Log.d(TAG, "Pending update of "+provider);
+            // We wait with updating allowing all request, from various sources, to arrive
+            Inevitable.task("update-req-"+provider, 700, () -> {
+                if (WearUtil.isBelowRateLimit("update-req-"+provider, 2)) {
+                    Log.d(TAG, "Requesting update of "+provider);
+                    final ComponentName componentName = new ComponentName(aaps.getAppContext(), provider);
+                    final ProviderUpdateRequester providerUpdateRequester = new ProviderUpdateRequester(aaps.getAppContext(), componentName);
+                    providerUpdateRequester.requestUpdateAll();
+                }
+            });
+        }
+    }
+
+    /*
+     * List all Complication providing classes that have active (registered) providers
+     */
+    private static Set<String> getActiveProviderClasses() {
+        Persistence persistence = new Persistence();
+        Set<String> providers = new HashSet<>();
+        Set<String> complications = persistence.getSetOf(KEY_COMPLICATIONS);
+        for (String complication: complications) {
+            final String providerClass = persistence.getString(complication, "");
+            if (providerClass.length() > 0) {
+                providers.add(providerClass);
+            }
+        }
+        return providers;
+    }
+
+    /*
+     * List all Complication providing classes that have active (registered) providers
+     * and additionally they depend on "since" field
+     *    == they need to be updated not only on data broadcasts, but every minute or so
+     */
+    private static Set<String> getSinceDependingProviderClasses() {
+        Persistence persistence = new Persistence();
+        Set<String> providers = new HashSet<>();
+        Set<String> complications = persistence.getSetOf(KEY_COMPLICATIONS);
+        for (String complication: complications) {
+            final String providerClass = persistence.getString(complication, "");
+            final boolean dependOnSince = persistence.getBoolean(complication+"_since", false);
+            if ((providerClass.length() > 0)&&(dependOnSince)) {
+                providers.add(providerClass);
+            }
+        }
+        return providers;
+    }
+
+    /*
+     * Listen to broadcast --> new data was stored by ListenerService to Persistence
+     */
+    public class MessageReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Set<String> complications = Persistence.setOf(KEY_COMPLICATIONS);
+            if (complications.size() > 0) {
+                checkIfUpdateNeeded();
+                // We request all active providers
+                requestUpdate(getActiveProviderClasses());
+            }
+        }
+    }
+
+
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/BrCobIobComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/BrCobIobComplication.java
new file mode 100644
index 0000000000..ec862f4f47
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/BrCobIobComplication.java
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+import info.nightscout.androidaps.interaction.utils.SmallestDoubleString;
+
+import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MAX_FIELD_LEN_SHORT;
+import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MIN_FIELD_LEN_COB;
+import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MIN_FIELD_LEN_IOB;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class BrCobIobComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = BrCobIobComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+            final String cob = new SmallestDoubleString(raw.sCOB2, SmallestDoubleString.Units.USE).minimise(MIN_FIELD_LEN_COB);
+            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(Math.max(MIN_FIELD_LEN_IOB, (MAX_FIELD_LEN_SHORT -1) - cob.length()));
+
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(DisplayFormat.basalRateSymbol()+raw.sBasalRate))
+                    .setShortTitle(ComplicationText.plainText(cob + " " + iob))
+                    .setTapAction(complicationPendingIntent);
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return BrCobIobComplication.class.getCanonicalName();
+    }
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/CobDetailedComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/CobDetailedComplication.java
new file mode 100644
index 0000000000..350ec9b0ec
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/CobDetailedComplication.java
@@ -0,0 +1,52 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+import info.nightscout.androidaps.interaction.utils.Pair;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class CobDetailedComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = CobDetailedComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+
+            Pair<String, String> cob = DisplayFormat.detailedCob(raw);
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(cob.first))
+                    .setTapAction(complicationPendingIntent);
+
+            if (cob.second.length() > 0) {
+                builder.setShortTitle(ComplicationText.plainText(cob.second));
+            }
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return CobDetailedComplication.class.getCanonicalName();
+    }
+
+    @Override
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.WIZARD;
+    };
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/CobIconComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/CobIconComplication.java
new file mode 100644
index 0000000000..e42f46e3a4
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/CobIconComplication.java
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.graphics.drawable.Icon;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.RawDisplayData;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class CobIconComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = CobIconComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(raw.sCOB2))
+                    .setIcon(
+                            Icon.createWithResource(
+                                    this, R.drawable.ic_carbs))
+                    .setBurnInProtectionIcon(
+                            Icon.createWithResource(
+                                    this, R.drawable.ic_carbs))
+                    .setTapAction(complicationPendingIntent);
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return CobIconComplication.class.getCanonicalName();
+    }
+
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.WIZARD;
+    };
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/CobIobComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/CobIobComplication.java
new file mode 100644
index 0000000000..31ea4dc5f4
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/CobIobComplication.java
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.SmallestDoubleString;
+
+import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MAX_FIELD_LEN_SHORT;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class CobIobComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = CobIobComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+            final String cob = raw.sCOB2;
+            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(MAX_FIELD_LEN_SHORT);
+
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(cob))
+                    .setShortTitle(ComplicationText.plainText(iob))
+                    .setTapAction(complicationPendingIntent);
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return CobIobComplication.class.getCanonicalName();
+    }
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationAction.java b/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationAction.java
new file mode 100644
index 0000000000..9ca1e9c456
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationAction.java
@@ -0,0 +1,12 @@
+package info.nightscout.androidaps.complications;
+
+public enum ComplicationAction {
+    NONE,
+    MENU,
+    WIZARD,
+    BOLUS,
+    ECARB,
+    STATUS,
+    WARNING_SYNC,
+    WARNING_OLD
+}
\ No newline at end of file
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java b/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java
new file mode 100644
index 0000000000..61dc8d4dde
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java
@@ -0,0 +1,167 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.wearable.complications.ProviderUpdateRequester;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.annotation.StringRes;
+
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.interaction.actions.BolusActivity;
+import info.nightscout.androidaps.interaction.actions.ECarbActivity;
+import info.nightscout.androidaps.interaction.actions.WizardActivity;
+import info.nightscout.androidaps.interaction.menus.MainMenuActivity;
+import info.nightscout.androidaps.interaction.menus.StatusMenuActivity;
+import info.nightscout.androidaps.interaction.utils.Constants;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class ComplicationTapBroadcastReceiver extends BroadcastReceiver {
+
+    private static final String TAG = ComplicationTapBroadcastReceiver.class.getSimpleName();
+
+    private static final String EXTRA_PROVIDER_COMPONENT =
+            "info.nightscout.androidaps.complications.action.PROVIDER_COMPONENT";
+    private static final String EXTRA_COMPLICATION_ID =
+            "info.nightscout.androidaps.complications.action.COMPLICATION_ID";
+    private static final String EXTRA_COMPLICATION_ACTION =
+            "info.nightscout.androidaps.complications.action.COMPLICATION_ACTION";
+    private static final String EXTRA_COMPLICATION_SINCE =
+            "info.nightscout.androidaps.complications.action.COMPLICATION_SINCE";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Bundle extras = intent.getExtras();
+        ComponentName provider = extras.getParcelable(EXTRA_PROVIDER_COMPONENT);
+        int complicationId = extras.getInt(EXTRA_COMPLICATION_ID);
+        String complicationAction = extras.getString(EXTRA_COMPLICATION_ACTION, ComplicationAction.MENU.toString());
+
+        ComplicationAction action = ComplicationAction.MENU;
+        try {
+            action = ComplicationAction.valueOf(ComplicationAction.class, complicationAction);
+        } catch (IllegalArgumentException | NullPointerException ex) {
+            // but how?
+            Log.e(TAG, "Cannot interpret complication action: "+complicationAction);
+        }
+
+        action = remapActionWithUserPreferences(action);
+
+        // Request an update for the complication that has just been tapped.
+        ProviderUpdateRequester requester = new ProviderUpdateRequester(context, provider);
+        requester.requestUpdate(complicationId);
+
+        Intent intentOpen = null;
+
+        switch (action) {
+            case NONE:
+                // do nothing
+                return;
+            case WIZARD:
+                intentOpen = new Intent(aaps.getAppContext(), WizardActivity.class);
+                break;
+            case BOLUS:
+                intentOpen = new Intent(aaps.getAppContext(), BolusActivity.class);
+                break;
+            case ECARB:
+                intentOpen = new Intent(aaps.getAppContext(), ECarbActivity.class);
+                break;
+            case STATUS:
+                intentOpen = new Intent(aaps.getAppContext(), StatusMenuActivity.class);
+                break;
+            case WARNING_OLD:
+            case WARNING_SYNC:
+                long oneAndHalfMinuteAgo = WearUtil.timestamp() - (Constants.MINUTE_IN_MS+Constants.SECOND_IN_MS * 30);
+                long since = extras.getLong(EXTRA_COMPLICATION_SINCE, oneAndHalfMinuteAgo);
+                @StringRes int labelId = (action == ComplicationAction.WARNING_SYNC) ?
+                        R.string.msg_warning_sync : R.string.msg_warning_old;
+                String msg = String.format(aaps.gs(labelId), DisplayFormat.shortTimeSince(since));
+                Toast.makeText(aaps.getAppContext(), msg, Toast.LENGTH_LONG).show();
+                break;
+            case MENU:
+            default:
+                intentOpen = new Intent(aaps.getAppContext(), MainMenuActivity.class);
+        }
+
+        if (intentOpen != null) {
+            // Perform intent - open dialog
+            intentOpen.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            aaps.getAppContext().startActivity(intentOpen);
+        }
+    }
+
+    private ComplicationAction remapActionWithUserPreferences(ComplicationAction originalAction) {
+        final String userPrefAction = aaps.getComplicationTapAction();
+        switch (originalAction) {
+            case WARNING_OLD:
+            case WARNING_SYNC:
+                // warnings cannot be reconfigured by user
+                return originalAction;
+            default:
+                switch (userPrefAction) {
+                    case "menu":
+                        return ComplicationAction.MENU;
+                    case "wizard":
+                        return ComplicationAction.WIZARD;
+                    case "bolus":
+                        return ComplicationAction.BOLUS;
+                    case "ecarb":
+                        return ComplicationAction.ECARB;
+                    case "status":
+                        return ComplicationAction.STATUS;
+                    case "none":
+                        return ComplicationAction.NONE;
+                    case "default":
+                    default:
+                        return originalAction;
+                }
+        }
+    }
+
+    /**
+     * Returns a pending intent, suitable for use as a tap intent, that causes a complication to be
+     * toggled and updated.
+     */
+    static PendingIntent getTapActionIntent(
+            Context context, ComponentName provider, int complicationId, ComplicationAction action) {
+        Intent intent = new Intent(context, ComplicationTapBroadcastReceiver.class);
+        intent.putExtra(EXTRA_PROVIDER_COMPONENT, provider);
+        intent.putExtra(EXTRA_COMPLICATION_ID, complicationId);
+        intent.putExtra(EXTRA_COMPLICATION_ACTION, action.toString());
+
+
+        // Pass complicationId as the requestCode to ensure that different complications get
+        // different intents.
+        return PendingIntent.getBroadcast(
+                context, complicationId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+
+    /**
+     * Returns a pending intent, suitable for use as a tap intent, that causes a complication to be
+     * toggled and updated.
+     */
+    static PendingIntent getTapWarningSinceIntent(
+            Context context, ComponentName provider, int complicationId, ComplicationAction action, long since) {
+        Intent intent = new Intent(context, ComplicationTapBroadcastReceiver.class);
+        intent.putExtra(EXTRA_PROVIDER_COMPONENT, provider);
+        intent.putExtra(EXTRA_COMPLICATION_ID, complicationId);
+        intent.putExtra(EXTRA_COMPLICATION_ACTION, action.toString());
+        intent.putExtra(EXTRA_COMPLICATION_SINCE, since);
+
+
+        // Pass complicationId as the requestCode to ensure that different complications get
+        // different intents.
+        return PendingIntent.getBroadcast(
+                context, complicationId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/IobDetailedComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/IobDetailedComplication.java
new file mode 100644
index 0000000000..db1d67a66c
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/IobDetailedComplication.java
@@ -0,0 +1,52 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+import info.nightscout.androidaps.interaction.utils.Pair;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class IobDetailedComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = IobDetailedComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+
+            Pair<String, String> iob = DisplayFormat.detailedIob(raw);
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(iob.first))
+                    .setTapAction(complicationPendingIntent);
+
+            if (iob.second.length() > 0) {
+                builder.setShortTitle(ComplicationText.plainText(iob.second));
+            }
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return IobDetailedComplication.class.getCanonicalName();
+    }
+
+    @Override
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.BOLUS;
+    };
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/IobIconComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/IobIconComplication.java
new file mode 100644
index 0000000000..1dca0f2e4d
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/IobIconComplication.java
@@ -0,0 +1,56 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.graphics.drawable.Icon;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.SmallestDoubleString;
+
+import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MAX_FIELD_LEN_SHORT;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class IobIconComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = IobIconComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(MAX_FIELD_LEN_SHORT);
+
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(iob))
+                    .setIcon(Icon.createWithResource(
+                            this, R.drawable.ic_ins))
+                    .setBurnInProtectionIcon(
+                            Icon.createWithResource(
+                                    this, R.drawable.ic_ins_burnin))
+                    .setTapAction(complicationPendingIntent);
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return IobIconComplication.class.getCanonicalName();
+    }
+
+    @Override
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.BOLUS;
+    };
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/LongStatusComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/LongStatusComplication.java
new file mode 100644
index 0000000000..f18ad21662
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/LongStatusComplication.java
@@ -0,0 +1,52 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class LongStatusComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = LongStatusComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        switch (dataType) {
+            case ComplicationData.TYPE_LONG_TEXT:
+
+                final String glucoseLine = DisplayFormat.longGlucoseLine(raw);
+                final String detailsLine = DisplayFormat.longDetailsLine(raw);
+
+                final ComplicationData.Builder builderLong = new ComplicationData.Builder(ComplicationData.TYPE_LONG_TEXT)
+                        .setLongTitle(ComplicationText.plainText(glucoseLine))
+                        .setLongText(ComplicationText.plainText(detailsLine))
+                        .setTapAction(complicationPendingIntent);
+                complicationData = builderLong.build();
+
+                break;
+            default:
+                if (Log.isLoggable(TAG, Log.WARN)) {
+                    Log.w(TAG, "Unexpected complication type " + dataType);
+                }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return LongStatusComplication.class.getCanonicalName();
+    }
+
+    @Override
+    protected boolean usesSinceField() {
+        return true;
+    }
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/LongStatusFlippedComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/LongStatusFlippedComplication.java
new file mode 100644
index 0000000000..7c0b730c76
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/LongStatusFlippedComplication.java
@@ -0,0 +1,52 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class LongStatusFlippedComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = LongStatusFlippedComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        switch (dataType) {
+            case ComplicationData.TYPE_LONG_TEXT:
+
+                final String glucoseLine = DisplayFormat.longGlucoseLine(raw);
+                final String detailsLine = DisplayFormat.longDetailsLine(raw);
+
+                final ComplicationData.Builder builderLong = new ComplicationData.Builder(ComplicationData.TYPE_LONG_TEXT)
+                        .setLongTitle(ComplicationText.plainText(detailsLine))
+                        .setLongText(ComplicationText.plainText(glucoseLine))
+                        .setTapAction(complicationPendingIntent);
+                complicationData = builderLong.build();
+
+                break;
+            default:
+                if (Log.isLoggable(TAG, Log.WARN)) {
+                    Log.w(TAG, "Unexpected complication type " + dataType);
+                }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return LongStatusFlippedComplication.class.getCanonicalName();
+    }
+
+    @Override
+    protected boolean usesSinceField() {
+        return true;
+    }
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/SgvComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/SgvComplication.java
new file mode 100644
index 0000000000..0296f8bab6
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/SgvComplication.java
@@ -0,0 +1,48 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class SgvComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = SgvComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        switch (dataType) {
+            case ComplicationData.TYPE_SHORT_TEXT:
+                final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                        .setShortText(ComplicationText.plainText(raw.sSgv + raw.sDirection))
+                        .setShortTitle(ComplicationText.plainText(DisplayFormat.shortTrend(raw)))
+                        .setTapAction(complicationPendingIntent);
+
+                complicationData = builder.build();
+                break;
+            default:
+                if (Log.isLoggable(TAG, Log.WARN)) {
+                    Log.w(TAG, "Unexpected complication type " + dataType);
+                }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return SgvComplication.class.getCanonicalName();
+    }
+
+    @Override
+    protected boolean usesSinceField() {
+        return true;
+    }
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/UploaderBattery.java b/wear/src/main/java/info/nightscout/androidaps/complications/UploaderBattery.java
new file mode 100644
index 0000000000..a5fcedacdd
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/UploaderBattery.java
@@ -0,0 +1,114 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.graphics.drawable.Icon;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import androidx.annotation.DrawableRes;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.RawDisplayData;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class UploaderBattery extends BaseComplicationProviderService {
+
+    private static final String TAG = UploaderBattery.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        @DrawableRes int batteryIcon = R.drawable.ic_battery_unknown;
+        @DrawableRes int burnInBatteryIcon = R.drawable.ic_battery_unknown_burnin;
+        int level = 0;
+        String levelStr = "???";
+
+        if (raw.sUploaderBattery.matches("^[0-9]+$")) {
+            try {
+                level = Integer.parseInt(raw.sUploaderBattery);
+                level = Math.max(Math.min(level, 100), 0);
+                levelStr = level + "%";
+                int iconNo = (int)Math.floor(level / 10.0);
+                if (level > 95) {
+                    iconNo = 10;
+                }
+                switch (iconNo) {
+                    case 10: batteryIcon = R.drawable.ic_battery_charging_wireless; break;
+                    case 9: batteryIcon = R.drawable.ic_battery_charging_wireless_90; break;
+                    case 8: batteryIcon = R.drawable.ic_battery_charging_wireless_80; break;
+                    case 7: batteryIcon = R.drawable.ic_battery_charging_wireless_70; break;
+                    case 6: batteryIcon = R.drawable.ic_battery_charging_wireless_60; break;
+                    case 5: batteryIcon = R.drawable.ic_battery_charging_wireless_50; break;
+                    case 4: batteryIcon = R.drawable.ic_battery_charging_wireless_40; break;
+                    case 3: batteryIcon = R.drawable.ic_battery_charging_wireless_30; break;
+                    case 2: batteryIcon = R.drawable.ic_battery_charging_wireless_20; break;
+                    case 1: batteryIcon = R.drawable.ic_battery_charging_wireless_10; break;
+                    case 0: batteryIcon = R.drawable.ic_battery_alert_variant_outline; break;
+                    default: batteryIcon = R.drawable.ic_battery_charging_wireless_outline;
+                }
+
+                switch (iconNo) {
+                    case 10: burnInBatteryIcon = R.drawable.ic_battery_charging_wireless_burnin; break;
+                    case 9: burnInBatteryIcon = R.drawable.ic_battery_charging_wireless_90_burnin; break;
+                    case 8: burnInBatteryIcon = R.drawable.ic_battery_charging_wireless_80_burnin; break;
+                    case 7: burnInBatteryIcon = R.drawable.ic_battery_charging_wireless_70_burnin; break;
+                    case 6: burnInBatteryIcon = R.drawable.ic_battery_charging_wireless_60_burnin; break;
+                    case 5: burnInBatteryIcon = R.drawable.ic_battery_charging_wireless_50_burnin; break;
+                    case 4: burnInBatteryIcon = R.drawable.ic_battery_charging_wireless_40_burnin; break;
+                    case 3: burnInBatteryIcon = R.drawable.ic_battery_charging_wireless_30_burnin; break;
+                    case 2: burnInBatteryIcon = R.drawable.ic_battery_charging_wireless_20_burnin; break;
+                    case 1: burnInBatteryIcon = R.drawable.ic_battery_charging_wireless_10_burnin; break;
+                    case 0: burnInBatteryIcon = R.drawable.ic_battery_alert_variant_outline; break;
+                    default: burnInBatteryIcon = R.drawable.ic_battery_charging_wireless_outline;
+                }
+
+
+            } catch (NumberFormatException ex){
+                Log.e(TAG, "Cannot parse battery level of: " + raw.sUploaderBattery);
+            }
+        }
+
+        if (dataType == ComplicationData.TYPE_RANGED_VALUE) {
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_RANGED_VALUE)
+                    .setMinValue(0)
+                    .setMaxValue(100)
+                    .setValue(level)
+                    .setShortText(ComplicationText.plainText(levelStr))
+                    .setIcon(Icon.createWithResource(this, batteryIcon))
+                    .setBurnInProtectionIcon(Icon.createWithResource(this, burnInBatteryIcon))
+                    .setTapAction(complicationPendingIntent);
+            complicationData = builder.build();
+        } else if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(levelStr))
+                    .setIcon(Icon.createWithResource(this, batteryIcon))
+                    .setBurnInProtectionIcon(Icon.createWithResource(this, burnInBatteryIcon))
+                    .setTapAction(complicationPendingIntent);
+            complicationData = builder.build();
+        } else if (dataType == ComplicationData.TYPE_ICON) {
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_ICON)
+                    .setIcon(Icon.createWithResource(this, batteryIcon))
+                    .setBurnInProtectionIcon(Icon.createWithResource(this, burnInBatteryIcon))
+                    .setTapAction(complicationPendingIntent);
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return UploaderBattery.class.getCanonicalName();
+    }
+
+    @Override
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.STATUS;
+    };
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperComplication.java
new file mode 100644
index 0000000000..293b1331ca
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperComplication.java
@@ -0,0 +1,61 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.Icon;
+import android.support.wearable.complications.ComplicationData;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.WindowManager;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.data.RawDisplayData;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public abstract class WallpaperComplication extends BaseComplicationProviderService {
+
+    public abstract String getWallpaperAssetsFileName();
+
+    private static final String TAG = WallpaperComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_LARGE_IMAGE) {
+
+            DisplayMetrics metrics = new DisplayMetrics();
+            WindowManager windowManager = (WindowManager) aaps.getAppContext()
+                    .getSystemService(Context.WINDOW_SERVICE);
+            windowManager.getDefaultDisplay().getMetrics(metrics);
+            int width = metrics.widthPixels;
+            int height = metrics.heightPixels;
+
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_LARGE_IMAGE);
+
+            AssetManager assetManager = getAssets();
+            try (InputStream istr = assetManager.open(getWallpaperAssetsFileName())) {
+                    Bitmap bitmap = BitmapFactory.decodeStream(istr);
+                    Bitmap scaled = Bitmap.createScaledBitmap(bitmap, width, height, true);
+                    builder.setLargeImage(Icon.createWithBitmap(scaled));
+            } catch (IOException e) {
+                Log.e(TAG, "Cannot read wallpaper asset: "+e.getMessage(), e);
+            }
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperDarkComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperDarkComplication.java
new file mode 100644
index 0000000000..8c84e1d8c3
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperDarkComplication.java
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.complications;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class WallpaperDarkComplication extends WallpaperComplication {
+
+    @Override
+    public String getWallpaperAssetsFileName() {
+        return "watch_dark.jpg";
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return WallpaperDarkComplication.class.getCanonicalName();
+    }
+
+    @Override
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.NONE;
+    };
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperGrayComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperGrayComplication.java
new file mode 100644
index 0000000000..bec047f323
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperGrayComplication.java
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.complications;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class WallpaperGrayComplication extends WallpaperComplication {
+
+    @Override
+    public String getWallpaperAssetsFileName() {
+        return "watch_gray.jpg";
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return WallpaperGrayComplication.class.getCanonicalName();
+    }
+
+    @Override
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.NONE;
+    };
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperLightComplication.java b/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperLightComplication.java
new file mode 100644
index 0000000000..2d2bbf6f14
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/WallpaperLightComplication.java
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.complications;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class WallpaperLightComplication extends WallpaperComplication {
+
+    @Override
+    public String getWallpaperAssetsFileName() {
+        return "watch_light.jpg";
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return WallpaperLightComplication.class.getCanonicalName();
+    }
+
+    @Override
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.NONE;
+    };
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
index 83c9ad58b3..9e018516ba 100644
--- a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
+++ b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
@@ -40,6 +40,7 @@ import info.nightscout.androidaps.interaction.AAPSPreferences;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interaction.actions.AcceptActivity;
 import info.nightscout.androidaps.interaction.actions.CPPActivity;
+import info.nightscout.androidaps.interaction.utils.Persistence;
 import info.nightscout.androidaps.interaction.utils.SafeParse;
 import info.nightscout.androidaps.interaction.utils.WearUtil;
 
@@ -512,12 +513,14 @@ public class ListenerService extends WearableListenerService implements GoogleAp
                     Intent messageIntent = new Intent();
                     messageIntent.setAction(Intent.ACTION_SEND);
                     messageIntent.putExtra("status", dataMap.toBundle());
+                    Persistence.storeDataMap(RawDisplayData.STATUS_PERSISTENCE_KEY, dataMap);
                     LocalBroadcastManager.getInstance(this).sendBroadcast(messageIntent);
                 } else if (path.equals(BASAL_DATA_PATH)){
                     dataMap = DataMapItem.fromDataItem(event.getDataItem()).getDataMap();
                     Intent messageIntent = new Intent();
                     messageIntent.setAction(Intent.ACTION_SEND);
                     messageIntent.putExtra("basals", dataMap.toBundle());
+                    Persistence.storeDataMap(RawDisplayData.BASALS_PERSISTENCE_KEY, dataMap);
                     LocalBroadcastManager.getInstance(this).sendBroadcast(messageIntent);
                 } else if (path.equals(NEW_PREFERENCES_PATH)){
                     dataMap = DataMapItem.fromDataItem(event.getDataItem()).getDataMap();
@@ -541,6 +544,7 @@ public class ListenerService extends WearableListenerService implements GoogleAp
                     Intent messageIntent = new Intent();
                     messageIntent.setAction(Intent.ACTION_SEND);
                     messageIntent.putExtra("data", dataMap.toBundle());
+                    Persistence.storeDataMap(RawDisplayData.DATA_PERSISTENCE_KEY, dataMap);
                     LocalBroadcastManager.getInstance(this).sendBroadcast(messageIntent);
                 }
             }
diff --git a/wear/src/main/java/info/nightscout/androidaps/data/RawDisplayData.java b/wear/src/main/java/info/nightscout/androidaps/data/RawDisplayData.java
new file mode 100644
index 0000000000..d4e3580561
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/data/RawDisplayData.java
@@ -0,0 +1,272 @@
+package info.nightscout.androidaps.data;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.PowerManager;
+
+import com.google.android.gms.wearable.DataMap;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import info.nightscout.androidaps.interaction.utils.Constants;
+import info.nightscout.androidaps.interaction.utils.Persistence;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+
+/**
+ * Holds bunch of data model variables and lists that arrive from phone app and are due to be
+ * displayed on watchface and complications. Keeping them together makes code cleaner and allows
+ * passing it to complications via persistence layer.
+ *
+ * Created by dlvoy on 2019-11-12
+ */
+public class RawDisplayData {
+
+    static final String DATA_PERSISTENCE_KEY = "raw_data";
+    static final String BASALS_PERSISTENCE_KEY = "raw_basals";
+    static final String STATUS_PERSISTENCE_KEY = "raw_status";
+
+    // data bundle
+    public long sgvLevel = 0;
+    public long datetime;
+    public String sSgv = "---";
+    public String sDirection  = "--";
+    public String sDelta = "--";
+    public String sAvgDelta = "--";
+    public String sUnits = "-";
+
+    // status bundle
+    public String sBasalRate  = "-.--U/h";
+    public String sUploaderBattery = "--";
+    public String sRigBattery = "--";
+    public boolean detailedIOB = false;
+    public String sIOB1 = "IOB";
+    public String sIOB2 = "-.--";
+    public String sCOB1  = "Carb";
+    public String sCOB2= "--g";
+    public String sBgi = "--";
+    public boolean showBGI = false;
+    public String externalStatusString = "no status";
+    public int batteryLevel = 1;
+    public long openApsStatus = -1;
+
+    // basals bundle
+    public ArrayList<BgWatchData> bgDataList = new ArrayList<>();
+    public ArrayList<TempWatchData> tempWatchDataList = new ArrayList<>();
+    public ArrayList<BasalWatchData> basalWatchDataList = new ArrayList<>();
+    public ArrayList<BolusWatchData> bolusWatchDataList = new ArrayList<>();
+    public ArrayList<BgWatchData> predictionList = new ArrayList<>();
+
+    public String toDebugString() {
+        return "DisplayRawData{" +
+                "sgvLevel=" + sgvLevel +
+                ", datetime=" + datetime +
+                ", sSgv='" + sSgv + '\'' +
+                ", sDirection='" + sDirection + '\'' +
+                ", sDelta='" + sDelta + '\'' +
+                ", sAvgDelta='" + sAvgDelta + '\'' +
+                ", sUnits='" + sUnits + '\'' +
+                ", sBasalRate='" + sBasalRate + '\'' +
+                ", sUploaderBattery='" + sUploaderBattery + '\'' +
+                ", sRigBattery='" + sRigBattery + '\'' +
+                ", detailedIOB=" + detailedIOB +
+                ", sIOB1='" + sIOB1 + '\'' +
+                ", sIOB2='" + sIOB2 + '\'' +
+                ", sCOB1='" + sCOB1 + '\'' +
+                ", sCOB2='" + sCOB2 + '\'' +
+                ", sBgi='" + sBgi + '\'' +
+                ", showBGI=" + showBGI +
+                ", externalStatusString='" + externalStatusString + '\'' +
+                ", batteryLevel=" + batteryLevel +
+                ", openApsStatus=" + openApsStatus +
+                ", bgDataList size=" + bgDataList.size() +
+                ", tempWatchDataList size=" + tempWatchDataList.size() +
+                ", basalWatchDataList size=" + basalWatchDataList.size() +
+                ", bolusWatchDataLis size=" + bolusWatchDataList.size() +
+                ", predictionList size=" + predictionList.size() +
+                '}';
+    }
+
+    public void updateFromPersistence(Persistence persistence) {
+
+        DataMap dataMapData = persistence.getDataMap(DATA_PERSISTENCE_KEY);
+        if (dataMapData != null) {
+            updateData(dataMapData);
+        }
+        DataMap dataMapStatus = persistence.getDataMap(STATUS_PERSISTENCE_KEY);
+        if (dataMapStatus != null) {
+            updateStatus(dataMapStatus);
+        }
+        DataMap dataMapBasals = persistence.getDataMap(BASALS_PERSISTENCE_KEY);
+        if (dataMapBasals != null) {
+            updateBasals(dataMapBasals);
+        }
+    }
+
+    /*
+     * Since complications do not need Basals, we skip them for performance
+     */
+    public void updateForComplicationsFromPersistence(Persistence persistence) {
+
+        DataMap dataMapData = persistence.getDataMap(DATA_PERSISTENCE_KEY);
+        if (dataMapData != null) {
+            updateData(dataMapData);
+        }
+        DataMap dataMapStatus = persistence.getDataMap(STATUS_PERSISTENCE_KEY);
+        if (dataMapStatus != null) {
+            updateStatus(dataMapStatus);
+        }
+    }
+
+    public DataMap updateDataFromMessage(Intent intent, PowerManager.WakeLock wakeLock) {
+        Bundle bundle = intent.getBundleExtra("data");
+        if (bundle != null) {
+            DataMap dataMap = WearUtil.bundleToDataMap(bundle);
+            updateData(dataMap);
+            return dataMap;
+        }
+        return null;
+    }
+
+    private void updateData(DataMap dataMap) {
+        WearUtil.getWakeLock("readingPrefs", 50);
+        sgvLevel = dataMap.getLong("sgvLevel");
+        datetime = dataMap.getLong("timestamp");
+        sSgv = dataMap.getString("sgvString");
+        sDirection = dataMap.getString("slopeArrow");
+        sDelta = dataMap.getString("delta");
+        sAvgDelta = dataMap.getString("avgDelta");
+        sUnits = dataMap.getString("glucoseUnits");
+    }
+
+    public DataMap updateStatusFromMessage(Intent intent, PowerManager.WakeLock wakeLock) {
+        Bundle bundle = intent.getBundleExtra("status");
+        if (bundle != null) {
+            DataMap dataMap = WearUtil.bundleToDataMap(bundle);
+            updateStatus(dataMap);
+            return dataMap;
+        }
+        return null;
+    }
+
+    private void updateStatus(DataMap dataMap) {
+        WearUtil.getWakeLock("readingPrefs", 50);
+        sBasalRate = dataMap.getString("currentBasal");
+        sUploaderBattery = dataMap.getString("battery");
+        sRigBattery = dataMap.getString("rigBattery");
+        detailedIOB = dataMap.getBoolean("detailedIob");
+        sIOB1 = dataMap.getString("iobSum") + "U";
+        sIOB2 = dataMap.getString("iobDetail");
+        sCOB1 = "Carb";
+        sCOB2 = dataMap.getString("cob");
+        sBgi = dataMap.getString("bgi");
+        showBGI = dataMap.getBoolean("showBgi");
+        externalStatusString = dataMap.getString("externalStatusString");
+        batteryLevel = dataMap.getInt("batteryLevel");
+        openApsStatus = dataMap.getLong("openApsStatus");
+    }
+
+    public DataMap updateBasalsFromMessage(Intent intent, PowerManager.WakeLock wakeLock) {
+        Bundle bundle = intent.getBundleExtra("basals");
+        if (bundle != null) {
+            DataMap dataMap = WearUtil.bundleToDataMap(bundle);
+            updateBasals(dataMap);
+            return dataMap;
+        }
+        return null;
+    }
+
+    private void updateBasals(DataMap dataMap) {
+        WearUtil.getWakeLock("readingPrefs", 500);
+        loadBasalsAndTemps(dataMap);
+    }
+
+    private void loadBasalsAndTemps(DataMap dataMap) {
+        ArrayList<DataMap> temps = dataMap.getDataMapArrayList("temps");
+        if (temps != null) {
+            tempWatchDataList = new ArrayList<>();
+            for (DataMap temp : temps) {
+                TempWatchData twd = new TempWatchData();
+                twd.startTime = temp.getLong("starttime");
+                twd.startBasal =  temp.getDouble("startBasal");
+                twd.endTime = temp.getLong("endtime");
+                twd.endBasal = temp.getDouble("endbasal");
+                twd.amount = temp.getDouble("amount");
+                tempWatchDataList.add(twd);
+            }
+        }
+        ArrayList<DataMap> basals = dataMap.getDataMapArrayList("basals");
+        if (basals != null) {
+            basalWatchDataList = new ArrayList<>();
+            for (DataMap basal : basals) {
+                BasalWatchData bwd = new BasalWatchData();
+                bwd.startTime = basal.getLong("starttime");
+                bwd.endTime = basal.getLong("endtime");
+                bwd.amount = basal.getDouble("amount");
+                basalWatchDataList.add(bwd);
+            }
+        }
+        ArrayList<DataMap> boluses = dataMap.getDataMapArrayList("boluses");
+        if (boluses != null) {
+            bolusWatchDataList = new ArrayList<>();
+            for (DataMap bolus : boluses) {
+                BolusWatchData bwd = new BolusWatchData();
+                bwd.date = bolus.getLong("date");
+                bwd.bolus = bolus.getDouble("bolus");
+                bwd.carbs = bolus.getDouble("carbs");
+                bwd.isSMB = bolus.getBoolean("isSMB");
+                bwd.isValid = bolus.getBoolean("isValid");
+                bolusWatchDataList.add(bwd);
+            }
+        }
+        ArrayList<DataMap> predictions = dataMap.getDataMapArrayList("predictions");
+        if (boluses != null) {
+            predictionList = new ArrayList<>();
+            for (DataMap prediction : predictions) {
+                BgWatchData bwd = new BgWatchData();
+                bwd.timestamp = prediction.getLong("timestamp");
+                bwd.sgv = prediction.getDouble("sgv");
+                bwd.color = prediction.getInt("color");
+                predictionList.add(bwd);
+            }
+        }
+    }
+
+    public void addToWatchSet(DataMap dataMap) {
+        ArrayList<DataMap> entries = dataMap.getDataMapArrayList("entries");
+        if (entries != null) {
+            bgDataList = new ArrayList<>();
+            for (DataMap entry : entries) {
+                double sgv = entry.getDouble("sgvDouble");
+                double high = entry.getDouble("high");
+                double low = entry.getDouble("low");
+                long timestamp = entry.getLong("timestamp");
+                int color = entry.getInt("color", 0);
+                bgDataList.add(new BgWatchData(sgv, high, low, timestamp, color));
+            }
+        } else {
+            double sgv = dataMap.getDouble("sgvDouble");
+            double high = dataMap.getDouble("high");
+            double low = dataMap.getDouble("low");
+            long timestamp = dataMap.getLong("timestamp");
+            int color = dataMap.getInt("color", 0);
+
+            final int size = bgDataList.size();
+            if (size > 0) {
+                if (bgDataList.get(size - 1).timestamp == timestamp)
+                    return; // Ignore duplicates.
+            }
+
+            bgDataList.add(new BgWatchData(sgv, high, low, timestamp, color));
+        }
+
+        // We use iterator instead for-loop because we iterate and remove on the go
+        Iterator itr = bgDataList.iterator();
+        while (itr.hasNext()) {
+            BgWatchData entry = (BgWatchData)itr.next();
+            if (entry.timestamp < (WearUtil.timestamp() - (Constants.HOUR_IN_MS * 5))) {
+                itr.remove(); //Get rid of anything more than 5 hours old
+            }
+        }
+    }
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Constants.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Constants.java
new file mode 100644
index 0000000000..2af3ef34b6
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Constants.java
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.interaction.utils;
+
+public class Constants {
+
+    public static final long SECOND_IN_MS = 1000;
+    public static final long MINUTE_IN_MS = 60000;
+    public static final long HOUR_IN_MS = 3600000;
+    public static final long DAY_IN_MS = 86400000;
+    public static final long WEEK_IN_MS = DAY_IN_MS * 7;
+    public static final long MONTH_IN_MS = DAY_IN_MS * 30;
+
+    public static final long STALE_MS = Constants.MINUTE_IN_MS * 12;
+
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/DisplayFormat.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/DisplayFormat.java
new file mode 100644
index 0000000000..f2cf06671e
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/DisplayFormat.java
@@ -0,0 +1,143 @@
+package info.nightscout.androidaps.interaction.utils;
+
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.data.RawDisplayData;
+
+public class DisplayFormat {
+
+    /**
+     * Maximal and minimal lengths of fields/labels shown in complications, in characters
+     * For MAX values - above that WearOS and watch faces may start ellipsize (...) contents
+     * For MIN values - this is minimal length that can hold legible data
+     */
+    public static final int MAX_FIELD_LEN_LONG = 22; // this is found out empirical, for TYPE_LONG_TEXT
+    public static final int MAX_FIELD_LEN_SHORT = 7; // according to Wear OS docs for TYPE_SHORT_TEXT
+    public static final int MIN_FIELD_LEN_COB = 3;   // since carbs are usually 0..99g
+    public static final int MIN_FIELD_LEN_IOB = 3;   // IoB can range from like .1U to 99U
+
+    public static String deltaSymbol() {
+        return aaps.areComplicationsUnicode() ? "\u0394" : "";
+    }
+
+    public static String verticalSeparatorSymbol() {
+        return aaps.areComplicationsUnicode() ? "\u205E" : "|";
+    }
+
+    public static String basalRateSymbol() {
+        return aaps.areComplicationsUnicode() ? "\u238D\u2006" : "";
+    }
+
+    public static String shortTimeSince(final long refTime) {
+
+        long deltaTimeMs = WearUtil.msSince(refTime);
+
+        if (deltaTimeMs < Constants.MINUTE_IN_MS) {
+            return "0'";
+        } else if (deltaTimeMs < Constants.HOUR_IN_MS) {
+            int minutes = (int) (deltaTimeMs / Constants.MINUTE_IN_MS);
+            return minutes + "'";
+        } else if (deltaTimeMs < Constants.DAY_IN_MS) {
+            int hours = (int) (deltaTimeMs / Constants.HOUR_IN_MS);
+            return hours + "h";
+        } else {
+            int days = (int) (deltaTimeMs / Constants.DAY_IN_MS);
+            if (days < 7) {
+                return days + "d";
+            } else {
+                int weeks = days / 7;
+                return weeks + "w";
+            }
+        }
+    }
+
+    public static String shortTrend(final RawDisplayData raw) {
+        String minutes = "--";
+        if (raw.datetime > 0) {
+            minutes = shortTimeSince(raw.datetime);
+        }
+
+        if (minutes.length() + raw.sDelta.length() + deltaSymbol().length() + 1 <= MAX_FIELD_LEN_SHORT) {
+            return minutes + " " + deltaSymbol() + raw.sDelta;
+        }
+
+        // that only optimizes obvious things like 0 before . or at end, + at beginning
+        String delta = (new SmallestDoubleString(raw.sDelta)).minimise(MAX_FIELD_LEN_SHORT -1);
+        if (minutes.length() + delta.length() + deltaSymbol().length() + 1 <= MAX_FIELD_LEN_SHORT) {
+            return minutes + " " + deltaSymbol() + delta;
+        }
+
+        String shortDelta = (new SmallestDoubleString(raw.sDelta)).minimise(MAX_FIELD_LEN_SHORT -(1+minutes.length()));
+
+        return minutes + " " + shortDelta;
+    }
+
+    public static String longGlucoseLine(final RawDisplayData raw) {
+        return raw.sSgv + raw.sDirection + " " + deltaSymbol() + (new SmallestDoubleString(raw.sDelta)).minimise(8) + " (" + shortTimeSince(raw.datetime) + ")";
+    }
+
+    public static String longDetailsLine(final RawDisplayData raw) {
+
+        final String SEP_LONG = "  " + verticalSeparatorSymbol() + "  ";
+        final String SEP_SHORT = " " + verticalSeparatorSymbol() + " ";
+        final int SEP_SHORT_LEN = SEP_SHORT.length();
+        final String SEP_MIN = " ";
+
+        String line = raw.sCOB2 + SEP_LONG + raw.sIOB1 + SEP_LONG + basalRateSymbol()+raw.sBasalRate;
+        if (line.length() <= MAX_FIELD_LEN_LONG) {
+            return line;
+        }
+        line = raw.sCOB2 + SEP_SHORT + raw.sIOB1 + SEP_SHORT + raw.sBasalRate;
+        if (line.length() <= MAX_FIELD_LEN_LONG) {
+            return line;
+        }
+
+        int remainingMax = MAX_FIELD_LEN_LONG - (raw.sCOB2.length() + raw.sBasalRate.length() + SEP_SHORT_LEN*2);
+        final String smallestIoB = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(Math.max(MIN_FIELD_LEN_IOB, remainingMax));
+        line = raw.sCOB2 + SEP_SHORT + smallestIoB + SEP_SHORT + raw.sBasalRate;
+        if (line.length() <= MAX_FIELD_LEN_LONG) {
+            return line;
+        }
+
+        remainingMax = MAX_FIELD_LEN_LONG - (smallestIoB.length() + raw.sBasalRate.length() + SEP_SHORT_LEN*2);
+        final String simplifiedCob = new SmallestDoubleString(raw.sCOB2, SmallestDoubleString.Units.USE).minimise(Math.max(MIN_FIELD_LEN_COB, remainingMax));
+
+        line = simplifiedCob + SEP_SHORT + smallestIoB + SEP_SHORT + raw.sBasalRate;
+        if (line.length() <= MAX_FIELD_LEN_LONG) {
+            return line;
+        }
+
+        line = simplifiedCob + SEP_MIN + smallestIoB + SEP_MIN + raw.sBasalRate;
+
+        return line;
+    }
+
+    public static Pair<String, String> detailedIob(RawDisplayData raw) {
+        final String iob1 = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(MAX_FIELD_LEN_SHORT);
+        String iob2 = "";
+        if (raw.sIOB2.contains("|")) {
+            String[] iobs = raw.sIOB2.replace("(", "").replace(")", "").split("\\|");
+
+            String iobBolus = new SmallestDoubleString(iobs[0]).minimise(MIN_FIELD_LEN_IOB);
+            if (iobBolus.trim().length() == 0) {
+                iobBolus = "--";
+            }
+            String iobBasal = new SmallestDoubleString(iobs[1]).minimise((MAX_FIELD_LEN_SHORT -1) - Math.max(MIN_FIELD_LEN_IOB, iobBolus.length()));
+            if (iobBasal.trim().length() == 0) {
+                iobBasal = "--";
+            }
+            iob2 = iobBolus+" "+iobBasal;
+        }
+        return Pair.create(iob1, iob2);
+    }
+
+    public static Pair<String, String> detailedCob(final RawDisplayData raw) {
+        SmallestDoubleString cobMini = new SmallestDoubleString(raw.sCOB2, SmallestDoubleString.Units.USE);
+
+        String cob2 = "";
+        if (cobMini.getExtra().length() > 0) {
+            cob2 = cobMini.getExtra() + cobMini.getUnits();
+        }
+        final String cob1 = cobMini.minimise(MAX_FIELD_LEN_SHORT);
+        return Pair.create(cob1, cob2);
+    }
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Inevitable.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Inevitable.java
new file mode 100644
index 0000000000..54361b6678
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Inevitable.java
@@ -0,0 +1,118 @@
+package info.nightscout.androidaps.interaction.utils;
+
+import android.os.PowerManager;
+import android.util.Log;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import info.nightscout.androidaps.BuildConfig;
+
+/**
+ * Created for xDrip by jamorham on 07/03/2018
+ * Adapted for AAPS by dlvoy on 2019-11-11
+ *
+ * Tasks which are fired from events can be scheduled here and only execute when they become idle
+ * and are not being rescheduled within their wait window.
+ *
+ */
+
+public class Inevitable {
+
+    private static final String TAG = Inevitable.class.getSimpleName();
+    private static final int MAX_QUEUE_TIME = (int) Constants.MINUTE_IN_MS * 6;
+    private static final boolean debug = BuildConfig.DEBUG;
+
+    private static final ConcurrentHashMap<String, Task> tasks = new ConcurrentHashMap<>();
+
+    public static synchronized void task(final String id, long idle_for, Runnable runnable) {
+        if (idle_for > MAX_QUEUE_TIME) {
+            throw new RuntimeException(id + " Requested time: " + idle_for + " beyond max queue time");
+        }
+        final Task task = tasks.get(id);
+        if (task != null) {
+            // if it already exists then extend the time
+            task.extendTime(idle_for);
+
+            if (debug)
+                Log.d(TAG, "Extending time for: " + id + " to " + WearUtil.dateTimeText(task.when));
+        } else {
+            // otherwise create new task
+            if (runnable == null) return; // extension only if already exists
+            tasks.put(id, new Task(id, idle_for, runnable));
+
+            if (debug) {
+                Log.d(TAG, "Creating task: " + id + " due: " + WearUtil.dateTimeText(tasks.get(id).when));
+            }
+
+            // create a thread to wait and execute in background
+            final Thread t = new Thread(() -> {
+                final PowerManager.WakeLock wl = WearUtil.getWakeLock(id, MAX_QUEUE_TIME + 5000);
+                try {
+                    boolean running = true;
+                    // wait for task to be due or killed
+                    while (running) {
+                        WearUtil.threadSleep(500);
+                        final Task thisTask = tasks.get(id);
+                        running = thisTask != null && !thisTask.poll();
+                    }
+                } finally {
+                    WearUtil.releaseWakeLock(wl);
+                }
+            });
+            t.setPriority(Thread.MIN_PRIORITY);
+            t.start();
+        }
+    }
+
+    public static synchronized void stackableTask(String id, long idle_for, Runnable runnable) {
+        int stack = 0;
+        while (tasks.get(id = id + "-" + stack) != null) {
+            stack++;
+        }
+        if (stack > 0) {
+            Log.d(TAG, "Task stacked to: " + id);
+        }
+        task(id, idle_for, runnable);
+    }
+
+    public static void kill(final String id) {
+        tasks.remove(id);
+    }
+
+    public static boolean waiting(final String id) {
+        return tasks.containsKey(id);
+    }
+
+    private static class Task {
+        private long when;
+        private final Runnable what;
+        private final String id;
+
+        Task(String id, long offset, Runnable what) {
+            this.what = what;
+            this.id = id;
+            extendTime(offset);
+        }
+
+        public void extendTime(long offset) {
+            this.when = WearUtil.timestamp() + offset;
+        }
+
+        public boolean poll() {
+            final long till = WearUtil.msTill(when);
+            if (till < 1) {
+                if (debug) Log.d(TAG, "Executing task! " + this.id);
+                tasks.remove(this.id); // early remove to allow overlapping scheduling
+                what.run();
+                return true;
+            } else if (till > MAX_QUEUE_TIME) {
+                Log.wtf(TAG, "Task: " + this.id + " In queue too long: " + till);
+                tasks.remove(this.id);
+                return true;
+            }
+            return false;
+        }
+
+    }
+
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Pair.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Pair.java
new file mode 100644
index 0000000000..4207cbd743
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Pair.java
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.interaction.utils;
+
+import java.util.Objects;
+
+/**
+ * Same as android Pair, but clean room java class - does not require Android SDK for tests
+ */
+public class Pair<F, S> {
+
+    public final F first;
+    public final S second;
+
+    public Pair(F first, S second) {
+        this.first = first;
+        this.second = second;
+    }
+
+    public static <F, S> Pair<F, S> create(F f, S s) {
+        return new Pair<>(f, s);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (o instanceof Pair) {
+            return ((Pair) o).first.equals(first) && ((Pair) o).second.equals(second);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "First: \""+first.toString()+"\" Second: \""+second.toString()+"\"";
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(first, second);
+    }
+
+}
+
+
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.java
new file mode 100644
index 0000000000..36c0ae76ee
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.java
@@ -0,0 +1,96 @@
+package info.nightscout.androidaps.interaction.utils;
+
+import android.content.SharedPreferences;
+import android.util.Base64;
+
+import androidx.annotation.Nullable;
+
+import com.google.android.gms.wearable.DataMap;
+
+import java.util.Set;
+
+import info.nightscout.androidaps.aaps;
+
+/**
+ * Created by dlvoy on 2019-11-12
+ */
+public class Persistence {
+
+    final SharedPreferences preferences;
+    public static final String COMPLICATION_PROVIDER_PREFERENCES_FILE_KEY =
+            "info.nightscout.androidaps.complications.COMPLICATION_PROVIDER_PREFERENCES_FILE_KEY";
+
+    public Persistence() {
+        preferences = aaps.getAppContext().getSharedPreferences(COMPLICATION_PROVIDER_PREFERENCES_FILE_KEY, 0);
+    }
+
+    @Nullable
+    public DataMap getDataMap(String key) {
+        if (preferences.contains(key)) {
+            final String rawB64Data = preferences.getString(key, null);
+            byte[] rawData = Base64.decode(rawB64Data, Base64.DEFAULT);
+            try {
+                return DataMap.fromByteArray(rawData);
+            } catch (IllegalArgumentException ex) {
+                // Should never happen, and if it happen - we ignore and fallback to null
+            }
+        }
+        return null;
+    }
+
+    public void putDataMap(String key, DataMap dataMap) {
+        preferences.edit().putString(key, Base64.encodeToString(dataMap.toByteArray(), Base64.DEFAULT)).apply();
+    }
+
+    public String getString(String key, String defaultValue) {
+        return preferences.getString(key, defaultValue);
+    }
+
+    public void putString(String key, String value) {
+        preferences.edit().putString(key, value).apply();
+    }
+
+    public boolean getBoolean(String key, boolean defaultValue) {
+        return preferences.getBoolean(key, defaultValue);
+    }
+
+    public void putBoolean(String key, boolean value) {
+        preferences.edit().putBoolean(key, value).apply();
+    }
+
+    public long whenDataUpdated() {
+        return preferences.getLong("data_updated_at", 0);
+    }
+
+    private void markDataUpdated() {
+        preferences.edit().putLong("data_updated_at", WearUtil.timestamp()).apply();
+    }
+
+    public Set<String> getSetOf(String key) {
+        return WearUtil.explodeSet(getString(key, ""), "|");
+    }
+
+    public void addToSet(String key, String value) {
+        final Set<String> set = WearUtil.explodeSet(getString(key, ""), "|");
+        set.add(value);
+        putString(key, WearUtil.joinSet(set, "|"));
+    }
+
+    public void removeFromSet(String key, String value) {
+        final Set<String> set = WearUtil.explodeSet(getString(key, ""), "|");
+        set.remove(value);
+        putString(key, WearUtil.joinSet(set, "|"));
+    }
+
+    public static void storeDataMap(String key, DataMap dataMap) {
+        Persistence p = new Persistence();
+        p.putDataMap(key, dataMap);
+        p.markDataUpdated();
+    }
+
+    public static Set<String> setOf(String key) {
+        Persistence p = new Persistence();
+        return p.getSetOf(key);
+    }
+
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/SmallestDoubleString.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/SmallestDoubleString.java
new file mode 100644
index 0000000000..8361478976
--- /dev/null
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/SmallestDoubleString.java
@@ -0,0 +1,135 @@
+package info.nightscout.androidaps.interaction.utils;
+
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Helper to minimise various floating point values, with or without unit, to fit into specified
+ * and limited size, scarifying precision (rounding up) and extra characters like leading zero,
+ * following zero(s) in fractional part, extra plus sign etc.
+ *
+ * Created by dlvoy on 2019-11-12
+ */
+public class SmallestDoubleString {
+
+    private String sign = "";
+    private String decimal = "";
+    private String separator = "";
+    private String fractional = "";
+    private String extra = "";
+    private String units = "";
+
+    private final Units withUnits;
+
+    public enum Units {
+        SKIP,
+        USE
+    }
+
+    private  static Pattern pattern = Pattern.compile("^([+-]?)([0-9]*)([,.]?)([0-9]*)(\\([^)]*\\))?(.*?)$", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE );
+
+    public SmallestDoubleString(String inputString) {
+        this(inputString, Units.SKIP);
+    }
+
+    public SmallestDoubleString(String inputString, Units withUnits) {
+        Matcher matcher = pattern.matcher(inputString);
+        matcher.matches();
+
+        sign = matcher.group(1);
+        decimal = matcher.group(2);
+        separator = matcher.group(3);
+        fractional = matcher.group(4);
+        units = matcher.group(6);
+
+        if (fractional == null || fractional.length() == 0) {
+            separator = "";
+            fractional = "";
+        }
+        if (decimal == null || decimal.length() == 0) {
+            decimal = "";
+        }
+        if (separator == null || separator.length() == 0) {
+            separator = "";
+        }
+        if (sign == null || sign.length() == 0) {
+            sign = "";
+        }
+
+        final String extraCandidate = matcher.group(5);
+        if (extraCandidate != null && extraCandidate.length() > 2) {
+            extra = extraCandidate.substring(1, extraCandidate.length()-1);
+        }
+
+        if (units != null) {
+            units = units.trim();
+        }
+
+        this.withUnits = withUnits;
+    }
+
+    public String minimise(int maxSize) {
+        final String originalSeparator = separator;
+
+        if (Integer.parseInt("0"+fractional) == 0) {
+            separator = "";
+            fractional = "";
+        }
+        if (Integer.parseInt("0"+decimal) == 0 && (fractional.length() >0)) {
+            decimal = "";
+        }
+        if (currentLen() <= maxSize)
+            return toString();
+
+        if (sign.equals("+")) {
+            sign = "";
+        }
+        if (currentLen() <= maxSize) {
+            return toString();
+        }
+
+        while ((fractional.length() > 1)&&(fractional.charAt(fractional.length()-1) == '0')) {
+            fractional = fractional.substring(0, fractional.length()-1);
+        }
+        if (currentLen() <= maxSize) {
+            return toString();
+        }
+
+        if (fractional.length() > 0) {
+            int remainingForFraction = maxSize-currentLen()+fractional.length();
+            String formatCandidate = "#";
+            if (remainingForFraction>=1) {
+                formatCandidate = "#."+("#######".substring(0, remainingForFraction));
+            }
+            DecimalFormat df = new DecimalFormat(formatCandidate);
+            df.setRoundingMode(RoundingMode.HALF_UP);
+
+            final String decimalSup = (decimal.length() > 0) ? decimal : "0";
+            String result = sign + df.format(Double.parseDouble(decimalSup+"."+fractional)).replace(",", originalSeparator).replace(".", originalSeparator) +
+                    ((withUnits == Units.USE) ? units : "");
+            return (decimal.length() > 0) ? result : result.substring(1);
+        }
+        return toString();
+    }
+
+    private int currentLen() {
+        return sign.length() + decimal.length() + separator.length() + fractional.length() +
+                ((withUnits == Units.USE) ? units.length() : 0);
+    }
+
+    @Override
+    public String toString() {
+        return sign+decimal+separator+fractional +
+                ((withUnits == Units.USE) ? units : "");
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public String getUnits() { return units; }
+
+
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java
index ca63749888..f8415bdd4a 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java
@@ -1,19 +1,134 @@
 package info.nightscout.androidaps.interaction.utils;
 
-import java.time.LocalDateTime;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.PowerManager;
+import android.os.SystemClock;
+import android.util.Log;
+
+import com.google.android.gms.wearable.DataMap;
+
 import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import info.nightscout.androidaps.aaps;
 
 /**
  * Created by andy on 3/5/19.
+ * Adapted by dlvoy on 2019-11-06 using code from jamorham JoH class
  */
 
 public class WearUtil {
 
+    private final static boolean debug_wakelocks = false;
+    private static final Map<String, Long> rateLimits = new HashMap<String, Long>();
+    private static final String TAG = WearUtil.class.getName();
+
+    //==============================================================================================
+    // Time related util methods
+    //==============================================================================================
 
     public static String dateTimeText(long timeInMs) {
         Date d = new Date(timeInMs);
         return "" + d.getDay() + "." + d.getMonth() + "." + d.getYear() + " " + d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds();
     }
 
+    public static long timestamp() {
+        return System.currentTimeMillis();
+    }
 
+    public static long msSince(long when) {
+        return (timestamp() - when);
+    }
+
+    public static long msTill(long when) {
+        return (when - timestamp());
+    }
+
+    //==============================================================================================
+    // Thread and power management utils
+    //==============================================================================================
+
+    // return true if below rate limit
+    public static synchronized boolean isBelowRateLimit(String named, int onceForSeconds) {
+        // check if over limit
+        if ((rateLimits.containsKey(named)) && (timestamp() - rateLimits.get(named) < (onceForSeconds * 1000))) {
+            Log.d(TAG, named + " rate limited to one for " + onceForSeconds + " seconds");
+            return false;
+        }
+        // not over limit
+        rateLimits.put(named, timestamp());
+        return true;
+    }
+
+    public static PowerManager.WakeLock getWakeLock(final String name, int millis) {
+        final PowerManager pm = (PowerManager) aaps.getAppContext().getSystemService(Context.POWER_SERVICE);
+        PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AAPS::"+name);
+        wl.acquire(millis);
+        if (debug_wakelocks) Log.d(TAG, "getWakeLock: " + name + " " + wl.toString());
+        return wl;
+    }
+
+    public static void releaseWakeLock(PowerManager.WakeLock wl) {
+        if (debug_wakelocks) Log.d(TAG, "releaseWakeLock: " + wl.toString());
+        if (wl == null) return;
+        if (wl.isHeld()) wl.release();
+    }
+
+    public static void startActivity(Class c) {
+        aaps.getAppContext().startActivity(getStartActivityIntent(c));
+    }
+
+    public static Intent getStartActivityIntent(Class c) {
+        return new Intent(aaps.getAppContext(), c).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    }
+
+    public static void threadSleep(long millis) {
+        try {
+            Thread.sleep(millis);
+        } catch (InterruptedException e) {
+            // we simply ignore if sleep was interrupted
+        }
+    }
+
+    public static String joinSet(Set<String> set, String separator) {
+        StringBuilder sb = new StringBuilder();
+        int i = 0;
+        for (String item : set) {
+            final String itemToAdd = item.trim();
+            if (itemToAdd.length() > 0) {
+                if (i > 0) {
+                    sb.append(separator);
+                }
+                i++;
+                sb.append(itemToAdd);
+            }
+        }
+        return sb.toString();
+    }
+
+    public static Set<String> explodeSet(String joined, String separator) {
+        // special RegEx literal \\Q starts sequence we escape, \\E ends is
+        // we use it to escape separator for use in RegEx
+        String[] items = joined.split("\\Q"+separator+"\\E");
+        Set<String> set = new HashSet<>();
+        for (String item : items) {
+            final String itemToAdd = item.trim();
+            if (itemToAdd.length() > 0) {
+                set.add(itemToAdd);
+            }
+        }
+        return set;
+    }
+
+    /**
+     * Taken out to helper method to allow testing
+     */
+    public static DataMap bundleToDataMap(Bundle bundle) {
+        return DataMap.fromBundle(bundle);
+    }
 }
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
index 24bb735067..78a6e401a2 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
@@ -10,7 +10,6 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
-import android.os.Bundle;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -33,20 +32,18 @@ import com.ustwo.clockwise.common.WatchFaceTime;
 import com.ustwo.clockwise.common.WatchShape;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 
-import info.nightscout.androidaps.data.BasalWatchData;
-import info.nightscout.androidaps.data.BgWatchData;
-import info.nightscout.androidaps.data.BolusWatchData;
+import info.nightscout.androidaps.complications.BaseComplicationProviderService;
+import info.nightscout.androidaps.data.RawDisplayData;
 import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.TempWatchData;
 import lecho.lib.hellocharts.view.LineChartView;
 
 /**
  * Created by emmablack on 12/29/14.
  * Updated by andrew-warrington on 02-Jan-2018.
+ * Refactored by dlvoy on 2019-11-2019
  */
 
 public  abstract class BaseWatchFace extends WatchFace implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -54,13 +51,10 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
     public static final long[] vibratePattern = {0,400,300,400,300,400};
     public TextView mTime, mSgv, mDirection, mTimestamp, mUploaderBattery, mRigBattery, mDelta, mAvgDelta, mStatus, mBasalRate, mIOB1, mIOB2, mCOB1, mCOB2, mBgi, mLoop, mDay, mMonth, isAAPSv2, mHighLight, mLowLight;
     public ImageView mGlucoseDial, mDeltaGauge, mHourHand, mMinuteHand;
-    public long datetime;
     public RelativeLayout mRelativeLayout;
     public LinearLayout mLinearLayout, mLinearLayout2, mDate, mChartTap, mMainMenuTap;
-    public long sgvLevel = 0;
     public int ageLevel = 1;
     public int loopLevel = 1;
-    public int batteryLevel = 1;
     public int highColor = Color.YELLOW;
     public int lowColor = Color.RED;
     public int midColor = Color.WHITE;
@@ -75,11 +69,9 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
     public int pointSize = 2;
     public BgGraphBuilder bgGraphBuilder;
     public LineChartView chart;
-    public ArrayList<BgWatchData> bgDataList = new ArrayList<>();
-    public ArrayList<TempWatchData> tempWatchDataList = new ArrayList<>();
-    public ArrayList<BasalWatchData> basalWatchDataList = new ArrayList<>();
-    public ArrayList<BolusWatchData> bolusWatchDataList = new ArrayList<>();
-    public ArrayList<BgWatchData> predictionList = new ArrayList<>();
+
+
+    public RawDisplayData rawData = new RawDisplayData();
 
     public PowerManager.WakeLock wakeLock;
     // related endTime manual layout
@@ -91,26 +83,9 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
 
     protected SharedPreferences sharedPrefs;
 
-    public boolean detailedIOB = false;
-    public boolean showBGI = false;
     public boolean forceSquareCanvas = false;  //set to true by the Steampunk watch face.
-    public long openApsStatus;
-    public String externalStatusString = "no status";
-    public String sSgv = "---";
-    public String sDirection = "--";
-    public String sUploaderBattery = "--";
-    public String sRigBattery = "--";
-    public String sDelta = "--";
-    public String sAvgDelta = "--";
-    public String sBasalRate = "-.--U/h";
-    public String sIOB1 = "IOB";
-    public String sIOB2 = "-.--";
-    public String sCOB1 = "Carb";
-    public String sCOB2 = "--g";
-    public String sBgi = "--";
     public String sMinute = "0";
     public String sHour = "0";
-    public String sUnits = "-";
 
     @Override
     public void onCreate() {
@@ -127,6 +102,8 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
         }
         sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
         sharedPrefs.registerOnSharedPreferenceChangeListener(this);
+
+        BaseComplicationProviderService.turnOff();
     }
 
     @Override
@@ -198,11 +175,11 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
     }
 
     public double timeSince() {
-        return System.currentTimeMillis() - datetime;
+        return System.currentTimeMillis() - rawData.datetime;
     }
 
     public String readingAge(boolean shortString) {
-        if (datetime == 0) { return shortString?"--'":"-- Minute ago"; }
+        if (rawData.datetime == 0) { return shortString?"--'":"-- Minute ago"; }
         int minutesAgo = (int) Math.floor(timeSince()/(1000*60));
         if (minutesAgo == 1) {
             return minutesAgo + (shortString?"'":" Minute ago");
@@ -267,50 +244,20 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
         @Override
         public void onReceive(Context context, Intent intent) {
 
-            Bundle bundle = intent.getBundleExtra("data");
-            if (layoutSet && bundle != null) {
-                DataMap dataMap = DataMap.fromBundle(bundle);
-                wakeLock.acquire(50);
-                sgvLevel = dataMap.getLong("sgvLevel");
-                datetime = dataMap.getLong("timestamp");
-                sSgv = dataMap.getString("sgvString");
-                sDirection = dataMap.getString("slopeArrow");
-                sDelta = dataMap.getString("delta");
-                sAvgDelta = dataMap.getString("avgDelta");
-                sUnits = dataMap.getString("glucoseUnits");
-                if (chart != null) {
-                    addToWatchSet(dataMap);
+            if (layoutSet) {
+                final DataMap dataMap = rawData.updateDataFromMessage(intent, wakeLock);
+                if (chart != null && dataMap != null) {
+                    rawData.addToWatchSet(dataMap);
                     setupCharts();
                 }
-            }
-
-            bundle = intent.getBundleExtra("status");
-            if (layoutSet && bundle != null) {
-                DataMap dataMap = DataMap.fromBundle(bundle);
-                wakeLock.acquire(50);
-                sBasalRate = dataMap.getString("currentBasal");
-                sUploaderBattery = dataMap.getString("battery");
-                sRigBattery = dataMap.getString("rigBattery");
-                detailedIOB = dataMap.getBoolean("detailedIob");
-                sIOB1 = dataMap.getString("iobSum") + "U";
-                sIOB2 = dataMap.getString("iobDetail");
-                sCOB1 = "Carb";
-                sCOB2 = dataMap.getString("cob");
-                sBgi = dataMap.getString("bgi");
-                showBGI = dataMap.getBoolean("showBgi");
-                externalStatusString = dataMap.getString("externalStatusString");
-                batteryLevel = dataMap.getInt("batteryLevel");
-                openApsStatus = dataMap.getLong("openApsStatus");
+                rawData.updateStatusFromMessage(intent, wakeLock);
             }
 
             setDataFields();
             setColor();
 
-            bundle = intent.getBundleExtra("basals");
-            if (layoutSet && bundle != null) {
-                DataMap dataMap = DataMap.fromBundle(bundle);
-                wakeLock.acquire(500);
-                loadBasalsAndTemps(dataMap);
+            if (layoutSet) {
+                rawData.updateBasalsFromMessage(intent, wakeLock);
             }
 
             mRelativeLayout.measure(specW, specH);
@@ -329,7 +276,7 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
 
         if (mSgv != null) {
             if (sharedPrefs.getBoolean("showBG", true)) {
-                mSgv.setText(sSgv);
+                mSgv.setText(rawData.sSgv);
                 mSgv.setVisibility(View.VISIBLE);
             } else {
                 //leave the textview there but invisible, as a height holder for the empty space above the white line
@@ -342,7 +289,7 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
 
         if (mDirection != null) {
             if (sharedPrefs.getBoolean("show_direction", true)) {
-                mDirection.setText(sDirection);
+                mDirection.setText(rawData.sDirection);
                 mDirection.setVisibility(View.VISIBLE);
             } else {
                 mDirection.setVisibility(View.GONE);
@@ -351,7 +298,7 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
 
         if (mDelta != null) {
             if (sharedPrefs.getBoolean("showDelta", true)) {
-                mDelta.setText(sDelta);
+                mDelta.setText(rawData.sDelta);
                 mDelta.setVisibility(View.VISIBLE);
             } else {
                 mDelta.setVisibility(View.GONE);
@@ -360,7 +307,7 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
 
         if (mAvgDelta != null) {
             if (sharedPrefs.getBoolean("showAvgDelta", true)) {
-                mAvgDelta.setText(sAvgDelta);
+                mAvgDelta.setText(rawData.sAvgDelta);
                 mAvgDelta.setVisibility(View.VISIBLE);
             } else {
                 mAvgDelta.setVisibility(View.GONE);
@@ -368,7 +315,7 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
         }
 
         if (mCOB1 != null && mCOB2 != null) {
-            mCOB2.setText(sCOB2);
+            mCOB2.setText(rawData.sCOB2);
             if (sharedPrefs.getBoolean("show_cob", true)) {
                 mCOB1.setVisibility(View.VISIBLE);
                 mCOB2.setVisibility(View.VISIBLE);
@@ -378,7 +325,7 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
             }
         //deal with cases where there is only the value shown for COB, and not the label
         } else if (mCOB2 != null) {
-            mCOB2.setText(sCOB2);
+            mCOB2.setText(rawData.sCOB2);
             if (sharedPrefs.getBoolean("show_cob", true)) {
                 mCOB2.setVisibility(View.VISIBLE);
             } else {
@@ -390,12 +337,12 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
             if (sharedPrefs.getBoolean("show_iob", true)) {
                 mIOB1.setVisibility(View.VISIBLE);
                 mIOB2.setVisibility(View.VISIBLE);
-                if (detailedIOB) {
-                    mIOB1.setText(sIOB1);
-                    mIOB2.setText(sIOB2);
+                if (rawData.detailedIOB) {
+                    mIOB1.setText(rawData.sIOB1);
+                    mIOB2.setText(rawData.sIOB2);
                 } else {
                     mIOB1.setText("IOB");
-                    mIOB2.setText(sIOB1);
+                    mIOB2.setText(rawData.sIOB1);
                 }
             } else {
                 mIOB1.setVisibility(View.GONE);
@@ -405,10 +352,10 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
         } else if (mIOB2 != null) {
             if (sharedPrefs.getBoolean("show_iob", true)) {
                 mIOB2.setVisibility(View.VISIBLE);
-                if (detailedIOB) {
-                    mIOB2.setText(sIOB2);
+                if (rawData.detailedIOB) {
+                    mIOB2.setText(rawData.sIOB2);
                 } else {
-                    mIOB2.setText(sIOB1);
+                    mIOB2.setText(rawData.sIOB1);
                 }
             } else {
                 mIOB2.setText("");
@@ -435,13 +382,13 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
         if (mUploaderBattery != null) {
             if (sharedPrefs.getBoolean("show_uploader_battery", true)) {
                 if (isAAPSv2 != null) {
-                        mUploaderBattery.setText(sUploaderBattery + "%");
+                        mUploaderBattery.setText(rawData.sUploaderBattery + "%");
                         mUploaderBattery.setVisibility(View.VISIBLE);
                 } else {
                     if (sharedPrefs.getBoolean("showExternalStatus", true)) {
-                        mUploaderBattery.setText("U: " + sUploaderBattery + "%");
+                        mUploaderBattery.setText("U: " + rawData.sUploaderBattery + "%");
                     } else {
-                        mUploaderBattery.setText("Uploader: " + sUploaderBattery + "%");
+                        mUploaderBattery.setText("Uploader: " + rawData.sUploaderBattery + "%");
                     }
                 }
             } else {
@@ -451,7 +398,7 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
 
         if (mRigBattery != null) {
             if (sharedPrefs.getBoolean("show_rig_battery", false)) {
-                mRigBattery.setText(sRigBattery);
+                mRigBattery.setText(rawData.sRigBattery);
                 mRigBattery.setVisibility(View.VISIBLE);
             } else {
                 mRigBattery.setVisibility(View.GONE);
@@ -460,7 +407,7 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
 
         if (mBasalRate != null) {
             if (sharedPrefs.getBoolean("show_temp_basal", true)) {
-                mBasalRate.setText(sBasalRate);
+                mBasalRate.setText(rawData.sBasalRate);
                 mBasalRate.setVisibility(View.VISIBLE);
             } else {
                 mBasalRate.setVisibility(View.GONE);
@@ -468,8 +415,8 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
         }
 
         if (mBgi != null) {
-            if (showBGI) {
-                mBgi.setText(sBgi);
+            if (rawData.showBGI) {
+                mBgi.setText(rawData.sBgi);
                 mBgi.setVisibility(View.VISIBLE);
             } else {
                 mBgi.setVisibility(View.GONE);
@@ -478,7 +425,7 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
         
         if (mStatus != null) {
             if (sharedPrefs.getBoolean("showExternalStatus", true)) {
-                mStatus.setText(externalStatusString);
+                mStatus.setText(rawData.externalStatusString);
                 mStatus.setVisibility(View.VISIBLE);
             } else {
                 mStatus.setVisibility(View.GONE);
@@ -488,8 +435,8 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
         if (mLoop != null) {
             if (sharedPrefs.getBoolean("showExternalStatus", true)) {
                 mLoop.setVisibility(View.VISIBLE);
-                if (openApsStatus != -1) {
-                    int mins = (int) ((System.currentTimeMillis() - openApsStatus) / 1000 / 60);
+                if (rawData.openApsStatus != -1) {
+                    int mins = (int) ((System.currentTimeMillis() - rawData.openApsStatus) / 1000 / 60);
                     mLoop.setText(mins + "'");
                     if (mins > 14) {
                         loopLevel = 0;
@@ -596,50 +543,13 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
         }
     }
 
-    public void addToWatchSet(DataMap dataMap) {
-
-        ArrayList<DataMap> entries = dataMap.getDataMapArrayList("entries");
-        if (entries != null) {
-            bgDataList = new ArrayList<BgWatchData>();
-            for (DataMap entry : entries) {
-                double sgv = entry.getDouble("sgvDouble");
-                double high = entry.getDouble("high");
-                double low = entry.getDouble("low");
-                long timestamp = entry.getLong("timestamp");
-                int color = entry.getInt("color", 0);
-                bgDataList.add(new BgWatchData(sgv, high, low, timestamp, color));
-            }
-        } else {
-            double sgv = dataMap.getDouble("sgvDouble");
-            double high = dataMap.getDouble("high");
-            double low = dataMap.getDouble("low");
-            long timestamp = dataMap.getLong("timestamp");
-            int color = dataMap.getInt("color", 0);
-
-            final int size = bgDataList.size();
-            if (size > 0) {
-                if (bgDataList.get(size - 1).timestamp == timestamp)
-                    return; // Ignore duplicates.
-            }
-
-            bgDataList.add(new BgWatchData(sgv, high, low, timestamp, color));
-        }
-
-        for (int i = 0; i < bgDataList.size(); i++) {
-            if (bgDataList.get(i).timestamp < (System.currentTimeMillis() - (1000 * 60 * 60 * 5))) {
-                bgDataList.remove(i); //Get rid of anything more than 5 hours old
-                break;
-            }
-        }
-    }
-
     public void setupCharts() {
-        if(bgDataList.size() > 0) { //Dont crash things just because we dont have values, people dont like crashy things
+        if(rawData.bgDataList.size() > 0) { //Dont crash things just because we dont have values, people dont like crashy things
             int timeframe = Integer.parseInt(sharedPrefs.getString("chart_timeframe", "3"));
             if (lowResMode) {
-                bgGraphBuilder = new BgGraphBuilder(getApplicationContext(), bgDataList, predictionList, tempWatchDataList, basalWatchDataList, bolusWatchDataList, pointSize, midColor, gridColor, basalBackgroundColor, basalCenterColor, bolusColor, Color.GREEN, timeframe);
+                bgGraphBuilder = new BgGraphBuilder(getApplicationContext(), rawData, pointSize, midColor, gridColor, basalBackgroundColor, basalCenterColor, bolusColor, Color.GREEN, timeframe);
             } else {
-                bgGraphBuilder = new BgGraphBuilder(getApplicationContext(), bgDataList,predictionList, tempWatchDataList, basalWatchDataList, bolusWatchDataList, pointSize, highColor, lowColor, midColor, gridColor, basalBackgroundColor, basalCenterColor, bolusColor, Color.GREEN, timeframe);
+                bgGraphBuilder = new BgGraphBuilder(getApplicationContext(), rawData, pointSize, highColor, lowColor, midColor, gridColor, basalBackgroundColor, basalCenterColor, bolusColor, Color.GREEN, timeframe);
             }
 
             chart.setLineChartData(bgGraphBuilder.lineData());
@@ -648,54 +558,4 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
         }
     }
 
-    private void loadBasalsAndTemps(DataMap dataMap) {
-        ArrayList<DataMap> temps = dataMap.getDataMapArrayList("temps");
-        if (temps != null) {
-            tempWatchDataList = new ArrayList<>();
-            for (DataMap temp : temps) {
-                TempWatchData twd = new TempWatchData();
-                twd.startTime = temp.getLong("starttime");
-                twd.startBasal =  temp.getDouble("startBasal");
-                twd.endTime = temp.getLong("endtime");
-                twd.endBasal = temp.getDouble("endbasal");
-                twd.amount = temp.getDouble("amount");
-                tempWatchDataList.add(twd);
-            }
-        }
-        ArrayList<DataMap> basals = dataMap.getDataMapArrayList("basals");
-        if (basals != null) {
-            basalWatchDataList = new ArrayList<>();
-            for (DataMap basal : basals) {
-                BasalWatchData bwd = new BasalWatchData();
-                bwd.startTime = basal.getLong("starttime");
-                bwd.endTime = basal.getLong("endtime");
-                bwd.amount = basal.getDouble("amount");
-                basalWatchDataList.add(bwd);
-            }
-        }
-        ArrayList<DataMap> boluses = dataMap.getDataMapArrayList("boluses");
-        if (boluses != null) {
-            bolusWatchDataList = new ArrayList<>();
-            for (DataMap bolus : boluses) {
-                BolusWatchData bwd = new BolusWatchData();
-                bwd.date = bolus.getLong("date");
-                bwd.bolus = bolus.getDouble("bolus");
-                bwd.carbs = bolus.getDouble("carbs");
-                bwd.isSMB = bolus.getBoolean("isSMB");
-                bwd.isValid = bolus.getBoolean("isValid");
-                bolusWatchDataList.add(bwd);
-            }
-        }
-        ArrayList<DataMap> predictions = dataMap.getDataMapArrayList("predictions");
-        if (boluses != null) {
-            predictionList = new ArrayList<>();
-            for (DataMap prediction : predictions) {
-                BgWatchData bwd = new BgWatchData();
-                bwd.timestamp = prediction.getLong("timestamp");
-                bwd.sgv = prediction.getDouble("sgv");
-                bwd.color = prediction.getInt("color");
-                predictionList.add(bwd);
-            }
-        }
-    }
 }
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java
index 4a401489d9..ee17d91e76 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.watchfaces;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.graphics.DashPathEffect;
 import android.preference.PreferenceManager;
 import android.text.format.DateFormat;
@@ -18,6 +17,7 @@ import java.util.TimeZone;
 import info.nightscout.androidaps.data.BasalWatchData;
 import info.nightscout.androidaps.data.BgWatchData;
 import info.nightscout.androidaps.data.BolusWatchData;
+import info.nightscout.androidaps.data.RawDisplayData;
 import info.nightscout.androidaps.data.TempWatchData;
 import lecho.lib.hellocharts.model.Axis;
 import lecho.lib.hellocharts.model.AxisValue;
@@ -115,6 +115,42 @@ public class BgGraphBuilder {
         this.end_time = (predictionEndTime>end_time)?predictionEndTime:end_time;
     }
 
+    public BgGraphBuilder(Context context, RawDisplayData raw, int aPointSize, int aHighColor, int aLowColor, int aMidColor, int gridColour, int basalBackgroundColor, int basalCenterColor, int bolusInvalidColor, int carbsColor, int timespan) {
+        this(context,
+                raw.bgDataList,
+                raw.predictionList,
+                raw.tempWatchDataList,
+                raw.basalWatchDataList,
+                raw.bolusWatchDataList,
+                aPointSize,
+                aHighColor,
+                aLowColor,
+                aMidColor,
+                gridColour,
+                basalBackgroundColor,
+                basalCenterColor,
+                bolusInvalidColor,
+                carbsColor,
+                timespan);
+    }
+
+    public BgGraphBuilder(Context context, RawDisplayData raw, int aPointSize, int aMidColor, int gridColour, int basalBackgroundColor, int basalCenterColor, int bolusInvalidColor, int carbsColor, int timespan) {
+        this(context,
+                raw.bgDataList,
+                raw.predictionList,
+                raw.tempWatchDataList,
+                raw.basalWatchDataList,
+                raw.bolusWatchDataList,
+                aPointSize,
+                aMidColor,
+                gridColour,
+                basalBackgroundColor,
+                basalCenterColor,
+                bolusInvalidColor,
+                carbsColor,
+                timespan);
+    }
+
     public LineChartData lineData() {
         LineChartData lineData = new LineChartData(defaultLines());
         lineData.setAxisYLeft(yAxis());
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Cockpit.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Cockpit.java
index b949e3832a..31d293929a 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Cockpit.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Cockpit.java
@@ -48,13 +48,13 @@ public class Cockpit extends BaseWatchFace {
         setTextSizes();
 
         if (mHighLight != null && mLowLight != null) {
-            if (sgvLevel == 1) {
+            if (rawData.sgvLevel == 1) {
                 mHighLight.setBackgroundResource(R.drawable.airplane_led_yellow_lit);
                 mLowLight.setBackgroundResource(R.drawable.airplane_led_grey_unlit);
-            } else if (sgvLevel == 0) {
+            } else if (rawData.sgvLevel == 0) {
                 mHighLight.setBackgroundResource(R.drawable.airplane_led_grey_unlit);
                 mLowLight.setBackgroundResource(R.drawable.airplane_led_grey_unlit);
-            } else if (sgvLevel == -1) {
+            } else if (rawData.sgvLevel == -1) {
                 mHighLight.setBackgroundResource(R.drawable.airplane_led_grey_unlit);
                 mLowLight.setBackgroundResource(R.drawable.airplane_led_red_lit);
             }
@@ -82,7 +82,7 @@ public class Cockpit extends BaseWatchFace {
     protected void setTextSizes() {
 
         if (mIOB2 != null) {
-            if (detailedIOB) {
+            if (rawData.detailedIOB) {
                 if (bIsRound) {
                     mIOB2.setTextSize(10);
                 } else {
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home.java
index 786dbd8179..f1929434f3 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home.java
@@ -69,15 +69,15 @@ public class Home extends BaseWatchFace {
                 R.color.dark_background : R.color.dark_statusView));
         mTime.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mTime));
         mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_background));
-        if (sgvLevel == 1) {
+        if (rawData.sgvLevel == 1) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
             mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
             mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
-        } else if (sgvLevel == 0) {
+        } else if (rawData.sgvLevel == 0) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
             mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
             mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
-        } else if (sgvLevel == -1) {
+        } else if (rawData.sgvLevel == -1) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
             mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
             mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
@@ -90,7 +90,7 @@ public class Home extends BaseWatchFace {
             mTimestamp.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_TimestampOld));
         }
 
-        if (batteryLevel == 1) {
+        if (rawData.batteryLevel == 1) {
             mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), dividerMatchesBg ?
                     R.color.dark_midColor : R.color.dark_uploaderBattery));
         } else {
@@ -138,15 +138,15 @@ public class Home extends BaseWatchFace {
             mLinearLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), dividerMatchesBg ?
                     R.color.light_background : R.color.light_stripe_background));
             mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_background));
-            if (sgvLevel == 1) {
+            if (rawData.sgvLevel == 1) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
                 mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
                 mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
-            } else if (sgvLevel == 0) {
+            } else if (rawData.sgvLevel == 0) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_midColor));
                 mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_midColor));
                 mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_midColor));
-            } else if (sgvLevel == -1) {
+            } else if (rawData.sgvLevel == -1) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_lowColor));
                 mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_lowColor));
                 mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_lowColor));
@@ -158,7 +158,7 @@ public class Home extends BaseWatchFace {
                 mTimestamp.setTextColor(Color.RED);
             }
 
-            if (batteryLevel == 1) {
+            if (rawData.batteryLevel == 1) {
                 mUploaderBattery.setTextColor(dividerMatchesBg ? Color.BLACK : Color.WHITE);
             } else {
                 mUploaderBattery.setTextColor(Color.RED);
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home2.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home2.java
index 64ec7e17c8..582bcd761f 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home2.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Home2.java
@@ -86,13 +86,13 @@ public class Home2 extends BaseWatchFace {
 
         setTextSizes();
 
-        if (sgvLevel == 1) {
+        if (rawData.sgvLevel == 1) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
             mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
-        } else if (sgvLevel == 0) {
+        } else if (rawData.sgvLevel == 0) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
             mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
-        } else if (sgvLevel == -1) {
+        } else if (rawData.sgvLevel == -1) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
             mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
         }
@@ -103,7 +103,7 @@ public class Home2 extends BaseWatchFace {
             mTimestamp.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_TimestampOld));
         }
 
-        if (batteryLevel == 1) {
+        if (rawData.batteryLevel == 1) {
             mUploaderBattery.setTextColor(dividerBatteryOkColor);
         } else {
             mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_uploaderBatteryEmpty));
@@ -195,13 +195,13 @@ public class Home2 extends BaseWatchFace {
 
             setTextSizes();
 
-            if (sgvLevel == 1) {
+            if (rawData.sgvLevel == 1) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
                 mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
-            } else if (sgvLevel == 0) {
+            } else if (rawData.sgvLevel == 0) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_midColor));
                 mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_midColor));
-            } else if (sgvLevel == -1) {
+            } else if (rawData.sgvLevel == -1) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_lowColor));
                 mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_lowColor));
             }
@@ -212,7 +212,7 @@ public class Home2 extends BaseWatchFace {
                 mTimestamp.setTextColor(Color.RED);
             }
 
-            if (batteryLevel == 1) {
+            if (rawData.batteryLevel == 1) {
                 mUploaderBattery.setTextColor(dividerTxtColor);
             } else {
                 mUploaderBattery.setTextColor(Color.RED);
@@ -248,7 +248,7 @@ public class Home2 extends BaseWatchFace {
 
         if (mIOB1 != null && mIOB2 != null) {
 
-            if (detailedIOB) {
+            if (rawData.detailedIOB) {
                 mIOB1.setTextSize(14);
                 mIOB2.setTextSize(10);
             } else {
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/LargeHome.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/LargeHome.java
index 672b95dee0..efce6baab7 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/LargeHome.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/LargeHome.java
@@ -53,15 +53,15 @@ public class LargeHome extends BaseWatchFace {
                 R.color.dark_background : R.color.dark_mLinearLayout));
         mTime.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_mTime));
         mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_background));
-        if (sgvLevel == 1) {
+        if (rawData.sgvLevel == 1) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
             mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
             mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
-        } else if (sgvLevel == 0) {
+        } else if (rawData.sgvLevel == 0) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
             mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
             mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
-        } else if (sgvLevel == -1) {
+        } else if (rawData.sgvLevel == -1) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
             mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
             mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
@@ -74,7 +74,7 @@ public class LargeHome extends BaseWatchFace {
             mTimestamp.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_TimestampOld));
         }
 
-        if (batteryLevel == 1) {
+        if (rawData.batteryLevel == 1) {
             mUploaderBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), dividerMatchesBg ?
                     R.color.dark_midColor : R.color.dark_uploaderBattery));
         } else {
@@ -90,15 +90,15 @@ public class LargeHome extends BaseWatchFace {
             mLinearLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), dividerMatchesBg ?
                     R.color.light_background : R.color.light_stripe_background));
             mRelativeLayout.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.light_background));
-            if (sgvLevel == 1) {
+            if (rawData.sgvLevel == 1) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
                 mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
                 mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
-            } else if (sgvLevel == 0) {
+            } else if (rawData.sgvLevel == 0) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_midColor));
                 mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_midColor));
                 mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_midColor));
-            } else if (sgvLevel == -1) {
+            } else if (rawData.sgvLevel == -1) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_lowColor));
                 mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_lowColor));
                 mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_lowColor));
@@ -110,7 +110,7 @@ public class LargeHome extends BaseWatchFace {
                 mTimestamp.setTextColor(Color.RED);
             }
 
-            if (batteryLevel == 1) {
+            if (rawData.batteryLevel == 1) {
                 mUploaderBattery.setTextColor(dividerMatchesBg ? Color.BLACK : Color.WHITE);
             } else {
                 mUploaderBattery.setTextColor(Color.RED);
@@ -120,15 +120,15 @@ public class LargeHome extends BaseWatchFace {
         } else {
             mRelativeLayout.setBackgroundColor(Color.BLACK);
             mLinearLayout.setBackgroundColor(dividerMatchesBg ? Color.BLACK : Color.LTGRAY);
-            if (sgvLevel == 1) {
+            if (rawData.sgvLevel == 1) {
                 mSgv.setTextColor(Color.YELLOW);
                 mDirection.setTextColor(Color.YELLOW);
                 mDelta.setTextColor(Color.YELLOW);
-            } else if (sgvLevel == 0) {
+            } else if (rawData.sgvLevel == 0) {
                 mSgv.setTextColor(Color.WHITE);
                 mDirection.setTextColor(Color.WHITE);
                 mDelta.setTextColor(Color.WHITE);
-            } else if (sgvLevel == -1) {
+            } else if (rawData.sgvLevel == -1) {
                 mSgv.setTextColor(Color.RED);
                 mDirection.setTextColor(Color.RED);
                 mDelta.setTextColor(Color.RED);
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java
index c42aff1518..a600290a04 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java
@@ -83,24 +83,24 @@ public class Steampunk extends BaseWatchFace {
             }
         }
 
-        if (!sSgv.equals("---")) {
+        if (!rawData.sSgv.equals("---")) {
 
             float rotationAngle = 0f;                                           //by default, show ? on the dial (? is at 0 degrees on the dial)
 
-            if (!sUnits.equals("-")) {
+            if (!rawData.sUnits.equals("-")) {
 
                 //ensure the glucose dial is the correct units
-                if (sUnits.equals("mmol")) {
+                if (rawData.sUnits.equals("mmol")) {
                     mGlucoseDial.setImageResource(R.drawable.steampunk_dial_mmol);
                 } else {
                     mGlucoseDial.setImageResource(R.drawable.steampunk_dial_mgdl);
                 }
 
                 //convert the Sgv to degrees of rotation
-                if (sUnits.equals("mmol")) {
-                    rotationAngle = Float.valueOf(sSgv) * 18f;  //convert to mg/dL, which is equivalent to degrees
+                if (rawData.sUnits.equals("mmol")) {
+                    rotationAngle = Float.valueOf(rawData.sSgv) * 18f;  //convert to mg/dL, which is equivalent to degrees
                 } else {
-                    rotationAngle = Float.valueOf(sSgv);       //if glucose a value is received, use it to determine the amount of rotation of the dial.
+                    rotationAngle = Float.valueOf(rawData.sSgv);       //if glucose a value is received, use it to determine the amount of rotation of the dial.
                 }
 
             }
@@ -122,36 +122,36 @@ public class Steampunk extends BaseWatchFace {
 
         //set the delta gauge and rotate the delta pointer
         float deltaIsNegative = 1f;         //by default go clockwise
-        if (!sAvgDelta.equals("--")) {      //if a legitimate delta value is received, then...
-            if (sAvgDelta.substring(0,1).equals("-")) deltaIsNegative = -1f;  //if the delta is negative, go counter-clockwise
+        if (!rawData.sAvgDelta.equals("--")) {      //if a legitimate delta value is received, then...
+            if (rawData.sAvgDelta.substring(0,1).equals("-")) deltaIsNegative = -1f;  //if the delta is negative, go counter-clockwise
 
             //ensure the delta gauge is the right units and granularity
-            if (!sUnits.equals("-")) {
-                if (sUnits.equals("mmol")) {
+            if (!rawData.sUnits.equals("-")) {
+                if (rawData.sUnits.equals("mmol")) {
                     if (sharedPrefs.getString("delta_granularity", "2").equals("1")) {  //low
                         mLinearLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_10);
-                        deltaRotationAngle = (Float.valueOf(sAvgDelta.substring(1)) * 30f);   //get rid of the sign so it can be converted to float.
+                        deltaRotationAngle = (Float.valueOf(rawData.sAvgDelta.substring(1)) * 30f);   //get rid of the sign so it can be converted to float.
                     }
                     if (sharedPrefs.getString("delta_granularity", "2").equals("2")) {  //medium
                         mLinearLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_05);
-                        deltaRotationAngle = (Float.valueOf(sAvgDelta.substring(1)) * 60f);   //get rid of the sign so it can be converted to float.
+                        deltaRotationAngle = (Float.valueOf(rawData.sAvgDelta.substring(1)) * 60f);   //get rid of the sign so it can be converted to float.
                     }
                     if (sharedPrefs.getString("delta_granularity", "2").equals("3")) {  //high
                         mLinearLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_03);
-                        deltaRotationAngle = (Float.valueOf(sAvgDelta.substring(1)) * 100f);   //get rid of the sign so it can be converted to float.
+                        deltaRotationAngle = (Float.valueOf(rawData.sAvgDelta.substring(1)) * 100f);   //get rid of the sign so it can be converted to float.
                     }
                 } else {
                     if (sharedPrefs.getString("delta_granularity", "2").equals("1")) {  //low
                         mLinearLayout.setBackgroundResource(R.drawable.steampunk_gauge_mgdl_20);
-                        deltaRotationAngle = (Float.valueOf(sAvgDelta.substring(1)) * 1.5f);   //get rid of the sign so it can be converted to float.
+                        deltaRotationAngle = (Float.valueOf(rawData.sAvgDelta.substring(1)) * 1.5f);   //get rid of the sign so it can be converted to float.
                     }
                     if (sharedPrefs.getString("delta_granularity", "2").equals("2")) {  //medium
                         mLinearLayout.setBackgroundResource(R.drawable.steampunk_gauge_mgdl_10);
-                        deltaRotationAngle = (Float.valueOf(sAvgDelta.substring(1)) * 3f);   //get rid of the sign so it can be converted to float.
+                        deltaRotationAngle = (Float.valueOf(rawData.sAvgDelta.substring(1)) * 3f);   //get rid of the sign so it can be converted to float.
                     }
                     if (sharedPrefs.getString("delta_granularity", "2").equals("3")) {  //high
                         mLinearLayout.setBackgroundResource(R.drawable.steampunk_gauge_mgdl_5);
-                        deltaRotationAngle = (Float.valueOf(sAvgDelta.substring(1)) * 6f);   //get rid of the sign so it can be converted to float.
+                        deltaRotationAngle = (Float.valueOf(rawData.sAvgDelta.substring(1)) * 6f);   //get rid of the sign so it can be converted to float.
                     }
                 }
             }
@@ -213,7 +213,7 @@ public class Steampunk extends BaseWatchFace {
         //top row. large font unless text too big (i.e. detailedIOB)
         mCOB2.setTextSize(fontLarge);
         mBasalRate.setTextSize(fontLarge);
-        if (sIOB2.length() < 7) {
+        if (rawData.sIOB2.length() < 7) {
             mIOB2.setTextSize(fontLarge);
         } else {
             mIOB2.setTextSize(fontSmall);
diff --git a/wear/src/main/res/drawable/ic_aaps_dark.xml b/wear/src/main/res/drawable/ic_aaps_dark.xml
new file mode 100644
index 0000000000..4126fec9d9
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_aaps_dark.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="38.4175"
+    android:viewportHeight="38.4175"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M19.2086,0C16.6157,0 14.1552,0.5028 11.9062,1.4289C7.1702,3.3868 3.3868,7.1702 1.4288,11.9062C0.5028,14.1552 -0,16.6157 -0,19.2086C-0,21.8016 0.5028,24.2621 1.4288,26.511C3.3868,31.2471 7.1702,35.031 11.9062,36.989C14.1552,37.915 16.6157,38.4173 19.2086,38.4173C21.8015,38.4173 24.2621,37.915 26.511,36.989C31.2471,35.031 35.031,31.2471 36.9889,26.511C37.915,24.2621 38.4173,21.8016 38.4173,19.2086C38.4173,16.6157 37.915,14.1552 36.9889,11.9062C35.031,7.1702 31.2471,3.3868 26.511,1.4289C24.2621,0.5028 21.8015,0 19.2086,0zM19.1823,2.99C28.1252,2.99 35.3746,10.2658 35.3746,19.1823C35.3746,22.2515 34.5282,25.1087 33.0466,27.5694L33.0466,19.235C33.0731,16.6421 32.4643,14.2612 31.2472,12.1181C30.0301,9.975 28.3632,8.3077 26.2201,7.0642C25.2941,6.535 24.3151,6.1119 23.3097,5.8208C22.1984,5.4769 21.0607,6.3765 21.0607,7.5406C21.0607,8.3344 21.5901,8.9959 22.3309,9.2341C23.0189,9.4457 23.6539,9.7365 24.2889,10.1069C25.8235,11.0329 27.0404,12.2768 27.9135,13.8643C28.7867,15.4518 29.2365,17.2243 29.2365,19.2086C29.2365,21.193 28.7867,22.966 27.9135,24.5535C27.0139,26.141 25.8235,27.3845 24.2889,28.2841C23.8656,28.5222 23.4422,28.734 22.9924,28.9192L22.9924,28.0722L22.9924,26.1674L22.9924,24.5799L22.9924,21.8018C22.9924,21.2461 22.8073,20.7697 22.4369,20.3993C22.0665,20.0289 21.6164,19.8437 21.0344,19.8437C20.5052,19.8437 20.0556,20.0289 19.6587,20.3993C19.2883,20.7697 19.0763,21.2197 19.0763,21.8018L19.0763,24.5799L19.0763,26.1674L19.0763,28.1781L19.0763,29.7393L19.0763,31.009C19.0763,31.5381 19.2619,31.9882 19.6587,32.3851C20.0292,32.7555 20.5052,32.967 21.0344,32.967C21.3254,32.967 21.6163,32.9142 21.8545,32.8083C22.8334,32.5702 23.7858,32.2526 24.659,31.7764C26.4581,30.8503 27.9399,29.6071 29.1305,27.9931L29.1305,31.009C29.1305,31.3265 29.1833,31.5915 29.2892,31.8296C26.511,34.0521 22.9923,35.3746 19.1823,35.3746C10.2394,35.3746 2.99,28.0987 2.99,19.1823C2.99,10.2658 10.2658,2.99 19.1823,2.99zM17.1716,5.3712C16.9334,5.3712 16.7218,5.4238 16.5101,5.4767C14.9226,5.7413 13.4145,6.2704 12.0122,7.0642C9.8955,8.2813 8.2286,9.975 6.9851,12.1181C5.768,14.2612 5.1594,16.6421 5.1594,19.235C5.1594,21.8279 5.7412,24.2094 6.9319,26.326C8.1225,28.4427 9.7366,30.1096 11.8003,31.3531C12.7528,31.9352 13.7582,32.3586 14.843,32.6497C16.0072,32.9672 17.1716,32.1206 17.1716,30.9035C17.1716,30.0833 16.6159,29.4215 15.8486,29.1569C15.1872,28.9452 14.5255,28.6545 13.917,28.2841C12.3559,27.3845 11.1392,26.141 10.266,24.5535C9.3665,22.966 8.9431,21.193 8.9431,19.2086C8.9431,17.2243 9.3929,15.4518 10.266,13.8643C11.1392,12.2768 12.3824,11.0329 13.917,10.1069C14.3403,9.8688 14.7901,9.6575 15.2399,9.4723L15.2399,10.0542L15.2399,11.6417L15.2399,13.6524L15.2399,15.2135L15.2399,16.4837C15.2399,17.0129 15.4254,17.4625 15.8223,17.8594C16.1927,18.2298 16.6688,18.4412 17.1979,18.4412C17.7535,18.4412 18.23,18.2562 18.6004,17.8594C18.9708,17.489 19.1559,17.0129 19.1559,16.4837L19.1559,15.2135L19.1559,13.5465L19.1559,11.6417L19.1559,10.0542L19.1559,7.276C19.1559,6.7204 18.9708,6.244 18.6004,5.8735C18.2035,5.556 17.7536,5.3712 17.1716,5.3712z"
+        android:strokeWidth="0.99999994" />
+</vector>
diff --git a/wear/src/main/res/drawable/ic_aaps_full.xml b/wear/src/main/res/drawable/ic_aaps_full.xml
new file mode 100644
index 0000000000..cf9716870c
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_aaps_full.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="38.4175"
+    android:viewportHeight="38.4175"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.2086,0C16.6157,0 14.1552,0.5028 11.9062,1.4289C7.1702,3.3868 3.3868,7.1702 1.4288,11.9062C0.5028,14.1552 -0,16.6157 -0,19.2086C-0,21.8016 0.5028,24.2621 1.4288,26.511C3.3868,31.2471 7.1702,35.031 11.9062,36.989C14.1552,37.915 16.6157,38.4173 19.2086,38.4173C21.8015,38.4173 24.2621,37.915 26.511,36.989C31.2471,35.031 35.031,31.2471 36.9889,26.511C37.915,24.2621 38.4173,21.8016 38.4173,19.2086C38.4173,16.6157 37.915,14.1552 36.9889,11.9062C35.031,7.1702 31.2471,3.3868 26.511,1.4289C24.2621,0.5028 21.8015,0 19.2086,0zM19.1823,2.99C28.1252,2.99 35.3746,10.2658 35.3746,19.1823C35.3746,22.2515 34.5282,25.1087 33.0466,27.5694L33.0466,19.235C33.0731,16.6421 32.4643,14.2612 31.2472,12.1181C30.0301,9.975 28.3632,8.3077 26.2201,7.0642C25.2941,6.535 24.3151,6.1119 23.3097,5.8208C22.1984,5.4769 21.0607,6.3765 21.0607,7.5406C21.0607,8.3344 21.5901,8.9959 22.3309,9.2341C23.0189,9.4457 23.6539,9.7365 24.2889,10.1069C25.8235,11.0329 27.0404,12.2768 27.9135,13.8643C28.7867,15.4518 29.2365,17.2243 29.2365,19.2086C29.2365,21.193 28.7867,22.966 27.9135,24.5535C27.0139,26.141 25.8235,27.3845 24.2889,28.2841C23.8656,28.5222 23.4422,28.734 22.9924,28.9192L22.9924,28.0722L22.9924,26.1674L22.9924,24.5799L22.9924,21.8018C22.9924,21.2461 22.8073,20.7697 22.4369,20.3993C22.0665,20.0289 21.6164,19.8437 21.0344,19.8437C20.5052,19.8437 20.0556,20.0289 19.6587,20.3993C19.2883,20.7697 19.0763,21.2197 19.0763,21.8018L19.0763,24.5799L19.0763,26.1674L19.0763,28.1781L19.0763,29.7393L19.0763,31.009C19.0763,31.5381 19.2619,31.9882 19.6587,32.3851C20.0292,32.7555 20.5052,32.967 21.0344,32.967C21.3254,32.967 21.6163,32.9142 21.8545,32.8083C22.8334,32.5702 23.7858,32.2526 24.659,31.7764C26.4581,30.8503 27.9399,29.6071 29.1305,27.9931L29.1305,31.009C29.1305,31.3265 29.1833,31.5915 29.2892,31.8296C26.511,34.0521 22.9923,35.3746 19.1823,35.3746C10.2394,35.3746 2.99,28.0987 2.99,19.1823C2.99,10.2658 10.2658,2.99 19.1823,2.99zM17.1716,5.3712C16.9334,5.3712 16.7218,5.4238 16.5101,5.4767C14.9226,5.7413 13.4145,6.2704 12.0122,7.0642C9.8955,8.2813 8.2286,9.975 6.9851,12.1181C5.768,14.2612 5.1594,16.6421 5.1594,19.235C5.1594,21.8279 5.7412,24.2094 6.9319,26.326C8.1225,28.4427 9.7366,30.1096 11.8003,31.3531C12.7528,31.9352 13.7582,32.3586 14.843,32.6497C16.0072,32.9672 17.1716,32.1206 17.1716,30.9035C17.1716,30.0833 16.6159,29.4215 15.8486,29.1569C15.1872,28.9452 14.5255,28.6545 13.917,28.2841C12.3559,27.3845 11.1392,26.141 10.266,24.5535C9.3665,22.966 8.9431,21.193 8.9431,19.2086C8.9431,17.2243 9.3929,15.4518 10.266,13.8643C11.1392,12.2768 12.3824,11.0329 13.917,10.1069C14.3403,9.8688 14.7901,9.6575 15.2399,9.4723L15.2399,10.0542L15.2399,11.6417L15.2399,13.6524L15.2399,15.2135L15.2399,16.4837C15.2399,17.0129 15.4254,17.4625 15.8223,17.8594C16.1927,18.2298 16.6688,18.4412 17.1979,18.4412C17.7535,18.4412 18.23,18.2562 18.6004,17.8594C18.9708,17.489 19.1559,17.0129 19.1559,16.4837L19.1559,15.2135L19.1559,13.5465L19.1559,11.6417L19.1559,10.0542L19.1559,7.276C19.1559,6.7204 18.9708,6.244 18.6004,5.8735C18.2035,5.556 17.7536,5.3712 17.1716,5.3712z"
+        android:strokeWidth="0.99999994" />
+</vector>
diff --git a/wear/src/main/res/drawable/ic_aaps_gray.xml b/wear/src/main/res/drawable/ic_aaps_gray.xml
new file mode 100644
index 0000000000..1797ca3c9a
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_aaps_gray.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="38.4175"
+    android:viewportHeight="38.4175"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/darker_gray"
+        android:pathData="M19.2086,0C16.6157,0 14.1552,0.5028 11.9062,1.4289C7.1702,3.3868 3.3868,7.1702 1.4288,11.9062C0.5028,14.1552 -0,16.6157 -0,19.2086C-0,21.8016 0.5028,24.2621 1.4288,26.511C3.3868,31.2471 7.1702,35.031 11.9062,36.989C14.1552,37.915 16.6157,38.4173 19.2086,38.4173C21.8015,38.4173 24.2621,37.915 26.511,36.989C31.2471,35.031 35.031,31.2471 36.9889,26.511C37.915,24.2621 38.4173,21.8016 38.4173,19.2086C38.4173,16.6157 37.915,14.1552 36.9889,11.9062C35.031,7.1702 31.2471,3.3868 26.511,1.4289C24.2621,0.5028 21.8015,0 19.2086,0zM19.1823,2.99C28.1252,2.99 35.3746,10.2658 35.3746,19.1823C35.3746,22.2515 34.5282,25.1087 33.0466,27.5694L33.0466,19.235C33.0731,16.6421 32.4643,14.2612 31.2472,12.1181C30.0301,9.975 28.3632,8.3077 26.2201,7.0642C25.2941,6.535 24.3151,6.1119 23.3097,5.8208C22.1984,5.4769 21.0607,6.3765 21.0607,7.5406C21.0607,8.3344 21.5901,8.9959 22.3309,9.2341C23.0189,9.4457 23.6539,9.7365 24.2889,10.1069C25.8235,11.0329 27.0404,12.2768 27.9135,13.8643C28.7867,15.4518 29.2365,17.2243 29.2365,19.2086C29.2365,21.193 28.7867,22.966 27.9135,24.5535C27.0139,26.141 25.8235,27.3845 24.2889,28.2841C23.8656,28.5222 23.4422,28.734 22.9924,28.9192L22.9924,28.0722L22.9924,26.1674L22.9924,24.5799L22.9924,21.8018C22.9924,21.2461 22.8073,20.7697 22.4369,20.3993C22.0665,20.0289 21.6164,19.8437 21.0344,19.8437C20.5052,19.8437 20.0556,20.0289 19.6587,20.3993C19.2883,20.7697 19.0763,21.2197 19.0763,21.8018L19.0763,24.5799L19.0763,26.1674L19.0763,28.1781L19.0763,29.7393L19.0763,31.009C19.0763,31.5381 19.2619,31.9882 19.6587,32.3851C20.0292,32.7555 20.5052,32.967 21.0344,32.967C21.3254,32.967 21.6163,32.9142 21.8545,32.8083C22.8334,32.5702 23.7858,32.2526 24.659,31.7764C26.4581,30.8503 27.9399,29.6071 29.1305,27.9931L29.1305,31.009C29.1305,31.3265 29.1833,31.5915 29.2892,31.8296C26.511,34.0521 22.9923,35.3746 19.1823,35.3746C10.2394,35.3746 2.99,28.0987 2.99,19.1823C2.99,10.2658 10.2658,2.99 19.1823,2.99zM17.1716,5.3712C16.9334,5.3712 16.7218,5.4238 16.5101,5.4767C14.9226,5.7413 13.4145,6.2704 12.0122,7.0642C9.8955,8.2813 8.2286,9.975 6.9851,12.1181C5.768,14.2612 5.1594,16.6421 5.1594,19.235C5.1594,21.8279 5.7412,24.2094 6.9319,26.326C8.1225,28.4427 9.7366,30.1096 11.8003,31.3531C12.7528,31.9352 13.7582,32.3586 14.843,32.6497C16.0072,32.9672 17.1716,32.1206 17.1716,30.9035C17.1716,30.0833 16.6159,29.4215 15.8486,29.1569C15.1872,28.9452 14.5255,28.6545 13.917,28.2841C12.3559,27.3845 11.1392,26.141 10.266,24.5535C9.3665,22.966 8.9431,21.193 8.9431,19.2086C8.9431,17.2243 9.3929,15.4518 10.266,13.8643C11.1392,12.2768 12.3824,11.0329 13.917,10.1069C14.3403,9.8688 14.7901,9.6575 15.2399,9.4723L15.2399,10.0542L15.2399,11.6417L15.2399,13.6524L15.2399,15.2135L15.2399,16.4837C15.2399,17.0129 15.4254,17.4625 15.8223,17.8594C16.1927,18.2298 16.6688,18.4412 17.1979,18.4412C17.7535,18.4412 18.23,18.2562 18.6004,17.8594C18.9708,17.489 19.1559,17.0129 19.1559,16.4837L19.1559,15.2135L19.1559,13.5465L19.1559,11.6417L19.1559,10.0542L19.1559,7.276C19.1559,6.7204 18.9708,6.244 18.6004,5.8735C18.2035,5.556 17.7536,5.3712 17.1716,5.3712z"
+        android:strokeWidth="0.99999994" />
+</vector>
diff --git a/wear/src/main/res/drawable/ic_aaps_light.xml b/wear/src/main/res/drawable/ic_aaps_light.xml
new file mode 100644
index 0000000000..cf9716870c
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_aaps_light.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="38.4175"
+    android:viewportHeight="38.4175"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.2086,0C16.6157,0 14.1552,0.5028 11.9062,1.4289C7.1702,3.3868 3.3868,7.1702 1.4288,11.9062C0.5028,14.1552 -0,16.6157 -0,19.2086C-0,21.8016 0.5028,24.2621 1.4288,26.511C3.3868,31.2471 7.1702,35.031 11.9062,36.989C14.1552,37.915 16.6157,38.4173 19.2086,38.4173C21.8015,38.4173 24.2621,37.915 26.511,36.989C31.2471,35.031 35.031,31.2471 36.9889,26.511C37.915,24.2621 38.4173,21.8016 38.4173,19.2086C38.4173,16.6157 37.915,14.1552 36.9889,11.9062C35.031,7.1702 31.2471,3.3868 26.511,1.4289C24.2621,0.5028 21.8015,0 19.2086,0zM19.1823,2.99C28.1252,2.99 35.3746,10.2658 35.3746,19.1823C35.3746,22.2515 34.5282,25.1087 33.0466,27.5694L33.0466,19.235C33.0731,16.6421 32.4643,14.2612 31.2472,12.1181C30.0301,9.975 28.3632,8.3077 26.2201,7.0642C25.2941,6.535 24.3151,6.1119 23.3097,5.8208C22.1984,5.4769 21.0607,6.3765 21.0607,7.5406C21.0607,8.3344 21.5901,8.9959 22.3309,9.2341C23.0189,9.4457 23.6539,9.7365 24.2889,10.1069C25.8235,11.0329 27.0404,12.2768 27.9135,13.8643C28.7867,15.4518 29.2365,17.2243 29.2365,19.2086C29.2365,21.193 28.7867,22.966 27.9135,24.5535C27.0139,26.141 25.8235,27.3845 24.2889,28.2841C23.8656,28.5222 23.4422,28.734 22.9924,28.9192L22.9924,28.0722L22.9924,26.1674L22.9924,24.5799L22.9924,21.8018C22.9924,21.2461 22.8073,20.7697 22.4369,20.3993C22.0665,20.0289 21.6164,19.8437 21.0344,19.8437C20.5052,19.8437 20.0556,20.0289 19.6587,20.3993C19.2883,20.7697 19.0763,21.2197 19.0763,21.8018L19.0763,24.5799L19.0763,26.1674L19.0763,28.1781L19.0763,29.7393L19.0763,31.009C19.0763,31.5381 19.2619,31.9882 19.6587,32.3851C20.0292,32.7555 20.5052,32.967 21.0344,32.967C21.3254,32.967 21.6163,32.9142 21.8545,32.8083C22.8334,32.5702 23.7858,32.2526 24.659,31.7764C26.4581,30.8503 27.9399,29.6071 29.1305,27.9931L29.1305,31.009C29.1305,31.3265 29.1833,31.5915 29.2892,31.8296C26.511,34.0521 22.9923,35.3746 19.1823,35.3746C10.2394,35.3746 2.99,28.0987 2.99,19.1823C2.99,10.2658 10.2658,2.99 19.1823,2.99zM17.1716,5.3712C16.9334,5.3712 16.7218,5.4238 16.5101,5.4767C14.9226,5.7413 13.4145,6.2704 12.0122,7.0642C9.8955,8.2813 8.2286,9.975 6.9851,12.1181C5.768,14.2612 5.1594,16.6421 5.1594,19.235C5.1594,21.8279 5.7412,24.2094 6.9319,26.326C8.1225,28.4427 9.7366,30.1096 11.8003,31.3531C12.7528,31.9352 13.7582,32.3586 14.843,32.6497C16.0072,32.9672 17.1716,32.1206 17.1716,30.9035C17.1716,30.0833 16.6159,29.4215 15.8486,29.1569C15.1872,28.9452 14.5255,28.6545 13.917,28.2841C12.3559,27.3845 11.1392,26.141 10.266,24.5535C9.3665,22.966 8.9431,21.193 8.9431,19.2086C8.9431,17.2243 9.3929,15.4518 10.266,13.8643C11.1392,12.2768 12.3824,11.0329 13.917,10.1069C14.3403,9.8688 14.7901,9.6575 15.2399,9.4723L15.2399,10.0542L15.2399,11.6417L15.2399,13.6524L15.2399,15.2135L15.2399,16.4837C15.2399,17.0129 15.4254,17.4625 15.8223,17.8594C16.1927,18.2298 16.6688,18.4412 17.1979,18.4412C17.7535,18.4412 18.23,18.2562 18.6004,17.8594C18.9708,17.489 19.1559,17.0129 19.1559,16.4837L19.1559,15.2135L19.1559,13.5465L19.1559,11.6417L19.1559,10.0542L19.1559,7.276C19.1559,6.7204 18.9708,6.244 18.6004,5.8735C18.2035,5.556 17.7536,5.3712 17.1716,5.3712z"
+        android:strokeWidth="0.99999994" />
+</vector>
diff --git a/wear/src/main/res/drawable/ic_alert.xml b/wear/src/main/res/drawable/ic_alert.xml
new file mode 100644
index 0000000000..d95c322d47
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_alert.xml
@@ -0,0 +1,9 @@
+<!-- drawable/alert.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_alert_burnin.xml b/wear/src/main/res/drawable/ic_alert_burnin.xml
new file mode 100644
index 0000000000..6f7bd23ef0
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_alert_burnin.xml
@@ -0,0 +1,9 @@
+<!-- drawable/alert_outline.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_alert_variant_outline.xml b/wear/src/main/res/drawable/ic_battery_alert_variant_outline.xml
new file mode 100644
index 0000000000..516ae49c17
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_alert_variant_outline.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_alert_variant_outline.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M14 20H6V6H14M14.67 4H13V2H7V4H5.33C4.6 4 4 4.6 4 5.33V20.67C4 21.4 4.6 22 5.33 22H14.67C15.4 22 16 21.4 16 20.67V5.33C16 4.6 15.4 4 14.67 4M21 8H19V13H21V8M21 15H19V17H21V15Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless.xml
new file mode 100644
index 0000000000..bd6bee5fb1
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_charging_wireless.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_10.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_10.xml
new file mode 100644
index 0000000000..932c4e5930
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_10.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_charging_wireless_10.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,18.5H4V6H12V18.5Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_10_burnin.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_10_burnin.xml
new file mode 100644
index 0000000000..a47508a1a9
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_10_burnin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="m5,2v2h-2c-0.5523,0 -1,0.4477 -1,1v16c0,0.5523 0.4477,1 1,1h10c0.5523,0 1,-0.4477 1,-1v-16c0,-0.5523 -0.4477,-1 -1,-1h-2v-2zM20.07,4.9297 L18.6598,6.3399c3.13,3.12 3.13,8.1903 0,11.32l1.4102,1.4102c3.9,-3.9 3.9,-10.231 0,-14.141zM4,6h8v14h-2v-1.5h-2v1.5h-2v-1.5h-2zM17.24,7.7598 L15.8298,9.17c1.56,1.56 1.56,4.0902 0,5.6602l1.4102,1.4102c2.34,-2.34 2.34,-6.1405 0,-8.4805z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_20.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_20.xml
new file mode 100644
index 0000000000..00af480fcd
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_20.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_charging_wireless_20.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,17H4V6H12V17Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_20_burnin.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_20_burnin.xml
new file mode 100644
index 0000000000..e08ff88448
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_20_burnin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="m5,2v2h-2c-0.5523,0 -1,0.4477 -1,1v16c0,0.5523 0.4477,1 1,1h10c0.5523,0 1,-0.4477 1,-1v-16c0,-0.5523 -0.4477,-1 -1,-1h-2v-2zM20.07,4.9297 L18.6598,6.3399c3.13,3.12 3.13,8.1903 0,11.32l1.4102,1.4102c3.9,-3.9 3.9,-10.231 0,-14.141zM4,6h8v11h-2v1h2v2h-2v-2h-2v2h-2v-2h-2zM6,18h2v-1h-2zM17.24,7.76 L15.8298,9.1702c1.56,1.56 1.56,4.0902 0,5.6602l1.4102,1.4102c2.34,-2.34 2.34,-6.1405 0,-8.4805z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_30.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_30.xml
new file mode 100644
index 0000000000..592d0f380c
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_30.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_charging_wireless_30.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,16H4V6H12V16Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_30_burnin.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_30_burnin.xml
new file mode 100644
index 0000000000..eb36861925
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_30_burnin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="m5,2v2h-2c-0.5523,0 -1,0.4477 -1,1v16c0,0.5523 0.4477,1 1,1h10c0.5523,0 1,-0.4477 1,-1v-16c0,-0.5523 -0.4477,-1 -1,-1h-2v-2zM20.07,4.9297 L18.6598,6.3399c3.13,3.12 3.13,8.1903 0,11.32l1.4102,1.4102c3.9,-3.9 3.9,-10.231 0,-14.141zM4,6h8v10h-2v2h2v2h-2v-2h-2v2h-2v-2h-2zM6,18h2v-2h-2zM17.24,7.76 L15.8298,9.1702c1.56,1.56 1.56,4.0902 0,5.6602l1.4102,1.4102c2.34,-2.34 2.34,-6.1405 0,-8.4805z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_40.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_40.xml
new file mode 100644
index 0000000000..f94f85a69b
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_40.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_charging_wireless_40.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,14.5H4V6H12V14.5Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_40_burnin.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_40_burnin.xml
new file mode 100644
index 0000000000..8980db2391
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_40_burnin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="m5,2v2h-2c-0.5523,0 -1,0.4477 -1,1v16c0,0.5523 0.4477,1 1,1h10c0.5523,0 1,-0.4477 1,-1v-16c0,-0.5523 -0.4477,-1 -1,-1h-2v-2zM20.07,4.9297 L18.6598,6.3399c3.13,3.12 3.13,8.1903 0,11.32l1.4102,1.4102c3.9,-3.9 3.9,-10.231 0,-14.141zM4,6h8v10h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-1.5h-2zM6,16v2h2v-2zM8,16h2v-1.5h-2zM17.2402,7.7598 L15.83,9.17c1.56,1.56 1.56,4.0902 0,5.6602l1.4102,1.4102c2.34,-2.34 2.34,-6.1405 0,-8.4805z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_50.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_50.xml
new file mode 100644
index 0000000000..f6a4148589
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_50.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_charging_wireless_50.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,13H4V6H12V13Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_50_burnin.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_50_burnin.xml
new file mode 100644
index 0000000000..9a9ee645dc
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_50_burnin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="m5,2v2h-2c-0.5523,0 -1,0.4477 -1,1v16c0,0.5523 0.4477,1 1,1h10c0.5523,0 1,-0.4477 1,-1v-16c0,-0.5523 -0.4477,-1 -1,-1h-2v-2zM20.07,4.9297 L18.6598,6.3399c3.13,3.12 3.13,8.1903 0,11.32l1.4102,1.4102c3.9,-3.9 3.9,-10.231 0,-14.141zM4,6h8v7h-2v1h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2zM6,14h2v-1h-2zM8,14v2h2v-2zM8,16h-2v2h2zM17.2402,7.7598 L15.83,9.17c1.56,1.56 1.56,4.0902 0,5.6602l1.4102,1.4102c2.34,-2.34 2.34,-6.1405 0,-8.4805z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_60.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_60.xml
new file mode 100644
index 0000000000..29192af0ed
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_60.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_charging_wireless_60.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,11.6H4V6H12V11.6Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_60_burnin.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_60_burnin.xml
new file mode 100644
index 0000000000..d5191601a6
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_60_burnin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="m5,2v2h-2c-0.5523,0 -1,0.4477 -1,1v16c0,0.5523 0.4477,1 1,1h10c0.5523,0 1,-0.4477 1,-1v-16c0,-0.5523 -0.4477,-1 -1,-1h-2v-2zM20.07,4.9297 L18.6598,6.3399c3.13,3.12 3.13,8.1903 0,11.32l1.4102,1.4102c3.9,-3.9 3.9,-10.231 0,-14.141zM4,6h8v6h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-0.4004h-2zM6,12v2h2v-2zM8,12h2v-0.4004h-2zM8,14v2h2v-2zM8,16h-2v2h2zM17.2402,7.7598 L15.83,9.17c1.56,1.56 1.56,4.0902 0,5.6602l1.4102,1.4102c2.34,-2.34 2.34,-6.1405 0,-8.4805z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_70.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_70.xml
new file mode 100644
index 0000000000..02c0ae7f58
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_70.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_charging_wireless_70.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,10H4V6H12V10Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_70_burnin.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_70_burnin.xml
new file mode 100644
index 0000000000..9efc928672
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_70_burnin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="m5,2v2h-2c-0.5523,0 -1,0.4477 -1,1v16c0,0.5523 0.4477,1 1,1h10c0.5523,0 1,-0.4477 1,-1v-16c0,-0.5523 -0.4477,-1 -1,-1h-2v-2zM20.07,4.9297 L18.6598,6.3399c3.13,3.12 3.13,8.1903 0,11.32l1.4102,1.4102c3.9,-3.9 3.9,-10.231 0,-14.141zM4,6h8v6h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2zM6,12v2h2v-2zM8,12h2v-2h-2zM8,14v2h2v-2zM8,16h-2v2h2zM17.2402,7.7598 L15.83,9.17c1.56,1.56 1.56,4.0902 0,5.6602l1.4102,1.4102c2.34,-2.34 2.34,-6.1405 0,-8.4805z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_80.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_80.xml
new file mode 100644
index 0000000000..21e44f7105
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_80.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_charging_wireless_80.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,9H4V6H12V9Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_80_burnin.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_80_burnin.xml
new file mode 100644
index 0000000000..9f212fad87
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_80_burnin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="m5,2v2h-2c-0.5523,0 -1,0.4477 -1,1v16c0,0.5523 0.4477,1 1,1h10c0.5523,0 1,-0.4477 1,-1v-16c0,-0.5523 -0.4477,-1 -1,-1h-2v-2zM20.07,4.9297 L18.6598,6.3399c3.13,3.12 3.13,8.1903 0,11.32l1.4102,1.4102c3.9,-3.9 3.9,-10.231 0,-14.141zM4,6h8v3h-2v1h2v2h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2zM6,10h2v-1h-2zM8,10v2h2v-2zM8,12h-2v2h2zM8,14v2h2v-2zM8,16h-2v2h2zM17.2402,7.7598 L15.83,9.17c1.56,1.56 1.56,4.0902 0,5.6602l1.4102,1.4102c2.34,-2.34 2.34,-6.1405 0,-8.4805z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_90.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_90.xml
new file mode 100644
index 0000000000..1004964eb2
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_90.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_charging_wireless_90.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,7.5H4V6H12V7.5Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_90_burnin.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_90_burnin.xml
new file mode 100644
index 0000000000..b6b371fa20
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_90_burnin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="m5,2v2h-2c-0.5523,0 -1,0.4477 -1,1v16c0,0.5523 0.4477,1 1,1h10c0.5523,0 1,-0.4477 1,-1v-16c0,-0.5523 -0.4477,-1 -1,-1h-2v-2zM20.07,4.9297 L18.6598,6.3399c3.13,3.12 3.13,8.1903 0,11.32l1.4102,1.4102c3.9,-3.9 3.9,-10.231 0,-14.141zM4,6h8v2h-2v2h2v2h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2v-0.5h-2zM6,8v2h2v-2zM8,8h2v-0.5h-2zM8,10v2h2v-2zM8,12h-2v2h2zM8,14v2h2v-2zM8,16h-2v2h2zM17.2402,7.7598 L15.83,9.17c1.56,1.56 1.56,4.0902 0,5.6602l1.4102,1.4102c2.34,-2.34 2.34,-6.1405 0,-8.4805z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_burnin.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_burnin.xml
new file mode 100644
index 0000000000..fd11b20ac9
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_burnin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="m5,2v2h-2a1,1 0,0 0,-1 1v16a1,1 0,0 0,1 1h10a1,1 0,0 0,1 -1v-16a1,1 0,0 0,-1 -1h-2v-2h-6zM20.07,4.9297 L18.6598,6.3399c3.13,3.12 3.13,8.1903 0,11.32l1.4102,1.4102c3.9,-3.9 3.9,-10.231 0,-14.141zM6,6h2v2h2v-2h2v2h-2v2h2v2h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2v-2zM6,8v2h2v-2h-2zM8,10v2h2v-2h-2zM8,12h-2v2h2v-2zM8,14v2h2v-2h-2zM8,16h-2v2h2v-2zM17.2402,7.7598 L15.83,9.17c1.56,1.56 1.56,4.0902 0,5.6602l1.4102,1.4102c2.34,-2.34 2.34,-6.1405 0,-8.4805z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_battery_charging_wireless_outline.xml b/wear/src/main/res/drawable/ic_battery_charging_wireless_outline.xml
new file mode 100644
index 0000000000..5fa535e117
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_charging_wireless_outline.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_charging_wireless_outline.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,20H4V6H12V20Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_outline.xml b/wear/src/main/res/drawable/ic_battery_outline.xml
new file mode 100644
index 0000000000..c066289e18
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_outline.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_outline.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M16,20H8V6H16M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.67C6,21.4 6.6,22 7.33,22H16.67A1.33,1.33 0 0,0 18,20.67V5.33C18,4.6 17.4,4 16.67,4Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_unknown.xml b/wear/src/main/res/drawable/ic_battery_unknown.xml
new file mode 100644
index 0000000000..0ac1d8a740
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_unknown.xml
@@ -0,0 +1,9 @@
+<!-- drawable/battery_unknown.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M15.07,12.25L14.17,13.17C13.63,13.71 13.25,14.18 13.09,15H11.05C11.16,14.1 11.56,13.28 12.17,12.67L13.41,11.41C13.78,11.05 14,10.55 14,10C14,8.89 13.1,8 12,8A2,2 0 0,0 10,10H8A4,4 0 0,1 12,6A4,4 0 0,1 16,10C16,10.88 15.64,11.68 15.07,12.25M13,19H11V17H13M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.66C6,21.4 6.6,22 7.33,22H16.67C17.4,22 18,21.4 18,20.66V5.33C18,4.59 17.4,4 16.67,4Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/drawable/ic_battery_unknown_burnin.xml b/wear/src/main/res/drawable/ic_battery_unknown_burnin.xml
new file mode 100644
index 0000000000..e6271cce70
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_battery_unknown_burnin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="m9,2v2h-1.6699a1.33,1.33 0,0 0,-1.3301 1.3301v15.34c0,0.73 0.6001,1.3301 1.3301,1.3301h9.3398a1.33,1.33 0,0 0,1.3301 -1.3301v-15.34c0,-0.73 -0.6001,-1.3301 -1.3301,-1.3301h-1.6699v-2h-6zM8,6h8v14h-8v-14zM11.9922,7.6348c-0.2078,0.0001 -0.4163,0.0123 -0.5391,0.0352 -0.4049,0.0754 -0.8771,0.2731 -1.1992,0.5039 -0.6162,0.4414 -1.052,1.0995 -1.2012,1.8145 -0.037,0.1772 -0.0681,0.4329 -0.0684,0.5488v0.0762h0.75,0.75v-0.0938c0.0014,-0.4091 0.2786,-0.888 0.6621,-1.1445 0.2753,-0.1841 0.5159,-0.2546 0.8555,-0.2519 0.4243,0.0034 0.7754,0.1522 1.0664,0.4531 0.1869,0.1932 0.2953,0.3781 0.3769,0.6465 0.0411,0.1352 0.0451,0.1813 0.0449,0.3965 -0.0002,0.2713 -0.0315,0.4308 -0.1269,0.6348 -0.095,0.203 -0.1813,0.3087 -0.5938,0.7285 -0.7466,0.7599 -0.8607,0.8854 -0.9922,1.082 -0.1397,0.209 -0.2684,0.4631 -0.3477,0.6895 -0.0532,0.152 -0.1426,0.522 -0.1426,0.5898v0.0371h0.7598,0.7578l0.0098,-0.0488c0.0341,-0.1549 0.1225,-0.3985 0.1914,-0.5332 0.1537,-0.3006 0.2936,-0.4663 1.0293,-1.2148 0.1839,-0.1871 0.3683,-0.3847 0.4121,-0.4375 0.2576,-0.3105 0.443,-0.7197 0.5117,-1.1309 0.041,-0.2451 0.0289,-0.7338 -0.0254,-0.9883 -0.1212,-0.568 -0.3798,-1.0577 -0.7773,-1.4727 -0.4524,-0.4721 -0.982,-0.7601 -1.6328,-0.8867 -0.1167,-0.0227 -0.3235,-0.0333 -0.5313,-0.0332zM11.2344,15.8985v0.75,0.75h0.75,0.752v-0.75,-0.75h-0.752,-0.75z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_br_cob_iob.xml b/wear/src/main/res/drawable/ic_br_cob_iob.xml
new file mode 100644
index 0000000000..39ab3af490
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_br_cob_iob.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.3500004"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="M2.10581,0L2.10581,2.02158L0.88367,2.02158L0.88367,2.40347L2.4877,2.40347L2.4877,0.38189L3.11661,0.38189L3.11661,1.36064L4.06383,1.36064L4.06383,2.40347L5.46633,2.40347L5.46633,2.02158L4.44572,2.02158L4.44572,0.97979L3.49849,0.97979L3.49849,0L2.10581,0zM6.35,2.67632C6.34627,2.67074 6.24353,2.7645 6.03994,2.95434L5.77122,3.20497L5.6534,3.17655C5.3071,3.09315 5.24507,3.08315 5.1878,3.09955C5.15206,3.10983 4.76909,3.46921 4.27312,3.95893C3.52798,4.6947 3.41539,4.79782 3.38119,4.77232C3.35966,4.75632 3.33705,4.73186 3.33106,4.71806C3.31381,4.67786 3.18023,4.66797 3.12746,4.70307C3.07893,4.73542 3.05625,4.80779 3.07216,4.87929C3.0769,4.90058 3.16273,5.00586 3.26285,5.11338C3.36297,5.22085 3.44394,5.31509 3.4432,5.32009C3.44229,5.32624 3.35937,5.40939 3.25872,5.50509C3.08189,5.67314 3.07396,5.67751 3.03134,5.63531C2.93273,5.53734 2.86032,5.4786 2.83187,5.4746C2.81532,5.4721 2.77225,5.49193 2.73627,5.51853C2.66517,5.57138 2.64068,5.65252 2.67787,5.71593C2.69089,5.73811 2.82382,5.88811 2.97294,6.04924C3.26659,6.36655 3.31682,6.39594 3.41323,6.30504C3.49888,6.22424 3.49476,6.16854 3.39307,6.04097C3.3326,5.96503 3.3089,5.91655 3.32383,5.89835C3.39353,5.81363 3.65195,5.57185 3.67006,5.57485C3.68182,5.5766 3.77167,5.66536 3.86953,5.77174C4.06914,5.9887 4.13944,6.01627 4.2385,5.91747C4.30491,5.85128 4.29934,5.78154 4.21886,5.68234L4.16202,5.61258L5.02347,4.76198C5.71231,4.0816 5.88684,3.89709 5.89525,3.84059C5.90102,3.80181 5.88663,3.65515 5.86321,3.51503L5.82032,3.26027L6.06681,2.99413C6.25865,2.78671 6.35373,2.6819 6.35,2.67632zM1.55288,2.8298L1.39578,2.99672C1.30862,3.08926 1.21858,3.22364 1.19321,3.29954C1.15023,3.42821 1.14045,3.43666 1.02629,3.43752C0.8805,3.43864 0.76648,3.5569 0.63407,3.84369C0.5495,4.02688 0.50995,4.05752 0.44493,3.99252C0.39438,3.94195 0.21215,4.11442 0.09819,4.32015C0.01256,4.47472 0.00413,4.51745 0.00413,4.79351C0.00413,5.0825 0.00931,5.10634 0.11937,5.30407C0.1829,5.4182 0.22745,5.53295 0.21859,5.55935C0.20973,5.58568 0.1525,5.6544 0.09095,5.7118C-0.01777,5.8131 -0.01956,5.81763 0.03617,5.87923C0.06772,5.91423 0.10055,5.94279 0.10904,5.94279C0.11752,5.94279 0.18649,5.88525 0.26252,5.81515L0.40101,5.68802L0.62528,5.80481C0.81904,5.90596 0.88601,5.92387 1.11776,5.93607C1.35316,5.94837 1.40736,5.94068 1.55856,5.87148C1.65334,5.82808 1.7847,5.74531 1.85053,5.68751C1.9462,5.60351 1.96813,5.56352 1.9606,5.48752C1.95064,5.38685 1.94855,5.38847 2.19056,5.27203C2.39349,5.1744 2.57883,4.99018 2.54248,4.92218C2.50254,4.84756 2.53451,4.81473 2.73368,4.72323C2.83026,4.67885 2.96425,4.58669 3.03134,4.51859L3.1533,4.39508L3.06286,4.32015C3.01333,4.2789 2.8977,4.19565 2.80551,4.13515C2.71333,4.07464 2.63756,4.00934 2.63756,3.98994C2.63756,3.97049 2.69651,3.89059 2.76831,3.81269C2.94051,3.62588 3.02691,3.42163 3.04581,3.15743C3.06082,2.94763 3.05927,2.94029 2.98535,2.93729C2.65357,2.9186 2.43796,2.98436 2.18281,3.18223C2.08182,3.26053 1.98086,3.32486 1.95854,3.32486C1.93621,3.32486 1.89257,3.27734 1.86138,3.21944C1.8302,3.16153 1.7477,3.05011 1.67845,2.97191L1.55288,2.8298zM2.76934,3.12591C2.89071,3.1352 2.89258,3.2497 2.77916,3.47731C2.68683,3.66259 2.55546,3.78691 2.36626,3.86901C2.10234,3.98351 2.02313,3.97355 2.02313,3.82561C2.02313,3.5834 2.32465,3.23585 2.60759,3.15175C2.67477,3.1318 2.72888,3.12281 2.76934,3.12591zM1.54823,3.15381C1.55858,3.15428 1.56884,3.15681 1.57871,3.16208C1.66896,3.21038 1.7875,3.48495 1.80041,3.67574C1.81018,3.82023 1.79652,3.88265 1.72238,4.02714C1.60404,4.25775 1.51885,4.27626 1.42472,4.09174C1.31523,3.87712 1.28465,3.63829 1.34152,3.44268C1.39407,3.26193 1.47572,3.15055 1.54823,3.15381zM5.23534,3.25355C5.27021,3.25211 5.32035,3.25762 5.4007,3.26957C5.6798,3.31114 5.68866,3.31893 5.72937,3.56051C5.74841,3.67335 5.76102,3.78375 5.75779,3.80545C5.75455,3.8272 5.37527,4.21699 4.91495,4.67155C4.30722,5.27165 4.06924,5.49295 4.04523,5.47925C4.02724,5.46815 4.00742,5.45985 4.00234,5.4591C3.95209,5.45162 4.08248,5.30502 4.50567,4.89324C4.77913,4.62716 5.00118,4.40153 4.99918,4.39353C4.99733,4.38475 4.89734,4.27049 4.77645,4.1398C4.65558,4.00906 4.55765,3.89555 4.55941,3.88555C4.56107,3.87665 4.58553,3.84712 4.61367,3.81992L4.66483,3.77031L4.83278,3.95325C4.98788,4.12191 5.05347,4.16211 5.04672,4.08451C5.04526,4.0676 4.97272,3.97698 4.88497,3.88348L4.72529,3.71347L4.7842,3.65197C4.81679,3.61807 4.84864,3.59109 4.855,3.59203C4.86115,3.59295 4.93974,3.67408 5.03018,3.77238C5.18414,3.93968 5.23466,3.97064 5.24464,3.90364C5.24691,3.88841 5.17502,3.79792 5.08444,3.70262C4.94553,3.55634 4.92424,3.52344 4.94853,3.49074C5.02685,3.38546 5.04927,3.39299 5.22397,3.58428C5.31516,3.68415 5.39986,3.76136 5.41207,3.75636C5.46287,3.73454 5.4343,3.68234 5.28753,3.52743C5.20235,3.4374 5.12846,3.354 5.1232,3.3414C5.11792,3.3289 5.13489,3.3012 5.16092,3.2799C5.18078,3.2634 5.20046,3.25499 5.23534,3.25355zM0.9741,3.71502C1.02524,3.71869 1.07833,3.78342 1.14257,3.90932C1.27721,4.17325 1.24552,4.53776 1.07177,4.72426C0.99026,4.81136 0.95881,4.81076 0.9002,4.72116C0.72813,4.4581 0.69612,4.13577 0.817,3.88607C0.87375,3.76887 0.92296,3.71134 0.9741,3.71502zM2.31097,4.16254C2.48217,4.17164 2.65058,4.23152 2.77347,4.33927C2.8656,4.42005 2.83833,4.47308 2.66185,4.55528L2.66185,4.55476C2.42952,4.66328 2.17358,4.66088 1.92753,4.54856C1.71884,4.45331 1.69355,4.38584 1.83141,4.28914C1.96552,4.19507 2.13977,4.15343 2.31097,4.16254zM0.40049,4.29845C0.52583,4.29845 0.64014,4.55737 0.6413,4.84363C0.64209,5.03751 0.62979,5.08809 0.55397,5.20278C0.41907,5.40683 0.31459,5.36992 0.21652,5.08393C0.11345,4.78332 0.22701,4.29845 0.40049,4.29845zM1.68258,4.72323C1.88928,4.72323 2.2095,4.84933 2.24637,4.94543C2.27522,5.02059 2.12145,5.13353 1.9358,5.17333C1.71811,5.21993 1.62794,5.21591 1.45262,5.15111C1.22242,5.06603 1.14609,5.003 1.18804,4.932C1.25635,4.8166 1.47768,4.72323 1.68258,4.72323zM1.12345,5.28081C1.38747,5.29432 1.71452,5.45539 1.66967,5.57227C1.65814,5.60237 1.5874,5.65324 1.51257,5.68544C1.43773,5.71764 1.3265,5.75085 1.26504,5.75985C1.01174,5.7956 0.59428,5.65145 0.59428,5.52834C0.59428,5.44594 0.82906,5.31013 1.01544,5.28443C1.04931,5.27979 1.08573,5.27889 1.12345,5.28081z"
+      android:strokeWidth="3.77952719"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_carbs.xml b/wear/src/main/res/drawable/ic_carbs.xml
new file mode 100644
index 0000000000..a1ac753064
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_carbs.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.3500004"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="m0.07296,6.18173c-0.11224,-0.12403 -0.10912,-0.13361 0.10984,-0.33755 0.12395,-0.11545 0.23996,-0.2533 0.25781,-0.30635 0.01785,-0.053 -0.07223,-0.28451 -0.20017,-0.51436 -0.22165,-0.3982 -0.23262,-0.44673 -0.23262,-1.02872 0,-0.55596 0.01701,-0.64151 0.18944,-0.95278 0.22952,-0.41433 0.59748,-0.76138 0.6993,-0.65956 0.13093,0.13093 0.21005,0.0684 0.38036,-0.30044 0.26666,-0.57755 0.49667,-0.81559 0.79028,-0.81787 0.2299,-0.002 0.24962,-0.0181 0.33616,-0.27725 0.05109,-0.15301 0.23231,-0.42442 0.40784,-0.61081l0.3159,-0.33544 0.25358,0.28625c0.13947,0.15744 0.30496,0.38166 0.36776,0.49829 0.0628,0.11662 0.15097,0.21203 0.19592,0.21203 0.04495,0 0.24814,-0.12905 0.45152,-0.28678 0.51384,-0.3985 0.94794,-0.53103 1.6161,-0.49339 0.14888,0.008 0.1524,0.0212 0.12218,0.44366 -0.03807,0.53204 -0.21229,0.9432 -0.55908,1.31942 -0.1446,0.15688 -0.26291,0.31727 -0.26291,0.35643 0,0.0392 0.1519,0.17085 0.33755,0.29265 0.18565,0.1218 0.41917,0.2894 0.51892,0.37247l0.18137,0.15102 -0.24567,0.24913c-0.13512,0.13703 -0.4048,0.32226 -0.59929,0.41164 -0.40112,0.18432 -0.46482,0.2508 -0.38439,0.40109 0.07321,0.13678 -0.29996,0.50766 -0.70863,0.70428 -0.48739,0.23449 -0.48332,0.23068 -0.46326,0.43341 0.01515,0.15308 -0.02944,0.23403 -0.2221,0.40318 -0.13258,0.11641 -0.39723,0.28315 -0.5881,0.37054 -0.30449,0.13941 -0.4133,0.1554 -0.88737,0.13052 -0.46672,-0.0245 -0.60186,-0.0605 -0.99207,-0.26433l-0.45174,-0.23597 -0.27839,0.25662c-0.15311,0.14114 -0.29237,0.25661 -0.30946,0.25661 -0.01709,0 -0.08305,-0.0574 -0.14659,-0.12764zM3.04651,5.79095c0.15071,-0.0649 0.29301,-0.16746 0.31623,-0.22796 0.10323,-0.26902 -0.77255,-0.65358 -1.31812,-0.5788 -0.37535,0.0515 -0.84735,0.32482 -0.84735,0.49076 0,0.24793 0.84009,0.5377 1.3502,0.46571 0.12377,-0.0175 0.34834,-0.0848 0.49905,-0.14971zM1.11599,4.81897c0.15268,-0.23095 0.17746,-0.33287 0.17587,-0.72332 -0.00236,-0.57649 -0.23257,-1.09745 -0.48498,-1.09745 -0.34938,0 -0.57808,0.97634 -0.37051,1.58171 0.19749,0.57597 0.40794,0.64999 0.67962,0.23906zM3.89797,4.76028c0.37387,-0.0802 0.68406,-0.30762 0.62598,-0.45898 -0.07426,-0.19351 -0.7192,-0.44794 -1.13545,-0.44794 -0.41266,0 -0.85838,0.18827 -0.99593,0.42069 -0.08449,0.14275 0.06918,0.27006 0.53279,0.4414 0.35307,0.1305 0.53422,0.13884 0.97261,0.0448zM2.15803,3.85532c0.34991,-0.37558 0.41361,-1.10931 0.14245,-1.64082 -0.25871,-0.50712 -0.42704,-0.51919 -0.65561,-0.047 -0.24344,0.50288 -0.17855,1.15285 0.16799,1.68264 0.11803,0.18046 0.18101,0.18141 0.34517,0.005zM5.36038,3.51489c0.35541,-0.16547 0.41056,-0.27201 0.22503,-0.43468 -0.49497,-0.43399 -1.35656,-0.47981 -1.89671,-0.10086 -0.27763,0.19477 -0.2274,0.33089 0.19289,0.52273 0.49552,0.22618 1.01089,0.23064 1.47879,0.0128zM3.46831,2.45169c0.14931,-0.29099 0.17721,-0.41624 0.15753,-0.70724 -0.02598,-0.38422 -0.2646,-0.93731 -0.44636,-1.03458 -0.15905,-0.0851 -0.35661,0.14839 -0.47756,0.56444 -0.11452,0.39395 -0.0528,0.87509 0.1677,1.3073 0.18957,0.3716 0.36037,0.33453 0.59868,-0.12992zM4.76565,2.13351c0.38101,-0.16525 0.6449,-0.41584 0.83084,-0.78896 0.30455,-0.61116 0.19648,-0.81689 -0.34467,-0.65619 -0.56982,0.16922 -1.17734,0.8697 -1.17734,1.35748 0,0.29794 0.15966,0.31819 0.69117,0.0877z"
+      android:strokeWidth="1"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_cob_detailed.xml b/wear/src/main/res/drawable/ic_cob_detailed.xml
new file mode 100644
index 0000000000..fc92be1910
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_cob_detailed.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.3500004"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="M2.18178,0L1.96112,0.23409C1.83867,0.36411 1.71202,0.55323 1.67638,0.65991C1.61601,0.84081 1.60267,0.85269 1.44229,0.85369C1.23746,0.85527 1.07693,1.02129 0.8909,1.4242C0.77209,1.6815 0.71663,1.72489 0.62528,1.63349C0.55425,1.56245 0.29758,1.80489 0.13746,2.09393C0.01717,2.3111 0.00568,2.37064 0.00568,2.75849C0.00568,3.1645 0.01332,3.19848 0.16795,3.47627C0.25721,3.63661 0.31993,3.79781 0.30747,3.83491C0.29502,3.8719 0.21411,3.96815 0.12764,4.04885C-0.02511,4.19121 -0.02766,4.19738 0.05064,4.28398C0.09497,4.33318 0.14104,4.37338 0.15296,4.37338C0.16488,4.37338 0.26215,4.29256 0.36897,4.19406L0.56327,4.01526L0.8785,4.17959C1.15071,4.3217 1.24485,4.34687 1.57045,4.36407C1.90117,4.3813 1.97711,4.37032 2.18953,4.27312C2.32269,4.21213 2.50735,4.09604 2.59984,4.01474C2.73425,3.89674 2.76545,3.8404 2.75487,3.73362C2.74087,3.59219 2.73783,3.59441 3.07785,3.4308C3.36295,3.29366 3.62346,3.03547 3.57239,2.93987C3.51628,2.83503 3.56076,2.78834 3.84059,2.65979C3.97628,2.59744 4.16439,2.46816 4.25865,2.37246L4.4297,2.19883L4.30361,2.09341C4.23402,2.03546 4.07088,1.919 3.94136,1.834C3.81185,1.74899 3.70572,1.65666 3.70572,1.62936C3.70572,1.60204 3.78829,1.49024 3.88917,1.38079C4.1311,1.11832 4.25277,0.83162 4.27933,0.46044C4.30041,0.16574 4.29792,0.1549 4.19406,0.1509C3.72793,0.12463 3.42495,0.21706 3.06648,0.49506C2.9246,0.60512 2.78313,0.69505 2.75177,0.69505C2.72041,0.69505 2.65864,0.62865 2.61483,0.54725C2.57101,0.46588 2.45581,0.30926 2.35851,0.19947L2.18178,0zM3.89072,0.416C4.06123,0.42906 4.0635,0.58975 3.90415,0.90951C3.77444,1.16982 3.59067,1.34454 3.32486,1.45986C2.95407,1.62064 2.8422,1.60673 2.8422,1.39888C2.8422,1.05859 3.26634,0.56981 3.66386,0.45165C3.75824,0.42363 3.83388,0.41164 3.89072,0.416zM2.17558,0.45475C2.19013,0.45541 2.20408,0.45923 2.21795,0.46664C2.34475,0.5345 2.51143,0.92051 2.52956,1.18856C2.54329,1.39156 2.52365,1.47907 2.41949,1.68207C2.25324,2.00614 2.13419,2.03173 2.00194,1.7725C1.84812,1.47097 1.80526,1.13523 1.88516,0.86041C1.95899,0.60648 2.07371,0.45017 2.17558,0.45475zM1.36839,1.24385C1.44024,1.24903 1.51483,1.3393 1.60507,1.51619C1.79423,1.887 1.74944,2.3988 1.50533,2.66082L1.50533,2.66134C1.39081,2.78392 1.34687,2.78308 1.26452,2.6572C1.02277,2.28762 0.97791,1.83445 1.14773,1.48363C1.22746,1.31904 1.29654,1.23868 1.36839,1.24385zM3.24683,1.87224C3.48736,1.88504 3.72375,1.96891 3.8964,2.12028C4.02583,2.23377 3.98725,2.30819 3.73931,2.42362L3.73931,2.42259C3.41289,2.57549 3.05353,2.57265 2.70784,2.41484C2.41464,2.28103 2.3798,2.18585 2.57349,2.05C2.7619,1.91783 3.0063,1.85944 3.24683,1.87224zM0.56276,2.06344C0.73884,2.06344 0.89959,2.4266 0.90124,2.82877C0.90235,3.10116 0.88528,3.17252 0.77876,3.33365C0.58924,3.62034 0.44215,3.56853 0.30437,3.16673C0.15957,2.74439 0.31902,2.06344 0.56276,2.06344zM2.36368,2.65979C2.65407,2.65979 3.10408,2.8369 3.15588,2.97191C3.1964,3.07751 2.98004,3.23641 2.71921,3.29231C2.41338,3.35781 2.28701,3.3523 2.0407,3.2613C1.71728,3.14177 1.61021,3.05311 1.66915,2.95331C1.76511,2.79119 2.0758,2.65979 2.36368,2.65979zM1.5782,3.4432C1.94913,3.46217 2.40912,3.68828 2.34611,3.85248C2.32991,3.89478 2.23059,3.96634 2.12545,4.01164C2.02031,4.05679 1.86349,4.10333 1.77715,4.11603C1.42129,4.16625 0.83509,3.96393 0.83509,3.79098C0.83509,3.6752 1.16442,3.48498 1.42627,3.44888C1.47385,3.44236 1.52521,3.44049 1.5782,3.4432zM2.95899,4.47311A0.21219,0.21219 0,0 0,2.98018 4.89686L4.84156,4.89686A0.21195,0.21195 0,1 0,4.84156 4.47311L2.98018,4.47311A0.21195,0.21195 0,0 0,2.95899 4.47311zM5.43739,4.47311A0.21219,0.21219 0,0 0,5.45858 4.89686L6.13244,4.89686A0.21195,0.21195 0,1 0,6.13244 4.47311L5.45858,4.47311A0.21195,0.21195 0,0 0,5.43739 4.47311zM2.95899,5.19968A0.21219,0.21219 0,0 0,2.98018 5.62343L3.78323,5.62343A0.21195,0.21195 135,1 0,3.78323 5.19968L2.98018,5.19968A0.21195,0.21195 0,0 0,2.95899 5.19968zM4.3863,5.19968A0.21219,0.21219 0,0 0,4.408 5.62343L6.13244,5.62343A0.21195,0.21195 0,1 0,6.13244 5.19968L4.408,5.19968A0.21195,0.21195 0,0 0,4.3863 5.19968zM2.95899,5.92625A0.21219,0.21219 0,0 0,2.98018 6.35L6.13244,6.35A0.21195,0.21195 0,1 0,6.13244 5.92625L2.98018,5.92625A0.21195,0.21195 0,0 0,2.95899 5.92625z"
+      android:strokeWidth="3.77952743"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_cob_iob.xml b/wear/src/main/res/drawable/ic_cob_iob.xml
new file mode 100644
index 0000000000..f029cf0d49
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_cob_iob.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.3500004"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="M1.96525,0L1.76682,0.21084C1.65651,0.32796 1.54261,0.4987 1.5105,0.5948C1.45611,0.75773 1.44362,0.76795 1.29915,0.76895C1.11463,0.77037 0.97012,0.92017 0.80253,1.28313C0.6955,1.51495 0.64556,1.55404 0.56327,1.47174C0.49929,1.40774 0.26827,1.62581 0.12402,1.88619C0.01566,2.08182 0.00465,2.13573 0.00465,2.48512C0.00465,2.85087 0.0116,2.88134 0.1509,3.13159C0.2313,3.27603 0.2882,3.42117 0.27699,3.45457C0.26577,3.48789 0.19262,3.57462 0.11472,3.64732C-0.02288,3.77553 -0.02454,3.7812 0.04599,3.8592C0.08592,3.9036 0.12724,3.93981 0.13798,3.93981C0.14871,3.93981 0.23605,3.86676 0.33228,3.77806L0.50746,3.61683L0.79117,3.76514C1.03639,3.89317 1.12159,3.91604 1.4149,3.93154C1.71283,3.94704 1.78113,3.93698 1.97249,3.84938C2.09244,3.79444 2.25866,3.68952 2.34198,3.61632C2.46305,3.51002 2.49103,3.4593 2.4815,3.3631C2.46889,3.2357 2.46666,3.23815 2.77296,3.09077C3.02979,2.96722 3.2639,2.73452 3.21789,2.64842C3.16734,2.55398 3.20766,2.51204 3.45974,2.39624C3.58197,2.34007 3.75154,2.22354 3.83646,2.13734L3.99045,1.98076L3.87677,1.88619C3.81408,1.83399 3.66736,1.7287 3.55069,1.6521C3.43401,1.57552 3.3383,1.49273 3.3383,1.46813C3.3383,1.44352 3.41279,1.34245 3.50366,1.24385C3.7216,1.00741 3.83114,0.74934 3.85506,0.41496C3.87406,0.14945 3.87162,0.13991 3.77806,0.13591C3.35816,0.11225 3.08555,0.19554 2.76262,0.44597C2.63481,0.5451 2.50717,0.62632 2.47892,0.62632C2.45067,0.62632 2.3954,0.56629 2.35593,0.49299C2.31646,0.41969 2.21207,0.27873 2.12442,0.17983L1.96525,0zM3.5047,0.37465C3.6583,0.38642 3.66064,0.53154 3.5171,0.81959C3.40025,1.05409 3.23461,1.21128 2.99517,1.31517C2.66114,1.46004 2.56057,1.44763 2.56057,1.26039C2.56057,0.95384 2.94247,0.51365 3.30057,0.40721C3.3856,0.38197 3.45349,0.37073 3.5047,0.37465zM1.95957,0.40979C1.97268,0.41038 1.98583,0.41397 1.99833,0.42065C2.11255,0.48178 2.26208,0.82927 2.27841,1.07074C2.29078,1.25361 2.27355,1.33228 2.17971,1.51515C2.02994,1.80708 1.92264,1.83033 1.80351,1.5968C1.66493,1.32517 1.62612,1.02272 1.69809,0.77515C1.7646,0.5464 1.86781,0.40567 1.95957,0.40979zM1.23248,1.12034C1.29721,1.12501 1.36461,1.20646 1.44591,1.36581C1.61631,1.69985 1.57589,2.16123 1.35599,2.39727L1.35599,2.39779C1.25283,2.50782 1.21364,2.50705 1.13947,2.39365C0.92168,2.06071 0.88054,1.65238 1.03353,1.33635C1.10535,1.18806 1.16776,1.11568 1.23248,1.12034zM6.35,1.66863C6.34525,1.66151 6.21462,1.78122 5.95519,2.02313L5.61258,2.34249L5.4622,2.30632C5.02091,2.19972 4.94193,2.18672 4.86895,2.20762C4.82341,2.22072 4.33565,2.67912 3.70365,3.30316C2.75411,4.24075 2.61035,4.37177 2.56677,4.33927C2.53934,4.31887 2.51084,4.28762 2.50321,4.27002C2.48122,4.21882 2.31104,4.20672 2.24379,4.25142C2.18195,4.29265 2.15272,4.3846 2.17299,4.4757C2.17903,4.50283 2.2883,4.63738 2.41587,4.77439C2.54346,4.91134 2.64677,5.03142 2.64583,5.03742C2.64467,5.04526 2.53897,5.15163 2.41071,5.27358C2.18538,5.48773 2.17563,5.49326 2.12132,5.43946C1.99566,5.31459 1.90281,5.23931 1.86655,5.23431C1.84547,5.23111 1.79045,5.25673 1.7446,5.29063L1.7446,5.2896C1.6537,5.35694 1.62323,5.4614 1.6707,5.5423C1.68728,5.57056 1.85635,5.76176 2.04639,5.96708C2.42058,6.37143 2.48526,6.40848 2.60811,6.29264C2.71725,6.18968 2.71185,6.11879 2.58227,5.95623C2.50521,5.85949 2.47489,5.79804 2.4939,5.77484C2.58273,5.66688 2.91214,5.35846 2.93522,5.36246C2.9502,5.36469 3.06425,5.47753 3.18895,5.61309C3.44332,5.88961 3.53349,5.92503 3.65972,5.79913C3.74435,5.71479 3.73643,5.62582 3.63389,5.49941L3.56206,5.41001L4.65966,4.32635C5.53745,3.45935 5.75947,3.22426 5.77019,3.15226C5.77755,3.10285 5.75922,2.91637 5.72937,2.73782L5.67511,2.41329L5.98878,2.07378C6.23324,1.80943 6.35475,1.67575 6.35,1.66863zM2.92489,1.68672C3.14157,1.69824 3.35485,1.7736 3.51038,1.90996C3.62698,2.0122 3.59214,2.07934 3.36879,2.18333L3.36879,2.1823C3.07473,2.32024 2.75054,2.31722 2.43913,2.17506C2.175,2.05451 2.14373,1.9693 2.3182,1.84692C2.48793,1.72785 2.7082,1.67519 2.92489,1.68672zM0.50695,1.8588C0.66557,1.8588 0.81036,2.18587 0.81184,2.54816C0.81284,2.79354 0.7972,2.85777 0.70125,3.00292C0.53052,3.26118 0.39851,3.2145 0.2744,2.85254C0.14395,2.47208 0.28738,1.8588 0.50695,1.8588zM2.12959,2.39624C2.39118,2.39624 2.79657,2.55574 2.84324,2.67736C2.87974,2.77249 2.68442,2.91531 2.44946,2.96571L2.44946,2.96623C2.17395,3.02523 2.06054,3.0198 1.83865,2.9378C1.54729,2.83013 1.45069,2.7502 1.50378,2.6603C1.59023,2.51425 1.87025,2.39624 2.12959,2.39624zM4.92993,2.40399C4.97437,2.40215 5.03786,2.40941 5.14025,2.42466C5.4959,2.47763 5.50697,2.48733 5.55883,2.79518C5.5831,2.93897 5.59964,3.0796 5.59552,3.1073C5.59139,3.13501 5.10827,3.63187 4.52169,4.21111C3.74727,4.97581 3.44331,5.25749 3.41271,5.23999C3.38979,5.22589 3.36492,5.21563 3.35845,5.21467L3.35793,5.21467C3.2939,5.20514 3.46049,5.01799 3.99976,4.49327C4.34823,4.1542 4.63172,3.86681 4.62917,3.85661C4.62683,3.84542 4.49849,3.70017 4.34444,3.53363C4.1904,3.36703 4.06625,3.22232 4.06849,3.20962C4.0706,3.19822 4.10135,3.16009 4.13722,3.12539L4.20233,3.06286L4.41678,3.29592C4.61443,3.51079 4.69824,3.56225 4.68964,3.46335C4.68777,3.4418 4.59474,3.32619 4.48293,3.20704L4.27984,2.99L4.35477,2.91145C4.39629,2.86825 4.43659,2.83449 4.44469,2.83549C4.45252,2.83666 4.5532,2.94019 4.66845,3.06545C4.86463,3.2786 4.9291,3.31828 4.94182,3.23288C4.94471,3.21347 4.85259,3.098 4.73718,2.97656C4.56017,2.79011 4.53311,2.74799 4.56406,2.70629C4.66386,2.57213 4.69284,2.58191 4.91546,2.82567C5.03166,2.95291 5.13916,3.05078 5.15472,3.04478C5.21946,3.01697 5.18363,2.95072 4.99659,2.75332C4.88805,2.6386 4.79349,2.53223 4.78679,2.51613C4.78006,2.50013 4.80167,2.46468 4.83485,2.43758C4.86014,2.41658 4.88549,2.40582 4.92993,2.40399zM1.42162,3.10214C1.75577,3.11923 2.17033,3.32267 2.11357,3.47059C2.09898,3.5087 2.00932,3.57293 1.91461,3.61373C1.8199,3.65443 1.67872,3.69638 1.60094,3.70778C1.28036,3.75302 0.75241,3.5711 0.75241,3.4153C0.75241,3.311 1.04931,3.13929 1.28519,3.10679C1.32805,3.10091 1.37388,3.09969 1.42162,3.10214z"
+      android:strokeWidth="3.77952719"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_ins.xml b/wear/src/main/res/drawable/ic_ins.xml
new file mode 100644
index 0000000000..9fbb294190
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_ins.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.3500004"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="m5.20323,5.58716c-0.04934,-0.04934 -0.08964,-0.11101 -0.08957,-0.13705 0.00015,-0.04479 0.07357,-0.17029 0.20164,-0.34457 0.05534,-0.07532 0.04685,-0.08608 -0.25244,-0.31978 -0.17034,-0.13302 -0.31763,-0.24184 -0.32729,-0.24184 -0.0097,0 -0.13423,0.14628 -0.27681,0.32508 -0.14258,0.17879 -0.28517,0.33503 -0.31687,0.34719 -0.10658,0.0409 -0.22263,0.0226 -0.28355,-0.04472 -0.06622,-0.07318 -0.08206,-0.28099 -0.02413,-0.31679 0.01999,-0.01236 0.05248,-0.05261 0.0722,-0.08944 0.03132,-0.05851 -0.15274,-0.20852 -1.45636,-1.18694 -0.86768,-0.65123 -1.50947,-1.15787 -1.53347,-1.21052 -0.03847,-0.08443 -0.03669,-0.18238 0.01334,-0.73465l0.01703,-0.18806 -0.44757,-0.35636c-0.67792,-0.53977 -0.67135,-0.54574 0.05517,-0.05015l0.46619,0.318 0.38246,-0.12402c0.21035,-0.06821 0.43241,-0.12402 0.49346,-0.12402 0.08878,0 0.41283,0.22646 1.61827,1.1309l1.50726,1.1309 0.09444,-0.1032c0.13419,-0.14664 0.24052,-0.17186 0.35766,-0.08481 0.17474,0.12986 0.14797,0.24469 -0.14031,0.60176 -0.14133,0.17505 -0.25696,0.33341 -0.25696,0.3519 0,0.02852 0.43093,0.37114 0.57734,0.45902 0.03126,0.01877 0.10059,-0.02865 0.20356,-0.13923 0.17303,-0.1858 0.25793,-0.20522 0.40194,-0.09194 0.16219,0.12758 0.1286,0.21219 -0.29258,0.73706 -0.21388,0.26654 -0.41438,0.50517 -0.44555,0.53029 -0.08919,0.07189 -0.22074,0.05371 -0.31847,-0.04402zM4.82115,3.65151c0,-0.0084 0.0095,-0.04015 0.0212,-0.07054 0.0154,-0.04012 -0.37986,-0.35625 -1.44313,-1.15421 -0.80538,-0.60443 -1.49235,-1.09896 -1.52658,-1.09896 -0.03424,0 -0.20085,0.04514 -0.37024,0.1003 -0.36256,0.11807 -0.37248,0.13332 -0.37248,0.57253 0,0.25291 0.01163,0.31313 0.07079,0.36667 0.03893,0.03524 0.08535,0.05506 0.10315,0.04406 0.0178,-0.011 0.12963,-0.14418 0.24851,-0.29595 0.20483,-0.26149 0.27872,-0.31713 0.32396,-0.24393 0.01089,0.01762 -0.08884,0.16562 -0.22163,0.32889 -0.25441,0.31283 -0.26107,0.34954 -0.08088,0.44598 0.05584,0.02989 0.102,-0.01041 0.29532,-0.25782 0.12602,-0.16128 0.24875,-0.29325 0.27272,-0.29325 0.1052,0 0.06917,0.08472 -0.15316,0.36009 -0.13062,0.16179 -0.2375,0.30207 -0.2375,0.31174 0,0.0097 0.04864,0.05222 0.1081,0.09456l0.1081,0.07697 0.22553,-0.28463c0.12404,-0.15654 0.24655,-0.28965 0.27224,-0.29579 0.11801,-0.0282 0.07105,0.08224 -0.15295,0.35967l-0.24291,0.30086 0.08764,0.06738c0.0482,0.03706 0.09946,0.06775 0.11391,0.06819 0.01445,0.00044 0.16822,-0.17598 0.34172,-0.39207 0.1735,-0.21608 0.32614,-0.39685 0.3392,-0.4017 0.01306,-0.0049 0.41023,0.28572 0.8826,0.6457 0.73098,0.55707 0.98676,0.72433 0.98676,0.64525z"
+      android:strokeWidth="1"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_ins_burnin.xml b/wear/src/main/res/drawable/ic_ins_burnin.xml
new file mode 100644
index 0000000000..8a3a16c64b
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_ins_burnin.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.3500004"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="m5.20323,5.58716c-0.04934,-0.04934 -0.08964,-0.11101 -0.08957,-0.13705 0.00015,-0.04479 0.07357,-0.17029 0.20164,-0.34457 0.05534,-0.07532 0.04685,-0.08608 -0.25244,-0.31978 -0.17034,-0.13302 -0.31763,-0.24184 -0.32729,-0.24184 -0.0097,0 -0.13423,0.14628 -0.27681,0.32508 -0.14258,0.17879 -0.28517,0.33503 -0.31687,0.34719 -0.10658,0.0409 -0.22263,0.0226 -0.28355,-0.04472 -0.06622,-0.07318 -0.08206,-0.28099 -0.02413,-0.31679 0.01999,-0.01236 0.05248,-0.05261 0.0722,-0.08944 0.03132,-0.05851 -0.15274,-0.20852 -1.45636,-1.18694 -0.86768,-0.65123 -1.50947,-1.15787 -1.53347,-1.21052 -0.03847,-0.08443 -0.03669,-0.18238 0.01334,-0.73465l0.01703,-0.18806 -0.44757,-0.35636c-0.67792,-0.53977 -0.67135,-0.54574 0.05517,-0.05015l0.46619,0.318 0.38246,-0.12402c0.21035,-0.06821 0.43241,-0.12402 0.49346,-0.12402 0.08878,0 0.41283,0.22646 1.61827,1.1309l1.50726,1.1309 0.09444,-0.1032c0.13419,-0.14664 0.24052,-0.17186 0.35766,-0.08481 0.17474,0.12986 0.14797,0.24469 -0.14031,0.60176 -0.14133,0.17505 -0.25696,0.33341 -0.25696,0.3519 0,0.02852 0.43093,0.37114 0.57734,0.45902 0.03126,0.01877 0.10059,-0.02865 0.20356,-0.13923 0.17303,-0.1858 0.25793,-0.20522 0.40194,-0.09194 0.16219,0.12758 0.1286,0.21219 -0.29258,0.73706 -0.21388,0.26654 -0.41438,0.50517 -0.44555,0.53029 -0.08919,0.07189 -0.22074,0.05371 -0.31847,-0.04402zM4.82115,3.65151c0,-0.0084 0.0095,-0.04015 0.0212,-0.07054 0.0154,-0.04012 -0.37986,-0.35625 -1.44313,-1.15421 -0.80538,-0.60443 -1.49235,-1.09896 -1.52658,-1.09896 -0.03424,0 -0.20085,0.04514 -0.37024,0.1003 -0.36256,0.11807 -0.37248,0.13332 -0.37248,0.57253 0,0.25291 0.01163,0.31313 0.07079,0.36667 0.03893,0.03524 0.08535,0.05506 0.10315,0.04406 0.0178,-0.011 0.12963,-0.14418 0.24851,-0.29595 0.20483,-0.26149 0.27872,-0.31713 0.32396,-0.24393 0.01089,0.01762 -0.08884,0.16562 -0.22163,0.32889 -0.25441,0.31283 -0.26107,0.34954 -0.08088,0.44598 0.05584,0.02989 0.102,-0.01041 0.29532,-0.25782 0.12602,-0.16128 0.24875,-0.29325 0.27272,-0.29325 0.1052,0 0.06917,0.08472 -0.15316,0.36009 -0.13062,0.16179 -0.2375,0.30207 -0.2375,0.31174 0,0.0097 0.04864,0.05222 0.1081,0.09456l0.1081,0.07697 0.22553,-0.28463c0.12404,-0.15654 0.24655,-0.28965 0.27224,-0.29579 0.11801,-0.0282 0.07105,0.08224 -0.15295,0.35967l-0.24291,0.30086 2.00681,1.53366z"
+      android:strokeWidth="1"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_iob_detailed.xml b/wear/src/main/res/drawable/ic_iob_detailed.xml
new file mode 100644
index 0000000000..95974f2fed
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_iob_detailed.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.3500004"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="M5.06429,0.00052C5.05917,-0.00715 4.91847,0.12128 4.63899,0.38189L4.27002,0.72605L4.10828,0.6873C3.63289,0.57208 3.54766,0.55834 3.46904,0.58084C3.41998,0.59495 2.89466,1.08887 2.21382,1.76113C1.19091,2.77117 1.03603,2.91234 0.98909,2.87734C0.95954,2.85534 0.92858,2.82193 0.92036,2.80293C0.89667,2.74783 0.71324,2.73468 0.64079,2.78278C0.57417,2.8272 0.5435,2.926 0.56534,3.0241C0.57184,3.05333 0.68939,3.19845 0.82682,3.34605C0.96427,3.49358 1.07536,3.62375 1.07435,3.62975C1.0731,3.6382 0.95931,3.75211 0.82114,3.88348C0.5784,4.11415 0.56752,4.12028 0.50901,4.06228C0.37365,3.92778 0.27367,3.84663 0.23461,3.84163C0.21199,3.83814 0.15263,3.86529 0.10335,3.90157C0.00591,3.97414 -0.02725,4.08596 0.02377,4.17287C0.04163,4.20331 0.22368,4.40953 0.4284,4.63072C0.8315,5.06635 0.90118,5.1064 1.03353,4.98161C1.1511,4.8707 1.14522,4.79448 1.00562,4.61936C0.92261,4.51518 0.89005,4.4485 0.91054,4.4235C1.00622,4.3072 1.3611,3.9756 1.38596,3.9796C1.4021,3.982 1.52499,4.10331 1.65933,4.24935C1.93335,4.54725 2.03029,4.58549 2.16628,4.44986C2.25744,4.359 2.24936,4.26306 2.13889,4.12688L2.06086,4.03076L3.24321,2.86287C4.18882,1.92888 4.42849,1.67595 4.44004,1.59835C4.44797,1.54512 4.42827,1.34421 4.39611,1.15187L4.33772,0.80202L4.67568,0.43667C4.93903,0.15192 5.06941,0.00818 5.06429,0.00052zM3.53467,0.79272C3.58254,0.79073 3.65122,0.79849 3.76153,0.81494C4.14466,0.872 4.15679,0.88224 4.21266,1.21388C4.2388,1.36878 4.25638,1.51988 4.25194,1.54978C4.24749,1.57963 3.72681,2.11485 3.0949,2.73885C2.26065,3.56263 1.93362,3.86673 1.90066,3.84783C1.87597,3.83263 1.84872,3.82092 1.84175,3.81992L1.84175,3.82044C1.77276,3.81017 1.95173,3.60848 2.53266,3.04323C2.90806,2.67795 3.21341,2.36848 3.21066,2.35748C3.20813,2.34543 3.07017,2.18859 2.90422,2.00918C2.73828,1.82971 2.60415,1.67406 2.60656,1.66036C2.60883,1.64806 2.64234,1.60733 2.68097,1.56993L2.75125,1.50223L2.98225,1.75338C3.19516,1.98487 3.28503,2.03976 3.27577,1.93322C3.27376,1.91001 3.17349,1.78562 3.05304,1.65726L2.83445,1.42369L2.91558,1.33945C2.96031,1.29295 3.00349,1.25629 3.01222,1.25729C3.02065,1.25855 3.12888,1.36988 3.25303,1.50482C3.46437,1.73441 3.53389,1.77717 3.54759,1.68517C3.5507,1.66426 3.45126,1.54004 3.32693,1.40922C3.13624,1.20839 3.10703,1.16318 3.14038,1.11828C3.24788,0.97375 3.27934,0.98436 3.51916,1.24695C3.64434,1.38403 3.76026,1.4886 3.77703,1.4826C3.84676,1.45264 3.80798,1.38106 3.6065,1.1684C3.48956,1.04482 3.38789,0.93042 3.38067,0.91312C3.37342,0.89582 3.39661,0.85809 3.43235,0.82889C3.4596,0.80629 3.48679,0.7947 3.53467,0.79272zM2.95899,4.47311A0.21219,0.21219 0,0 0,2.98018 4.89686L4.84156,4.89686A0.21195,0.21195 0,1 0,4.84156 4.47311L2.98018,4.47311A0.21195,0.21195 0,0 0,2.95899 4.47311zM5.43739,4.47311A0.21219,0.21219 0,0 0,5.45858 4.89686L6.13244,4.89686A0.21195,0.21195 0,1 0,6.13244 4.47311L5.45858,4.47311A0.21195,0.21195 0,0 0,5.43739 4.47311zM2.95899,5.19968A0.21219,0.21219 0,0 0,2.98018 5.62343L3.78323,5.62343A0.21195,0.21195 135,1 0,3.78323 5.19968L2.98018,5.19968A0.21195,0.21195 0,0 0,2.95899 5.19968zM4.3863,5.19968A0.21219,0.21219 0,0 0,4.408 5.62343L6.13244,5.62343A0.21195,0.21195 0,1 0,6.13244 5.19968L4.408,5.19968A0.21195,0.21195 0,0 0,4.3863 5.19968zM2.95899,5.92625A0.21219,0.21219 0,0 0,2.98018 6.35L6.13244,6.35A0.21195,0.21195 0,1 0,6.13244 5.92625L2.98018,5.92625A0.21195,0.21195 0,0 0,2.95899 5.92625z"
+      android:strokeWidth="3.77952743"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/wear/src/main/res/drawable/ic_sgv.xml b/wear/src/main/res/drawable/ic_sgv.xml
new file mode 100644
index 0000000000..e7aefdd542
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_sgv.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.3500004"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="m2.67094,6.29599c-0.5642,-0.13292 -1.10932,-0.57834 -1.39546,-1.14023 -0.20998,-0.41234 -0.255,-1.03331 -0.11508,-1.58719 0.19288,-0.76352 1.19905,-2.58796 1.86532,-3.38228l0.15622,-0.18625 0.12739,0.15521c0.25595,0.31183 1.05173,1.53363 1.3001,1.99612 0.14033,0.2613 0.3431,0.70829 0.45061,0.99333 0.25166,0.66721 0.28022,1.46003 0.06928,1.9227 -0.42491,0.93195 -1.4798,1.45914 -2.45838,1.22859zM2.67504,5.29572c0.12119,-0.12119 0.08718,-0.27576 -0.13821,-0.62811 -0.31945,-0.49937 -0.4215,-0.87437 -0.39753,-1.46074 0.01125,-0.27533 0.003,-0.48091 -0.01834,-0.45684 -0.12072,0.13615 -0.38575,0.96774 -0.4119,1.29242 -0.03899,0.4842 0.10781,0.95289 0.36671,1.17073 0.19862,0.16713 0.47642,0.2054 0.59927,0.0825z"
+      android:strokeWidth="0.99999994"
+      android:fillColor="@android:color/white"
+
+        />
+</vector>
diff --git a/wear/src/main/res/drawable/ic_sync_alert.xml b/wear/src/main/res/drawable/ic_sync_alert.xml
new file mode 100644
index 0000000000..bd4ca18d5f
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_sync_alert.xml
@@ -0,0 +1,9 @@
+<!-- drawable/sync_alert.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M11,13H13V7H11M21,4H15V10L17.24,7.76C18.32,8.85 19,10.34 19,12C19,14.61 17.33,16.83 15,17.65V19.74C18.45,18.85 21,15.73 21,12C21,9.79 20.09,7.8 18.64,6.36M11,17H13V15H11M3,12C3,14.21 3.91,16.2 5.36,17.64L3,20H9V14L6.76,16.24C5.68,15.15 5,13.66 5,12C5,9.39 6.67,7.17 9,6.35V4.26C5.55,5.15 3,8.27 3,12Z" />
+</vector>
\ No newline at end of file
diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml
index d50cb015e6..ca24978853 100644
--- a/wear/src/main/res/values/strings.xml
+++ b/wear/src/main/res/values/strings.xml
@@ -46,6 +46,25 @@
         <item>4</item>
     </string-array>
 
+    <string-array name="complication_tap_action">
+        <item>Default</item>
+        <item>Menu</item>
+        <item>Wizard</item>
+        <item>Bolus</item>
+        <item>eCarb</item>
+        <item>Status</item>
+        <item>None</item>
+    </string-array>
+
+    <string-array name="complication_tap_action_values">
+        <item>default</item>
+        <item>menu</item>
+        <item>wizard</item>
+        <item>bolus</item>
+        <item>ecarb</item>
+        <item>status</item>
+        <item>none</item>
+    </string-array>
 
     <string name="label_xdrip">AAPS</string>
     <string name="label_xdrip_large">AAPS(Large)</string>
@@ -53,4 +72,13 @@
     <string name="label_xdrip_no_chart">AAPS(NoChart)</string>
     <string name="label_xdrip_circle">AAPS(Circle)</string>
 
+
+    <string name="label_warning_sync">No data!</string>
+    <string name="label_warning_old">Old data!</string>
+    <string name="label_warning_since">Since %1$s</string>
+    <string name="label_warning_sync_aaps">Sync with AAPS!</string>
+
+    <string name="msg_warning_sync">No data received since %1$s! Check if AAPS on the phone sends data to watch</string>
+    <string name="msg_warning_old">AAPS data is %1$s old! Check your sensor, xDrip+, NS, AAPS config or other!</string>
+
 </resources>
diff --git a/wear/src/main/res/xml/preferences.xml b/wear/src/main/res/xml/preferences.xml
index f0fc4b5789..d74b6e1301 100644
--- a/wear/src/main/res/xml/preferences.xml
+++ b/wear/src/main/res/xml/preferences.xml
@@ -217,6 +217,20 @@
         android:title="Wizard Percentage"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
+    <ListPreference
+        android:defaultValue="default"
+        android:entries="@array/complication_tap_action"
+        android:entryValues="@array/complication_tap_action_values"
+        android:key="complication_tap_action"
+        android:summary="What dialog to show after tap on complication"
+        android:title="Complication Tap Action" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="complication_unicode"
+        android:summary="Use unicode special characters in complications."
+        android:title="Unicode in Complications"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
     <info.nightscout.androidaps.interaction.utils.VersionPreference
         android:defaultValue="1"
         android:entries="@array/input_design"
diff --git a/wear/src/test/java/info/nightscout/androidaps/data/BgWatchDataTest.java b/wear/src/test/java/info/nightscout/androidaps/data/BgWatchDataTest.java
new file mode 100644
index 0000000000..e920dc3202
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/data/BgWatchDataTest.java
@@ -0,0 +1,113 @@
+package info.nightscout.androidaps.data;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import info.nightscout.androidaps.interaction.utils.Constants;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+import info.nightscout.androidaps.testing.mockers.WearUtilMocker;
+
+import static org.hamcrest.number.OrderingComparison.comparesEqualTo;
+import static org.hamcrest.number.OrderingComparison.greaterThan;
+import static org.hamcrest.number.OrderingComparison.lessThan;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest( { WearUtil.class } )
+public class BgWatchDataTest {
+
+    @Before
+    public void mock() throws Exception {
+        WearUtilMocker.prepareMockNoReal();
+    }
+
+    @Test
+    public void bgWatchDataHashTest() {
+        // GIVEN
+        BgWatchData inserted = new BgWatchData(
+                88.0, 160.0, 90.0,
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*4*1, 1
+        );
+        Set<BgWatchData> set = new HashSet<>();
+
+        // THEN
+        assertFalse(set.contains(inserted));
+        set.add(inserted);
+        assertTrue(set.contains(inserted));
+    }
+
+    /**
+     * BgWatchData has BIZARRE equals - only timestamp and color are checked!
+     */
+    @Test
+    public void bgWatchDataEqualsTest() {
+        // GIVEN
+        BgWatchData item1 = new BgWatchData(
+                88.0, 160.0, 90.0,
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS, 1
+        );
+
+        BgWatchData item2sameTimeSameColor = new BgWatchData(
+                123.0, 190, 90.0,
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS, 1
+        );
+
+        BgWatchData item3sameTimeSameDiffColor = new BgWatchData(
+                96.0, 190, 90.0,
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS, 0
+        );
+        BgWatchData item4differentTime = new BgWatchData(
+                88.0, 160.0, 90.0,
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*2, 1
+        );
+
+        // THEN
+        assertEquals(item1, item2sameTimeSameColor);
+        assertNotEquals(item1, item3sameTimeSameDiffColor);
+        assertNotEquals(item1, item4differentTime);
+
+        assertFalse(item1.equals("aa bbb"));
+    }
+
+    /**
+     * BgWatchData is ordered by timestamp, reverse order
+     */
+    @Test
+    public void bgWatchDataCompareTest() {
+        // GIVEN
+        BgWatchData item1 = new BgWatchData(
+                85, 160.0, 90.0,
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*2, 1
+        );
+
+        BgWatchData item2 = new BgWatchData(
+                80, 190, 90.0,
+                WearUtilMocker.REF_NOW, 1
+        );
+
+        BgWatchData item3 = new BgWatchData(
+                80, 190, 50.0,
+                WearUtilMocker.REF_NOW + Constants.MINUTE_IN_MS*5, 0
+        );
+
+        BgWatchData item4 = new BgWatchData(
+                160, 140, 70.0,
+                WearUtilMocker.REF_NOW, 0
+        );
+
+        // THEN
+        assertThat(item2, lessThan(item1));
+        assertThat(item2, greaterThan(item3));
+        assertThat(item2, comparesEqualTo(item4));
+    }
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/data/RawDataSgvDisplayDataTest.java b/wear/src/test/java/info/nightscout/androidaps/data/RawDataSgvDisplayDataTest.java
new file mode 100644
index 0000000000..fa73a0272e
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/data/RawDataSgvDisplayDataTest.java
@@ -0,0 +1,148 @@
+package info.nightscout.androidaps.data;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.google.android.gms.wearable.DataMap;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.interaction.utils.Constants;
+import info.nightscout.androidaps.interaction.utils.Persistence;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+import info.nightscout.androidaps.testing.mockers.AAPSMocker;
+import info.nightscout.androidaps.testing.mockers.AndroidMocker;
+import info.nightscout.androidaps.testing.mockers.WearUtilMocker;
+import info.nightscout.androidaps.testing.mocks.BundleMock;
+import info.nightscout.androidaps.testing.mocks.IntentMock;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest( { WearUtil.class, Log.class, SharedPreferences.class, Context.class, aaps.class, android.util.Base64.class, Intent.class } )
+public class RawDataSgvDisplayDataTest {
+
+    @Before
+    public void mock() throws Exception {
+        AAPSMocker.prepareMock();
+        AAPSMocker.resetMockedSharedPrefs();
+        AndroidMocker.mockBase64();
+        WearUtilMocker.prepareMockNoReal();
+    }
+
+    //==============================================================================================
+    // SGV DATA
+    //==============================================================================================
+
+    private DataMap dataMapForData() {
+        DataMap dataMap = new DataMap();
+        dataMap.putLong("sgvLevel", 1L);
+        dataMap.putLong("timestamp", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS);
+        dataMap.putString("sgvString", "106");
+        dataMap.putString("slopeArrow", "↗");
+        dataMap.putString("delta", "5.4");
+        dataMap.putString("avgDelta", "3.7");
+        dataMap.putString("glucoseUnits", "mg/dl");
+        return dataMap;
+    }
+
+    private void assertDataEmpty(RawDisplayData newRaw) {
+        assertThat(newRaw.sgvLevel, is(0L));
+        assertThat(newRaw.datetime, is(0L));
+        assertThat(newRaw.sSgv, is("---"));
+        assertThat(newRaw.sDirection, is("--"));
+        assertThat(newRaw.sDelta, is("--"));
+        assertThat(newRaw.sAvgDelta, is("--"));
+        assertThat(newRaw.sUnits, is("-"));
+    }
+
+    private void assertDataOk(RawDisplayData newRaw) {
+        assertThat(newRaw.sgvLevel, is(1L));
+        assertThat(newRaw.datetime, is(WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS));
+        assertThat(newRaw.sSgv, is("106"));
+        assertThat(newRaw.sDirection, is("↗"));
+        assertThat(newRaw.sDelta, is("5.4"));
+        assertThat(newRaw.sAvgDelta, is("3.7"));
+        assertThat(newRaw.sUnits, is("mg/dl"));
+    }
+
+    @Test
+    public void updateDataFromEmptyPersistenceTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        newRaw.updateFromPersistence(persistence);
+
+        // THEN
+        assertDataEmpty(newRaw);
+    }
+
+    @Test
+    public void updateDataFromPersistenceTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        Persistence.storeDataMap(RawDisplayData.DATA_PERSISTENCE_KEY, dataMapForData());
+        newRaw.updateFromPersistence(persistence);
+
+        // THEN
+        assertDataOk(newRaw);
+    }
+
+    @Test
+    public void partialUpdateDataFromPersistenceTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        Persistence.storeDataMap(RawDisplayData.DATA_PERSISTENCE_KEY, dataMapForData());
+        newRaw.updateForComplicationsFromPersistence(persistence);
+
+        // THEN
+        assertDataOk(newRaw);
+    }
+
+    @Test
+    public void updateDataFromMessageTest() {
+        // GIVEN
+        Intent intent = IntentMock.mock();
+        Bundle bundle = BundleMock.mock(dataMapForData());
+
+        intent.putExtra("data", bundle);
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        newRaw.updateDataFromMessage(intent, null);
+
+        // THEN
+        assertDataOk(newRaw);
+    }
+
+    @Test
+    public void updateDataFromEmptyMessageTest() {
+        // GIVEN
+        Intent intent = IntentMock.mock();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        newRaw.updateDataFromMessage(intent, null);
+
+        // THEN
+        assertDataEmpty(newRaw);
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/data/RawDisplayDataBasalsTest.java b/wear/src/test/java/info/nightscout/androidaps/data/RawDisplayDataBasalsTest.java
new file mode 100644
index 0000000000..1245d0fbcb
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/data/RawDisplayDataBasalsTest.java
@@ -0,0 +1,265 @@
+package info.nightscout.androidaps.data;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.google.android.gms.wearable.DataMap;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.ArrayList;
+
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.interaction.utils.Constants;
+import info.nightscout.androidaps.interaction.utils.Persistence;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+import info.nightscout.androidaps.testing.mockers.AAPSMocker;
+import info.nightscout.androidaps.testing.mockers.AndroidMocker;
+import info.nightscout.androidaps.testing.mockers.WearUtilMocker;
+import info.nightscout.androidaps.testing.mocks.BundleMock;
+import info.nightscout.androidaps.testing.mocks.IntentMock;
+import info.nightscout.androidaps.testing.utils.BasalWatchDataExt;
+import info.nightscout.androidaps.testing.utils.BgWatchDataExt;
+import info.nightscout.androidaps.testing.utils.BolusWatchDataExt;
+import info.nightscout.androidaps.testing.utils.TempWatchDataExt;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest( { WearUtil.class, Log.class, SharedPreferences.class, Context.class, aaps.class, android.util.Base64.class, Intent.class } )
+public class RawDisplayDataBasalsTest {
+
+    @Before
+    public void mock() throws Exception {
+        AAPSMocker.prepareMock();
+        AAPSMocker.resetMockedSharedPrefs();
+        AndroidMocker.mockBase64();
+        WearUtilMocker.prepareMockNoReal();
+    }
+
+    //==============================================================================================
+    // BASALS for chart
+    //==============================================================================================
+
+    private DataMap dataMapForBasals() {
+
+        DataMap dataMap = new DataMap();
+
+        ArrayList<DataMap> temps = new ArrayList<>();
+        DataMap temp = new DataMap();
+        temp.putLong("starttime", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*20);
+        temp.putDouble("startBasal", 1.5);
+        temp.putLong("endtime", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*10);
+        temp.putDouble("endbasal", 1.5);
+        temp.putDouble("amount", 1.8);
+        temps.add(temp);
+
+        DataMap temp2 = new DataMap();
+        temp2.putLong("starttime", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*10);
+        temp2.putDouble("startBasal", 1.3);
+        temp2.putLong("endtime", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*2);
+        temp2.putDouble("endbasal", 1.3);
+        temp2.putDouble("amount", 2.3);
+        temps.add(temp2);
+        dataMap.putDataMapArrayList("temps", temps);
+
+        ArrayList<DataMap> basals = new ArrayList<>();
+        DataMap basal = new DataMap();
+        basal.putLong("starttime", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*20);
+        basal.putLong("endtime", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*2);
+        basal.putDouble("amount", 1.2);
+        basals.add(basal);
+        dataMap.putDataMapArrayList("basals", basals);
+
+        ArrayList<DataMap> boluses = new ArrayList<>();
+        DataMap bolus = new DataMap();
+        bolus.putLong("date", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*17);
+        bolus.putDouble("bolus", 5.5);
+        bolus.putDouble("carbs", 20.0);
+        bolus.putBoolean("isSMB", false);
+        bolus.putBoolean("isValid", true);
+        boluses.add(bolus);
+
+        DataMap bolus2 = new DataMap();
+        bolus2.putLong("date", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*11);
+        bolus2.putDouble("bolus", 3.0);
+        bolus2.putDouble("carbs", 0.0);
+        bolus2.putBoolean("isSMB", false);
+        bolus2.putBoolean("isValid", true);
+        boluses.add(bolus2);
+
+        DataMap bolus3 = new DataMap();
+        bolus3.putLong("date", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*3);
+        bolus3.putDouble("bolus", 0.0);
+        bolus3.putDouble("carbs", 15.0);
+        bolus3.putBoolean("isSMB", true);
+        bolus3.putBoolean("isValid", false);
+        boluses.add(bolus3);
+
+        dataMap.putDataMapArrayList("boluses", boluses);
+
+        ArrayList<DataMap> predictions = new ArrayList<>();
+        for (int i=0; i<10; i++) {
+            DataMap prediction = new DataMap();
+            prediction.putLong("timestamp", WearUtilMocker.REF_NOW + Constants.MINUTE_IN_MS*i);
+            prediction.putDouble("sgv", 160-4*i);
+            prediction.putInt("color", 0);
+            predictions.add(prediction);
+        }
+        dataMap.putDataMapArrayList("predictions", predictions);
+
+        return dataMap;
+    }
+
+    private void assertBasalsEmpty(RawDisplayData newRaw) {
+        assertThat(newRaw.tempWatchDataList.size(), is(0));
+        assertThat(newRaw.basalWatchDataList.size(), is(0));
+        assertThat(newRaw.bolusWatchDataList.size(), is(0));
+        assertThat(newRaw.predictionList.size(), is(0));
+    }
+
+    private void assertBasalsOk(RawDisplayData newRaw) {
+        assertThat(newRaw.tempWatchDataList.size(), is(2));
+        assertThat(newRaw.basalWatchDataList.size(), is(1));
+        assertThat(newRaw.bolusWatchDataList.size(), is(3));
+        assertThat(newRaw.predictionList.size(), is(10));
+
+        assertThat(new TempWatchDataExt(newRaw.tempWatchDataList.get(0)), is(TempWatchDataExt.build(
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*20,
+                1.5,
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*10,
+                1.5,
+                1.8
+        )));
+
+        assertThat(new TempWatchDataExt(newRaw.tempWatchDataList.get(1)), is(TempWatchDataExt.build(
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*10,
+                1.3,
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*2,
+                1.3,
+                2.3
+        )));
+
+        assertThat(new BasalWatchDataExt(newRaw.basalWatchDataList.get(0)), is(BasalWatchDataExt.build(
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*20,
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*2,
+                1.2
+        )));
+
+        assertThat(new BolusWatchDataExt(newRaw.bolusWatchDataList.get(0)), is(BolusWatchDataExt.build(
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*17,
+                5.5,
+                20,
+                false,
+                true
+        )));
+
+        assertThat(new BolusWatchDataExt(newRaw.bolusWatchDataList.get(1)), is(BolusWatchDataExt.build(
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*11,
+                3,
+                0,
+                false,
+                true
+        )));
+
+        assertThat(new BolusWatchDataExt(newRaw.bolusWatchDataList.get(2)), is(BolusWatchDataExt.build(
+                WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*3,
+                0,
+                15,
+                true,
+                false
+        )));
+
+
+        assertThat(new BgWatchDataExt(newRaw.predictionList.get(3)), is(BgWatchDataExt.build(
+                160-4*3,
+                WearUtilMocker.REF_NOW + Constants.MINUTE_IN_MS*3,
+                0
+        )));
+
+        assertThat(new BgWatchDataExt(newRaw.predictionList.get(7)), is(BgWatchDataExt.build(
+                160-4*7,
+                WearUtilMocker.REF_NOW + Constants.MINUTE_IN_MS*7,
+                0
+        )));
+    }
+
+    @Test
+    public void updateBasalsFromEmptyPersistenceTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        newRaw.updateFromPersistence(persistence);
+
+        // THEN
+        assertBasalsEmpty(newRaw);
+    }
+
+    @Test
+    public void updateBasalsFromPersistenceTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        Persistence.storeDataMap(RawDisplayData.BASALS_PERSISTENCE_KEY, dataMapForBasals());
+        newRaw.updateFromPersistence(persistence);
+
+        // THEN
+        assertBasalsOk(newRaw);
+    }
+
+    @Test
+    public void partialUpdateBasalsFromPersistenceTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        Persistence.storeDataMap(RawDisplayData.BASALS_PERSISTENCE_KEY, dataMapForBasals());
+        newRaw.updateForComplicationsFromPersistence(persistence);
+
+        // THEN
+        assertBasalsEmpty(newRaw);
+    }
+
+    @Test
+    public void updateBasalsFromMessageTest() {
+        // GIVEN
+        Intent intent = IntentMock.mock();
+        Bundle bundle = BundleMock.mock(dataMapForBasals());
+
+        intent.putExtra("basals", bundle);
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        newRaw.updateBasalsFromMessage(intent, null);
+
+        // THEN
+        assertBasalsOk(newRaw);
+    }
+
+    @Test
+    public void updateBasalsFromEmptyMessageTest() {
+        // GIVEN
+        Intent intent = IntentMock.mock();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        newRaw.updateBasalsFromMessage(intent, null);
+
+        // THEN
+        assertBasalsEmpty(newRaw);
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/data/RawDisplayDataBgEntriesTest.java b/wear/src/test/java/info/nightscout/androidaps/data/RawDisplayDataBgEntriesTest.java
new file mode 100644
index 0000000000..c200288213
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/data/RawDisplayDataBgEntriesTest.java
@@ -0,0 +1,146 @@
+package info.nightscout.androidaps.data;
+
+import com.google.android.gms.wearable.DataMap;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.ArrayList;
+
+import info.nightscout.androidaps.interaction.utils.Constants;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+import info.nightscout.androidaps.testing.mockers.WearUtilMocker;
+import info.nightscout.androidaps.testing.utils.BgWatchDataExt;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest( { WearUtil.class } )
+public class RawDisplayDataBgEntriesTest {
+
+    @Before
+    public void mock() throws Exception {
+        WearUtilMocker.prepareMockNoReal();
+    }
+
+    //==============================================================================================
+    // ENTRIES for chart
+    //==============================================================================================
+
+    private DataMap dataMapForEntries() {
+
+        DataMap dataMap = new DataMap();
+        ArrayList<DataMap> entries = new ArrayList<>();
+        for (int i=0; i<12; i++) {
+            DataMap entry = new DataMap();
+            entry.putLong("timestamp", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*4*(16-i));
+            entry.putDouble("sgvDouble", 145.0-5*i);
+            entry.putDouble("high", 170.0);
+            entry.putDouble("low", 80.0);
+            entry.putInt("color", 0);
+            entries.add(entry);
+        }
+        dataMap.putDataMapArrayList("entries", entries);
+
+        return dataMap;
+    }
+
+    private DataMap dataMapForEntries(long timestamp, double sgv) {
+        DataMap entry = new DataMap();
+        entry.putLong("timestamp", timestamp);
+        entry.putDouble("sgvDouble", sgv);
+        entry.putDouble("high", 160.0);
+        entry.putDouble("low", 90.0);
+        entry.putInt("color", 1);
+        return entry;
+    }
+
+    @Test
+    public void addToWatchSetTest() {
+        // GIVEN
+        RawDisplayData newRaw = new RawDisplayData();
+        DataMap multipleEntries = dataMapForEntries();
+        DataMap singleEntry1 = dataMapForEntries(WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*4*2,92);
+        DataMap singleEntry2 = dataMapForEntries(WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*4*1,88);
+
+        // WHEN, THEN
+        // add list
+        newRaw.addToWatchSet(multipleEntries);
+        assertThat(newRaw.bgDataList.size(), is(12));
+
+        assertThat(new BgWatchDataExt(newRaw.bgDataList.get(5)),
+                is(new BgWatchDataExt(new BgWatchData(
+                        120.0, 170.0, 80.0,
+                        WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*4*(16-5), 0
+                ))));
+
+        assertThat(new BgWatchDataExt(newRaw.bgDataList.get(11)),
+                is(new BgWatchDataExt(new BgWatchData(
+                        90.0, 170.0, 80.0,
+                        WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*4*(16-11), 0
+                ))));
+
+        // add single entries
+        newRaw.addToWatchSet(singleEntry1);
+        newRaw.addToWatchSet(singleEntry2);
+        assertThat(newRaw.bgDataList.size(), is(14));
+
+        assertThat(new BgWatchDataExt(newRaw.bgDataList.get(12)),
+                is(new BgWatchDataExt(new BgWatchData(
+                        92.0, 160.0, 90.0,
+                        WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*4*2, 1
+                ))));
+        assertThat(new BgWatchDataExt(newRaw.bgDataList.get(13)),
+                is(new BgWatchDataExt(new BgWatchData(
+                        88.0, 160.0, 90.0,
+                        WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*4*1, 1
+                ))));
+
+        // ignore duplicates
+        newRaw.addToWatchSet(singleEntry2);
+        assertThat(newRaw.bgDataList.size(), is(14));
+    }
+
+    @Test
+    public void addToWatchSetCleanupOldTest() {
+        RawDisplayData newRaw = new RawDisplayData();
+
+        newRaw.addToWatchSet(dataMapForEntries(WearUtil.timestamp(),125));
+        assertThat(newRaw.bgDataList.size(), is(1));
+
+        WearUtilMocker.progressClock(Constants.HOUR_IN_MS*2);
+        newRaw.addToWatchSet(dataMapForEntries(WearUtil.timestamp(),140));
+        assertThat(newRaw.bgDataList.size(), is(2));
+
+        WearUtilMocker.progressClock(Constants.HOUR_IN_MS*1);
+        newRaw.addToWatchSet(dataMapForEntries(WearUtil.timestamp(),150));
+        WearUtilMocker.progressClock(Constants.HOUR_IN_MS*1 +Constants.MINUTE_IN_MS*30);
+        newRaw.addToWatchSet(dataMapForEntries(WearUtil.timestamp(),101));
+        assertThat(newRaw.bgDataList.size(), is(4));
+
+        WearUtilMocker.progressClock(Constants.MINUTE_IN_MS*30);
+        newRaw.addToWatchSet(dataMapForEntries(WearUtil.timestamp(),90));
+        assertThat(newRaw.bgDataList.size(), is(5));
+
+        WearUtilMocker.progressClock(Constants.HOUR_IN_MS*1 +Constants.MINUTE_IN_MS*30);
+        newRaw.addToWatchSet(dataMapForEntries(WearUtil.timestamp(),80));
+        assertThat(newRaw.bgDataList.size(), is(5));
+
+        WearUtilMocker.progressClock(Constants.HOUR_IN_MS*4);
+        newRaw.addToWatchSet(dataMapForEntries(WearUtil.timestamp(),92));
+        assertThat(newRaw.bgDataList.size(), is(2));
+
+        WearUtilMocker.progressClock(Constants.HOUR_IN_MS*5 +Constants.MINUTE_IN_MS*30);
+        newRaw.addToWatchSet(dataMapForEntries(WearUtil.timestamp(),107));
+        assertThat(newRaw.bgDataList.size(), is(1));
+
+        WearUtilMocker.progressClock(Constants.HOUR_IN_MS*6 +Constants.MINUTE_IN_MS*30);
+        newRaw.addToWatchSet(dataMapForEntries(WearUtil.timestamp()-Constants.HOUR_IN_MS*6,138));
+        assertThat(newRaw.bgDataList.size(), is(0));
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/data/RawDisplayDataStatusTest.java b/wear/src/test/java/info/nightscout/androidaps/data/RawDisplayDataStatusTest.java
new file mode 100644
index 0000000000..da0daea608
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/data/RawDisplayDataStatusTest.java
@@ -0,0 +1,176 @@
+package info.nightscout.androidaps.data;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.google.android.gms.wearable.DataMap;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.interaction.utils.Constants;
+import info.nightscout.androidaps.interaction.utils.Persistence;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+import info.nightscout.androidaps.testing.mockers.AAPSMocker;
+import info.nightscout.androidaps.testing.mockers.AndroidMocker;
+import info.nightscout.androidaps.testing.mockers.RawDataMocker;
+import info.nightscout.androidaps.testing.mockers.WearUtilMocker;
+import info.nightscout.androidaps.testing.mocks.BundleMock;
+import info.nightscout.androidaps.testing.mocks.IntentMock;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest( { WearUtil.class, Log.class, SharedPreferences.class, Context.class, aaps.class, android.util.Base64.class, Intent.class } )
+public class RawDisplayDataStatusTest {
+
+    @Before
+    public void mock() throws Exception {
+        AAPSMocker.prepareMock();
+        AAPSMocker.resetMockedSharedPrefs();
+        AndroidMocker.mockBase64();
+        WearUtilMocker.prepareMockNoReal();
+    }
+
+    @Test
+    public void toDebugStringTest() {
+        RawDisplayData raw = RawDataMocker.rawDelta(5, "1.5");
+        raw.externalStatusString = "placeholder-here";
+
+        assertThat(raw.datetime, is(WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*5));
+        assertThat(raw.toDebugString(), containsString("placeholder-here"));
+    }
+
+    //==============================================================================================
+    // STATUS
+    //==============================================================================================
+
+    private DataMap dataMapForStatus() {
+        DataMap dataMap = new DataMap();
+        dataMap.putString("currentBasal", "120%");
+        dataMap.putString("battery", "76");
+        dataMap.putString("rigBattery", "40%");
+        dataMap.putBoolean("detailedIob", true);
+        dataMap.putString("iobSum", "12.5") ;
+        dataMap.putString("iobDetail","(11,2|1,3)");
+        dataMap.putString("cob","5(10)g");
+        dataMap.putString("bgi", "13");
+        dataMap.putBoolean("showBgi", false);
+        dataMap.putString("externalStatusString", "");
+        dataMap.putInt("batteryLevel", 1);
+        dataMap.putLong("openApsStatus", WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*2);
+        return dataMap;
+    }
+
+    private void assertStatusEmpty(RawDisplayData newRaw) {
+        assertThat(newRaw.sBasalRate, is("-.--U/h"));
+        assertThat(newRaw.sUploaderBattery, is("--"));
+        assertThat(newRaw.sRigBattery, is("--"));
+        assertThat(newRaw.detailedIOB, is(false));
+        assertThat(newRaw.sIOB1, is("IOB"));
+        assertThat(newRaw.sIOB2, is("-.--"));
+        assertThat(newRaw.sCOB1, is("Carb"));
+        assertThat(newRaw.sCOB2, is("--g"));
+        assertThat(newRaw.sBgi, is("--"));
+        assertThat(newRaw.showBGI, is(false));
+        assertThat(newRaw.externalStatusString, is("no status"));
+        assertThat(newRaw.batteryLevel, is(1));
+        assertThat(newRaw.openApsStatus, is(-1L));
+    }
+
+    private void assertStatusOk(RawDisplayData newRaw) {
+        assertThat(newRaw.sBasalRate, is("120%"));
+        assertThat(newRaw.sUploaderBattery, is("76"));
+        assertThat(newRaw.sRigBattery, is("40%"));
+        assertThat(newRaw.detailedIOB, is(true));
+        assertThat(newRaw.sIOB1, is("12.5U"));
+        assertThat(newRaw.sIOB2, is("(11,2|1,3)"));
+        assertThat(newRaw.sCOB1, is("Carb"));
+        assertThat(newRaw.sCOB2, is("5(10)g"));
+        assertThat(newRaw.sBgi, is("13"));
+        assertThat(newRaw.showBGI, is(false));
+        assertThat(newRaw.externalStatusString, is(""));
+        assertThat(newRaw.batteryLevel, is(1));
+        assertThat(newRaw.openApsStatus, is(WearUtilMocker.REF_NOW - Constants.MINUTE_IN_MS*2));
+    }
+
+    @Test
+    public void updateStatusFromEmptyPersistenceTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        newRaw.updateFromPersistence(persistence);
+
+        // THEN
+        assertStatusEmpty(newRaw);
+    }
+
+    @Test
+    public void updateStatusFromPersistenceTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        Persistence.storeDataMap(RawDisplayData.STATUS_PERSISTENCE_KEY, dataMapForStatus());
+        newRaw.updateFromPersistence(persistence);
+
+        // THEN
+        assertStatusOk(newRaw);
+    }
+
+    @Test
+    public void partialUpdateStatusFromPersistenceTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        Persistence.storeDataMap(RawDisplayData.STATUS_PERSISTENCE_KEY, dataMapForStatus());
+        newRaw.updateForComplicationsFromPersistence(persistence);
+
+        // THEN
+        assertStatusOk(newRaw);
+    }
+
+    @Test
+    public void updateStatusFromMessageTest() {
+        // GIVEN
+        Intent intent = IntentMock.mock();
+        Bundle bundle = BundleMock.mock(dataMapForStatus());
+
+        intent.putExtra("status", bundle);
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        newRaw.updateStatusFromMessage(intent, null);
+
+        // THEN
+        assertStatusOk(newRaw);
+    }
+
+    @Test
+    public void updateStatusFromEmptyMessageTest() {
+        // GIVEN
+        Intent intent = IntentMock.mock();
+        RawDisplayData newRaw = new RawDisplayData();
+
+        // WHEN
+        newRaw.updateStatusFromMessage(intent, null);
+
+        // THEN
+        assertStatusEmpty(newRaw);
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/interaction/utils/DisplayFormatTest.java b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/DisplayFormatTest.java
new file mode 100644
index 0000000000..98fb4fd11b
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/DisplayFormatTest.java
@@ -0,0 +1,204 @@
+package info.nightscout.androidaps.interaction.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.testing.mockers.AAPSMocker;
+import info.nightscout.androidaps.testing.mockers.WearUtilMocker;
+
+import static info.nightscout.androidaps.testing.mockers.RawDataMocker.rawCob;
+import static info.nightscout.androidaps.testing.mockers.RawDataMocker.rawCobIobBr;
+import static info.nightscout.androidaps.testing.mockers.RawDataMocker.rawDelta;
+import static info.nightscout.androidaps.testing.mockers.RawDataMocker.rawIob;
+import static info.nightscout.androidaps.testing.mockers.RawDataMocker.rawSgv;
+import static info.nightscout.androidaps.testing.mockers.WearUtilMocker.backInTime;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * This test covers DisplayFormat class (directly)
+ * but also SmallestDoubleString - due to carefully chosen input data to format
+ */
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest( { WearUtil.class, Log.class, SharedPreferences.class, Context.class, aaps.class } )
+public class DisplayFormatTest {
+
+    @Before
+    public void mock() throws Exception {
+        WearUtilMocker.prepareMock();
+        AAPSMocker.prepareMock();
+        AAPSMocker.resetMockedSharedPrefs();
+    }
+
+    @Test
+    public void shortTimeSinceTest() {
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,0,0)), is("0'"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,0,5)), is("0'"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,0,55)), is("0'"));
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,1,0)), is("1'"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,1,59)), is("1'"));
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,2,0)), is("2'"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,3,0)), is("3'"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,4,0)), is("4'"));
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,10,0)), is("10'"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,30,0)), is("30'"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,59,0)), is("59'"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,0,59,59)), is("59'"));
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,1,0,0)), is("1h"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,1,30,0)), is("1h"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,1,59,59)), is("1h"));
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,2,0,0)), is("2h"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,3,0,0)), is("3h"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,4,0,0)), is("4h"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,5,0,0)), is("5h"));
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,12,0,0)), is("12h"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,18,0,0)), is("18h"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(0,23,59,59)), is("23h"));
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(1,0,0,0)), is("1d"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(1,12,0,0)), is("1d"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(1,23,59,59)), is("1d"));
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(2,0,0,0)), is("2d"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(3,0,0,0)), is("3d"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(4,0,0,0)), is("4d"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(5,0,0,0)), is("5d"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(6,0,0,0)), is("6d"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(6,23,59,59)), is("6d"));
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(7,0,0,0)), is("1w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(8,0,0,0)), is("1w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(9,0,0,0)), is("1w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(13,23,59,59)), is("1w"));
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(14,0,0,0)), is("2w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(21,0,0,0)), is("3w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(28,0,0,0)), is("4w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(31,0,0,0)), is("4w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(32,0,0,0)), is("4w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(35,0,0,0)), is("5w"));
+
+        assertThat(DisplayFormat.shortTimeSince(backInTime(100,0,0,0)), is("14w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(200,0,0,0)), is("28w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(365,0,0,0)), is("52w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(366,0,0,0)), is("52w"));
+        assertThat(DisplayFormat.shortTimeSince(backInTime(367,0,0,0)), is("52w"));
+    }
+
+    @Test
+    public void shortTrendTest() {
+        RawDisplayData raw = new RawDisplayData();
+        assertThat(DisplayFormat.shortTrend(raw), is("-- Δ--"));
+
+        raw.datetime = backInTime(0, 0, 2, 0);
+        assertThat(DisplayFormat.shortTrend(raw), is("2' Δ--"));
+
+        AAPSMocker.setMockedUnicodeComplicationsOn(true);
+
+        // shortening
+        assertThat(DisplayFormat.shortTrend(rawDelta(2, "1.2")), is("2' Δ1.2"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(11,"1.2")), is("11' 1.2"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(12,"0.7")), is("12' Δ.7"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(10,"1.0")), is("10' Δ1"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(14,"-5.0")), is("14' Δ-5"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(13,"-5.1")), is("13' -5"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(15,"0.87")), is("15' .87"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(10,"-1.78")), is("10' -2"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(3, "2.549")), is("3' 2.55"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(1, "-1.563")), is("1' -1.6"));
+
+        // preserving separator
+        assertThat(DisplayFormat.shortTrend(rawDelta(2, "1,2")), is("2' Δ1,2"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(15,"0,87")), is("15' ,87"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(3, "+2,549")), is("3' 2,55"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(1, "-1,563")), is("1' -1,6"));
+
+        // UTF-off mode - without delta symbol
+        AAPSMocker.setMockedUnicodeComplicationsOn(false);
+        assertThat(DisplayFormat.shortTrend(rawDelta(2, "1.2")), is("2' 1.2"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(12,"0.7")), is("12' 0.7"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(10,"1.0")), is("10' 1.0"));
+        assertThat(DisplayFormat.shortTrend(rawDelta(14,"-5.0")), is("14' -5"));
+    }
+
+    @Test
+    public void longGlucoseLine() {
+        assertThat(DisplayFormat.longGlucoseLine(rawSgv("125",2, "1.2")), is("125→ Δ1.2 (2')"));
+        assertThat(DisplayFormat.longGlucoseLine(rawSgv("97",11, "5.2")), is("97↗ Δ5.2 (11')"));
+        assertThat(DisplayFormat.longGlucoseLine(rawSgv("110",12,"0.7")), is("110→ Δ.7 (12')"));
+        assertThat(DisplayFormat.longGlucoseLine(rawSgv("65",10,"7.0")), is("65↗ Δ7 (10')"));
+        assertThat(DisplayFormat.longGlucoseLine(rawSgv("215",14,"-5.0")), is("215↘ Δ-5 (14')"));
+        assertThat(DisplayFormat.longGlucoseLine(rawSgv("8.3",13,"-5.1")), is("8.3↘ Δ-5.1 (13')"));
+        assertThat(DisplayFormat.longGlucoseLine(rawSgv("6.8",15,"10.83")), is("6.8↑ Δ10.83 (15')"));
+        assertThat(DisplayFormat.longGlucoseLine(rawSgv("13.2",10,"-11.78")), is("13.2↓ Δ-11.78 (10')"));
+        assertThat(DisplayFormat.longGlucoseLine(rawSgv("3.9",3, "2.549")), is("3.9→ Δ2.549 (3')"));
+        assertThat(DisplayFormat.longGlucoseLine(rawSgv("11.1",1, "-15.563")), is("11.1↓ Δ-15.563 (1')"));
+    }
+
+    @Test
+    public void longDetailsLineTest() {
+        AAPSMocker.setMockedUnicodeComplicationsOn(true);
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("0g", "0U", "3.5U/h")), is("0g  ⁞  0U  ⁞  ⎍ 3.5U/h"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("50g", "7.56U", "0%")), is("50g  ⁞  7.56U  ⁞  ⎍ 0%"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("12g", "3.23U", "120%")), is("12g ⁞ 3.23U ⁞ 120%"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("2(40)g", "-1.5U", "0.55U/h")), is("2(40)g ⁞ -2U ⁞ 0.55U/h"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("0(24)g", "0.05U", "160%")), is("0(24)g ⁞ 0.05U ⁞ 160%"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("47g", "13.87U", "220%")), is("47g ⁞ 13.87U ⁞ 220%"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("13(5)g", "5.90U", "300%")), is("13(5)g ⁞ 5.90U ⁞ 300%"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("11(50)g", "0U", "70%")), is("11(50)g ⁞ 0U ⁞ 70%"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("7g", "0.54U", "30%")), is("7g  ⁞  0.54U  ⁞  ⎍ 30%"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("19(38)g", "35.545U", "12.9U/h")), is("19g ⁞ 36U ⁞ 12.9U/h"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("100(1)g", "12.345U", "6.98647U/h")), is("100g 12U 6.98647U/h"));
+
+        AAPSMocker.setMockedUnicodeComplicationsOn(false);
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("0g", "0U", "3.5U/h")), is("0g  |  0U  |  3.5U/h"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("50g", "7.56U", "0%")), is("50g  |  7.56U  |  0%"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("12g", "3.23U", "120%")), is("12g  |  3.23U  |  120%"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("7g", "0.54U", "30%")), is("7g  |  0.54U  |  30%"));
+        assertThat(DisplayFormat.longDetailsLine(rawCobIobBr("19(38)g", "35.545U", "12.9U/h")), is("19g | 36U | 12.9U/h"));
+    }
+
+    @Test
+    public void detailedIobTest() {
+        assertThat(DisplayFormat.detailedIob(rawIob("-1.29U", "(0,910|-2,20)")), is(Pair.create("-1.29U", ",91 -2")));
+        assertThat(DisplayFormat.detailedIob(rawIob("3.50U", "")), is(Pair.create("3.50U", "")));
+        assertThat(DisplayFormat.detailedIob(rawIob("12.5U", "(+1,4|-4.78)")), is(Pair.create("12.5U", "1,4 -5")));
+        assertThat(DisplayFormat.detailedIob(rawIob("0.67U", "some junks")), is(Pair.create(".67U", "")));
+        assertThat(DisplayFormat.detailedIob(rawIob("-11.0U", "(broken|data)")), is(Pair.create("-11U", "-- --")));
+        assertThat(DisplayFormat.detailedIob(rawIob("5.52U", "(0,5439|wrong)")), is(Pair.create("5.52U", ",54 --")));
+        assertThat(DisplayFormat.detailedIob(rawIob("-8.1U", "(|-8,1)")), is(Pair.create("-8.1U", "-- -8")));
+        assertThat(DisplayFormat.detailedIob(rawIob("-8.1U", "(|-8,1)")), is(Pair.create("-8.1U", "-- -8")));
+        assertThat(DisplayFormat.detailedIob(rawIob("7.6U", "(malformed)")), is(Pair.create("7.6U", "")));
+        assertThat(DisplayFormat.detailedIob(rawIob("-4.26U", "(6,97|1,3422|too much)")), is(Pair.create("-4.26U", "7 1,3")));
+    }
+
+    @Test
+    public void detailedCobTest() {
+        assertThat(DisplayFormat.detailedCob(rawCob("0g")), is(Pair.create("0g", "")));
+        assertThat(DisplayFormat.detailedCob(rawCob("50g")), is(Pair.create("50g", "")));
+        assertThat(DisplayFormat.detailedCob(rawCob("2(40)g")), is(Pair.create("2g", "40g")));
+        assertThat(DisplayFormat.detailedCob(rawCob("0(24)g")), is(Pair.create("0g", "24g")));
+        assertThat(DisplayFormat.detailedCob(rawCob("13(5)g")), is(Pair.create("13g", "5g")));
+        assertThat(DisplayFormat.detailedCob(rawCob("11(50)g")), is(Pair.create("11g", "50g")));
+        assertThat(DisplayFormat.detailedCob(rawCob("19(38)g")), is(Pair.create("19g", "38g")));
+        assertThat(DisplayFormat.detailedCob(rawCob("100(1)g")), is(Pair.create("100g", "1g")));
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/interaction/utils/PairTest.java b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/PairTest.java
new file mode 100644
index 0000000000..ce63330e9c
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/PairTest.java
@@ -0,0 +1,68 @@
+package info.nightscout.androidaps.interaction.utils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(PowerMockRunner.class)
+public class PairTest {
+
+    @Test
+    public void pairEqualsTest() {
+        // GIVEN
+        Pair left = Pair.create("aa", "bbb");
+        Pair right = Pair.create("ccc", "dd");
+        Pair another = Pair.create("aa", "bbb");
+        Pair samePos1 = Pair.create("aa", "d");
+        Pair samePos2 = Pair.create("zzzzz", "bbb");
+        Pair no1 = Pair.create(12, 345L);
+        Pair no2 = Pair.create(-943, 42);
+        Pair no3 = Pair.create(12L, 345);
+        Pair no4 = Pair.create(12, 345L);
+
+        // THEN
+        assertNotEquals(left, right);
+        assertEquals(left, another);
+        assertNotEquals(left, samePos1);
+        assertNotEquals(left, samePos2);
+        assertNotEquals(no1, no2);
+        assertNotEquals(no1, no3);
+        assertEquals(no1, no4);
+
+        assertFalse(left.equals("aa bbb"));
+    }
+
+    @Test
+    public void pairHashTest() {
+        // GIVEN
+        Pair inserted = Pair.create("aa", "bbb");
+        Set<Pair> set = new HashSet<>();
+
+        // THEN
+        assertFalse(set.contains(inserted));
+        set.add(inserted);
+        assertTrue(set.contains(inserted));
+    }
+
+    @Test
+    public void toStringTest() {
+        // GIVEN
+        Pair pair = Pair.create("the-first", "2nd");
+
+        assertThat(pair.toString(), containsString("the-first"));
+        assertThat(pair+"", containsString("2nd"));
+    }
+
+
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/interaction/utils/PersistenceTest.java b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/PersistenceTest.java
new file mode 100644
index 0000000000..1faa4ddfe7
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/PersistenceTest.java
@@ -0,0 +1,189 @@
+package info.nightscout.androidaps.interaction.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import com.google.android.gms.wearable.DataMap;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.Set;
+
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.testing.mockers.AAPSMocker;
+import info.nightscout.androidaps.testing.mockers.AndroidMocker;
+import info.nightscout.androidaps.testing.mockers.LogMocker;
+import info.nightscout.androidaps.testing.mockers.WearUtilMocker;
+
+import static info.nightscout.androidaps.testing.mockers.WearUtilMocker.REF_NOW;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest( { WearUtil.class, Log.class, SharedPreferences.class, Context.class, aaps.class, android.util.Base64.class} )
+public class PersistenceTest {
+
+    @Before
+    public void mock() throws Exception {
+        WearUtilMocker.prepareMock();
+        LogMocker.prepareMock();
+        AAPSMocker.prepareMock();
+        AAPSMocker.resetMockedSharedPrefs();
+        AndroidMocker.mockBase64();
+    }
+
+    @Test
+    public void putStringTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+
+        // WHEN
+        final String emptyGot = persistence.getString("test-key", "default-value");
+        persistence.putString("test-key", "newValue");
+        final String updatedGot = persistence.getString("test-key", "another-default-value");
+
+        // THEN
+        assertThat(emptyGot, is("default-value"));
+        assertThat(updatedGot, is("newValue"));
+    }
+
+    @Test
+    public void putBooleanTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+
+        // WHEN
+        final boolean emptyGot = persistence.getBoolean("test-key", false);
+        persistence.putBoolean("test-key", true);
+        final boolean updatedGot = persistence.getBoolean("test-key", false);
+
+        // THEN
+        assertFalse(emptyGot);
+        assertTrue(updatedGot);
+    }
+
+    @Test
+    public void whenDataUpdatedTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+        DataMap map = new DataMap();
+
+        // WHEN
+        final long whenNotUpdated = persistence.whenDataUpdated();
+
+        Persistence.storeDataMap("data-map", map);
+        final long whenUpdatedFirst = persistence.whenDataUpdated();
+
+        WearUtilMocker.progressClock(60000);
+        Persistence.storeDataMap("data-map", map);
+        final long whenUpdatedNext = persistence.whenDataUpdated();
+
+        // THEN
+        assertThat(whenNotUpdated, is(0L));
+        assertThat(whenUpdatedFirst, is(REF_NOW));
+        assertThat(whenUpdatedNext, is(REF_NOW + 60000));
+    }
+
+    @Test
+    public void getDataMapTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+        DataMap map = new DataMap();
+        map.putByteArray("test-key", new byte[]{9, 42, 127, -5});
+
+        // WHEN
+        DataMap notExisting = persistence.getDataMap("not-there");
+        Persistence.storeDataMap("data-map", map);
+        DataMap restoredMap = persistence.getDataMap("data-map");
+        byte[] restoredMapContents = restoredMap.getByteArray("test-key");
+
+        // THEN
+        assertNull(notExisting);
+        assertNotNull(restoredMap);
+        assertTrue(restoredMap.containsKey("test-key"));
+
+        assertThat(restoredMapContents.length, is(4));
+        assertThat(restoredMapContents[0], is((byte)9));
+        assertThat(restoredMapContents[1], is((byte)42));
+        assertThat(restoredMapContents[2], is((byte)127));
+        assertThat(restoredMapContents[3], is((byte)-5));
+    }
+
+    @Test
+    public void brokenDataMapTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+
+        // WHEN
+        persistence.putString("data-map", "ZmFrZSBkYXRh");
+        DataMap restoredMap = persistence.getDataMap("data-map");
+
+        // THEN
+        assertNull(restoredMap);
+    }
+
+    @Test
+    public void setsTest() {
+        // GIVEN
+        Persistence persistence = new Persistence();
+
+        // WHEN
+        Set<String> emptySet = persistence.getSetOf("some fake id");
+
+        persistence.addToSet("test-set", "element1");
+        persistence.addToSet("test-set", "second-elem");
+        persistence.addToSet("test-set", "3rd");
+        persistence.addToSet("test-set", "czwarty");
+        persistence.addToSet("test-set", "V");
+        persistence.addToSet("test-set", "6");
+
+        Set<String> initialSet = persistence.getSetOf("test-set");
+        Set<String> sameInitialSet = Persistence.setOf("test-set");
+
+        persistence.addToSet("test-set", "second-elem");
+        persistence.addToSet("test-set", "new-one");
+
+        Set<String> extendedSet = persistence.getSetOf("test-set");
+
+        persistence.removeFromSet("test-set", "czwarty");
+        persistence.removeFromSet("test-set", "6");
+        persistence.removeFromSet("test-set", "3rd");
+
+        Set<String> reducedSet = persistence.getSetOf("test-set");
+
+        // THEN
+        assertThat(emptySet.size(), is(0));
+
+        assertThat(initialSet.size(), is(6));
+        assertTrue(initialSet.contains("element1"));
+        assertTrue(initialSet.contains("second-elem"));
+        assertTrue(initialSet.contains("3rd"));
+        assertTrue(initialSet.contains("czwarty"));
+        assertTrue(initialSet.contains("V"));
+        assertTrue(initialSet.contains("6"));
+
+        assertThat(initialSet, is(sameInitialSet));
+
+        assertThat(extendedSet.size(), is(7));
+        assertTrue(extendedSet.contains("new-one"));
+
+        assertThat(reducedSet.size(), is(4));
+        assertTrue(reducedSet.contains("element1"));
+        assertTrue(reducedSet.contains("second-elem"));
+        assertFalse(reducedSet.contains("3rd"));
+        assertFalse(reducedSet.contains("czwarty"));
+        assertTrue(reducedSet.contains("V"));
+        assertFalse(reducedSet.contains("6"));
+        assertTrue(reducedSet.contains("new-one"));
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/interaction/utils/SafeParseTest.java b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/SafeParseTest.java
new file mode 100644
index 0000000000..62a71e6420
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/SafeParseTest.java
@@ -0,0 +1,128 @@
+package info.nightscout.androidaps.interaction.utils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Created by dlvoy on 21.11.2019.
+ */
+@RunWith(PowerMockRunner.class)
+public class SafeParseTest {
+
+    @Test
+    public void stringToDoubleTest() {
+        // correct values
+        assertThat(0.1234, is(SafeParse.stringToDouble("0.1234")));
+        assertThat(0.1234, is(SafeParse.stringToDouble("0,1234")));
+        assertThat(0.5436564812, is(SafeParse.stringToDouble(".5436564812")));
+        assertThat(0.5436564812, is(SafeParse.stringToDouble(",5436564812")));
+        assertThat(1000500100900.0, is(SafeParse.stringToDouble("1000500100900")));
+        assertThat(42.0, is(SafeParse.stringToDouble("42")));
+
+        // units or other extra values are not permitted
+        assertThat(0.0, is(SafeParse.stringToDouble("12 U/h")));
+
+        // strings are not parsable
+        assertThat(0.0, is(SafeParse.stringToDouble("ala ma kota")));
+
+        // separator errors
+        assertThat(0.0, is(SafeParse.stringToDouble("0.1234.5678")));
+        assertThat(0.0, is(SafeParse.stringToDouble("0,1234,5678")));
+
+        // various emptiness
+        assertThat(0.0, is(SafeParse.stringToDouble("")));
+        assertThat(0.0, is(SafeParse.stringToDouble("     ")));
+        assertThat(0.0, is(SafeParse.stringToDouble("\n\r")));
+    }
+
+    @Test
+    public void stringToIntTest() {
+        // correct values
+        assertThat(1052934, is(SafeParse.stringToInt("1052934")));
+        assertThat(-42, is(SafeParse.stringToInt("-42")));
+        assertThat(2147483647, is(SafeParse.stringToInt("2147483647")));
+        assertThat(-2147483648, is(SafeParse.stringToInt("-2147483648")));
+
+        // outside Integer range
+        assertThat(0, is(SafeParse.stringToInt("2147483648")));
+        assertThat(0, is(SafeParse.stringToInt("-2147483649")));
+
+        // units or other extra values are not permitted
+        assertThat(0, is(SafeParse.stringToInt("12 U/h")));
+        assertThat(0, is(SafeParse.stringToInt("0.1234")));
+        assertThat(0, is(SafeParse.stringToInt("0,1234")));
+        assertThat(0, is(SafeParse.stringToInt(".5436564812")));
+        assertThat(0, is(SafeParse.stringToInt(",5436564812")));
+        assertThat(0, is(SafeParse.stringToInt("42.1234")));
+        assertThat(0, is(SafeParse.stringToInt("42,1234")));
+        assertThat(0, is(SafeParse.stringToInt("3212.5436564812")));
+        assertThat(0, is(SafeParse.stringToInt("3212,5436564812")));
+        assertThat(0, is(SafeParse.stringToInt("1000500100900")));
+
+        // strings are not parsable
+        assertThat(0, is(SafeParse.stringToInt("ala ma kota")));
+
+        // various emptiness
+        assertThat(0, is(SafeParse.stringToInt("")));
+        assertThat(0, is(SafeParse.stringToInt("     ")));
+        assertThat(0, is(SafeParse.stringToInt("\n\r")));
+    }
+
+    @Test
+    public void stringToLongTest() {
+        // correct values
+        assertThat(1052934L, is(SafeParse.stringToLong("1052934")));
+        assertThat(-42L, is(SafeParse.stringToLong("-42")));
+        assertThat(2147483647L, is(SafeParse.stringToLong("2147483647")));
+        assertThat(-2147483648L, is(SafeParse.stringToLong("-2147483648")));
+        assertThat(1000500100900L, is(SafeParse.stringToLong("1000500100900")));
+
+        // outside Integer range
+        assertThat(2147483648L, is(SafeParse.stringToLong("2147483648")));
+        assertThat(-2147483649L, is(SafeParse.stringToLong("-2147483649")));
+
+        // units or other extra values are not permitted
+        assertThat(0L, is(SafeParse.stringToLong("12 U/h")));
+        assertThat(0L, is(SafeParse.stringToLong("0.1234")));
+        assertThat(0L, is(SafeParse.stringToLong("0,1234")));
+        assertThat(0L, is(SafeParse.stringToLong(".5436564812")));
+        assertThat(0L, is(SafeParse.stringToLong(",5436564812")));
+        assertThat(0L, is(SafeParse.stringToLong("42.1234")));
+        assertThat(0L, is(SafeParse.stringToLong("42,1234")));
+        assertThat(0L, is(SafeParse.stringToLong("3212.5436564812")));
+        assertThat(0L, is(SafeParse.stringToLong("3212,5436564812")));
+
+        // strings are not parsable
+        assertThat(0L, is(SafeParse.stringToLong("ala ma kota")));
+
+        // various emptiness
+        assertThat(0L, is(SafeParse.stringToLong("")));
+        assertThat(0L, is(SafeParse.stringToLong("     ")));
+        assertThat(0L, is(SafeParse.stringToLong("\n\r")));
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void stringToDoubleNullTest() {
+        SafeParse.stringToDouble(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void stringToIntNullTest() {
+        SafeParse.stringToInt(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void stringToLongNullTest() {
+        SafeParse.stringToLong(null);
+    }
+
+    @Before
+    public void prepareMock() {
+
+    }
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/interaction/utils/WearUtilTest.java b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/WearUtilTest.java
new file mode 100644
index 0000000000..9e60423c6a
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/WearUtilTest.java
@@ -0,0 +1,186 @@
+package info.nightscout.androidaps.interaction.utils;
+
+import android.os.Bundle;
+import android.util.Log;
+
+import com.google.android.gms.wearable.DataMap;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import info.nightscout.androidaps.testing.mockers.LogMocker;
+import info.nightscout.androidaps.testing.mockers.WearUtilMocker;
+import info.nightscout.androidaps.testing.mocks.BundleMock;
+
+import static info.nightscout.androidaps.testing.mockers.WearUtilMocker.REF_NOW;
+import static org.hamcrest.CoreMatchers.both;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.lessThan;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Created by dlvoy on 22.11.2019.
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest( { WearUtil.class, Log.class} )
+public class WearUtilTest {
+
+    @Before
+    public void mock() throws Exception {
+        WearUtilMocker.prepareMock();
+        LogMocker.prepareMock();
+    }
+
+    @Test
+    public void timestampAndTimeDiffsTest() {
+
+        // smoke for mocks - since we freeze "now" to get stable tests
+        assertThat(REF_NOW, is(WearUtil.timestamp()));
+
+        assertThat(0L, is(WearUtil.msTill(REF_NOW)));
+        assertThat(3456L, is(WearUtil.msTill(REF_NOW+3456L)));
+        assertThat(-6294L, is(WearUtil.msTill(REF_NOW-6294L)));
+
+        assertThat(0L, is(WearUtil.msTill(REF_NOW)));
+        assertThat(-3456L, is(WearUtil.msSince(REF_NOW+3456L)));
+        assertThat(6294L, is(WearUtil.msSince(REF_NOW-6294L)));
+    }
+
+    @Test
+    public void joinSetTest() {
+        // GIVEN
+        Set<String> refSet = new HashSet<>();
+        refSet.add("element1");
+        refSet.add("second-elem");
+        refSet.add("3rd");
+
+        // WHEN
+        String joined = WearUtil.joinSet(refSet, "|");
+
+        // THEN
+        // we cannot guarantee order of items in joined string
+        // but all items have to be there
+        assertThat(joined.length(), is("element1".length() + "second-elem".length() + "3rd".length() + "|".length()*2 ));
+
+        assertThat("|"+joined+"|", containsString("|"+"element1"+"|"));
+        assertThat("|"+joined+"|", containsString("|"+"second-elem"+"|"));
+        assertThat("|"+joined+"|", containsString("|"+"3rd"+"|"));
+    }
+
+    @Test
+    public void explodeSetTest() {
+        // GIVEN
+        String serializedSet = "second-elem:element1:3rd";
+
+        // WHEN
+        Set<String> set = WearUtil.explodeSet(serializedSet, ":");
+
+        // THEN
+        assertThat(set.size(), is(3));
+
+        assertTrue(set.contains("element1"));
+        assertTrue(set.contains("second-elem"));
+        assertTrue(set.contains("3rd"));
+    }
+
+    @Test
+    public void explodeSetEmptyElemsTest() {
+        // GIVEN
+        String serializedSet = ",,,,real,,,another,,,";
+
+        // WHEN
+        Set<String> set = WearUtil.explodeSet(serializedSet, ",");
+
+        // THEN
+        assertThat(set.size(), is(2));
+
+        assertThat(true, is(set.contains("real")));
+        assertThat(true, is(set.contains("another")));
+    }
+
+    @Test
+    public void joinExplodeStabilityTest() {
+        // GIVEN
+        Set<String> refSet = new HashSet<>();
+        refSet.add("element1");
+        refSet.add("second-elem");
+        refSet.add("3rd");
+        refSet.add("czwarty");
+        refSet.add("V");
+        refSet.add("6");
+
+        // WHEN
+        String joinedSet = WearUtil.joinSet(refSet, "#");
+        final Set<String> explodedSet = WearUtil.explodeSet(joinedSet, "#");
+
+        // THEN
+        assertThat(explodedSet, is(refSet));
+    }
+
+    @Test
+    public void threadSleepTest() {
+        // GIVEN
+        final long testStart = System.currentTimeMillis();
+        final long requestedSleepDuration = 85L;
+        final long measuringMargin = 100L;
+
+        // WHEN
+        WearUtil.threadSleep(requestedSleepDuration);
+        final long measuredSleepDuration = System.currentTimeMillis() - testStart;
+
+        // THEN
+        // we cannot guarantee to be exact to the millisecond - we add some margin of error
+        assertThat(measuredSleepDuration, is(both(greaterThan(60L)).and(lessThan(requestedSleepDuration+measuringMargin))));
+    }
+
+    @Test
+    public void rateLimitTest() {
+        // WHEN
+        final boolean firstCall = WearUtil.isBelowRateLimit("test-limit", 3);
+        final boolean callAfterward = WearUtil.isBelowRateLimit("test-limit", 3);
+        WearUtilMocker.progressClock(500L);
+        final boolean callTooSoon = WearUtil.isBelowRateLimit("test-limit", 3);
+        WearUtilMocker.progressClock(3100L);
+        final boolean callAfterRateLimit = WearUtil.isBelowRateLimit("test-limit", 3);
+
+        // THEN
+        assertTrue(firstCall);
+        assertFalse(callAfterward);
+        assertFalse(callTooSoon);
+        assertTrue(callAfterRateLimit);
+    }
+
+    /**
+     * It tests if mock for bundleToDataMap is sane,
+     * because original impl. of bundleToDataMap
+     * uses DataMap.fromBundle which need Android SDK runtime
+     */
+    @Test
+    public void bundleToDataMapTest() throws Exception {
+        // GIVEN
+        DataMap refMap = new DataMap();
+        refMap.putString("ala", "ma kota");
+        refMap.putInt("why", 42);
+        refMap.putFloatArray("list", new float[]{0.45f, 3.2f, 6.8f});
+
+        // WHEN
+        WearUtilMocker.prepareMockNoReal();
+        Bundle bundle = BundleMock.mock(refMap);
+        DataMap gotMap = WearUtil.bundleToDataMap(bundle);
+
+        // THEN
+        assertThat(gotMap, is(refMap));
+    }
+
+
+}
\ No newline at end of file
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/mockers/AAPSMocker.java b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/AAPSMocker.java
new file mode 100644
index 0000000000..7684d169f1
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/AAPSMocker.java
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.testing.mockers;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import org.junit.Assert;
+import org.mockito.ArgumentMatchers;
+import org.mockito.invocation.InvocationOnMock;
+import org.powermock.api.mockito.PowerMockito;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.testing.mocks.SharedPreferencesMock;
+
+import static org.mockito.Mockito.mock;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+
+public class AAPSMocker {
+
+    private static final Map<String, SharedPreferences> mockedSharedPrefs = new HashMap<>();
+    private static boolean unicodeComplicationsOn = true;
+
+    public static void prepareMock() throws Exception {
+        Context mockedContext = mock(Context.class);
+        mockStatic(aaps.class, InvocationOnMock::callRealMethod);
+
+        PowerMockito.when(aaps.class, "getAppContext").thenReturn(mockedContext);
+        PowerMockito.when(mockedContext, "getSharedPreferences",  ArgumentMatchers.anyString(), ArgumentMatchers.anyInt()).thenAnswer(invocation -> {
+
+            final String key = invocation.getArgument(0);
+            if (mockedSharedPrefs.containsKey(key)) {
+                return mockedSharedPrefs.get(key);
+            } else {
+                SharedPreferencesMock newPrefs = new SharedPreferencesMock();
+                mockedSharedPrefs.put(key, newPrefs);
+                return newPrefs;
+            }
+        });
+        PowerMockito.when(aaps.class, "areComplicationsUnicode").thenAnswer(invocation -> unicodeComplicationsOn);
+
+        setMockedUnicodeComplicationsOn(true);
+        resetMockedSharedPrefs();
+    }
+
+    public static void resetMockedSharedPrefs() {
+        mockedSharedPrefs.clear();
+    }
+
+    public static void resetMockedSharedPrefs(String forKey) {
+        mockedSharedPrefs.remove(forKey);
+    }
+
+    public static void setMockedUnicodeComplicationsOn(boolean setUnicodeOn) {
+        unicodeComplicationsOn = setUnicodeOn;
+    }
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/mockers/AndroidMocker.java b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/AndroidMocker.java
new file mode 100644
index 0000000000..a1addfdc1d
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/AndroidMocker.java
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.testing.mockers;
+
+import org.junit.Assert;
+import org.powermock.api.mockito.PowerMockito;
+
+import java.util.Base64;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+
+public class AndroidMocker {
+
+    public static void mockBase64() throws Exception {
+        mockStatic(android.util.Base64.class);
+
+        PowerMockito.when(android.util.Base64.class, "decode", anyString(), anyInt()).thenAnswer(invocation -> {
+
+            final String payload = invocation.getArgument(0);
+            try {
+                return Base64.getDecoder().decode(payload);
+            } catch (java.lang.IllegalArgumentException ex) {
+                return null;
+            }
+        });
+
+        PowerMockito.when(android.util.Base64.class, "encodeToString", any(), anyInt()).thenAnswer(invocation -> {
+
+            final byte[] payload = invocation.getArgument(0);
+            return  Base64.getEncoder().encodeToString(payload);
+
+        });
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/mockers/LogMocker.java b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/LogMocker.java
new file mode 100644
index 0000000000..5c374665bc
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/LogMocker.java
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.testing.mockers;
+
+import android.util.Log;
+
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+
+public class LogMocker {
+    public static void prepareMock() {
+        mockStatic(Log.class);
+    }
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/mockers/RawDataMocker.java b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/RawDataMocker.java
new file mode 100644
index 0000000000..7d06f00c51
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/RawDataMocker.java
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps.testing.mockers;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.SafeParse;
+
+import static info.nightscout.androidaps.testing.mockers.WearUtilMocker.backInTime;
+
+public class RawDataMocker {
+
+    public static RawDisplayData rawSgv(String sgv, int m, String deltaString) {
+        RawDisplayData raw = new RawDisplayData();
+        raw.datetime = backInTime(0, 0, m, 0);
+        raw.sDelta = deltaString;
+        raw.sSgv = sgv;
+
+        double delta = SafeParse.stringToDouble(deltaString);
+
+        if (delta <= (-3.5 * 5)) {
+            raw.sDirection = "\u21ca";
+        } else if (delta <= (-2 * 5)) {
+            raw.sDirection = "\u2193";
+        } else if (delta <= (-1 * 5)) {
+            raw.sDirection = "\u2198";
+        } else if (delta <= (1 * 5)) {
+            raw.sDirection = "\u2192";
+        } else if (delta <= (2 * 5)) {
+            raw.sDirection = "\u2197";
+        } else if (delta <= (3.5 * 5)) {
+            raw.sDirection = "\u2191";
+        } else {
+            raw.sDirection = "\u21c8";
+        }
+
+        return raw;
+    }
+
+    public static RawDisplayData rawDelta(int m, String delta) {
+        RawDisplayData raw = new RawDisplayData();
+        raw.datetime = backInTime(0, 0, m, 0);
+        raw.sDelta = delta;
+        return raw;
+    }
+
+    public static RawDisplayData rawCobIobBr(String cob, String iob, String br) {
+        RawDisplayData raw = new RawDisplayData();
+        raw.sCOB2 = cob;
+        raw.sIOB1 = iob;
+        raw.sBasalRate = br;
+        return raw;
+    }
+
+    public static RawDisplayData rawIob(String iob, String iob2) {
+        RawDisplayData raw = new RawDisplayData();
+        raw.sIOB1 = iob;
+        raw.sIOB2 = iob2;
+        return raw;
+    }
+
+    public static RawDisplayData rawCob(String cob) {
+        RawDisplayData raw = new RawDisplayData();
+        raw.sCOB2 = cob;
+        return raw;
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/mockers/WearUtilMocker.java b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/WearUtilMocker.java
new file mode 100644
index 0000000000..11a89f0699
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/WearUtilMocker.java
@@ -0,0 +1,98 @@
+package info.nightscout.androidaps.testing.mockers;
+
+import android.os.Bundle;
+
+import com.google.android.gms.wearable.Asset;
+import com.google.android.gms.wearable.DataMap;
+
+import org.junit.Assert;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
+
+import java.util.ArrayList;
+
+import info.nightscout.androidaps.interaction.utils.Constants;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+
+public class WearUtilMocker {
+
+    public static final long REF_NOW = 1572610530000L;
+    private static long clockMsDiff = 0L;
+
+    public static void prepareMock() throws Exception {
+        resetClock();
+        mockStatic(WearUtil.class, InvocationOnMock::callRealMethod);
+
+        // because we cleverly used timestamp() by implementation, we can mock it
+        // and control the time in tests
+        PowerMockito.when(WearUtil.class, "timestamp").then(invocation -> (REF_NOW + clockMsDiff));
+    }
+
+    public static void prepareMockNoReal() throws Exception {
+        resetClock();
+        mockStatic(WearUtil.class);
+
+        PowerMockito.when(WearUtil.class, "timestamp").then(invocation -> REF_NOW + clockMsDiff);
+        PowerMockito.when(WearUtil.class, "getWakeLock", anyString(), anyInt()).then(invocation -> null);
+        PowerMockito.when(WearUtil.class, "bundleToDataMap", any(Bundle.class)).then(bundleToDataMapMock);
+    }
+
+    public static void resetClock() {
+        clockMsDiff = 0L;
+    }
+
+    public static void progressClock(long byMilliseconds) {
+        clockMsDiff = clockMsDiff + byMilliseconds;
+    }
+
+    public static void setClock(long atMillisecondsSinceEpoch) {
+        clockMsDiff = atMillisecondsSinceEpoch - REF_NOW;
+    }
+
+    public static long backInTime(int d, int h, int m, int s) {
+        return REF_NOW - (Constants.DAY_IN_MS * d + Constants.HOUR_IN_MS * h + Constants.MINUTE_IN_MS * m + Constants.SECOND_IN_MS * s);
+    }
+
+    private static Answer bundleToDataMapMock = invocation -> {
+        DataMap map = new DataMap();
+        Bundle bundle = invocation.getArgument(0);
+        for(String key: bundle.keySet()) {
+            Object v = bundle.get(key);
+            if (v instanceof Asset)     map.putAsset(key, (Asset)v);
+            if (v instanceof Boolean)   map.putBoolean(key, (Boolean)v);
+            if (v instanceof Byte)      map.putByte(key, (Byte)v);
+            if (v instanceof byte[])    map.putByteArray(key, (byte[])v);
+            if (v instanceof DataMap)   map.putDataMap(key, (DataMap)v);
+            if (v instanceof Double)    map.putDouble(key, (Double)v);
+            if (v instanceof Float)     map.putFloat(key, (Float)v);
+            if (v instanceof float[])   map.putFloatArray(key, (float[])v);
+            if (v instanceof Integer)   map.putInt(key, (Integer)v);
+            if (v instanceof Long)      map.putLong(key, (Long)v);
+            if (v instanceof long[])    map.putLongArray(key, (long[])v);
+            if (v instanceof String)    map.putString(key, (String)v);
+            if (v instanceof String[])  map.putStringArray(key, (String[])v);
+
+            if (v instanceof ArrayList) {
+                if (!((ArrayList)v).isEmpty()) {
+                    if (((ArrayList) v).get(0) instanceof Integer) {
+                        map.putIntegerArrayList(key, (ArrayList<Integer>)v);
+                    }
+                    if (((ArrayList) v).get(0) instanceof String) {
+                        map.putStringArrayList(key, (ArrayList<String>)v);
+                    }
+                    if (((ArrayList) v).get(0) instanceof DataMap) {
+                        map.putDataMapArrayList(key, (ArrayList<DataMap>)v);
+                    }
+                }
+            }
+        }
+
+        return map;
+    };
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/mocks/BundleMock.java b/wear/src/test/java/info/nightscout/androidaps/testing/mocks/BundleMock.java
new file mode 100644
index 0000000000..24449dd352
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/mocks/BundleMock.java
@@ -0,0 +1,233 @@
+package info.nightscout.androidaps.testing.mocks;
+
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.SparseArray;
+
+import com.google.android.gms.wearable.DataMap;
+
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyByte;
+import static org.mockito.Matchers.anyChar;
+import static org.mockito.Matchers.anyDouble;
+import static org.mockito.Matchers.anyFloat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyShort;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
+
+public final class BundleMock {
+
+    public static Bundle mock() {
+        return mock(new HashMap<String, Object>());
+    }
+
+    public static Bundle mock(DataMap dataMap) {
+        HashMap<String, Object> hm = new HashMap<>();
+        for (String key : dataMap.keySet()) {
+            hm.put(key, dataMap.get(key));
+        }
+        return mock(hm);
+    }
+
+    public static Bundle mock(final HashMap<String, Object> map) {
+
+        Answer unsupported = new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                throw new UnsupportedOperationException();
+            }
+        };
+        Answer put = new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                map.put((String)invocation.getArguments()[0], invocation.getArguments()[1]);
+                return null;
+            }
+        };
+        Answer<Object> get = new Answer<Object>() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                return map.get(invocation.getArguments()[0]);
+            }
+        };
+        Answer<Object> getOrDefault = new Answer<Object>() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object key = invocation.getArguments()[0];
+                return map.containsKey(key) ? map.get(key) : invocation.getArguments()[1];
+            }
+        };
+
+        Bundle bundle = Mockito.mock(Bundle.class);
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                return map.size();
+            }
+        }).when(bundle).size();
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                return map.isEmpty();
+            }
+        }).when(bundle).isEmpty();
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                map.clear();
+                return null;
+            }
+        }).when(bundle).clear();
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                return map.containsKey(invocation.getArguments()[0]);
+            }
+        }).when(bundle).containsKey(anyString());
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                return map.get(invocation.getArguments()[0]);
+            }
+        }).when(bundle).get(anyString());
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                map.remove(invocation.getArguments()[0]);
+                return null;
+            }
+        }).when(bundle).remove(anyString());
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                return map.keySet();
+            }
+        }).when(bundle).keySet();
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                return BundleMock.class.getSimpleName() + "{map=" + map.toString() + "}";
+            }
+        }).when(bundle).toString();
+
+        doAnswer(put).when(bundle).putBoolean(anyString(), anyBoolean());
+        when(bundle.getBoolean(anyString())).thenAnswer(get);
+        when(bundle.getBoolean(anyString(), anyBoolean())).thenAnswer(getOrDefault);
+
+        doAnswer(put).when(bundle).putByte(anyString(), anyByte());
+        when(bundle.getByte(anyString())).thenAnswer(get);
+        when(bundle.getByte(anyString(), anyByte())).thenAnswer(getOrDefault);
+
+        doAnswer(put).when(bundle).putChar(anyString(), anyChar());
+        when(bundle.getChar(anyString())).thenAnswer(get);
+        when(bundle.getChar(anyString(), anyChar())).thenAnswer(getOrDefault);
+
+        doAnswer(put).when(bundle).putInt(anyString(), anyShort());
+        when(bundle.getShort(anyString())).thenAnswer(get);
+        when(bundle.getShort(anyString(), anyShort())).thenAnswer(getOrDefault);
+
+        doAnswer(put).when(bundle).putLong(anyString(), anyLong());
+        when(bundle.getLong(anyString())).thenAnswer(get);
+        when(bundle.getLong(anyString(), anyLong())).thenAnswer(getOrDefault);
+
+        doAnswer(put).when(bundle).putFloat(anyString(), anyFloat());
+        when(bundle.getFloat(anyString())).thenAnswer(get);
+        when(bundle.getFloat(anyString(), anyFloat())).thenAnswer(getOrDefault);
+
+        doAnswer(put).when(bundle).putDouble(anyString(), anyDouble());
+        when(bundle.getDouble(anyString())).thenAnswer(get);
+        when(bundle.getDouble(anyString(), anyDouble())).thenAnswer(getOrDefault);
+
+        doAnswer(put).when(bundle).putString(anyString(), anyString());
+        when(bundle.getString(anyString())).thenAnswer(get);
+        when(bundle.getString(anyString(), anyString())).thenAnswer(getOrDefault);
+
+        doAnswer(put).when(bundle).putBooleanArray(anyString(), any(boolean[].class));
+        when(bundle.getBooleanArray(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putLongArray(anyString(), any(long[].class));
+        when(bundle.getLongArray(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putDoubleArray(anyString(), any(double[].class));
+        when(bundle.getDoubleArray(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putIntArray(anyString(), any(int[].class));
+        when(bundle.getIntArray(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putInt(anyString(), anyInt());
+        when(bundle.getInt(anyString())).thenAnswer(get);
+        when(bundle.getInt(anyString(), anyInt())).thenAnswer(getOrDefault);
+
+        doAnswer(unsupported).when(bundle).putAll(any(Bundle.class));
+        when(bundle.hasFileDescriptors()).thenAnswer(unsupported);
+
+        doAnswer(put).when(bundle).putShort(anyString(), anyShort());
+        when(bundle.getShort(anyString())).thenAnswer(get);
+        when(bundle.getShort(anyString(), anyShort())).thenAnswer(getOrDefault);
+
+        doAnswer(put).when(bundle).putFloat(anyString(), anyFloat());
+        when(bundle.getFloat(anyString())).thenAnswer(get);
+        when(bundle.getFloat(anyString(), anyFloat())).thenAnswer(getOrDefault);
+
+        doAnswer(put).when(bundle).putCharSequence(anyString(), any(CharSequence.class));
+        when(bundle.getCharSequence(anyString())).thenAnswer(get);
+        when(bundle.getCharSequence(anyString(), any(CharSequence.class))).thenAnswer(getOrDefault);
+
+        doAnswer(put).when(bundle).putBundle(anyString(), any(Bundle.class));
+        when(bundle.getBundle(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putParcelable(anyString(), any(Parcelable.class));
+        when(bundle.getParcelable(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putParcelableArray(anyString(), any(Parcelable[].class));
+        when(bundle.getParcelableArray(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putParcelableArrayList(anyString(), any(ArrayList.class));
+        when(bundle.getParcelableArrayList(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putSparseParcelableArray(anyString(), any(SparseArray.class));
+        when(bundle.getSparseParcelableArray(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putSerializable(anyString(), any(Serializable.class));
+        when(bundle.getSerializable(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putIntegerArrayList(anyString(), any(ArrayList.class));
+        when(bundle.getIntegerArrayList(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putStringArrayList(anyString(), any(ArrayList.class));
+        when(bundle.getStringArrayList(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putCharSequenceArrayList(anyString(), any(ArrayList.class));
+        when(bundle.getCharSequenceArrayList(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putCharArray(anyString(), any(char[].class));
+        when(bundle.getCharArray(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putByteArray(anyString(), any(byte[].class));
+        when(bundle.getByteArray(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putShortArray(anyString(), any(short[].class));
+        when(bundle.getShortArray(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putFloatArray(anyString(), any(float[].class));
+        when(bundle.getFloatArray(anyString())).thenAnswer(get);
+
+        doAnswer(put).when(bundle).putCharSequenceArray(anyString(), any(CharSequence[].class));
+        when(bundle.getCharSequenceArray(anyString())).thenAnswer(get);
+
+        return bundle;
+    }
+}
\ No newline at end of file
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/mocks/IntentMock.java b/wear/src/test/java/info/nightscout/androidaps/testing/mocks/IntentMock.java
new file mode 100644
index 0000000000..c82a43fed9
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/mocks/IntentMock.java
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.testing.mocks;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
+
+import java.util.HashMap;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
+
+public final class IntentMock {
+
+    public static Intent mock() {
+        return mock(new HashMap<String, Object>());
+    }
+
+    public static Intent mock(final HashMap<String, Object> map) {
+
+        Answer put = invocation -> {
+            map.put((String)invocation.getArguments()[0], invocation.getArguments()[1]);
+            return null;
+        };
+        Answer<Object> get = invocation -> map.get(invocation.getArguments()[0]);
+
+        Intent intent = Mockito.mock(Intent.class);
+
+        when(intent.putExtra(anyString(), any(Bundle.class))).thenAnswer(put);
+        when(intent.getBundleExtra(anyString())).thenAnswer(get);
+
+        doAnswer(invocation -> map.containsKey(invocation.getArguments()[0])).when(intent).hasExtra(anyString());
+
+        return intent;
+    }
+}
\ No newline at end of file
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/mocks/SharedPreferencesMock.java b/wear/src/test/java/info/nightscout/androidaps/testing/mocks/SharedPreferencesMock.java
new file mode 100644
index 0000000000..5b0736a450
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/mocks/SharedPreferencesMock.java
@@ -0,0 +1,158 @@
+package info.nightscout.androidaps.testing.mocks;
+
+import android.content.SharedPreferences;
+
+import androidx.annotation.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class SharedPreferencesMock implements SharedPreferences {
+
+    private final EditorInternals editor = new EditorInternals();
+
+    class EditorInternals implements Editor {
+
+        Map<String, Object> innerMap = new HashMap<>();
+
+        @Override
+        public Editor putString(String k, @Nullable String v) {
+            innerMap.put(k, v);
+            return this;
+        }
+
+        @Override
+        public Editor putStringSet(String k, @Nullable Set<String> set) {
+            innerMap.put(k, set);
+            return this;
+        }
+
+        @Override
+        public Editor putInt(String k, int i) {
+            innerMap.put(k, i);
+            return this;
+        }
+
+        @Override
+        public Editor putLong(String k, long l) {
+            innerMap.put(k, l);
+            return this;
+        }
+
+        @Override
+        public Editor putFloat(String k, float v) {
+            innerMap.put(k, v);
+            return this;
+        }
+
+        @Override
+        public Editor putBoolean(String k, boolean b) {
+            innerMap.put(k, b);
+            return this;
+        }
+
+        @Override
+        public Editor remove(String k) {
+            innerMap.remove(k);
+            return this;
+        }
+
+        @Override
+        public Editor clear() {
+            innerMap.clear();
+            return this;
+        }
+
+        @Override
+        public boolean commit() {
+            return true;
+        }
+
+        @Override
+        public void apply() {
+
+        }
+    }
+
+    @Override
+    public Map<String, ?> getAll() {
+        return editor.innerMap;
+    }
+
+    @Nullable
+    @Override
+    public String getString(String k, @Nullable String s) {
+        if (editor.innerMap.containsKey(k)) {
+            return (String) editor.innerMap.get(k);
+        } else {
+            return s;
+        }
+    }
+
+    @Nullable
+    @Override
+    public Set<String> getStringSet(String k, @Nullable Set<String> set) {
+        if (editor.innerMap.containsKey(k)) {
+            return (Set<String>) editor.innerMap.get(k);
+        } else {
+            return set;
+        }
+    }
+
+    @Override
+    public int getInt(String k, int i) {
+        if (editor.innerMap.containsKey(k)) {
+            return (Integer) editor.innerMap.get(k);
+        } else {
+            return i;
+        }
+    }
+
+    @Override
+    public long getLong(String k, long l) {
+        if (editor.innerMap.containsKey(k)) {
+            return (Long) editor.innerMap.get(k);
+        } else {
+            return l;
+        }
+    }
+
+    @Override
+    public float getFloat(String k, float v) {
+        if (editor.innerMap.containsKey(k)) {
+            return (Float) editor.innerMap.get(k);
+        } else {
+            return v;
+        }
+    }
+
+    @Override
+    public boolean getBoolean(String k, boolean b) {
+        if (editor.innerMap.containsKey(k)) {
+            return (Boolean) editor.innerMap.get(k);
+        } else {
+            return b;
+        }
+    }
+
+    @Override
+    public boolean contains(String k) {
+        return editor.innerMap.containsKey(k);
+    }
+
+    @Override
+    public Editor edit() {
+        return editor;
+    }
+
+    @Override
+    public void registerOnSharedPreferenceChangeListener(OnSharedPreferenceChangeListener onSharedPreferenceChangeListener) {
+
+    }
+
+    @Override
+    public void unregisterOnSharedPreferenceChangeListener(OnSharedPreferenceChangeListener onSharedPreferenceChangeListener) {
+
+    }
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/utils/BasalWatchDataExt.java b/wear/src/test/java/info/nightscout/androidaps/testing/utils/BasalWatchDataExt.java
new file mode 100644
index 0000000000..9a23f491d9
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/utils/BasalWatchDataExt.java
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.testing.utils;
+
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+import info.nightscout.androidaps.data.BasalWatchData;
+
+import static info.nightscout.androidaps.testing.utils.ExtUtil.assertClassHaveSameFields;
+
+public class BasalWatchDataExt extends BasalWatchData {
+
+    private BasalWatchDataExt() {
+        super();
+    }
+
+    public BasalWatchDataExt(BasalWatchData ref) {
+        super();
+
+        // since we do not want modify BasalWatchData - we use this wrapper class
+        // but we make sure it has same fields
+        assertClassHaveSameFields(BasalWatchData.class, "startTime,endTime,amount");
+
+        this.startTime = ref.startTime;
+        this.endTime = ref.endTime;
+        this.amount = ref.amount;
+    }
+
+    public static BasalWatchDataExt build(long startTime, long endTime, double amount) {
+        BasalWatchDataExt bwd = new BasalWatchDataExt();
+        bwd.startTime = startTime;
+        bwd.endTime = endTime;
+        bwd.amount = amount;
+        return bwd;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if ((obj instanceof BasalWatchData)||(obj instanceof BasalWatchDataExt)) {
+            return (this.startTime == ((BasalWatchData) obj).startTime)
+                && (this.endTime == ((BasalWatchData) obj).endTime)
+                && (this.amount == ((BasalWatchData) obj).amount);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return startTime+", "+endTime+", "+amount;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(startTime, endTime, amount);
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/utils/BgWatchDataExt.java b/wear/src/test/java/info/nightscout/androidaps/testing/utils/BgWatchDataExt.java
new file mode 100644
index 0000000000..c49125809e
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/utils/BgWatchDataExt.java
@@ -0,0 +1,66 @@
+package info.nightscout.androidaps.testing.utils;
+
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+import info.nightscout.androidaps.data.BgWatchData;
+
+import static info.nightscout.androidaps.testing.utils.ExtUtil.assertClassHaveSameFields;
+
+public class BgWatchDataExt extends BgWatchData {
+
+    private BgWatchDataExt() {
+        super();
+    }
+
+    public BgWatchDataExt(double aSgv, double aHigh, double aLow, long aTimestamp, int aColor) {
+        super(aSgv, aHigh, aLow, aTimestamp, aColor);
+    }
+
+    public BgWatchDataExt(BgWatchData ref) {
+        super();
+
+        // since we do not want modify BgWatchDataExt - we use this wrapper class
+        // but we make sure it has same fields
+        assertClassHaveSameFields(BgWatchData.class, "sgv,high,low,timestamp,color");
+
+        this.sgv = ref.sgv;
+        this.high = ref.high;
+        this.low = ref.low;
+        this.timestamp = ref.timestamp;
+        this.color = ref.color;
+    }
+
+    public static BgWatchDataExt build(double sgv, long timestamp, int color) {
+        BgWatchDataExt twd = new BgWatchDataExt();
+        twd.sgv = sgv;
+        twd.timestamp = timestamp;
+        twd.color = color;
+        return twd;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if ((obj instanceof BgWatchData)||(obj instanceof BgWatchDataExt)) {
+            return (this.sgv == ((BgWatchData) obj).sgv)
+                    && (this.high == ((BgWatchData) obj).high)
+                    && (this.low == ((BgWatchData) obj).low)
+                    && (this.timestamp == ((BgWatchData) obj).timestamp)
+                    && (this.color == ((BgWatchData) obj).color);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return sgv+", "+high+", "+low+", "+timestamp+", "+color;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(sgv, high, low, timestamp, color);
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/utils/BolusWatchDataExt.java b/wear/src/test/java/info/nightscout/androidaps/testing/utils/BolusWatchDataExt.java
new file mode 100644
index 0000000000..a5553f6a59
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/utils/BolusWatchDataExt.java
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.testing.utils;
+
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+import info.nightscout.androidaps.data.BolusWatchData;
+
+import static info.nightscout.androidaps.testing.utils.ExtUtil.assertClassHaveSameFields;
+
+public class BolusWatchDataExt extends BolusWatchData {
+
+    private BolusWatchDataExt() {
+        super();
+    }
+
+    public BolusWatchDataExt(BolusWatchData ref) {
+        super();
+
+        // since we do not want modify BolusWatchData - we use this wrapper class
+        // but we make sure it has same fields
+        assertClassHaveSameFields(BolusWatchData.class, "date,bolus,carbs,isSMB,isValid");
+
+        this.date = ref.date;
+        this.bolus = ref.bolus;
+        this.carbs = ref.carbs;
+        this.isSMB = ref.isSMB;
+        this.isValid = ref.isValid;
+    }
+
+    public static BolusWatchDataExt build(long date, double bolus, double carbs, boolean isSMB, boolean isValid) {
+        BolusWatchDataExt bwd = new BolusWatchDataExt();
+        bwd.date = date;
+        bwd.bolus = bolus;
+        bwd.carbs = carbs;
+        bwd.isSMB = isSMB;
+        bwd.isValid = isValid;
+        return bwd;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if ((obj instanceof BolusWatchData)||(obj instanceof BolusWatchDataExt)) {
+            return (this.date == ((BolusWatchData) obj).date)
+                    && (this.bolus == ((BolusWatchData) obj).bolus)
+                    && (this.carbs == ((BolusWatchData) obj).carbs)
+                    && (this.isSMB == ((BolusWatchData) obj).isSMB)
+                    && (this.isValid == ((BolusWatchData) obj).isValid);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return date+", "+bolus+", "+carbs+", "+isSMB+", "+isValid;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(date, bolus, carbs, isSMB, isValid);
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/utils/ExtUtil.java b/wear/src/test/java/info/nightscout/androidaps/testing/utils/ExtUtil.java
new file mode 100644
index 0000000000..1559db11ae
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/utils/ExtUtil.java
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.testing.utils;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+class ExtUtil {
+
+    static <T> void  assertClassHaveSameFields(Class<T> checkedClass, String commaSeparatedFieldList) {
+        Set<String> parentFields = new HashSet<>();
+        for (Field f : checkedClass.getDeclaredFields()) {
+            final String fieldName = f.getName();
+            // skip runtime-injected fields like $jacocoData
+            if (fieldName.startsWith("$")) {
+                continue;
+            }
+            parentFields.add(fieldName);
+        }
+
+        Set<String> knownFields = new HashSet<>(Arrays.asList(commaSeparatedFieldList.split(",")));
+        assertThat(parentFields, is(knownFields));
+    }
+
+}
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/utils/TempWatchDataExt.java b/wear/src/test/java/info/nightscout/androidaps/testing/utils/TempWatchDataExt.java
new file mode 100644
index 0000000000..478c6de966
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/utils/TempWatchDataExt.java
@@ -0,0 +1,66 @@
+package info.nightscout.androidaps.testing.utils;
+
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+import info.nightscout.androidaps.data.TempWatchData;
+
+import static info.nightscout.androidaps.testing.utils.ExtUtil.assertClassHaveSameFields;
+
+
+public class TempWatchDataExt extends TempWatchData {
+
+    private TempWatchDataExt() {
+        super();
+    }
+
+    public TempWatchDataExt(TempWatchData ref) {
+        super();
+
+        // since we do not want modify BolusWatchData - we use this wrapper class
+        // but we make sure it has same fields
+        assertClassHaveSameFields(TempWatchData.class, "startTime,startBasal,endTime,endBasal,amount");
+
+        this.startTime = ref.startTime;
+        this.startBasal = ref.startBasal;
+        this.endTime = ref.endTime;
+        this.endBasal = ref.endBasal;
+        this.amount = ref.amount;
+    }
+
+    public static TempWatchDataExt build(long startTime, double startBasal, long endTime,
+                                         double endBasal, double amount) {
+        TempWatchDataExt twd = new TempWatchDataExt();
+        twd.startTime = startTime;
+        twd.startBasal = startBasal;
+        twd.endTime = endTime;
+        twd.endBasal = endBasal;
+        twd.amount = amount;
+        return twd;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if ((obj instanceof TempWatchData)||(obj instanceof TempWatchDataExt)) {
+            return (this.startTime == ((TempWatchData) obj).startTime)
+                && (this.startBasal == ((TempWatchData) obj).startBasal)
+                && (this.endTime == ((TempWatchData) obj).endTime)
+                && (this.endBasal == ((TempWatchData) obj).endBasal)
+                && (this.amount == ((TempWatchData) obj).amount);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return startTime+", "+startBasal+", "+endTime+", "+endBasal+", "+amount;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(startTime, startBasal, endTime, endBasal, amount);
+    }
+
+}