diff --git a/app/build.gradle b/app/build.gradle
index 61dae24ba6..2720ef7605 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -247,6 +247,7 @@ dependencies {
     implementation project(':danar')
     implementation project(':rileylink')
     implementation project(':medtronic')
+    implementation project(':omnipod')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
@@ -267,6 +268,8 @@ dependencies {
     implementation "androidx.activity:activity-ktx:${activityVersion}"
     implementation "androidx.fragment:fragment:${fragmentVersion}"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
     implementation 'com.google.android.material:material:1.1.0'
 
     implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
@@ -282,8 +285,6 @@ dependencies {
     implementation "com.jjoe64:graphview:4.0.1"
     implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
     implementation 'com.madgag.spongycastle:core:1.58.0.0'
-    // Omnipod wizard
-    implementation(name: "com.atech-software.android.library.wizardpager-1.1.4", ext: "aar")
     implementation("com.google.android:flexbox:0.3.0") {
         exclude group: "com.android.support"
     }
diff --git a/app/libs/com.atech-software.android.library.wizardpager-1.1.4.aar b/app/libs/com.atech-software.android.library.wizardpager-1.1.4.aar
deleted file mode 100644
index af0c6511cf..0000000000
Binary files a/app/libs/com.atech-software.android.library.wizardpager-1.1.4.aar and /dev/null differ
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index 1c0583f042..ef728a2193 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.dana.di.DanaModule
 import info.nightscout.androidaps.danar.di.DanaRModule
 import info.nightscout.androidaps.danars.di.DanaRSModule
 import info.nightscout.androidaps.plugins.pump.common.dagger.RileyLinkModule
+import info.nightscout.androidaps.plugins.pump.omnipod.dagger.OmnipodModule
 import javax.inject.Singleton
 
 @Singleton
@@ -29,6 +30,7 @@ import javax.inject.Singleton
         WizardModule::class,
         RileyLinkModule::class,
         MedtronicModule::class,
+        OmnipodModule::class,
         APSModule::class,
         PreferencesModule::class,
         OverviewModule::class,
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt
index e9339e187b..014a8de8e3 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt
@@ -26,4 +26,5 @@ abstract class CommandQueueModule {
     @ContributesAndroidInjector abstract fun commandTempBasalAbsoluteInjector(): CommandTempBasalAbsolute
     @ContributesAndroidInjector abstract fun commandTempBasalPercentInjector(): CommandTempBasalPercent
     @ContributesAndroidInjector abstract fun commandSetUserSettingsInjector(): CommandSetUserSettings
+    @ContributesAndroidInjector abstract fun commandCustomCommandInjector(): CommandCustomCommand
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index 0af077c632..42dd3e2972 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -36,6 +36,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyL
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.OmnipodOverviewFragment
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment
 import info.nightscout.androidaps.plugins.source.BGSourceFragment
 import info.nightscout.androidaps.plugins.treatments.TreatmentsFragment
@@ -67,6 +68,7 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesLoopFragment(): LoopFragment
     @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
     @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): MedtronicFragment
+    @ContributesAndroidInjector abstract fun contributesOmnipodFragment(): OmnipodOverviewFragment
     @ContributesAndroidInjector abstract fun contributesNSProfileFragment(): NSProfileFragment
     @ContributesAndroidInjector abstract fun contributesNSClientFragment(): NSClientFragment
     @ContributesAndroidInjector
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index 75c834977a..892c9c36a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -31,6 +31,7 @@ import info.nightscout.androidaps.plugins.general.persistentNotification.Persist
 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.insulin.InsulinLyumjevPlugin
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefFreePeakPlugin
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefRapidActingPlugin
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
@@ -82,6 +83,12 @@ abstract class PluginsModule {
     @IntKey(40)
     abstract fun bindInsulinOrefUltraRapidActingPlugin(plugin: InsulinOrefUltraRapidActingPlugin): PluginBase
 
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(42)
+    abstract fun bindInsulinLyumjevPlugin(plugin: InsulinLyumjevPlugin): PluginBase
+
     @Binds
     @AllConfigs
     @IntoMap
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
index ec71d8a4ad..6ba01130ae 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley
 import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
+import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.service.RileyLinkOmnipodService
 import info.nightscout.androidaps.services.AlarmSoundService
 import info.nightscout.androidaps.services.DataService
 import info.nightscout.androidaps.services.LocationService
@@ -29,4 +30,5 @@ abstract class ServicesModule {
     @ContributesAndroidInjector abstract fun contributesInsightConnectionService(): InsightConnectionService
     @ContributesAndroidInjector abstract fun contributesRileyLinkService(): RileyLinkService
     @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService
+    @ContributesAndroidInjector abstract fun contributesRileyLinkOmnipodService(): RileyLinkOmnipodService
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
index 74abd439f8..bdf3c8a6b8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
@@ -167,7 +167,7 @@ class ImportExportPrefs @Inject constructor(
         if (!prefsEncryptionIsDisabled() && !assureMasterPasswordSet(activity, R.string.nav_export)) return
 
         TwoMessagesAlertDialog.showAlert(activity, resourceHelper.gs(R.string.nav_export),
-            resourceHelper.gs(R.string.export_to) + " " + fileToExport + " ?",
+            resourceHelper.gs(R.string.export_to) + " " + fileToExport.name + " ?",
             resourceHelper.gs(R.string.password_preferences_encrypt_prompt), {
             askForMasterPassIfNeeded(activity, R.string.preferences_export_canceled, then)
         }, null, R.drawable.ic_header_export)
@@ -177,9 +177,8 @@ class ImportExportPrefs @Inject constructor(
 
         if (fileToImport.handler == PrefsFormatsHandler.ENCRYPTED) {
             if (!assureMasterPasswordSet(activity, R.string.nav_import)) return
-
             TwoMessagesAlertDialog.showAlert(activity, resourceHelper.gs(R.string.nav_import),
-                resourceHelper.gs(R.string.import_from) + " " + fileToImport.file + " ?",
+                resourceHelper.gs(R.string.import_from) + " " + fileToImport.name + " ?",
                 resourceHelper.gs(R.string.password_preferences_decrypt_prompt), {
                 askForMasterPass(activity, R.string.preferences_import_canceled, then)
             }, null, R.drawable.ic_header_import)
@@ -283,7 +282,7 @@ class ImportExportPrefs @Inject constructor(
         askToConfirmImport(activity, importFile) { password ->
 
             val format: PrefsFormat = when (importFile.handler) {
-                PrefsFormatsHandler.CLASSIC   -> classicPrefsFormat
+                PrefsFormatsHandler.CLASSIC -> classicPrefsFormat
                 PrefsFormatsHandler.ENCRYPTED -> encryptedPrefsFormat
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt
index 52910dfff1..5678a1801e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt
@@ -34,6 +34,7 @@ enum class PrefsImportDir {
 
 @Parcelize
 data class PrefsFile(
+    val name: String,
     val file: File,
     val baseDir: File,
     val dirKind: PrefsImportDir,
@@ -46,6 +47,7 @@ data class PrefsFile(
 class PrefsFileContract : ActivityResultContract<Void, PrefsFile>() {
 
     companion object {
+
         const val OUTPUT_PARAM = "prefs_file"
     }
 
@@ -74,6 +76,7 @@ class PrefFileListProvider @Inject constructor(
 ) {
 
     companion object {
+
         private val path = File(Environment.getExternalStorageDirectory().toString())
         private val aapsPath = File(path, "AAPS" + File.separator + "preferences")
         private const val IMPORT_AGE_NOT_YET_OLD_DAYS = 60
@@ -96,7 +99,7 @@ class PrefFileListProvider @Inject constructor(
             val detectedOld = !detectedNew && classicPrefsFormat.isPreferencesFile(it, contents)
             if (detectedNew || detectedOld) {
                 val formatHandler = if (detectedNew) PrefsFormatsHandler.ENCRYPTED else PrefsFormatsHandler.CLASSIC
-                prefFiles.add(PrefsFile(it, path, PrefsImportDir.ROOT_DIR, formatHandler, metadataFor(loadMetadata, formatHandler, contents)))
+                prefFiles.add(PrefsFile(it.name, it, path, PrefsImportDir.ROOT_DIR, formatHandler, metadataFor(loadMetadata, formatHandler, contents)))
             }
         }
 
@@ -104,7 +107,7 @@ class PrefFileListProvider @Inject constructor(
         aapsPath.walk().filter { it.isFile && it.name.endsWith(".json") }.forEach {
             val contents = storage.getFileContents(it)
             if (encryptedPrefsFormat.isPreferencesFile(it, contents)) {
-                prefFiles.add(PrefsFile(it, aapsPath, PrefsImportDir.AAPS_DIR, PrefsFormatsHandler.ENCRYPTED, metadataFor(loadMetadata, PrefsFormatsHandler.ENCRYPTED, contents)))
+                prefFiles.add(PrefsFile(it.name, it, aapsPath, PrefsImportDir.AAPS_DIR, PrefsFormatsHandler.ENCRYPTED, metadataFor(loadMetadata, PrefsFormatsHandler.ENCRYPTED, contents)))
             }
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TimeAsXAxisLabelFormatter.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TimeAsXAxisLabelFormatter.java
index c5e5441470..18feddf916 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TimeAsXAxisLabelFormatter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TimeAsXAxisLabelFormatter.java
@@ -4,6 +4,7 @@ import com.jjoe64.graphview.DefaultLabelFormatter;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Locale;
 
 /**
  * Created by mike on 09.06.2016.
@@ -20,10 +21,22 @@ public class TimeAsXAxisLabelFormatter extends DefaultLabelFormatter {
     public String formatLabel(double value, boolean isValueX) {
         if (isValueX) {
             // format as date
-            DateFormat dateFormat = new SimpleDateFormat(mFormat);
+            DateFormat dateFormat = new SimpleDateFormat(mFormat, Locale.getDefault());
             return dateFormat.format((long) value);
         } else {
-            return super.formatLabel(value, isValueX);
+            try {
+                // unknown reason for crashing on this
+                //                Fatal Exception: java.lang.NullPointerException
+                //                Attempt to invoke virtual method 'double com.jjoe64.graphview.Viewport.getMaxY(boolean)' on a null object reference
+                //                com.jjoe64.graphview.DefaultLabelFormatter.formatLabel (DefaultLabelFormatter.java:89)
+                //                info.nightscout.androidaps.plugins.general.overview.graphExtensions.TimeAsXAxisLabelFormatter.formatLabel (TimeAsXAxisLabelFormatter.java:26)
+                //                com.jjoe64.graphview.GridLabelRenderer.drawVerticalSteps (GridLabelRenderer.java:1057)
+                //                com.jjoe64.graphview.GridLabelRenderer.draw (GridLabelRenderer.java:866)
+                //                com.jjoe64.graphview.GraphView.onDraw (GraphView.java:296)
+                return super.formatLabel(value, isValueX);
+            } catch (Exception ignored) {
+                return "";
+            }
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinLyumjevPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinLyumjevPlugin.kt
new file mode 100644
index 0000000000..b5fa0fea3d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinLyumjevPlugin.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.plugins.insulin
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.InsulinInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class InsulinLyumjevPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    profileFunction: ProfileFunction,
+    rxBus: RxBusWrapper, aapsLogger: AAPSLogger
+) : InsulinOrefBasePlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger) {
+
+
+    override fun getId(): Int = InsulinInterface.OREF_LYUMJEV
+
+    override fun getFriendlyName(): String = resourceHelper.gs(R.string.lyumjev)
+
+    override fun commentStandardText(): String = resourceHelper.gs(R.string.lyumjev)
+
+    override val peak = 45
+
+    init {
+        pluginDescription
+            .pluginName(R.string.lyumjev)
+            .description(R.string.description_insulin_lyumjev)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.kt
index 770e7f1f91..a0241ff9c9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.kt
@@ -41,5 +41,6 @@ class InsulinOrefRapidActingPlugin @Inject constructor(
             .pluginName(R.string.rapid_acting_oref)
             .description(R.string.description_insulin_rapid)
             .setDefault()
+            .enableByDefault(true)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt
index 60f07c3203..a793c47e89 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt
@@ -34,6 +34,5 @@ class InsulinOrefUltraRapidActingPlugin @Inject constructor(
         pluginDescription
             .pluginName(R.string.ultrarapid_oref)
             .description(R.string.description_insulin_ultra_rapid)
-            .enableByDefault(true)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index e443ac4657..82ba382519 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -29,6 +29,7 @@ import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TDD;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
@@ -36,6 +37,7 @@ import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.interfaces.PumpPluginBase;
@@ -43,9 +45,9 @@ import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
+import info.nightscout.androidaps.queue.commands.CustomCommand;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -64,7 +66,6 @@ import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpH
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistoryRequest;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Tdd;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.InstanceId;
@@ -1395,7 +1396,10 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
 
     @Override
     public void executeCustomAction(CustomActionType customActionType) {
+    }
 
+    @Nullable @Override public PumpEnactResult executeCustomCommand(CustomCommand customCommand) {
+        return null;
     }
 
     @Override
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 0da2b70209..033a65e38d 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
@@ -12,6 +12,7 @@ import android.os.IBinder;
 import android.os.Looper;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -56,6 +57,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
+import info.nightscout.androidaps.queue.commands.CustomCommand;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
@@ -1171,7 +1173,10 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
 
     @Override
     public void executeCustomAction(CustomActionType customActionType) {
+    }
 
+    @Nullable @Override public PumpEnactResult executeCustomCommand(CustomCommand customCommand) {
+        return null;
     }
 
     private void readHistory() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
index dbc8823395..9ce64fc431 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.mdi;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -27,6 +28,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
+import info.nightscout.androidaps.queue.commands.CustomCommand;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
@@ -281,7 +283,10 @@ public class MDIPlugin extends PumpPluginBase implements PumpInterface {
 
     @Override
     public void executeCustomAction(CustomActionType customActionType) {
+    }
 
+    @Nullable @Override public PumpEnactResult executeCustomCommand(CustomCommand customCommand) {
+        return null;
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
index 2ef49e95b5..e9ea8c8eab 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
@@ -16,9 +16,9 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.common.ManufacturerType
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType
+import info.nightscout.androidaps.queue.commands.CustomCommand
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
@@ -133,6 +133,11 @@ class VirtualPumpPlugin @Inject constructor(
     }
 
     override fun executeCustomAction(customActionType: CustomActionType) {}
+
+    override fun executeCustomCommand(customCommand: CustomCommand?): PumpEnactResult? {
+        return null
+    }
+
     override fun isInitialized(): Boolean {
         return true
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
index bbc541c7b9..b2d141b0f2 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
@@ -20,16 +20,16 @@ import info.nightscout.androidaps.events.EventProfileNeedsUpdate
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.queue.commands.CustomCommand
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.queue.commands.*
 import info.nightscout.androidaps.queue.commands.Command.CommandType
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -260,7 +260,7 @@ class CommandQueue @Inject constructor(
         } else {
             add(CommandBolus(injector, detailedBolusInfo, callback, type))
             if (type == CommandType.BOLUS) { // Bring up bolus progress dialog (start here, so the dialog is shown when the bolus is requested,
-// not when the Bolus command is starting. The command closes the dialog upon completion).
+                // not when the Bolus command is starting. The command closes the dialog upon completion).
                 showBolusProgressDialog(detailedBolusInfo.insulin, detailedBolusInfo.context)
                 // Notify Wear about upcoming bolus
                 rxBus.send(EventBolusRequested(detailedBolusInfo.insulin))
@@ -485,6 +485,55 @@ class CommandQueue @Inject constructor(
         return true
     }
 
+    override fun customCommand(customCommand: CustomCommand, callback: Callback?): Boolean {
+        if (isCustomCommandInQueue(customCommand.javaClass)) {
+            callback?.result(executingNowError())?.run()
+            return false
+        }
+        // remove all unfinished
+        removeAllCustomCommands(customCommand.javaClass)
+        // add new command to queue
+        add(CommandCustomCommand(injector, customCommand, callback))
+        notifyAboutNewCommand()
+        return true
+    }
+
+    @Synchronized
+    override fun isCustomCommandInQueue(customCommandType: Class<out CustomCommand>): Boolean {
+        if(isCustomCommandRunning(customCommandType)) {
+            return true
+        }
+        synchronized(queue) {
+            for (i in queue.indices) {
+                val command = queue[i]
+                if (command is CommandCustomCommand && customCommandType.isInstance(command.customCommand)) {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
+    override fun isCustomCommandRunning(customCommandType: Class<out CustomCommand>): Boolean {
+        val performing = this.performing
+        if (performing is CommandCustomCommand && customCommandType.isInstance(performing.customCommand)) {
+            return true
+        }
+        return false
+    }
+
+    @Synchronized
+    private fun removeAllCustomCommands(targetType: Class<out CustomCommand>) {
+        synchronized(queue) {
+            for (i in queue.indices.reversed()) {
+                val command = queue[i]
+                if (command is CustomCommand && targetType.isInstance(command.commandType)) {
+                    queue.removeAt(i)
+                }
+            }
+        }
+    }
+
     override fun spannedStatus(): Spanned {
         var s = ""
         var line = 0
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCustomCommand.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCustomCommand.kt
new file mode 100644
index 0000000000..f0df2754d3
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCustomCommand.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.queue.commands
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.queue.Callback
+import javax.inject.Inject
+
+class CommandCustomCommand(
+    injector: HasAndroidInjector,
+    val customCommand: CustomCommand,
+    callback: Callback?
+) : Command(injector, CommandType.CUSTOM_COMMAND, callback) {
+
+    @Inject lateinit var activePlugin: ActivePluginProvider
+
+    override fun execute() {
+        val result = activePlugin.activePump.executeCustomCommand(customCommand)
+        aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${result?.success} enacted: ${result?.enacted}")
+        callback?.result(result)?.run()
+    }
+
+    override fun status(): String {
+        return customCommand.statusDescription
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.kt
index 57e94e8d31..da911775bf 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.kt
@@ -2,8 +2,6 @@ package info.nightscout.androidaps.queue.commands
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.queue.Callback
 import javax.inject.Inject
@@ -14,17 +12,12 @@ class CommandStartPump(
 ) : Command(injector, CommandType.START_PUMP, callback) {
 
     @Inject lateinit var activePlugin: ActivePluginProvider
-    @Inject lateinit var profileFunction: ProfileFunction
 
     override fun execute() {
         val pump = activePlugin.activePump
         if (pump is LocalInsightPlugin) {
             val result = pump.startPump()
             callback?.result(result)?.run()
-        } else if (pump.pumpDescription.pumpType == PumpType.Insulet_Omnipod) {
-            // When using CommandQueue.setProfile, it refuses to set the profile is the same as the current profile
-            // However we need to set the current profile to resume delivery in case the Pod is suspended
-            pump.setNewBasalProfile(profileFunction.getProfile())
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
index c5d7164d5a..1d7c37929f 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
@@ -16,10 +16,10 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragment
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
 import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefs
@@ -30,12 +30,13 @@ import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment
 import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin
+import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.setupwizard.elements.*
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
 import info.nightscout.androidaps.utils.AndroidPermission
 import info.nightscout.androidaps.utils.CryptoUtil
-import info.nightscout.androidaps.utils.locale.LocaleHelper.update
 import info.nightscout.androidaps.utils.extensions.isRunningTest
+import info.nightscout.androidaps.utils.locale.LocaleHelper.update
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -313,11 +314,37 @@ class SWDefinition @Inject constructor(
                 }, null)
             })
             .visibility(SWValidator { (activePlugin.activePump as PluginBase).preferencesId > 0 }))
+        .add(SWInfotext(injector)
+            .label(R.string.setupwizard_pump_pump_not_initialized)
+            .visibility(SWValidator { !isPumpInitialized() }))
+        .add( // Omnipod only
+            SWInfotext(injector)
+                .label(R.string.setupwizard_pump_waiting_for_riley_link_connection)
+                .visibility(SWValidator {
+                    val activePump = activePlugin.activePump
+                    activePump is OmnipodPumpPlugin && !activePump.isRileyLinkReady
+                }))
         .add(SWButton(injector)
             .text(R.string.readstatus)
-            .action(Runnable { commandQueue.readStatus("Clicked connect to pump", null) }))
+            .action(Runnable { commandQueue.readStatus("Clicked connect to pump", null) })
+            .visibility(SWValidator {
+                // Hide for Omnipod, because as we don't require a Pod to be paired in the setup wizard,
+                // Getting the status might not be possible
+                activePlugin.activePump !is OmnipodPumpPlugin
+            }))
         .add(SWEventListener(injector, EventPumpStatusChanged::class.java))
-        .validator(SWValidator { activePlugin.activePump.isInitialized })
+        .validator(SWValidator {
+            isPumpInitialized()
+        })
+
+    private fun isPumpInitialized(): Boolean {
+        val activePump = activePlugin.activePump
+
+        // For Omnipod, consider the pump initialized when a RL has been configured successfully
+        // Users will be prompted to activate a Pod after completing the setup wizard.
+        return activePump.isInitialized || (activePump is OmnipodPumpPlugin && activePump.isRileyLinkReady)
+    }
+
     private val screenAps = SWScreen(injector, R.string.configbuilder_aps)
         .skippable(false)
         .add(SWInfotext(injector)
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
index 44af0e1312..782e07f069 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
@@ -16,13 +16,14 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientStatus
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.setupwizard.elements.SWItem
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
 import info.nightscout.androidaps.utils.AndroidPermission
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.locale.LocaleHelper.update
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog.show
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog.showConfirmation
+import info.nightscout.androidaps.utils.locale.LocaleHelper.update
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -81,6 +82,11 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({ updateButtons() }) { fabricPrivacy.logException(it) }
         )
+        disposable.add(rxBus
+            .toObservable(EventRileyLinkDeviceStatusChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateButtons() }) { fabricPrivacy.logException(it) }
+        )
         disposable.add(rxBus
             .toObservable(EventNSClientStatus::class.java)
             .observeOn(AndroidSchedulers.mainThread())
@@ -104,6 +110,7 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
                 updateButtons()
             }) { fabricPrivacy.logException(it) }
         )
+        updateButtons()
     }
 
     private fun generateLayout() {
@@ -172,7 +179,7 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
         finish()
     }
 
-    @Suppress("UNUSED_PARAMETER","SameParameterValue")
+    @Suppress("UNUSED_PARAMETER", "SameParameterValue")
     private fun nextPage(view: View?): Int {
         var page = currentWizardPage + 1
         while (page < screens.size) {
@@ -182,7 +189,7 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
         return min(currentWizardPage, screens.size - 1)
     }
 
-    @Suppress("UNUSED_PARAMETER","SameParameterValue")
+    @Suppress("UNUSED_PARAMETER", "SameParameterValue")
     private fun previousPage(view: View?): Int {
         var page = currentWizardPage - 1
         while (page >= 0) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt
index c6f97b7b89..892e162c45 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt
@@ -66,7 +66,7 @@ object PrefImportSummaryDialog {
                 rowLayout.setOnClickListener {
                     val msg = "[${context.getString(metaKey.label)}] ${metaEntry.info}"
                     when (metaEntry.status) {
-                        PrefsStatus.WARN  -> ToastUtils.Long.warnToast(context, msg)
+                        PrefsStatus.WARN -> ToastUtils.Long.warnToast(context, msg)
                         PrefsStatus.ERROR -> ToastUtils.Long.errorToast(context, msg)
                         else              -> ToastUtils.Long.infoToast(context, msg)
                     }
@@ -132,6 +132,9 @@ object PrefImportSummaryDialog {
         }
 
         val dialog = builder.show()
+        val textView = dialog.findViewById<View>(android.R.id.message) as TextView?
+        textView!!.textSize = 12f
+        textView!!.setPadding(10,0,0,0)
         dialog.setCanceledOnTouchOutside(false)
     }
 
diff --git a/app/src/main/res/layout/dialog_alert_import_summary.xml b/app/src/main/res/layout/dialog_alert_import_summary.xml
index fb6e5a0708..d13e78dd79 100644
--- a/app/src/main/res/layout/dialog_alert_import_summary.xml
+++ b/app/src/main/res/layout/dialog_alert_import_summary.xml
@@ -1,30 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="10dp">
+    android:layout_height="wrap_content">
 
-    <TableLayout
-        android:id="@+id/summary_table"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:stretchColumns="2" />
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scroll_content_frame"
+        android:layout_width="match_parent"
+        android:layout_height="210dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingBottom="10dp">
 
-    <Button
-        android:id="@+id/summary_details_btn"
-        style="?android:attr/buttonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="3dp"
-        android:text="@string/check_preferences_details_btn"
-        android:textColor="@color/colorTreatmentButton"
-        android:visibility="gone" />
+            <TableLayout
+                android:id="@+id/summary_table"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:stretchColumns="2" />
 
-</LinearLayout>
\ No newline at end of file
+            <Button
+                android:id="@+id/summary_details_btn"
+                style="?android:attr/buttonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:gravity="bottom"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="3dp"
+                android:text="@string/check_preferences_details_btn"
+                android:textColor="@color/colorTreatmentButton"
+                android:visibility="gone" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_alert_two_messages.xml b/app/src/main/res/layout/dialog_alert_two_messages.xml
index e155b6f215..0a8f2232db 100644
--- a/app/src/main/res/layout/dialog_alert_two_messages.xml
+++ b/app/src/main/res/layout/dialog_alert_two_messages.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="20dp">
+    android:padding="10dp">
 
     <TextView
         android:id="@+id/password_prompt_title"
diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index a436fbff97..fda5ce6971 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -655,7 +655,7 @@
     <string name="apssetup">Konfigureer APS plugin</string>
     <string name="sensitivitysetup">Konfigureer Sensitiwiteits plugin</string>
     <string name="setupwizard_sensitivity_description">Sensitiwiteit plugin vir sensitiwiteit opsporing en KAB berekening. Vir meer inligting besoek:</string>
-    <string name="setupwizard_sensitivity_url">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
     <string name="diawarning">Onthou asseblief: dat nuwe insulien profiele vereis DIA van minstens 5h. DIA 5 – 6h op nuwe profiel is gelyk aan DIA 3h op ou insulien profiele.</string>
     <string name="bgsourcesetup">Konfigureer BG bron</string>
     <string name="setupwizard_profile_description">Kies asseblief bron van profiel. As Pasiënt \'n kind is gebruik NS profiel. As niemand jou volg op Nightscout sal jy waarskynlik plaaslike profiel kies. Onthou asseblief dat jy net die bron kies van profiel. Om dit te gebruik moet jy dit aktiveer deur uitvoering \"Profiel skakelaar\"</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 6c66d1931f..750122d745 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -819,7 +819,7 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Erhöhe die Sensitivität für temporäre Ziele >= 100.]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Niedrige temporäre Ziele senken die Sensitivität</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Senke die Sensitivität für temporäre Ziele < 100.]]></string>
-    <string name="resistance_lowers_target_title">Resistenz senkt Zielwert</string>
+    <string name="resistance_lowers_target_title">Resistenz senkt den Zielwert</string>
     <string name="resistance_lowers_target_summary">Wenn Resistenz festgestellt wird, senke den Glukose-Zielwert</string>
     <string name="sensitivity_raises_target_title">Empfindlichkeit erhöht den Zielwert</string>
     <string name="sensitivity_raises_target_summary">Wenn eine höhere Empfindlichkeit festgestellt wird, wird der Glukose-Zielwert erhöht.</string>
@@ -1156,7 +1156,7 @@ Unerwartetes Verhalten.</string>
     <string name="smscommunicator_otp_step2_provisioning_header">2. Scanne den Code zum Einrichten von AndroidAPS OTP-Codes</string>
     <string name="smscommunicator_otp_step3_test_header">3. Teste das Einmal-Passwort</string>
     <string name="smscommunicator_otp_reset_header">Authentifikators zurücksetzen</string>
-    <string name="smscommunicator_otp_install_info">Installiere auf jedem Folloer-Phone eine Authenticator-App, die RFC 6238 TOTP-Token unterstützt. Beliebte kostenlose Apps sind:\n Authy\n Google Authenticator\n LastPass Authenticator\n FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_install_info">Installiere auf jedem Follower-Phone eine Authenticator-App, die RFC 6238 TOTP-Token unterstützt. Beliebte kostenlose Apps sind:\n Authy\n Google Authenticator\n LastPass Authenticator\n FreeOTP Authenticator</string>
     <string name="smscommunicator_otp_provisioning_warning">Diesen Code NICHT ONLINE TEILEN!\nVerwende ihn nur zur Einrichtung der Authenticator App auf den Follower-Phones.</string>
     <string name="smscommunicator_otp_reset_warning">Wenn Du den Authentifikator zurücksetzt werden alle bestehenden Authentifikatoren ungültig. Du musst sie dann neu einrichten!</string>
     <string name="onconnect">Beim Verbinden</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 8a5253187f..0bac747297 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -228,13 +228,13 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smscommunicator">Communicateur SMS</string>
     <string name="smscommunicator_allowednumbers">Numéros de tél autorisés</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
-    <string name="smscommunicator_bolusreplywithcode">Renvoyer le code %2$s pour injecter le bolus %1$.2fU</string>
-    <string name="smscommunicator_mealbolusreplywithcode">Pour injecter le bolus repas de %1$.2fU renvoyer le code %2$s</string>
-    <string name="smscommunicator_temptargetwithcode">Pour définir la Cible Temp %1$s renvoyer le code %2$s</string>
-    <string name="smscommunicator_temptargetcancel">Pour annuler la Cible Temp renvoyer le code %1$s</string>
-    <string name="smscommunicator_stopsmswithcode">Pour désactiver les commandes à distance SMS renvoyer le code %1$s.\n\nGardez à l\'esprit que vous ne pourrez le réactiver que directement à partir de l\'application AAPS du smartphone maître.</string>
+    <string name="smscommunicator_bolusreplywithcode">Pour injecter le bolus de %1$.2f U, renvoyez le code %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">Pour injecter le bolus repas de %1$.2f U, renvoyez le code %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">Pour définir la cible temp %1$s, renvoyez le code %2$s</string>
+    <string name="smscommunicator_temptargetcancel">Pour annuler la cible temp, renvoyez le code %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">Pour désactiver les commandes à distance SMS, renvoyez le code %1$s.\n\nGardez à l\'esprit que vous ne pourrez le réactiver que directement à partir de l\'application AAPS du smartphone maître.</string>
     <string name="smscommunicator_stoppedsms">Service de commande à distance SMS arrêté. Pour le réactiver, utilisez AAPS sur le smartphone maître.</string>
-    <string name="smscommunicator_calibrationreplywithcode">Renvoyer le code %2$s pour envoyer la calibration %1$.2f</string>
+    <string name="smscommunicator_calibrationreplywithcode">Pour envoyer la calibration %1$.2f, renvoyez le code %2$s</string>
     <string name="smscommunicator_bolusfailed">Échec du Bolus</string>
     <string name="smscommunicator_remotebolusmindistance_summary">Nombre minimum de minutes qu\'il doit y avoir entre un bolus distant et le suivant</string>
     <string name="smscommunicator_remotebolusmindistance">Combien de minutes doit-il y avoir, au minimum, entre un bolus et le suivant</string>
@@ -259,22 +259,22 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smscommunicator_loopisenabled">La Boucle est activée</string>
     <string name="valuelimitedto">%1$.2f limité à %2$.2f</string>
     <string name="valueoutofrange">La valeur %1$s est en dehors des limites</string>
-    <string name="smscommunicator_pumpconnectwithcode">Pour connecter la pompe, répondre avec le code %1$s</string>
+    <string name="smscommunicator_pumpconnectwithcode">Pour connecter la pompe, renvoyez le code %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Echec de la connexion pompe</string>
-    <string name="smscommunicator_pumpdisconnectwithcode">Pour déconnecter la pompe pendant %1d minutes, répondre avec le code %2$s</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Pour déconnecter la pompe pendant %1d min, renvoyez le code %2$s</string>
     <string name="smscommunicator_pumpdisconnected">Pompe déconnectée</string>
     <string name="smscommunicator_reconnect">Pompe reconnectée</string>
     <string name="smscommunicator_remotecommandnotallowed">La commande à distance n\'est pas autorisée</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolus à distance non disponible. Réessayez plus tard.</string>
-    <string name="smscommunicator_basalreplywithcode">Pour démarrer la basal de %1$.2f U/h pendant %2$d min, renvoyer le code %3$s</string>
-    <string name="smscommunicator_profilereplywithcode">Pour changer le profil vers %1$s %2$d%%, renvoyer le code %3$s</string>
-    <string name="smscommunicator_extendedreplywithcode">Pour démarrer le bolus étendu de %1$.2f U/h pendant %2$d min, renvoyer le code %3$s</string>
-    <string name="smscommunicator_carbsreplywithcode">Pour entrer %1$dg à %2$s renvoyer le code %3$s</string>
-    <string name="smscommunicator_basalpctreplywithcode">Pour démarrer la Basal %1$d%% pendant %2$d min, renvoyer le code %3$s</string>
-    <string name="smscommunicator_suspendreplywithcode">Envoyer le code %2$s pour suspendre la Boucle pour %1$d minutes</string>
-    <string name="smscommunicator_loopresumereplywithcode">Pour reprendre la veuillez répondre avec le code %1$s</string>
-    <string name="smscommunicator_loopenablereplywithcode">Pour activer la boucle veuillez répondre avec le code %1$s</string>
-    <string name="smscommunicator_loopdisablereplywithcode">Pour désactiver la boucle veuillez répondre avec le code %1$s</string>
+    <string name="smscommunicator_basalreplywithcode">Pour démarrer la basal de %1$.2f U/h pendant %2$d min, renvoyez le code %3$s</string>
+    <string name="smscommunicator_profilereplywithcode">Pour changer le profil vers %1$s %2$d%%, renvoyez le code %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Pour démarrer le bolus étendu de %1$.2f U/h pendant %2$d min, renvoyez le code %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">Pour entrer %1$dg à %2$s, renvoyez le code %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">Pour démarrer la Basal %1$d%% pendant %2$d min, renvoyez le code %3$s</string>
+    <string name="smscommunicator_suspendreplywithcode">Pour suspendre la boucle pendant %1$d min, renvoyez le code %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Pour reprendre la boucle, renvoyez le code %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Pour activer la boucle, renvoyez le code %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Pour désactiver la boucle, renvoyez le code %1$s</string>
     <string name="smscommunicator_tempbasalset">Démarrage réussi pour %1$.2fU/h de basal temporaire pour %2$d min</string>
     <string name="smscommunicator_extendedset">Le Bolus étendu %1$.2fU pendant %2$d min a commencé avec succès</string>
     <string name="smscommunicator_carbsset">%1$d  g de glucides entrés avec succès</string>
@@ -282,15 +282,15 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smscommunicator_tempbasalset_percent">Démarrage réussi pour %1$d%% de Basal temporaire pour %2$d min</string>
     <string name="smscommunicator_tempbasalfailed">Le démarrage du basal temporaire a échoué</string>
     <string name="smscommunicator_extendedfailed">Le départ du Bolus étendu a échoué</string>
-    <string name="smscommunicator_basalstopreplywithcode">Envoyer le code %1$s pour arrêter la Basal temporaire</string>
-    <string name="smscommunicator_extendedstopreplywithcode">Pour arrêter le Bolus étendu, renvoyer le code %1$s</string>
+    <string name="smscommunicator_basalstopreplywithcode">Pour arrêter la basal temp, renvoyez le code %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Pour arrêter le bolus étendu, renvoyez le code %1$s</string>
     <string name="smscommunicator_tempbasalcanceled">Basal temporaire annulé</string>
     <string name="smscommunicator_extendedcanceled">Bolus étendu annulé</string>
     <string name="smscommunicator_tempbasalcancelfailed">Echec de l\'annulation du basal temporaire</string>
     <string name="smscommunicator_extendedcancelfailed">Échec de l\'annulation du Bolus étendu</string>
     <string name="smscommunicator_unknowncommand">Commande inconnue ou mauvaise réponse</string>
     <string name="quickwizard">Assistant Rapide</string>
-    <string name="quickwizardsettings">Paramètres de l\'Assistant Rapide</string>
+    <string name="quickwizardsettings">Assistant Rapide</string>
     <string name="overview_editquickwizard_buttontext">Texte du bouton :</string>
     <string name="overview_editquickwizard_carbs">Glucides:</string>
     <string name="overview_editquickwizard_valid">Valide:</string>
@@ -306,7 +306,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="primefill">Amorcer/Remplir</string>
     <string name="fillwarning">Veuillez à ce que la quantité corresponde aux caractéristiques de votre cathéter !</string>
     <string name="othersettings_title">Autres</string>
-    <string name="fillbolus_title">Quantité d\'insuline par défaut pour Amorcer/Remplir</string>
+    <string name="fillbolus_title">Insuline par défaut pour Amorcer/Remplir</string>
     <string name="button1">Bouton 1</string>
     <string name="button2">Bouton 2</string>
     <string name="button3">Bouton 3</string>
@@ -475,7 +475,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="xdripstatus">Barre d\'état pour xDrip (Montre)</string>
     <string name="xdripstatus_shortname">xds</string>
     <string name="wear_showbgi_title">Afficher l’Impact Glycémie</string>
-    <string name="wear_showbgi_summary">Ajouter l’IG sur la vue générale</string>
+    <string name="wear_showbgi_summary">Ajouter l’IGly sur la vue générale</string>
     <string name="ns_noupload">Pas de téléchargement vers NS</string>
     <string name="ns_noupload_summary">Toutes les données envoyées à NS sont abandonnées. AAPS est connecté à NS mais aucun changement n’est fait dans NS</string>
     <string name="overview_extendedbolus_cancel_button">Annuler Bolus étendu</string>
@@ -820,7 +820,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Augmente la Sensibilité pour les cibles temporaires >= 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Cible temp. basse abaisse la sensibilité</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Diminue la Sensibilité pour les cibles temporaires < 100]]></string>
-    <string name="resistance_lowers_target_title">La résistance diminue la cible</string>
+    <string name="resistance_lowers_target_title">Résistance diminue la cible</string>
     <string name="resistance_lowers_target_summary">Quand une résistance est détectée, baisse de la glycémie cible</string>
     <string name="sensitivity_raises_target_title">Sensibilité augmente la cible</string>
     <string name="sensitivity_raises_target_summary">Quand une sensibilité est détectée, augmentation de la glycémie cible</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 52b36d5793..a938cc30f9 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -21,6 +21,7 @@
     <string name="description_food">Visualizza i preset dei cibi definiti in Nightscout</string>
     <string name="description_insulin_rapid">Preset per insulina Humalog e NovoRapid / NovoLog</string>
     <string name="description_insulin_ultra_rapid">Preset per insulina Fiasp</string>
+    <string name="description_insulin_lyumjev">Preset per insulina Lyumjev</string>
     <string name="description_insulin_free_peak">Ti consente di definire il picco di attività dell\'insulina e deve essere utilizzato solo dagli utenti avanzati</string>
     <string name="description_loop">Attiva o disattiva l\'implementazione per la gestione del loop.</string>
     <string name="description_ns_client">Sincronizza i tuoi dati con Nightscout</string>
@@ -535,6 +536,7 @@
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
+    <string name="lyumjev">Lyumjev</string>
     <string name="dia_too_short">DIA di %1$f troppo breve - utilizzo %2$f.</string>
     <string name="activate_profile">Attiva profilo</string>
     <string name="invalid">NON VALIDO</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 9e370cf365..32beb5d045 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -1213,4 +1213,5 @@
     <string name="only_upload_if_charging">Įkelti tik akumuliatoriaus įkrovimo metu</string>
     <string name="worker_state">Darbinė Būklė: %s</string>
     <string name="uploaded_data">Įkelti duomenis</string>
+    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Į jūsų Open Humans paskyrą bus įkelti šie duomenys: glikemijos reikšmės, bolusai, angliavandeniai, priežiūros portalo įvykiai (išskyrus pastabas), ištęstiniai bolusai, profilio pakeitimai, visos paros dozės, laikinos valandinės bazės, laikini tikslai, nustatymai, programos versija, įrenginio modelis ir ekrano matmenys. Konfidenciali ar privati ​​informacija, pvz., Jūsų Nightscout URL arba API slaptažodis, nebus įkelta.</string>
 </resources>
diff --git a/app/src/main/res/values-no-rNO/exam.xml b/app/src/main/res/values-no-rNO/exam.xml
index 3ea04e700d..8bc7127bf1 100644
--- a/app/src/main/res/values-no-rNO/exam.xml
+++ b/app/src/main/res/values-no-rNO/exam.xml
@@ -1,2 +1,168 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="dia_whatmeansdia">Hva er riktig om DIA?</string>
+    <string name="dia_label_exam">Tema: Insulinvarighet (DIA)</string>
+    <string name="dia_minimumis3h">Minimumsverdien er 3 timer.</string>
+    <string name="dia_minimumis5h">Minimumsverdien er 5 timer.</string>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
+    <string name="dia_meaningisequaltodiapump">Betydningen er lik DIA verdien angitt i pumpen.</string>
+    <string name="dia_valuemustbedetermined">Du må bestemme din individuelle verdi (men ikke mindre enn 5 timer).</string>
+    <string name="hypott_label">Tema: Hypo Temp Target</string>
+    <string name="hypott_whenhypott">Hva er hovedgrunnen til å velge en hypo TT?</string>
+    <string name="hypott_goinglow">Forhindre at BS går lavt hvis du allerede har en null temp gående.</string>
+    <string name="hypott_preventoversmb">Forhindre at AAPS skal doserer for mye insulin etter en BS stigning forårsaket av hurtigvirkende karbohydrater gitt for å behandle et lavt BS.</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
+    <string name="offlineprofile_whatprofile">Hvilken profiltype kan brukes og konfigureres offline?</string>
+    <string name="offlineprofile_label">Tema: Offline profil</string>
+    <string name="offlineprofile_nsprofile">NS profil kan brukes, men ikke konfigureres.</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">Tema: koble fra pumpen</string>
+    <string name="pumpdisconnect_whattodo">Hva bør gjøres innen du kobler fra pumpen?</string>
+    <string name="pumpdisconnect_letknow">Trykk på \"Koble fra pumpen\" slik at AAPS vet at ingen insulin vil bli levert.</string>
+    <string name="pumpdisconnect_suspend">Trykk \"Pause loop\" så AAPS stopper å loope mens pumpen er frakoblet.</string>
+    <string name="pumpdisconnect_dontchnage">Endre ikke på noe i AAPS, koble bare fra pumpen.</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">Tema: AndroidAPS innstillinger</string>
+    <string name="objectives_howtosave">Hva er beste praksis for å ta backup av dine innstillinger?</string>
+    <string name="objectives_exportsettings">Eksportere dem lokalt fra Vedlikeholds menyen.</string>
+    <string name="objectives_storeelsewhere">Lagre den eksporterte filen til en annen plass som epost, Dropbox, Google Drive…</string>
+    <string name="objectives_doexportonstart">Eksporter dem rett etter installeringen av AAPS.</string>
+    <string name="objectives_doexportafterchange">Eksporter dem rett etter at du har gjort endringer i dine innstillinger.</string>
+    <string name="objectives_doexportafterobjective">Eksporter dem etter at du har fullført et nytt læringsmål.</string>
+    <string name="objectives_doexportafterfirtssettings">Eksporter dem etter at du har avsluttet dine første innstillinger.</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="noisycgm_label">Emne: CGM-målingern med støy</string>
+    <string name="noisycgm_whattodo">Hva bør gjøres hvis CGM data har støy?</string>
+    <string name="nothing">Ingenting, AAPS vil håndtere det.</string>
+    <string name="noisycgm_pause">Deaktiver loop for å unngå overdosering.</string>
+    <string name="noisycgm_replacesensor">Bytt CGM sensor.</string>
+    <string name="noisycgm_turnoffphone">Slå av telefonen.</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="noisycgm_checksmoothing">Kontroller at CGM appen din jevner ut BS målinger.</string>
+    <string name="exercise_label">Tema: Trening</string>
+    <string name="exercise_whattodo">Hvordan kan du hjelpe systemet med å håndtere trening?</string>
+    <string name="exercise_setactivitytt">Ved å bruke funksjonen for temp target/mål.</string>
+    <string name="exercise_switchprofilebelow100">Gjør et profilbytte til under 100%.</string>
+    <string name="exercise_switchprofileabove100">Gjør et profilbytte til over 100%.</string>
+    <string name="exercise_stoploop">Stopp loop.</string>
+    <string name="exercise_doitbeforestart">Angi et \"aktivitet\" temp mål før du begynner treningen.</string>
+    <string name="exercise_afterstart">Å angi et \"aktivitet\" temp mål etter at du har startet treningen fører til dårligere resultater enn om man startet før.</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#active temp-target</string>
+    <string name="suspendloop_label">Tema: Stanset/pauset loop</string>
+    <string name="suspendloop_doigetinsulin">Får jag insulin når loop er stanset/pauset?</string>
+    <string name="suspendloop_yes">Ja, basal insulin vil fortsatt bli levert.</string>
+    <string name="suspendloop_no">Nei, levering av insulin er stanset.</string>
+    <string name="basaltest_label">Tema: Basal, ISF og IC testing</string>
+    <string name="basaltest_when">Når bør jeg validere basal, ISF og IC verdier?</string>
+    <string name="basaltest_beforeloop">Før jeg begynner å loope.</string>
+    <string name="basaltest_havingregularhypo">Om du ofte opplever lave BS verdier.</string>
+    <string name="basaltest_havingregularhyper">Om du ofte opplever høye BS verdier.</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">Tema: Forutsetninger før oppstart</string>
+    <string name="prerequisites_what">Hva trenger jeg?</string>
+    <string name="prerequisites_determinedcorrectprofile">Validert profil informasjon (basal, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">En datamaskin for å lage en APK.</string>
+    <string name="prerequisites_phone">En telefon som støttes.</string>
+    <string name="prerequisites_car">En bil.</string>
+    <string name="prerequisites_nightscout">Nightscout for å klare læringsmålene.</string>
+    <string name="prerequisites_tidepoolaccount">En Tidepool konto.</string>
+    <string name="prerequisites_googleaccount">En Google konto.</string>
+    <string name="prerequisites_githubaccount">En Github konto.</string>
+    <string name="prerequisites_beanandroiddeveloper">Erfaring med Android programmering.</string>
+    <string name="prerequisites_own670g">En MiniMed 670G pumpe.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="prerequisites_smartwatch">En smartklokke.</string>
+    <string name="prerequisites_supportedcgm">En CGM som støttes.</string>
+    <string name="update_label">Tema: Oppdatering av AndroidAPS</string>
+    <string name="whatistrue">Hva er sant?</string>
+    <string name="update_git">Du må ha Git installert.</string>
+    <string name="update_asap">Oppdater så snart den nye versjonen er publisert og du har nok tid til å gjøre det.</string>
+    <string name="update_keys">Du bør bruke de samme signeringsnøklene.</string>
+    <string name="update_neverupdate">Aldri oppdater hvis systemet fungerer bra.</string>
+    <string name="update_askfriend">Spør en venn om den nye APK filen.</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_label">Tema: Feilsøking</string>
+    <string name="troubleshooting_wheretoask">Hvor skal jeg lete etter hjelp?</string>
+    <string name="troubleshooting_fb">Bli medlem av AndroidAPS Facebook gruppen.</string>
+    <string name="troubleshooting_wiki">Les AndroidAPS dokumentasjonen.</string>
+    <string name="troubleshooting_gitter">Besøk AndroidAPS Gitter rommet.</string>
+    <string name="troubleshooting_googlesupport">Besøk AndroidAPS Google support</string>
+    <string name="troubleshooting_yourendo">Snakk med din diabeteslege.</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">Tema: Insulin plugin</string>
+    <string name="insulin_ultrarapid">Hvilke typer insulin kan brukes sammen med insulinprofilen \"Ultra-Rapid-Oref\"?</string>
+    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">Novorapid®</string>
+    <string name="insulin_humalog">Humalog®</string>
+    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">Tema: Sensitivitet plugin</string>
+    <string name="sensitivity_which">Hvilken sensitivitetsalgoritme har et konfigurerbart tidsintervall?</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="sensitivityuam_which">Hvilken sensitivitets plugin må anvendes for å bruke UAM funksjonen?</string>
+    <string name="wrongcarbs_label">Tema: Feilaktig registrering av karbohydrater</string>
+    <string name="wrongcarbs_whattodo">Hva skal du gjøre hvis du har gjort en feilaktig registrering av karbohydrater?</string>
+    <string name="wrongcarbs_treatmentstab">I Behandlinger, slett den feilaktige registreringen og legg inn karbohydrater på nytt.</string>
+    <string name="wrongcarbs_addfakeinsulin">Legg inn falsk insulin ved å bruke prime/fyll funksjonen</string>
+    <string name="extendedcarbs_label">Tema: Mat med fett og protein</string>
+    <string name="extendedcarbs_handling">Hva skal du gjøre om maten inneholder store mengder fett og/eller proteiner?</string>
+    <string name="extendedcarbs_useextendedcarbs">Regn om fett og proteiner til karbohydrater og bruk eKarbo funksjonen.</string>
+    <string name="extendedcarbs_add">Regn om fett og proteiner til karbohydrater og legg det til bolus beregningen.</string>
+    <string name="extendedcarbs_useextendedbolus">Bruk forlenget bolus til å dekke inntaket av fett og proteiner.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">Tema: Fjernovervåking</string>
+    <string name="nsclient_howcanyou">Hvordan kan du overvåke AAPS for ditt barn på avstand?</string>
+    <string name="nsclient_nightscout">Ved å bruke Nightscout.</string>
+    <string name="nsclient_dexcomfollow">Dexcom Follow app hvis du bruker Dexcom appen (bare for BS).</string>
+    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow hvis du bruker xDrip appen.</string>
+    <string name="nsclient_xdripfollower">xDrip app kjører i følger-modus.</string>
+    <string name="nsclient_looponiphone">Loop app på iPhone.</string>
+    <string name="nsclient_spikeiphone">Spike app på iPhone.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">Tema: Insulin sensitivitetsfaktor (ISF)</string>
+    <string name="isf_increasingvalue">Høyere ISF verdier fører til mindre insulintilførsel når AAPS korrigerer for høyt BS.</string>
+    <string name="isf_decreasingvalue">Lavere ISF verdier fører til mindre insulintilførsel når AAPS korrigerer for høyt BS.</string>
+    <string name="isf_noeffect">Endring av ISF verdier har ingen effekt på mengden insulin som tilføres når AAPS korrigerer høyt BS.</string>
+    <string name="isf_preferences">Du må angi ISF i Innstillinger.</string>
+    <string name="isf_profile">Å endre ISF verdien i din profil er tilstrekkelig for å ta i bruk endringen.</string>
+    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Tema: Insulin-karbo (IK) forholdet</string>
+    <string name="ic_increasingvalue">Høyere IC forhold fører til at mindre insulin leveres for en gitt mengde karbohydrater.</string>
+    <string name="ic_decreasingvalue">Lavere IC forhold fører til at mindre insulin leveres for en gitt mengde karbohydrater.</string>
+    <string name="ic_noeffect">Hvis du har 0 COB, vil endring av IC forholdet føre til endring av insulinmengden som trengs for å korrigere ditt BS nivå.</string>
+    <string name="ic_different">IC vil være forskjellig hvis du regner en skive brød som 10g eller 12g.</string>
+    <string name="ic_meaning">IC betyr: Hvor mange brødenheter som dekkes av 1E insulin.</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+    <string name="profileswitch_label">Tema: Profilbytte</string>
+    <string name="profileswitch_pctwillchange"> Når man angir 90% i profilbytte…</string>
+    <string name="profileswitch_basalhigher">Basal vil være 10% høyere.</string>
+    <string name="profileswitch_basallower">Basal vil være 10% lavere.</string>
+    <string name="profileswitch_ichigher">IC verdien vil være 10% høyere.</string>
+    <string name="profileswitch_iclower">IC verdien vil være 10% lavere.</string>
+    <string name="profileswitch_isfhigher">ISF verdien vil være 10% høyere.</string>
+    <string name="profileswitch_isflower">ISF verdien vil være 10% lavere.</string>
+    <string name="profileswitch_overall">Du vil få omtrent 10% mindre insulin totalt.</string>
+    <string name="profileswitch_targethigher">Mål BS vil bli 10% høyere.</string>
+    <string name="profileswitch_targetlower">Mål BS vil bli 10% lavere.</string>
+    <string name="profileswitch_targetbottom">Bare laveste BS grenseverdi vil bli 10% lavere.</string>
+    <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitchtime_iwant">Hvis du våkner 1t tidligere enn normalt, hvordan skal du varsle AAPS om endringen i døgnrytmen din?</string>
+    <string name="profileswitchtime_1">Gjøre et profilbytte med en tidsforskyvning på 1t</string>
+    <string name="profileswitchtime__1">Gjøre et profil bytte med en tidsforskyvning på -1t</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitchtime_60">Gjør et profilbytte med en tidsforskyvning på 60</string>
+    <string name="profileswitchtime__60">Gjør et profilbytte med en tidsforskyvning på -60</string>
+    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
+    <string name="basalhelp_label">Tema: Hjelp med basaldoser</string>
+    <string name="basalhelp_where">Hvor finner du hjelp for basaldoser m. m.</string>
+    <string name="basalhelp_diabetesteam">Ditt diabetesteam</string>
+    <string name="basalhelp_google">Google</string>
+    <string name="basalhelp_facebook">Facebook</string>
+    <string name="other_medication_label">Annen medisinering</string>
+    <string name="other_medication_text">AAPS senker basalen for å øke glukosemengden i blodet. Medisiner av typen SGLT2-hemmere (glifloziner) kan motvirke den forventede økningen i BS og som kan resultere i livsfarlig insulinmangel eller ketoacidose (DKA). \nVanlige merker i markedet: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\n
+Jeg lover herved å ALDRI ta slike medisiner samtidig som jeg bruker AAPS, eller jeg kommer til å ta en pause i looping så lenge jeg bruker slik medisin.</string>
+</resources>
diff --git a/app/src/main/res/values-no-rNO/insight_alert_codes.xml b/app/src/main/res/values-no-rNO/insight_alert_codes.xml
index 3ea04e700d..39e7860fc9 100644
--- a/app/src/main/res/values-no-rNO/insight_alert_codes.xml
+++ b/app/src/main/res/values-no-rNO/insight_alert_codes.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="alert_r1_code">Påminnelses R1</string>
+    <string name="alert_r2_code">Påminnelse R2</string>
+    <string name="alert_r3_code">Påminnelse R3</string>
+    <string name="alert_r4_code">Påminnelse R4</string>
+    <string name="alert_r7_code">Påminnelse R7</string>
+    <string name="alert_w31_code">Advarsel W31</string>
+    <string name="alert_w32_code">Advarsel W32</string>
+    <string name="alert_w33_code">Advarsel W33</string>
+    <string name="alert_w34_code">Advarsel W34</string>
+    <string name="alert_w36_code">Advarsel W36</string>
+    <string name="alert_w38_code">8Advarsel W38</string>
+    <string name="alert_w39_code">Advarsel W39</string>
+    <string name="alert_m20_code">Vedlikehold M20</string>
+    <string name="alert_m21_code">Vedlikehold M21</string>
+    <string name="alert_m22_code">Vedlikehold M22</string>
+    <string name="alert_m23_code">Vedlikehold M23</string>
+    <string name="alert_m24_code">Vedlikehold M24</string>
+    <string name="alert_m25_code">Vedlikehold M25</string>
+    <string name="alert_m26_code">Vedlikehold M26</string>
+    <string name="alert_m27_code">Vedlikehold M27</string>
+    <string name="alert_m28_code">Vedlikehold M28</string>
+    <string name="alert_m29_code">Vedlikehold M29</string>
+    <string name="alert_m30_code">Vedlikehold M30</string>
+    <string name="alert_e6_code">Feil E6</string>
+    <string name="alert_e10_code">Feil E10</string>
+    <string name="alert_e13_code">Feil E13</string>
+</resources>
diff --git a/app/src/main/res/values-no-rNO/insight_alert_descriptions.xml b/app/src/main/res/values-no-rNO/insight_alert_descriptions.xml
index 3ea04e700d..683042025e 100644
--- a/app/src/main/res/values-no-rNO/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-no-rNO/insight_alert_descriptions.xml
@@ -1,2 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="alert_r7_description"><![CDATA[Mengde: <b>%1$d%%</b>\nVarighet: <b>%2$s t</b>]]></string>
+    <string name="alert_w31_description"><![CDATA[Ampullens innhold: <b>%1$s E</b>]]></string>
+    <string name="alert_w32_description">Bytt batteri.</string>
+    <string name="alert_w33_description">Angi tidspunkt/dato.</string>
+    <string name="alert_w34_description">Kontakt Accu-Chek kundestøtte.</string>
+    <string name="alert_w36_description"><![CDATA[Mengde: <b>%1$d%%</b><br/>\nVarighet: <b>%2$s t</b>]]></string>
+    <string name="alert_w38_description"><![CDATA[Angitt: <b>%1$s E</b><br/>Levert: <b>%2$s E</b>]]></string>
+    <string name="alert_m20_description">Sett inn ampulle.</string>
+    <string name="alert_m21_description">Bytt ampulle.</string>
+    <string name="alert_m22_description">Bytt batteri.</string>
+    <string name="alert_m23_description">Kontroller pumpestatus.</string>
+    <string name="alert_m24_description">Bytt infusjonssett.</string>
+    <string name="alert_m25_description">Kontakt Accu-Chek kundestøtte.</string>
+    <string name="alert_m26_description">Bytt ampulle.</string>
+    <string name="alert_m27_description">Restart nedlasting av data.</string>
+    <string name="alert_m28_description">Kontroller pumpestatus.</string>
+    <string name="alert_m29_description">Angi batteritype.</string>
+    <string name="alert_m30_description">Angi ampulle type.</string>
+    <string name="alert_e6_description">Bytt batteri og ampulle.</string>
+    <string name="alert_e10_description">Bytt ampulle.</string>
+    <string name="alert_e13_description">Bytt språk.</string>
+</resources>
diff --git a/app/src/main/res/values-no-rNO/insight_alert_titles.xml b/app/src/main/res/values-no-rNO/insight_alert_titles.xml
index 3ea04e700d..c9feb15ccb 100644
--- a/app/src/main/res/values-no-rNO/insight_alert_titles.xml
+++ b/app/src/main/res/values-no-rNO/insight_alert_titles.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="alert_r1_title">Tilfør bolus</string>
+    <string name="alert_r2_title">Manglende bolus</string>
+    <string name="alert_r3_title">Alarmklokke</string>
+    <string name="alert_r4_title">Bytt infusjonssett</string>
+    <string name="alert_r7_title">Midlertidig basaldose fullført</string>
+    <string name="alert_w31_title">Lavt ampulleinnhold</string>
+    <string name="alert_w32_title">Batteri lavt</string>
+    <string name="alert_w33_title">Ugyldig klokkeslett/dato</string>
+    <string name="alert_w34_title">Slutt på garanti</string>
+    <string name="alert_w36_title">Midlertidig basaldose avbrutt</string>
+    <string name="alert_w38_title">Bolus avbrutt</string>
+    <string name="alert_w39_title">Lånetidsadvarsel</string>
+    <string name="alert_m20_title">Ampulle ikke satt inn</string>
+    <string name="alert_m21_title">Ampulle tom</string>
+    <string name="alert_m22_title">Batteri tomt</string>
+    <string name="alert_m23_title">Automatisk av - pumpe stoppet</string>
+    <string name="alert_m24_title">Tilstopping</string>
+    <string name="alert_m25_title">Lånetid over - drift stoppes</string>
+    <string name="alert_m26_title">Bytte av ampulle ikke fullført</string>
+    <string name="alert_m27_title">Nedlasting av data mislyktes</string>
+    <string name="alert_m28_title">Tidsavbrudd for pausemodus</string>
+    <string name="alert_m29_title">Batteritype ikke angitt</string>
+    <string name="alert_m30_title">Ampulletype ikke angitt</string>
+    <string name="alert_e6_title">Mekanisk feil</string>
+    <string name="alert_e10_title">Tilbakespolingsfeil</string>
+    <string name="alert_e13_title">Språkfeil</string>
+</resources>
diff --git a/app/src/main/res/values-no-rNO/insight_exceptions.xml b/app/src/main/res/values-no-rNO/insight_exceptions.xml
index 3ea04e700d..461bcf6c7c 100644
--- a/app/src/main/res/values-no-rNO/insight_exceptions.xml
+++ b/app/src/main/res/values-no-rNO/insight_exceptions.xml
@@ -1,2 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="connection_failed">Tilkobling mislyktes</string>
+    <string name="connection_lost">Mistet forbindelsen</string>
+    <string name="pairing_rejected">Sammenkobling avvist</string>
+    <string name="socket_creation_failed">Mislykket opprettelse av socket tilkobling</string>
+    <string name="timeout">Tidsavbrudd</string>
+    <string name="maximum_number_of_bolus_type_already_running">Maksimalt antall bolusdoser som allerede går</string>
+    <string name="no_active_tbr_to_cancel">Ingen aktiv midlertidig basaldose å kansellere</string>
+    <string name="no_active_tbr_to_change">Ingen aktiv midlertidig basaldose å endre</string>
+    <string name="no_such_bolus_to_cancel">Ingen slik bolus til å avbryte</string>
+    <string name="pump_already_in_that_state_exception">Pumpe allerede i den tilstanden</string>
+    <string name="run_mode_not_allowed">Kjør modus ikke tillatt</string>
+</resources>
diff --git a/app/src/main/res/values-no-rNO/objectives.xml b/app/src/main/res/values-no-rNO/objectives.xml
index 3ea04e700d..df92efa27d 100644
--- a/app/src/main/res/values-no-rNO/objectives.xml
+++ b/app/src/main/res/values-no-rNO/objectives.xml
@@ -1,2 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="objectives_button_back">Tilbake</string>
+    <string name="objectives_button_start">Start</string>
+    <string name="objectives_button_verify">Kontroller</string>
+    <string name="nth_objective">%1$d. Læringsmål</string>
+    <string name="objectivenotstarted">Læringsmål %1$d ikke startet</string>
+    <string name="objectivenotfinished">Læringsmål %1$d er ikke ferdig</string>
+    <string name="objectives_0_objective">Stiller inn utseende og overvåking for analyser av basaler og forholdstall</string>
+    <string name="objectives_0_gate">Kontroller at BS er tilgjengelig i Nightscout og at insulindata fra pumpen lastes opp</string>
+    <string name="objectives_openloop_objective">Starter med åpen loop</string>
+    <string name="objectives_openloop_gate">Kjør i \"Åpen Loop\" modus i noen dager og aktiver flere temp basaler. Konfigurer og aktiver flere midlertidige og default temp BS mål (f.eks. for Aktivitet eller Hypo behandling)</string>
+    <string name="objectives_maxbasal_objective">Forstå din åpen loop, inkludert den temp basal anbefalingen</string>
+    <string name="objectives_maxbasal_gate">Ut ifra hva du har erfart og lært, avgjør hva din max basal skal være og still den inn i både pumpen og AAPS innstillinger</string>
+    <string name="objectives_maxiobzero_objective">Begynn å bruk lukket loop med aktivert funksjon for stopping av insulin ved lavt BS</string>
+    <string name="objectives_maxiobzero_gate">Aktiver closed loop med max IOB = 0 i noen dager uten for mange episoder hvor systemet stopper insulintilførsel på grunn av lavt BS</string>
+    <string name="objectives_maxiob_objective">Finjustering av lukket loop med gradvis økende maks IOB over 0 og redusering av BS målverdi</string>
+    <string name="objectives_maxiob_gate">Kjør i noen dager og opplev minst en natt uten lavt BS alarmer før du begynner å redusere målverdi for BS</string>
+    <string name="objectives_autosens_objective">Juster om nødvendig basal og forholdstall, og deretter aktiverer du autosens</string>
+    <string name="objectives_autosens_gate">1 uke vellykket looping på dagtid hvor alle måltider (KH) angis</string>
+    <string name="objectives_ama_objective">Aktiver ekstra funksjoner for bruk på dagtid, slik som avansert måltidsassistent (AMA)</string>
+    <string name="objectives_smb_objective">Aktiver ekstra funksjoner for bruk på dagtid, slik som SMB (Super Micro Bolus)</string>
+    <string name="objectives_auto_objective">Aktiver Automatisering</string>
+    <string name="objectives_smb_gate">Du må lese wiki og øke din maxIOB for å få SMB til å fungere. Et godt utgangspunkt er maxIOB = gjennomsnittlig måltidsbolus + 3*max daglig basal</string>
+    <string name="objectives_auto_gate">Les dokumentasjonen på hvordan Automatisering virker. Lag din første enkle regel. I stedet for å utføre en behandling, få AAPS AAPS til å bare vise en melding. Kun når du er sikker på at Automatisering virker riktig kan du erstatte meldingsvarselet med en behandlingskommando. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
+    <string name="objectives_bgavailableinns">BS tilgjengelig i NS</string>
+    <string name="objectives_pumpstatusavailableinns">Pumpe status tilgjengelig i NS</string>
+    <string name="objectives_manualenacts">Manuell kommando</string>
+    <string name="accomplished">Utført: %1$s</string>
+    <string name="objectives_usage_objective">Lær hvordan du kontrollerer AndroidAPS</string>
+    <string name="objectives_usage_gate">Utfør forskjellige handlinger i AndroidAPS</string>
+    <string name="objectives_useprofileswitch">Angi profil 90% for 10 min (langt-trykk på profilnavn i Oversikt)</string>
+    <string name="objectives_usedisconnectpump">Simuler dusjing. Frakoble pumpen i 1t (langt trykk på Åpen Loop)</string>
+    <string name="objectives_usereconnectpump">... og koble til igjen på samme måte</string>
+    <string name="objectives_usetemptarget">Opprett egendefinerte midlertidige BS mål med 10 min varighet (langt-trykk på gjeldende mål)</string>
+    <string name="objectives_useactions">I Konfigurasjonsverktøyet aktiverer du Hendelser plugin, og gjør det synlig og viser innholdet fra menyen i øverste linje</string>
+    <string name="objectives_useloop">Vis innholdet i Loop plugin</string>
+    <string name="objectives_usescale">Test skaleringsfunksjonen ved et langt trykk på BS grafen</string>
+    <string name="objectives_button_enter">Angi</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Hvis du har minst 3 måneder erfaring med andre lukkede loop systemer kan du kanskje kvalifisere for en kode som lar deg hoppe over Læringsmålene. Se https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives for mer detaljer.</string>
+    <string name="codeaccepted">Kode akseptert</string>
+    <string name="codeinvalid">Kode ugyldig</string>
+    <string name="objectives_exam_objective">Bevis kunnskapen din</string>
+    <string name="objectives_exam_gate">Studer og besvare spørsmålene riktig</string>
+    <string name="answerdisabledto">Besvarelser deaktivert til: %1$s</string>
+    <string name="wronganswer">Feil svar!</string>
+    <string name="unfinshed_button">Neste uferdig</string>
+    <string name="requestcode">Be om kode: %1$s</string>
+    <string name="objectives_hint">(kontroller alle riktige svar)</string>
+    <string name="disconnectpump_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath</string>
+    <string name="usetemptarget_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
+    <string name="useaction_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#config-builder</string>
+    <string name="usescale_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
+    <string name="notconnected">Ikke koblet til Internett</string>
+    <string name="failedretrievetime">Feil ved henting av tid</string>
+    <string name="requirementnotmet">Læringmålets krav er ikke oppfylt</string>
+    <plurals name="objective_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dager</item>
+    </plurals>
+    <plurals name="objective_hours">
+        <item quantity="one">%1$d time</item>
+        <item quantity="other">%1$d timer</item>
+    </plurals>
+    <plurals name="objective_minutes">
+        <item quantity="one">%1$d minutt</item>
+        <item quantity="other">%1$d minutter</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 1ce4989b86..f306760a89 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -4,5 +4,1216 @@
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <!--    <string name="ga_lang" translatable="false">Irish</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <string name="treatmentssafety_title">Sikkerhetsbegrensninger for behandlinger</string>
+    <string name="treatmentssafety_maxbolus_title">Maks tillat bolus [U]</string>
+    <string name="treatmentssafety_maxcarbs_title">Maks tillat karbo [g]</string>
+    <string name="nav_preferences">Innstillinger</string>
+    <string name="nav_refreshtreatments">Oppdater behandlinger fra NS</string>
+    <string name="nav_resetdb">Nullstill databasene</string>
+    <string name="reset_db_confirm">Vil du virkelig nullstille databasene?</string>
+    <string name="nav_exit">Avslutt</string>
+    <string name="ns_sync_use_absolute_title">Bruk alltid absolutte verdier for basal</string>
+    <string name="alert_dialog_storage_permission_text">Start telefonen på nytt eller restart AndroidAPS fra systeminnstillingene \nellers vil ikke AndroidAPS ha aktivert loggføring (viktig for å spore og kontrollere at algoritmene fungerer riktig)!</string>
+    <string name="alert_dialog_permission_battery_optimization_failed">Det ser ikke ut som mobilen støtter registrering av apper som unntas fra batterioptimalisering - du kan oppleve ytelsesproblemer.</string>
+    <string name="description_actions">Knapper for rask tilgang til ofte brukte funksjoner</string>
+    <string name="description_config_builder">Brukt for innstilling av aktive plugin</string>
+    <string name="description_objectives">Opplæringsprogram</string>
+    <string name="description_food">Viser forhåndsinnstillinger for mat som er definert i Nightscout</string>
+    <string name="description_insulin_rapid">Innstillinger for Humalog og NovoRapid / NovoLog insulin</string>
+    <string name="description_insulin_ultra_rapid">Innstillinger for Fiasp</string>
+    <string name="description_insulin_lyumjev">Insulin innstillinger for Lyumjev</string>
+    <string name="description_insulin_free_peak">Lar deg stille inn tidspunktet for toppen av insulinvirkningen. Bør bare benyttes av erfarne brukere</string>
+    <string name="description_loop">Aktiver eller deaktiver hendelsen som trigger loop.</string>
+    <string name="description_ns_client">Synkroniserer dine data med Nightscout</string>
+    <string name="description_ma">Slik algoritmen var definert i 2016</string>
+    <string name="description_ama">Slik algoritmen var definert i 2017</string>
+    <string name="description_smb">Siste utgave av algoritmen for avanserte brukere</string>
+    <string name="description_overview">Viser loopens nåværende tilstand og knapper for de vanligste funksjonene</string>
+    <string name="description_persistent_notification">Viser en konstant melding med en kort oppsummering av hva loop gjør</string>
+    <string name="description_profile_local">Definer en profil som er tilgjengelig offline.</string>
+    <string name="description_profile_nightscout">Bruker profiler som du har definert i Nightscout</string>
+    <string name="description_profile_simple">Definer en profil med bare en tidsperiode.</string>
+    <string name="description_pump_combo">Tilkobling mot Accu-Chek Combo pumper krever at ruffy er installert</string>
+    <string name="description_pump_mdi">Integrasjon mot de som kun bruker insulinpenner i sin diabetesbehandling</string>
+    <string name="description_pump_virtual">Integrasjon mot pumper som ikke støttes av AndroidAPS (åpen loop)</string>
+    <string name="description_sensitivity_aaps">Sensitiviteten beregnes på samme måte som i Oref0, men du kan angi hvor mye av historikken som skal tas med i beregningen. Minimum opptak av karbohydrater beregnes ut fra maks karbohydratopptak angitt i dine innstillinger.</string>
+    <string name="description_sensitivity_oref1">Sensitivitet beregnes fra 8t og 24t historiske dat (velger alltid det resultatet som gir høyest insulinsensitivitet. Karbohydrater som ikke er absorbert blir avsluttet etter tiden som er angitt i innstillinger. Plugin beregner også UAM.</string>
+    <string name="description_sensitivity_weighted_average">Sensitivitet beregnes som en vektet gjennomsnittsverdi av avvikene. Ferske avvik har høyere vekting. Minimum opptak av karbohydrater beregnes ut fra maks opptakstid for karbohydrater angitt i dine innstillinger. Denne algoritmen er den raskeste for å justere endringer i sensitivitet.</string>
+    <string name="description_source_eversense">Motta BS verdier fra den modifiserte Eversense appen.</string>
+    <string name="description_source_glimp">Motta BS verdier fra Glimp.</string>
+    <string name="description_source_mm640g">Motta BS verdier fra 600SeriesAndroidUploader.</string>
+    <string name="description_source_ns_client">Last ned BS verdier fra Nightscout</string>
+    <string name="description_source_xdrip">Motta BS verdier fra xDrip.</string>
+    <string name="description_treatments">Lagre data om alle behandlinger som er utført</string>
+    <string name="description_wear">Monitorer og kontroller AndroidAPS med din WearOS klokke.</string>
+    <string name="description_xdrip_status_line">Vis informasjon om loop på din xDrip+ urskive.</string>
+    <string name="description_sms_communicator">Fjernstyr AndroidAPS med SMS kommandoer.</string>
+    <string name="treatments_insulin_label_string">Insulin:</string>
+    <string name="treatments_carbs_label_string">Karbo:</string>
+    <string name="treatments_iob_label_string">IOB:</string>
+    <string name="sms_iob">IOB:</string>
+    <string name="treatments_iobtotal_label_string">Total IOB:</string>
+    <string name="treatments_iobactivitytotal_label_string">Total IOB aktivitet:</string>
+    <string name="tempbasals_realduration_label_string">Varighet:</string>
+    <string name="tempbasals_netratio_label_string">Ratio:</string>
+    <string name="tempbasals_netinsulin_label_string">Ins:</string>
+    <string name="tempbasals_iob_label_string">IOB:</string>
+    <string name="tempbasals_iobtotal_label_string">Total IOB:</string>
+    <string name="treatments_wizard_bg_label">BS</string>
+    <string name="treatments_wizard_tt_label">TT</string>
+    <string name="treatments_wizard_carbs_label">Karbo</string>
+    <string name="treatments_wizard_correction_label">Korr</string>
+    <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
+    <string name="openapsma_run">Utfør nå</string>
+    <string name="vitualpump_label">VIRTUELL PUMPE</string>
+    <string name="virtualpump_resultok">OK</string>
+    <string name="openapsma_lastrun_label">Siste beregning</string>
+    <string name="openapsma_inputparameters_label">Angi verdier</string>
+    <string name="openapsma_glucosestatus_label">Glukosestatus</string>
+    <string name="openapsma_currenttemp_label">Nåværende temp</string>
+    <string name="openapsma_iobdata_label">IOB data</string>
+    <string name="openapsma_profile_label">Profil</string>
+    <string name="openapsma_mealdata_label">Måltidsdata</string>
+    <string name="result">Resultat</string>
+    <string name="result_insulin_carbs">Resultat: %1$s %2$s</string>
+    <string name="openapsma_noglucosedata">Ingen BS data tilgjengelig</string>
+    <string name="openapsma_request_label">Forespørsel</string>
+    <string name="glucose">Glukose</string>
+    <string name="delta">Delta</string>
+    <string name="sms_delta">Delta:</string>
+    <string name="configbuilder">Konfigurasjonsverktøy</string>
+    <string name="overview">Oversikt</string>
+    <string name="nsprofile">NS profil</string>
+    <string name="simpleprofile">Enkel profil</string>
+    <string name="treatments">Behandlinger</string>
+    <string name="virtualpump">Virtuell pumpe</string>
+    <string name="careportal">Careportal</string>
+    <string name="configbuilder_pump">Pumpe</string>
+    <string name="configbuilder_pump_description">Hvilken pumpe ønsker du å bruke sammen med AndroidAPS?</string>
+    <string name="configbuilder_treatments">Behandlinger</string>
+    <string name="configbuilder_treatments_description">Hvilken plugin burde brukes til håndtering av behandlinger?</string>
+    <string name="configbuilder_profile">Profil</string>
+    <string name="configbuilder_profile_description">Hvilken profil bør AndroidAPS bruke?</string>
+    <string name="configbuilder_aps">APS</string>
+    <string name="configbuilder_aps_description">Hvilken APS algoritme skal brukes for administrasjon av behandlinger?</string>
+    <string name="configbuilder_general">Generelt</string>
+    <string name="configbuilder_general_description">Det er noen generelle plugins som kan være nyttige.</string>
+    <string name="configbuilder_constraints_description">Hvilke begrensninger brukes?</string>
+    <string name="constraints">Begrensninger</string>
+    <string name="loop">Loop</string>
+    <string name="configbuilder_loop">Loop</string>
+    <string name="configbuilder_loop_description">Bruk dette for å aktivere AndroidAPS loop integrasjon.</string>
+    <string name="loop_aps_label">APS</string>
+    <string name="loop_constraintsprocessed_label">Etter behandling av begrensninger</string>
+    <string name="loop_tbrsetbypump_label">Temp Basal satt av pumpen</string>
+    <string name="openapsma_lastenact_label">Siste utført</string>
+    <string name="noapsselected">INGEN APS ER VALGT ELLER HAR LEVERT RESULTAT</string>
+    <string name="safety">Sikkerhet</string>
+    <string name="openapsma_disabled">Plugin er deaktivert</string>
+    <string name="constraints_violation">Brudd på begrensninger</string>
+    <string name="treatmentdeliveryerror">Mislykket bolus levering</string>
+    <string name="overview_newtempbasal_basalpercent">Basal verdi [%]</string>
+    <string name="setbasalquestion">Aksepter ny temp basal:</string>
+    <string name="overview_treatment_label">Behandling</string>
+    <string name="overview_calculator_label">Kalkulator</string>
+    <string name="constraintapllied">Begrensning benyttet!</string>
+    <string name="sms_bolus">Bolus:</string>
+    <string name="basal">Basal</string>
+    <string name="sms_basal">Basal:</string>
+    <string name="changeyourinput">Endre dine inndata!</string>
+    <string name="configbuilder_bgsource">BS kilde</string>
+    <string name="configbuilder_bgsource_description">Hvor skal AndroidAPS hente sine data fra?</string>
+    <string name="xdrip">xDrip</string>
+    <string name="apsmode_title">APS modus</string>
+    <string name="closedloop">Lukket loop</string>
+    <string name="openloop">Åpen loop</string>
+    <string name="lowglucosesuspend">Stopp hvis lavt BS</string>
+    <string name="disabledloop">Loop er deaktivert</string>
+    <string name="disableloop">Stans loop</string>
+    <string name="enableloop">Aktiver loop</string>
+    <string name="openloop_newsuggestion">Ny anbefaling tilgjengelig</string>
+    <string name="carbssuggestion">Karbo forslag</string>
+    <string name="unsupportednsversion">Versjonen av Nightscout støttes ikke</string>
+    <string name="loopdisabled">LOOP DEAKTIVERT PGA BEGRENSNINGER</string>
+    <string name="treatments_wizard_basaliob_label">Basal IOB</string>
+    <string name="bolusconstraintapplied">Bolus begrensning utført</string>
+    <string name="carbsconstraintapplied">Karbohydrat begrensning utført</string>
+    <string name="careportal_newnstreatment_other">Annet</string>
+    <string name="careportal_newnstreatment_meter">Meter</string>
+    <string name="careportal_newnstreatment_sensor">Sensor</string>
+    <string name="careportal_newnstreatment_carbs_label">Karbo</string>
+    <string name="careportal_newnstreatment_insulin_label">Insulin</string>
+    <string name="careportal_newnstreatment_carbtime_label">Karbo tid</string>
+    <string name="careportal_newnstreatment_split_label">Delt</string>
+    <string name="careportal_newnstreatment_duration_label">Varighet</string>
+    <string name="careportal_newnstreatment_percent_label">Prosent</string>
+    <string name="careportal_newnstreatment_absolute_label">Absolutt</string>
+    <string name="careportal_newnstreatment_notes_label">Merknader</string>
+    <string name="event_time_label">Hendelse tidspunkt</string>
+    <string name="careportal_newnstreatment_profile_label">Profil</string>
+    <string name="careportal_newnstreatment_enteredby_title">Angitt av</string>
+    <string name="careportal_newnstreatment_glucosetype">Glukosetype</string>
+    <string name="noprofile">Ingen profil innlest fra NS enda</string>
+    <string name="overview_tempbasal_button">Temp basal</string>
+    <string name="overview_extendedbolus_button">Forlenget bolus</string>
+    <string name="configbuilder_nightscoutversion_label">Nightscout versjon:</string>
+    <string name="missing_carbs">Mangler %1$d g</string>
+    <string name="exported">Innstillinger lagret</string>
+    <string name="export_to">Eksporter innstillinger til</string>
+    <string name="import_from">Importer innstillinger fra</string>
+    <string name="setting_imported">Innstillinger importert</string>
+    <string name="filenotfound">Fil ikke funnet</string>
+    <string name="nav_export">Eksporter innstillinger</string>
+    <string name="nav_import">Importer innstillinger</string>
+    <string name="openapsma_maxbasal_title">Max E/t en Temp Basal kan settes til</string>
+    <string name="openapsma_maxbasal_summary">Denne verdien kalles max basal i OpenAPS sammenheng</string>
+    <string name="openapsma_maxiob_title">Max basal IOB som OpenAPS kan levere [U]</string>
+    <string name="openapsma_maxiob_summary">Denne verdien kalles Max IOB i OpenAPS sammenheng.\nDet er max insulinmengde i [U] APS kan levere.</string>
+    <string name="password_preferences_encrypt_prompt">Du må angi et hovedpassord som vil bli brukt til å kryptere dine eksporterte innstillinger.</string>
+    <string name="password_preferences_decrypt_prompt">Du må angi et hovedpassord som vil bli brukt for å lese inn og dekryptere innstillinger.</string>
+    <string name="preferences_export_canceled">Eksport kansellert! Innstillinger ble IKKE lagret!</string>
+    <string name="preferences_import_canceled">Innlesing avbrutt! Innstillinger ble IKKE lest inn!</string>
+    <string name="preferences_import_impossible">Kunne ikke importere innstillinger!</string>
+    <string name="goto_main_try_again">Gå tilbake til hovedskjermen og prøv på nytt.</string>
+    <string name="old_master_password">Gammelt hovedpassord</string>
+    <string name="different_password_used">Denne filen ble eksportert og kryptert med et annet passord. Oppgi det gamle passordet for å dekryptere filen.</string>
+    <string name="master_password_will_be_replaced">Som et resultat av vellykket import vil ditt nåværende passord bli ERSTATTET med det gamle passordet!</string>
+    <string name="preferences_import_list_title">Velg fil å importere</string>
+    <string name="check_preferences_before_import">Vennligst sjekk innstillingene før du importerer:</string>
+    <string name="check_preferences_cannot_import">Innstillingene kan ikke importeres!</string>
+    <string name="check_preferences_dangerous_import">Innstillingene bør ikke importeres!</string>
+    <string name="check_preferences_details_btn">Forklar importproblemer…</string>
+    <string name="check_preferences_details_title">Detaljer om importproblemer</string>
+    <string name="check_preferences_import_btn">Import</string>
+    <string name="check_preferences_import_anyway_btn">Importer uansett (FARLIGT!)</string>
+    <string name="metadata_warning_different_flavour">Innstillinger ble opprettet med en annen utgave av AAPS (%1$s) mens du har: %2$s.\n\nNoen innstillinger kan mangle eller være ugyldige. Etter å ha importert bør du kontrollere og oppdatere innstillingene dine.</string>
+    <string name="metadata_warning_different_device">Innstillingene ble opprettet på en annen enhet. Det er OK om du importerer fra en eldre/annen telefon, men kontroller at importerte innstillinger er riktig!</string>
+    <string name="metadata_warning_outdated_format">Du bruker et utgått format fra en gammel versjon av AAPS som ikke er sikkert! Bruk det bare som en siste utvei hvis du ikke har en nyere eksport som benytter JSON formatet.</string>
+    <string name="metadata_warning_old_export">Importerte innstillinger er allerede %1$s dager gamle! Kanskje du har flere oppdaterte innstillinger eller du har valgt feil fil? Husk å eksportere innstillinger regelmessig!</string>
+    <string name="metadata_warning_date_format">Ugyldig dato-tid format!</string>
+    <string name="metadata_warning_different_version">Innstillinger er fra en annen delversjon av appen. Det er OK å importere etter en oppgradering av app, men sjekk at innstillinger fortsatt er korrekte etter importen!</string>
+    <string name="metadata_urgent_different_version">Innstillinger er fra en annen hovedversjon av appen. Forskjeller mellom hovedversjoner kan være betydelige og dermed inkompatible innstillinger. Verifiser etter importen at dine innstillinger fortsatt er korrekte!</string>
+    <string name="metadata_label_format">Filformat</string>
+    <string name="metadata_label_created_at">Opprettet den</string>
+    <string name="metadata_label_aaps_version">AAPS versjon</string>
+    <string name="metadata_label_aaps_flavour">Bygge variant</string>
+    <string name="metadata_label_device_name">Eksporterer enhetens pasientnavn</string>
+    <string name="metadata_label_device_model">Eksportere enhetsmodell</string>
+    <string name="metadata_label_encryption">Fil kryptering</string>
+    <string name="metadata_format_old">Gammelt eksportformat</string>
+    <string name="metadata_format_new">Nytt krypteringsformat</string>
+    <string name="metadata_format_debug">Nytt feilsøkingsformat (ukryptert)</string>
+    <string name="metadata_format_other">Ukjent eksportformat</string>
+    <string name="prefdecrypt_settings_tampered">Filen med innstillinger er manipulert</string>
+    <string name="prefdecrypt_settings_secure">Fil med innstillinger er sikker</string>
+    <string name="prefdecrypt_settings_unencrypted">Bruk er ikke sikker, ukryptert format</string>
+    <string name="prefdecrypt_wrong_json">JSON formatfeil, mangler påkrevd felt (format, innhold, metadata eller sikkerhet)</string>
+    <string name="prefdecrypt_wrong_password">Dekrypteringsfeil, oppgitt passord kan ikke dekryptere filen</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Filens sjekksum (hash) mangler, kan dermed ikke bekrefte innstillingene!</string>
+    <string name="prefdecrypt_issue_modified">Filen har blitt endret etter eksporten!</string>
+    <string name="prefdecrypt_issue_parsing">Dekrypteringsfeil, klarte ikke å tolke innstillingene!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Dekrypteringsfeil, det oppgitte passordet er ugyldig eller filen har blitt endret! Det kan hende filen ble eksportert med et annet passord.</string>
+    <string name="prefdecrypt_issue_wrong_format">Mangler krypteringsinformasjon, formatet på innstillinger er ugyldig!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Ugyldig eller ikke spesifisert krypteringsalgoritme!</string>
+    <string name="exported_today">eksportert i dag</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">eksportert for %1$s siden</string>
+    <string name="exported_at" comment="at placeholder we add export date">eksportert den %1$s</string>
+    <string name="exported_less_than_hour_ago">eksportert for mindre enn time siden</string>
+    <string name="in_directory" comment="placeholder is for exported file path">i katalogen: %1$s</string>
+    <string name="end_user_license_agreement">Sluttbrukeravtale</string>
+    <string name="end_user_license_agreement_text">MÅ IKKE BENYTTES TIL Å TA MEDISINSKE BESLUTNINGER. DET FINNES INGEN GARANTI FOR PROGRAMMET I DEN UTSTREKNING SOM TILLATES AV GJELDENDE LOV. SÅFREMT IKKE ANNET ER ANGITT SKRIFTLIG LEVERES PROGRAMMET HELT UTEN GARANTIER I NOEN SOM HELST FORM, VERKEN UTTRYKT ELLER INNEFORSTÅTT, INKLUSIV MEN IKKE BEGRENSET TIL SALGBARHET ELLER EGNETHET TIL VISSE FORMÅL. ALL RISIKO KNYTTET TIL KVALITET AV PROGRAMMETS FUNKSJONALITET ER HOS DEG SOM BRUKER. OM PROGRAMMET VISER SEG Å VÆRE DEFEKT, ER DET BRUKEREN SOM MÅ TA ALT ANSVAR FOR KOSTNADER KNYTTET TIL ALL SERVICE, REPERASJON ELLER RETTELSE.</string>
+    <string name="end_user_license_agreement_i_understand">JEG FORSTÅR OG GODTAR</string>
+    <string name="save">Lagre</string>
+    <string name="reloadprofile">Les inn profil på nytt</string>
+    <string name="smscommunicator">SMS tjeneste</string>
+    <string name="smscommunicator_allowednumbers">Godkjente mobilnumre</string>
+    <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
+    <string name="smscommunicator_bolusreplywithcode">For å levere bolus på %1$.2fE, svar med kode %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">For å levere måltidsbolus på %1$.2fE, svar med kode %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">For å sette Temp Target på %1$s, svar med kode %2$s</string>
+    <string name="smscommunicator_temptargetcancel">For å avbryte Temp Target, svar med kode %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">For å deaktivere fjernstyring via SMS meldinger, svar med kode %1$s.\n\nHusk at du vil kunne reaktivere den igjen kun fra AAPS master telefon.</string>
+    <string name="smscommunicator_stoppedsms">Fjernstyring via SMS meldinger er stanset. For å reaktivere, bruk AAPS på master telefonen.</string>
+    <string name="smscommunicator_calibrationreplywithcode">For å sende kalibrering %1$.2f, svar med kode %2$s</string>
+    <string name="smscommunicator_bolusfailed">Bolus mislyktes</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Minimum antall minutter som må forløpe mellom en fjernstyrt bolus og den neste</string>
+    <string name="smscommunicator_remotebolusmindistance">Minimum antall minutter mellom en fjernstyrt bolus og neste</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">For din egen sikkerhet, for å endre denne innstillingen må du legge til minst 2 telefonnumre.</string>
+    <string name="bolusdelivered">Bolus %1$.2f E levert vellykket</string>
+    <string name="bolusrequested">Skal levere %1$.2f E</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %1$.2f E levert vellykket</string>
+    <string name="smscommunicator_mealbolusdelivered">Måltidsbolus %1$.2f E levert vellykket</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Temp target på %1$s er satt for %2$d minutter</string>
+    <string name="smscommunicator_tt_set">Temp target på %1$s for %2$d minutter ble vellykket definert</string>
+    <string name="smscommunicator_tt_canceled">Temp Target ble vellykket avbrutt</string>
+    <string name="smscommunicator_remotecommandsallowed">Tillat fjernstyring via SMS meldinger</string>
+    <string name="danarprofile">Innstillinger for DanaR profil</string>
+    <string name="danarprofile_dia">DIA [h]</string>
+    <string name="danarprofile_dia_summary">Insulinets virkningstid</string>
+    <string name="uploading">Laster opp</string>
+    <string name="bolusstopped">Bolus stoppet</string>
+    <string name="bolusstopping">Stopper bolus</string>
+    <string name="smscommunicator_loophasbeendisabled">Loop har blitt deaktivert</string>
+    <string name="smscommunicator_loophasbeenenabled">Loop har blitt aktivert</string>
+    <string name="smscommunicator_loopisdisabled">Loop er deaktivert</string>
+    <string name="smscommunicator_loopisenabled">Loop er aktivert</string>
+    <string name="valuelimitedto">%1$.2f begrenset til %2$.2f</string>
+    <string name="valueoutofrange">Verdien %1$s er utenfor angitt begrensning</string>
+    <string name="smscommunicator_pumpconnectwithcode">For å koble til pumpen, svar med kode %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Tilkobling til pumpen mislyktes</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">For å koble fra pumpen i %1d minutter, svar med koden %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Pumpe frakoblet</string>
+    <string name="smscommunicator_reconnect">Pumpen tilkoblet igjen</string>
+    <string name="smscommunicator_remotecommandnotallowed">Fjernstyringskommando er ikke tillatt</string>
+    <string name="smscommunicator_remotebolusnotallowed">Fjernstyrings bolus er ikke tilgjengelig. Prøv igjen senere.</string>
+    <string name="smscommunicator_basalreplywithcode">For å starte basal %1$.2f E/t i %2$d minutter, svar med kode %3$s</string>
+    <string name="smscommunicator_profilereplywithcode">For å bytte profil til %1$s %2$d%%, svar med kode %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">For å starte forlenget bolus %1$.2f E i %2$d minutter, svar med kode %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">For å angi %1$dg kl. %2$s, svar med kode %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">For å starte basal %1$d%% i %2$d minutter, svar med kode %3$s</string>
+    <string name="smscommunicator_suspendreplywithcode">For å pause loop i %1$d minutter, svar med kode %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">For å gjenoppta loop, svar med kode %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">For å aktivere loop, svar med kode %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">For å deaktivere loop, svar med kode %1$s</string>
+    <string name="smscommunicator_tempbasalset">Vellykket start av temp basal %1$.2fE/t i %2$d minutter</string>
+    <string name="smscommunicator_extendedset">Vellykket start av forlenget bolus %1$.2fE i %2$d minutter</string>
+    <string name="smscommunicator_carbsset">Vellykket registrering av %1$dg KH</string>
+    <string name="smscommunicator_carbsfailed">Registrering av %1$dg karbohydrater mislyktes</string>
+    <string name="smscommunicator_tempbasalset_percent">Vellykket start av temp basal %1$d%% i %2$d minutter</string>
+    <string name="smscommunicator_tempbasalfailed">Mislykket start av temp basal</string>
+    <string name="smscommunicator_extendedfailed">Mislykket start av forlenget bolus</string>
+    <string name="smscommunicator_basalstopreplywithcode">For å avbryte Temp basal, svar med kode %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">For å stoppe forlenget bolus, svar med kode %1$s</string>
+    <string name="smscommunicator_tempbasalcanceled">Temp basal avbrutt</string>
+    <string name="smscommunicator_extendedcanceled">Forlenget bolus avbrutt</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Mislykket kansellering av Temp basal</string>
+    <string name="smscommunicator_extendedcancelfailed">Mislykket kansellering av forlenget bolus</string>
+    <string name="smscommunicator_unknowncommand">Ukjent kommando eller feil svar</string>
+    <string name="quickwizard">Hurtigveiviser</string>
+    <string name="quickwizardsettings">Innstillinger for hurtigveiviser</string>
+    <string name="overview_editquickwizard_buttontext">Knappetekst:</string>
+    <string name="overview_editquickwizard_carbs">Karbo:</string>
+    <string name="overview_editquickwizard_valid">Gyldig:</string>
+    <string name="overview_editquickwizardlistactivity_add">Legg til</string>
+    <string name="overview_quickwizard_item_edit_button">Rediger</string>
+    <string name="overview_quickwizard_item_remove_button">Fjern</string>
+    <string name="mealbolus">Måltid</string>
+    <string name="correctionbous">Korreksjon</string>
+    <string name="actions">Handlinger</string>
+    <string name="ns_upload_only">Kun NS opplasting (deaktivert sync)</string>
+    <string name="ns_upload_only_summary">Kun opplast til NS. Påvirker ikke SGV (BS) med mindre en lokal kilde som xDrip er valgt. Påvirker ikke profiler hvis NS profiler benyttes.</string>
+    <string name="pumpNotInitialized">Pumpen ikke initialisert!</string>
+    <string name="primefill">Prime/fylling</string>
+    <string name="fillwarning">Kontroller at mengden samsvarer med spesifikasjonen for slangesettet ditt!</string>
+    <string name="othersettings_title">Annet</string>
+    <string name="fillbolus_title">Standardverdier for påfyll/prime</string>
+    <string name="button1">Knapp 1</string>
+    <string name="button2">Knapp 2</string>
+    <string name="button3">Knapp 3</string>
+    <string name="units_colon">Enheter:</string>
+    <string name="units">Enheter</string>
+    <string name="dia">DIA</string>
+    <string name="target_range">Målområde:</string>
+    <string name="prefs_range_title">Område for visualisering</string>
+    <string name="prefs_range_summary">Høy og lav verdi for grafen i Oversikt og smartklokke</string>
+    <string name="low_mark">Lav verdi</string>
+    <string name="high_mark">Høy verdi</string>
+    <string name="wear">Klokke</string>
+    <string name="resend_all_data">Send alle data på nytt</string>
+    <string name="open_settings_on_wear">Åpne Innstillinger på klokken</string>
+    <string name="basal_rate">Basal rate:</string>
+    <string name="basalvaluebelowminimum">Basal verdi under minimum. Profilen settes ikke!</string>
+    <string name="sms_actualbg">BS:</string>
+    <string name="sms_lastbg">Siste BS:</string>
+    <string name="mdi">MDI</string>
+    <string name="MM640g">MM640G</string>
+    <string name="ongoingnotificaction">Pågående varslinger</string>
+    <string name="old_data">GAMLE DATA</string>
+    <string name="sms_minago">%1$d min siden</string>
+    <string name="localprofile">Lokal profil</string>
+    <string name="openapsama">OpenAPS AMA</string>
+    <string name="short_avgdelta">Kort middelverdi</string>
+    <string name="long_avgdelta">Lang middelverdi</string>
+    <string name="array_of_elements">Liste med %1$d elementer.\nFaktisk verdi:</string>
+    <string name="openapsma_autosensdata_label">Autosens data</string>
+    <string name="openapsma_scriptdebugdata_label">Script feilsøking</string>
+    <string name="openapsama_useautosens">Bruk Autosens funksjon</string>
+    <string name="refresheventsfromnightscout">Oppdater hendelser fra NS</string>
+    <string name="deletefuturetreatments">Slett behandlinger i fremtiden</string>
+    <string name="eatingsoon">Spise snart</string>
+    <string name="hypo">Hypo</string>
+    <string name="activity">Aktivitet</string>
+    <string name="removerecord">Fjern registrering</string>
+    <string name="actions_shortname">ACT</string>
+    <string name="configbuilder_shortname">KONF</string>
+    <string name="loop_shortname">LOOP</string>
+    <string name="simpleprofile_shortname">SP</string>
+    <string name="oaps_shortname">OAPS</string>
+    <string name="localprofile_shortname">LP</string>
+    <string name="overview_shortname">HJEM</string>
+    <string name="virtualpump_shortname">VPUMP</string>
+    <string name="profileviewer_shortname">NSPROFIL</string>
+    <string name="treatments_shortname">BEH</string>
+    <string name="objectives_shortname">MÅL</string>
+    <string name="wear_shortname">WEAR</string>
+    <string name="smscommunicator_shortname">SMS</string>
+    <string name="short_tabtitles">Korte navn i menyfaner</string>
+    <string name="always_use_shortavg">Bruk alltid kort gjennomsnittsverdi delta i stedet for enkel delta</string>
+    <string name="always_use_shortavg_summary">Nyttig når data fra ufiltrerte kilder som xDrip registrerer mye støy.</string>
+    <string name="profile">Profil</string>
+    <string name="openapsama_max_daily_safety_multiplier_summary">Standardverdi: 3 Dette er en viktig OpenAPS sikkerhetsbegrensning. Dette begrenser dine basaler til maks 3x av din høyeste basalverdi. Du vil trolig ikke behøve å endre denne verdien, men les og forstå hva som menes med \"3x max daglig; 4x gjeldende\" som sikkerhetsinnstilling.</string>
+    <string name="openapsama_current_basal_safety_multiplier_summary">Standardverdi: 4 Dette er en viktig OpenAPS sikkerhetsbegrensning. Dette begrenser dine temp basal til max 4 ganger din nåværende basal dose, uansett hva som er maks basal i pumpen. Dette er for å unngå at man setter farlige høye maks basal doser uten at man har forstått algoritmene. Når du taket i denne begrensningen bør du i stedet fokusere på å endre andre innstillinger.</string>
+    <string name="openapsama_autosens_max_summary">Standardverdi: 1.2\nDetta er en multiplikatorbegrensning for autosens (og snart autotune) som begrenser at autosens ikke kan øke med mer enn 20%%, som dermed begrenser hvor mye autosens kan justere opp dine basaler, hvor mye ISK kan reduseres og hvor lavt BS målverdi kan settes.</string>
+    <string name="openapsama_autosens_min_summary">Standardverdi: 0.7\nDette er en multiplikatorbegrensning for autosens sikkerhet. Den begrenser autosens til å redusere basalverdier, og øke isulinssensitivitet (ISF) og BS mål med ikke mer enn enn 30%.</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens justerer også BS målverdier</string>
+    <string name="openapsama_autosens_adjusttargets_summary">Standard verdi: sann\nGir autosens tillatelse til å justere BS mål, i tillegg til ISF og basaler.</string>
+    <string name="openapsama_bolussnooze_dia_divisor_summary">Standard verdi: 2\nBolus snooze er aktivt etter at du har gitt en måltidsbolus slik at loop ikke skal forsøke å sette lav-temp når du nettopp har spist. I dette eksempelet brukesg standardverdi på 2, så med en 3 timers DIA vil bolus snooze begrensning gradvis forsvinne etter 1.5 timer (3DIA / 2). Bolus snooze brukes ikke hvis SMB er aktivert.</string>
+    <string name="openapsama_min_5m_carbimpact_summary">Standardverdi er: 3.0 (AMA) eller 8.0 (SMB). Dette er grunninnstillingen for KH opptak per 5 minutt. Den påvirker hvor raskt COB skal reduseres, og benyttes i beregning av fremtidig BS kurve når BS enten synker eller øker mer enn forventet. Standardverdi er 3mg/dl/5 min.</string>
+    <string name="openapsama_link_to_preferncejson_doc_txt">Advarsel!\nNormalt vil du ikke trenge å endre verdiene under. Vennligst TRYKK HER og LES teksten for å være sikker på at du FORSTÅR konsekvensene før du gjør endringer.</string>
+    <string name="smscommunicator_invalidphonennumber">Ugyldig SMS mobilnummer</string>
+    <string name="overview_calibration">Kalibrering</string>
+    <string name="send_calibration">Send kalibrering %1$.1f til xDrip?</string>
+    <string name="xdripnotinstalled">xDrip+ ikke installert</string>
+    <string name="calibrationsent">Kalibrering er sendt til xDrip</string>
+    <string name="smscommunicator_calibrationsent">Kalibrering sendt. Vær oppmerksom på at xDrip må være konfigurert til å ta imot kalibreringer.</string>
+    <string name="smscommunicator_calibrationfailed">xDrip tar ikke imot kalibreringer</string>
+    <string name="pumpsuspended">Pumpen er pauset</string>
+    <string name="executing">Utfører</string>
+    <string name="virtualpump_settings">Virtuelle pumpe innstillinger</string>
+    <string name="virtualpump_uploadstatus_title">Last opp status til Nightscout</string>
+    <string name="nsclientinternal">NSClient</string>
+    <string name="nsclientinternal_shortname">NSCI</string>
+    <string name="nsclientinternal_url">URL:</string>
+    <string name="nsclientinternal_autoscroll">Autoscroll</string>
+    <string name="restart">Omstart</string>
+    <string name="nsclientinternal_title">NSClient</string>
+    <string name="nsclientinternal_url_title">Nightscout URL</string>
+    <string name="nsclientinternal_url_dialogmessage">Oppgi din Nightscout URL</string>
+    <string name="nsclientinternal_secret_title">Nightscout API secret</string>
+    <string name="nsclientinternal_secret_dialogtitle">Nightscout API secret</string>
+    <string name="nsclientinternal_secret_dialogmessage">Oppgi NS API secret (min 12 tegn)</string>
+    <string name="deliver_now">Lever nå</string>
+    <string name="clear_queue">Tøm kø</string>
+    <string name="show_queue">Vis kø</string>
+    <string name="queue">Kø:</string>
+    <string name="status">Status:</string>
+    <string name="paused">Pauset</string>
+    <string name="clearlog">Tøm logg</string>
+    <string name="nowritepermission">NSCLIENT har ingen skriverettighet. Feil API secret?</string>
+    <string name="wear_settings">Klokke innstillinger</string>
+    <string name="wear_detailedIOB_title">Vis detaljert IOB</string>
+    <string name="wear_detailedIOB_summary">Vis IOB med bolus och basal IOB på klokke</string>
+    <string name="nosuccess">mislykket - sjekk telefonen</string>
+    <string name="notavailable">n/a</string>
+    <string name="patientage">Pasientens alder</string>
+    <string name="child">Barn</string>
+    <string name="teenage">Tenåring</string>
+    <string name="adult">Voksen</string>
+    <string name="resistantadult">Insulin resistent voksen</string>
+    <string name="patientage_summary">Velg pasientens alder for oppsett av sikkerhetsgrenser</string>
+    <string name="patient_name">Pasientens navn</string>
+    <string name="patient_name_summary">Angi pasientnavn eller kallenavn for å kunne skille mellom flere oppsett</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Bruker</string>
+    <string name="Glimp">Glimp</string>
+    <string name="needwhitelisting">%1$s behøver å omgå batterispare funksjonene for å fungere tilfredsstillende</string>
+    <string name="loopsuspended">Loop pauset</string>
+    <string name="loopsuspendedfor">Pauset (%1$d m)</string>
+    <string name="loopsuperbolusfor">Superbolus (%1$d m)</string>
+    <string name="suspendloop">Pause loop</string>
+    <string name="suspendloopfor1h">Pause loop i 1t</string>
+    <string name="suspendloopfor2h">Pause loop i 2t</string>
+    <string name="suspendloopfor3h">Pause loop i 3t</string>
+    <string name="suspendloopfor10h">Pause loop i 10t</string>
+    <string name="suspendloopforXmin">Pause loop i %1$d min</string>
+    <string name="disconnectpumpfor15m">Koble fra pumpen i 15 min</string>
+    <string name="disconnectpumpfor30m">Koble fra pumpen i 30 min</string>
+    <string name="disconnectpumpfor1h">Koble fra pumpen i 1t</string>
+    <string name="disconnectpumpfor2h">Koble fra pumpen i 2t</string>
+    <string name="disconnectpumpfor3h">Koble fra pumpen i 3t</string>
+    <string name="resume">Gjenoppta</string>
+    <string name="reconnect">Tilkoble pumpen</string>
+    <string name="smscommunicator_wrongduration">Feil varighet</string>
+    <string name="smscommunicator_loopsuspended">Loop er pauset</string>
+    <string name="smscommunicator_loopresumed">Loop gjenopptatt</string>
+    <string name="treatments_wizard_bgtrend_label">15 min trend</string>
+    <string name="treatments_wizard_cob_label">COB</string>
+    <string name="superbolus">Superbolus</string>
+    <string name="ns_logappstartedevent">Logg app start til NS</string>
+    <string name="restartingapp">Avslutter appen for at innstillinger skal tas i bruk.</string>
+    <string name="configbuilder_insulin_description">Hvilken type insulin bruker du?</string>
+    <string name="fastactinginsulin">Hurtigvirkende insulin</string>
+    <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
+    <string name="ultrafastactinginsulincomment">Fiasp</string>
+    <string name="insulin_shortname">INS</string>
+    <string name="enablesuperbolus">Aktiver superbolus i veiviser</string>
+    <string name="enablesuperbolus_summary">Aktiver superbolus funksjonen i wizard. Ikke aktiver denne før du vet hvordan den fungerer. DEN KAN LEDE TIL EN OVERDOSERING AV INSULIN HVIS DEN BRUKES BLINDT!</string>
+    <string name="show_statuslights">Vis statusindikatorer på hjem skjermen</string>
+    <string name="statuslights_cage_warning">OBS: alder slangesett [h]</string>
+    <string name="statuslights_cage_critical">Advarsel: alder slangesett [h]</string>
+    <string name="statuslights_iage_warning">OBS: alder insulin [h]</string>
+    <string name="statuslights_iage_critical">Advarsel: alder insulin [h]</string>
+    <string name="statuslights_sage_warning">OBS: alder CGM [h]</string>
+    <string name="statuslights_sage_critical">Advarsel: alder CGM [h]</string>
+    <string name="statuslights_bage_warning">OBS: alder batteri [h]</string>
+    <string name="statuslights_bage_critical">Advarsel: alder batteri [h]</string>
+    <string name="statuslights_res_warning">OBS: nivå insulinreservoar [U]</string>
+    <string name="statuslights_res_critical">Advarsel: nivå insulinreservoar [U]</string>
+    <string name="statuslights_bat_warning">OBS: batterivarsel [%]</string>
+    <string name="statuslights_bat_critical">Advarsel: lavt batterinivå [%]</string>
+    <string name="prediction_shortname">PROGN</string>
+    <string name="iob">IOB</string>
+    <string name="cob">COB</string>
+    <string name="basal_shortname">BAS</string>
+    <string name="deviation_shortname">DEV</string>
+    <string name="activity_shortname">AKT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DEVSLOPE</string>
+    <string name="nav_about">Om</string>
+    <string name="smscommunicator_missingsmspermission">Mangler SMS tillatelse</string>
+    <string name="smscommunicator_missingphonestatepermission">Mangler app tillatelse til telefon</string>
+    <string name="xdripstatus_settings">xDrip Status (klokke)</string>
+    <string name="xdripstatus">xDrip Statuslinje (klokke)</string>
+    <string name="xdripstatus_shortname">xds</string>
+    <string name="wear_showbgi_title">Vis BGI</string>
+    <string name="wear_showbgi_summary">Legg til BGI i statuslinje</string>
+    <string name="ns_noupload">Ingen opplast til NS</string>
+    <string name="ns_noupload_summary">Alle data som sendes til NS blir slettet. Selv om AAPS er tilknyttet NS, gjøres det ingen endring i NS</string>
+    <string name="overview_extendedbolus_cancel_button">Avbryt forlenget bolus</string>
+    <string name="careportal_sensorage_label">Sensor alder</string>
+    <string name="careportal_canulaage_label">Kanyle alder</string>
+    <string name="careportal_insulinage_label">Insulin alder</string>
+    <string name="doprofileswitch">Gjør profilbytte</string>
+    <string name="careportal_pbage_label">Alder pumpebatteri</string>
+    <string name="ns_alarmoptions">Alarm valg</string>
+    <string name="ns_alarms">Opprett varsler fra NS alarmer</string>
+    <string name="ns_announcements">Opprett varsler fra NS meldinger</string>
+    <string name="nsalarm_staledatavalue_label">Ingen data advarsel [min]</string>
+    <string name="nsalarm_urgent_staledatavalue_label">Kritisk mangel på data advarsel [min]</string>
+    <string name="openapsama_autosens_period">Intervall for autosens [h]</string>
+    <string name="openapsama_autosens_period_summary">Antall timer med historiske data for beregning av sensitivitet (absorpsjonstid for KH er ekskludert)</string>
+    <string name="pump">Pumpe</string>
+    <string name="openaps">OpenAPS</string>
+    <string name="uploader">Opplaster</string>
+    <string name="configbuilder_sensitivity">Sensitivitets deteksjon</string>
+    <string name="configbuilder_sensitivity_description">Hvilken sensitivitetsalgoritme skal benyttes?</string>
+    <string name="sensitivity_shortname">SENS</string>
+    <string name="sensitivityoref0">Sensitivitet Oref0</string>
+    <string name="sensitivityoref1">Sensitivitet Oref1</string>
+    <string name="sensitivityaaps">Sensitivitet AAPS</string>
+    <string name="absorptionsettings_title">Absorpsjon innstillinger</string>
+    <string name="absorption_maxtime_title">Maks absorpsjonstid for måltid [h]</string>
+    <string name="absorption_maxtime_summary">Tid i timer hvor det forventes at alle karbohydrater fra måltid vil være absorbert</string>
+    <string name="careportal_sensorage_label_short">SAGE</string>
+    <string name="careportal_insulinage_label_short">IAGE</string>
+    <string name="careportal_canulaage_label_short">CAGE</string>
+    <string name="careportal_pbage_label_short">PBAGE</string>
+    <string name="openaps_short">OAPS</string>
+    <string name="uploader_short">UPLD</string>
+    <string name="basal_short">BAS</string>
+    <string name="virtualpump_extendedbolus_label_short">FORL</string>
+    <string name="keep_screen_on_title">Hold skjermen påslått</string>
+    <string name="keep_screen_on_summary">Forhindre Android å slå av skjermen. Mobil vil bruke mye batteri hvis den ikke plugges til strømledning.</string>
+    <string name="sensitivity_warning">Hvis du slår på Autosense funksjonen må du huske å angi alle spiste karbohydrater. Ellers vil KH avvik gi feil i sensitivitetsberegningen !!</string>
+    <string name="sensitivityweightedaverage">Sensitivitet vektet middelverdi</string>
+    <string name="mdtp_ok">OK</string>
+    <string name="mdtp_cancel">Avbryt</string>
+    <string name="notloadedplugins">Ikke alle profiler ble lastet!</string>
+    <string name="valuesnotstored">Verdier ikke lagret!</string>
+    <string name="ns_localbroadcasts">Aktiver sending til andre apper (som xDrip). Ikke aktiver dette hvis du har mer enn en AAPS eller NSClient installert!</string>
+    <string name="ns_localbroadcasts_title">Aktiver lokale sendinger.</string>
+    <string name="careportal_activity_label">AKTIVITET &amp; TILBAKEMELDING</string>
+    <string name="careportal_carbsandbolus_label">KARBO &amp; BOLUS</string>
+    <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
+    <string name="careportal_pump_label">PUMPE</string>
+    <string name="careportal_newnstreatment_duration_min_label">Varighet [min]</string>
+    <string name="openapssmb">OpenAPS SMB</string>
+    <string name="enableuam">Aktiver UAM</string>
+    <string name="enablesmb">Aktiver SMB</string>
+    <string name="enablesmb_summary">Bruk Super Mikro Solen i stedet for temp basal for raskere resultat</string>
+    <string name="enableuam_summary">Oppdaget uannonsert måltid (UAM)</string>
+    <string name="insulin_oref_peak">IOB kurvens topp tid</string>
+    <string name="insulin_peak_time">Topp tid [min]</string>
+    <string name="free_peak_oref">Free-Peak Oref</string>
+    <string name="rapid_acting_oref">Rapid-Acting Oref</string>
+    <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
+    <string name="lyumjev">Lyumjev</string>
+    <string name="dia_too_short">DIA på %1$f for kort - bruker %2$f i stedet!</string>
+    <string name="activate_profile">Aktiver profil</string>
+    <string name="invalid">UGYLDIG</string>
+    <string name="careportal_newnstreatment_percentage_label">Prosent</string>
+    <string name="careportal_newnstreatment_timeshift_label">Tidsforskyving</string>
+    <string name="default_temptargets">Standard temp mål</string>
+    <string name="eatingsoon_duration">spise snart varighet</string>
+    <string name="eatingsoon_target">spise snart målverdi</string>
+    <string name="activity_duration">aktivitet varighet</string>
+    <string name="activity_target">aktivitet målverdi</string>
+    <string name="hypo_duration">hypo varighet</string>
+    <string name="hypo_target">hypo målverdi</string>
+    <string name="reuse">gjenbruk</string>
+    <string name="wearcontrol_title">Kontroller fra klokke</string>
+    <string name="wearcontrol_summary">Sett temp målverdi og angi behandlinger fra klokken.</string>
+    <string name="food">Mat</string>
+    <string name="shortgramm">g</string>
+    <string name="none"><![CDATA[<none>]]></string>
+    <string name="shortkilojoul">kJ</string>
+    <string name="shortenergy">En</string>
+    <string name="shortprotein">Pr</string>
+    <string name="shortfat">Fett</string>
+    <string name="active"><![CDATA[<Active>]]></string>
+    <string name="executingrightnow">Kommandoen utføres akkurat nå</string>
+    <string name="pump_unreachable">Pumpe utilgjengelig</string>
+    <string name="missed_bg_readings">Mangler BS målinger</string>
+    <string name="raise_notifications_as_android_notifications">Bruk systemvarslinger for alarmer og varslinger</string>
+    <string name="gradually_increase_notification_volume">Øk volumet gradvis for alarmer og varsler</string>
+    <string name="localalertsettings_title">Lokale varsler</string>
+    <string name="enable_missed_bg_readings_alert">Varsel hvis ingen BS data mottas</string>
+    <string name="enable_pump_unreachable_alert">Varsel hvis pumpen er utilgjengelig</string>
+    <string name="pump_unreachable_threshold">Pumpen er ikke tilgjengelig etter [min]</string>
+    <string name="enable_carbs_req_alert">Varsel hvis karbohydrater må tilføres</string>
+    <string name="urgent_alarm">Kritisk alarm</string>
+    <string name="info">INFO</string>
+    <string name="eversense">Eversense App (patched)</string>
+    <string name="dexcomg5_nsupload_title">Last opp BS data til NS</string>
+    <string name="bgsource_upload">BS opplast innstillinger</string>
+    <string name="wear_detailed_delta_title">Vis detaljer om delta</string>
+    <string name="wear_detailed_delta_summary">Vis delta med én ekstra desimal</string>
+    <string name="smbinterval_summary">Minste antall minutter mellom hver SMB</string>
+    <string name="smbmaxminutes">SMB maks minutter</string>
+    <string name="smbmaxminutes_summary">Maks antall minutter med basal som kan bli SMB</string>
+    <string name="uamsmbmaxminutes">UAM SMB maks minutter</string>
+    <string name="uamsmbmaxminutes_summary">Maks antall minutter basal som kan bli SMB ved UAM</string>
+    <string name="carbsReqThreshold">Minimumsgrense for KH forslag</string>
+    <string name="carbsReqThreshold_summary">Minimum mengde karbohydrater i gram for å vise advarsel. Behov under denne grenseverdien vil ikke vises som et varsel.</string>
+    <string name="dexcomg5_xdripupload_title">Send BS data til xDrip+</string>
+    <string name="dexcomg5_xdripupload_summary">I xDrip+ velg 640G/Eversens som datakilde</string>
+    <string name="nsclientbg">NSClient BS</string>
+    <string name="overview_editquickwizard_usebg">BS beregning</string>
+    <string name="overview_editquickwizard_usebolusiob">Bolus IOB beregning</string>
+    <string name="overview_editquickwizard_usebasaliob">Basal IOB beregning</string>
+    <string name="overview_editquickwizard_usetrend">Trend beregning</string>
+    <string name="overview_editquickwizard_usesuperbolus">Superbolus beregning</string>
+    <string name="yes">Ja</string>
+    <string name="no">Nei</string>
+    <string name="positiveonly">Bare positive</string>
+    <string name="negativeonly">Bare negative</string>
+    <string name="overview_editquickwizard_usecob">COB beregning</string>
+    <string name="overview_editquickwizard_usetemptarget">Temp target beregning</string>
+    <string name="loopenabled">Loop er aktivert</string>
+    <string name="apsselected">APS valgt</string>
+    <string name="nsclienthaswritepermission">NSClient har skrive rettigheter</string>
+    <string name="closedmodeenabled">Lukket loop aktivert</string>
+    <string name="maxiobset">Maks IOB er angitt riktig</string>
+    <string name="hasbgdata">BS tilgjengelig fra valgt kilde</string>
+    <string name="combo_programming_bolus">Programmerer bolus i pumpen</string>
+    <string name="combo_refresh">Oppdater</string>
+    <string name="combo_pump_state_label">Status</string>
+    <string name="combo_pump_activity_label">Aktivitet</string>
+    <string name="combo_no_pump_connection">Ingen tilkobling i %1$d min</string>
+    <string name="combo_tbr_remaining">%1$d%% (%2$d min igjen)</string>
+    <string name="combo_pump_state_initializing">Initialiserer</string>
+    <string name="combo_pump_state_suspended_due_to_error">Pauset på grunn av en feil</string>
+    <string name="combo_pump_state_suspended_by_user">Pauset av bruker</string>
+    <string name="combo_pump_state_running">Kjører</string>
+    <string name="combo_pump_action_cancelling_tbr">Avbryter TBR</string>
+    <string name="combo_pump_action_setting_tbr">Setter TBR (%1$d%% / %2$d min)</string>
+    <string name="combo_pump_action_bolusing">Gir bolus (%1$.1f E)</string>
+    <string name="combo_pump_action_refreshing">Oppdaterer</string>
+    <string name="combo_pump_unsupported_operation">Forespurt operasjon støttes ikke av pumpen</string>
+    <string name="combo_low_suspend_forced_notification">Usikker bruk: Kombinasjons eller forlenget bolus er aktiv. Loop modus er satt til å slå av basal ved lavt BS i 6 timer. Bare vanlige boluser kan gis i denne perioden</string>
+    <string name="combo_force_disabled_notification">Usikker bruk: pumpen bruker en annen profil enn den første (standardprogram). Loop er deaktivert. Velg den første profilen i pumpen og oppdater.</string>
+    <string name="bolus_frequency_exceeded">En bolus med samme verdi har blitt forespurt i løpet av de to siste minutter. Dette er ikke tillatt for å unngå feilaktige dobbelt boluser og feil i beregninger.</string>
+    <string name="combo_pump_connected_now">Nå</string>
+    <string name="combo_activity_reading_pump_history">Leser pumpehistorikk</string>
+    <string name="combo_activity_setting_basal_profile">Setter basal profil</string>
+    <string name="combo_pump_cartridge_low_warrning">Lavt nivå i insulinampull</string>
+    <string name="combo_pump_battery_low_warrning">Pumpebatteriet er lavt</string>
+    <string name="combo_is_in_error_state">Pumpen viser feil E%1$d: %2$s</string>
+    <string name="combo_reservoir_low">Lav</string>
+    <string name="combo_reservoir_empty">Tom</string>
+    <string name="combo_reservoir_normal">Normal</string>
+    <string name="combo_notification_check_time_date">Pumpens tid må oppdateres</string>
+    <string name="combo_warning">Varsel</string>
+    <string name="combo_pump_tbr_cancelled_warrning">Varsel om kansellering av temp basal er bekreftet</string>
+    <string name="combo_error_no_connection_no_bolus_delivered">Ingen kontakt med pumpen. Ingen bolus er levert</string>
+    <string name="combo_error_no_bolus_delivered">Bolus avbrutt. Det virker som ingen bolus er levert. For å være sikker, sjekk pumpen for å unngå levering av dobbel bolus og gjør evt et nytt forsøk. For å unngå feil vil systemet aldri prøve å levere ny bolus.</string>
+    <string name="combo_error_partial_bolus_delivered">Bare %1$.2f E av bolusdosen på %2$.2f E ble levert på grunn av en feil. Sjekk pumpen for å kontrollere dette og iverksett nødvendige tiltak.</string>
+    <string name="combo_error_bolus_verification_failed">Levering av bolusdose og kontroll av pumpens historikk feilet. Vennligst sjekk pumpen. Hvis en bolus ble levert vil den automatisk bli lagt til ved neste tilkobling til pumpen.</string>
+    <string name="combo_reservoir_level_insufficient_for_bolus">Ikke nok insulin til bolus i ampullen</string>
+    <string name="extendedbolusdeliveryerror">Forlenget bolus feilet</string>
+    <string name="insightpump_shortname">Sight</string>
+    <string name="ago">siden</string>
+    <string name="set_neutral_temps_title">Sett nøytrale temp basaler</string>
+    <string name="set_neutral_temps_summary">Hvis aktivert så vil den stoppe en temp basal rett før hver hele time for å stoppe noen pumpers varsler/vibreringer på hver hele time.</string>
+    <string name="enablesmbalways">Aktiverer alltid SMB</string>
+    <string name="enablesmbalways_summary">Aktiver alltid SMB uavhengig av boluser. Bare mulig med en bra filtrert BS kilde som f.eks. Dexcom G5/G6</string>
+    <string name="enablesmbaftercarbs">Aktiver SMB etter karbohydrater</string>
+    <string name="enablesmbaftercarbs_summary">Aktiver SMB i 6t etter karbohydrat inntak, selv med 0 IOB. Bare mulig med en bra filtrert BS kilde som f. eks. Dexcom G5/G6</string>
+    <string name="enablesmbwithcob">Aktiver SMB med COB</string>
+    <string name="enablesmbwithcob_summary">Aktiver SMB når COB er aktiv.</string>
+    <string name="enablesmbwithtemptarget">Aktiver SMB med temp målverdi</string>
+    <string name="enablesmbwithtemptarget_summary">Aktiver SMB når temp målverdi er aktiv (spise snart, trening)</string>
+    <string name="enablesmbwithhightemptarget">Aktiver SMB ved høye temp målverdier</string>
+    <string name="enablesmbwithhightemptarget_summary">Aktiver SMB når det er aktive temp målverdier (trening, over 100 mg/dl eller 5,5 mmol/l)</string>
+    <string name="overview_insulin_label">Insulin</string>
+    <string name="overview_carbs_label">Karbo</string>
+    <string name="overview_buttons_selection">Knapper</string>
+    <string name="show_calibration_button_summary">Sender en kalibrering til xDrip+ eller åpner en G5 kalibreringsdialog</string>
+    <string name="show_cgm_button_summary">Åpner xDrip+, tilbake knappen returnerer til AAPS</string>
+    <string name="carb_increment_button_message">Antall karbohydrater som skal legges til når knappen trykkes</string>
+    <string name="insulin_increment_button_message">Mengde insulin som skal legges til når knappen trykkes inn</string>
+    <string name="error_starting_cgm">Kunne ikke starte CGM-programmet. Kontroller at det er installert.</string>
+    <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignorer 5m</string>
+    <string name="ignore15m">Ignorer 15m</string>
+    <string name="ignore30m">Ignorer 30m</string>
+    <string name="required">beh</string>
+    <string name="nav_historybrowser">Historikk leser</string>
+    <string name="wear_notifysmb_title">Varsle på SMB</string>
+    <string name="wear_notifysmb_summary">Vis SMB på klokken som en standard bolus.</string>
+    <string name="ns_create_announcements_from_errors_title">Lag meldinger ved feil</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Opprett varslinger hvis det er nødvendig med karbohydrater</string>
+    <string name="ns_create_announcements_from_errors_summary">Opprett varslinger i Nightscout ved feil eller meldinger (også synlig i Careportal under Behandlinger)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Opprett Nighjtscout meldinger ved behov for karbohydrater</string>
+    <string name="wear_predictions_summary">Vis blodsukker prognoser på klokken.</string>
+    <string name="wear_predictions_title">Prognoser</string>
+    <string name="data_choices">Data valg</string>
+    <string name="fabric_upload">Innlesing av fabrikkinstillinger</string>
+    <string name="allow_automated_crash_reporting">Tillat automatisk rapportering av appkrasher og bruksdata til utviklerne via fabrioc.io tjenesten.</string>
+    <string name="g5appnotdetected">Vennligst oppdater din Dexcom app til en versjon som støttes</string>
+    <string name="dexcom_app_not_installed">Dexcom appen er ikke installert.</string>
+    <string name="start_activity_tt">Start Trening TT</string>
+    <string name="start_eating_soon_tt">Start Spise snart TT</string>
+    <string name="temptargetshort">TT</string>
+    <string name="do_not_bolus_record_only">Ikke gi bolus, bare loggfør</string>
+    <string name="category">Kategori</string>
+    <string name="subcategory">Underkategori</string>
+    <string name="bolusrecordedonly">Bolus vil bare bli loggført (ikke levert av pumpe)</string>
+    <string name="ns_autobackfill_summary">Hente manglende BS data fra NS</string>
+    <string name="loop_smbsetbypump_label">SMB satt med pumpe</string>
+    <string name="overview_show_activity">Aktivitet</string>
+    <string name="overview_show_sensitivity">Sensitivitet</string>
+    <string name="overview_show_deviations">Avvik</string>
+    <string name="overview_show_cob">Aktive KH (COB)</string>
+    <string name="overview_show_iob">Aktivt insulin (IOB)</string>
+    <string name="overview_show_basals">Basaler</string>
+    <string name="no_action_selected">Ingen handling valgt. Ingenting endres</string>
+    <string name="start_hypo_tt">Start Hypo TT</string>
+    <string name="closed_loop_disabled_on_dev_branch">Du kjører dev-versjonen. Lukket loop ikke aktivert.</string>
+    <string name="engineering_mode_enabled">Engineering Mode aktivert</string>
+    <string name="not_eng_mode_or_release">Engineering Mode ikke aktivert og appen kjøres ikke som standard utgivelse</string>
+    <string name="combo_actvity_reading_basal_profile">Leser basalprofil</string>
+    <string name="combo_bolus_rejected_due_to_pump_history_change">Pumpe historikken har blitt endret siden bolus kalkuleringen ble utført. Bolus har ikke blitt levert. Vennligst rekalkuler om bolus fortsatt er nødvendig.</string>
+    <string name="combo_error_updating_treatment_record">Bolus har blitt levert, men det oppsto en feil ved loggføring i behandlinger. Dette kan oppstå hvis to små bolus på samme størrelse blir levert i løpet av to minutter. Vennligst sjekk pumpe historikken og behandlinger logg, og bruk Careportal for å legge til de manglende behandlingene. Pass på at du ikke legger til to identiske behandlinger på samme minutt.</string>
+    <string name="combo_high_temp_rejected_due_to_pump_history_changes">Avviser høy temp target siden kalkuleringen ikke tok hensyn til nylige endringer i pumpe historikken</string>
+    <string name="combo_activity_checking_pump_state">Oppdaterer pumpestatus</string>
+    <string name="combo_warning_pump_basal_rate_changed">Basal dosen i pumpen har blitt endret og vil i løpet av kort tid bli oppdatert</string>
+    <string name="combo_error_failure_reading_changed_basal_rate">Basal raten i pumpen er endret, men feilet i å lese ny verdi</string>
+    <string name="combo_activity_checking_for_history_changes">Sjekker for endringer i historikken</string>
+    <string name="combo_error_multiple_boluses_with_identical_timestamp">Flere boluser levert i samme minutt og med samme insulinmengde ble importert. Bare en av doseringene ble lagt til i behandlinger. Vennligst sjekk pumpen og legg til manuelt ekstra bolus doseringer i Careportal. Ikke legg til flere boluser i samme minutt.</string>
+    <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nfacebook:\nhttp://facebook.androidaps.org\nhttp://facebook.androidaps.de (de)</string>
+    <string name="combo_check_date">Den siste bolus er eldre enn 24t eller er i fremtiden. Vennligst sjekk at datoen i pumpen er korrekt.</string>
+    <string name="combo_suspious_bolus_time">Tid/dato for levert bolus i pumpen er trolig feil, og IOB beregningen blir da feil. Vennligst sjekk pumpens tid/dato.</string>
+    <string name="profileswitch_ismissing">Profil bytte mangler. Utfør et profil bytte og trykk på \"Aktiver profil\" i din lokale profil.</string>
+    <string name="combo_bolus_count">Antall boluser</string>
+    <string name="combo_tbr_count">Antall temp basaler</string>
+    <string name="pumpisnottempbasalcapable">Pumpen støtter ikke temp basaler</string>
+    <string name="novalidbasalrate">Ingen gyldige basal rater ble lest fra pumpen</string>
+    <string name="closedmodedisabledinpreferences">Lukket Loop deaktivert i innstillinger</string>
+    <string name="autosensdisabledinpreferences">Autosens deaktivert i innstillinger</string>
+    <string name="smbdisabledinpreferences">SMB deaktivert i innstillinger</string>
+    <string name="uamdisabledinpreferences">UAM deaktivert i innstillinger</string>
+    <string name="uamdisabledoref1notselected">UAM deaktivert fordi den trenger Oref1 sensitivitetsplugin</string>
+    <string name="maxbasalmultiplier">maks basal multiplikator</string>
+    <string name="maxdailybasalmultiplier">maks daglig basal multiplikator</string>
+    <string name="smb_frequency_exceeded">En bolus ble gitt i løpet av de siste 3 minuttene, dropper SMB</string>
+    <string name="basal_set_correctly">Basal justert korrekt</string>
+    <string name="limitingextendedbolus">Begrenser forlenget bolus til %1$.1f E på grunn av %2$s</string>
+    <string name="limitingmaxiob">Begrenser maks IOB til %1$.1f E på grunn av %2$s</string>
+    <string name="limitingcarbs">Begrenser karbohydrater til %1$d g på grunn av %2$s</string>
+    <string name="limitingiob">Begrenser IOB til %1$.1f E på grunn av %2$s</string>
+    <string name="maxvalueinpreferences">maks verdi i innstillingene</string>
+    <string name="hardlimit">hard begrensning</string>
+    <string name="unsafeusage">usikker bruk</string>
+    <string name="readstatusfailed">Feil i lesing av status</string>
+    <string name="record_pump_site_change">Logg bytte av slangesett</string>
+    <string name="record_insulin_cartridge_change">Logg bytte av insulinampull</string>
+    <string name="smbalwaysdisabled">SMB Alltid På og SMB Etter Karbohydrater er deaktivert fordi BS kilden ikke støtter avansert filtrering</string>
+    <string name="smbnotallowedinopenloopmode">SMB ikke tillatt i åpen loop</string>
+    <string name="food_short">Mat</string>
+    <string name="reset">tilbakestill</string>
+    <string name="loopdisconnectedfor">Frakoblet (%1$d m)</string>
+    <string name="openapssmb_maxiob_title">Maks total IOB OpenAPS ikke kan overstige [U]</string>
+    <string name="openapssmb_maxiob_summary">Denne verdien kalles Maks IOB av OpenAPS\nOpenAPS vil ikke gi mere insulin hvis mengden insulin ombord (IOB) overstiger denne verdien</string>
+    <string name="pump_stopped">Pumpen stoppet</string>
+    <string name="pump_started">Pumpen startet</string>
+    <string name="pump_paused">Pumpen pauset</string>
+    <string name="absorption_cutoff_title">Maks absorpsjonstid for måltid [h]</string>
+    <string name="absorption_cutoff_summary">Etter denne tiden forventes det at måltidet er absorbert. Eventuelle gjenværende karbo vil tas ut av beregninger.</string>
+    <string name="time">Tid</string>
+    <string name="overview_show_notes_field_in_dialogs_title">Vis merknadsfelt i dialogvindu for Behandlinger</string>
+    <string name="next_button">Neste</string>
+    <string name="previous_button">Forrige</string>
+    <string name="nav_setupwizard">Installasjonsguide</string>
+    <string name="setupwizard_finish">Avslutt</string>
+    <string name="setupwizard_language_prompt">Velg språk</string>
+    <string name="firstinsulinincrement">Første økning hurtigknapp for insulin</string>
+    <string name="secondinsulinincrement">Andre økning hurtigknapp for insulin</string>
+    <string name="thirdinsulinincrement">Tredje økning hurtigknapp for insulin</string>
+    <string name="firstcarbsincrement">Første økning hurtigknapp for karbohydrater</string>
+    <string name="secondcarbsincrement">Andre økning hurtigknapp for karbohydrater</string>
+    <string name="thirdcarbsincrement">Tredje økning hurtigknapp for karbohydrater</string>
+    <string name="cgm">CGM</string>
+    <string name="ns_wifionly">Bare kun WiFi tilkoblinger</string>
+    <string name="ns_wifi_ssids">WiFi nettverksnavn</string>
+    <string name="ns_chargingonly">Bare under lading</string>
+    <string name="connectionsettings_title">Tilkoblingsinnstillinger</string>
+    <string name="ns_wifi_allowedssids">Tillatte nettverksnavn SSID (separert med semikolon)</string>
+    <string name="ns_allowroaming">Tillat tilkobling i roaming</string>
+    <string name="openapsama_autosens_max">Maks autosens ratio</string>
+    <string name="openapsama_autosens_min">Minimum autosens ratio</string>
+    <string name="openapsama_bolussnooze_dia_divisor">Bolus snooze DIA divisor</string>
+    <string name="openapsama_max_daily_safety_multiplier">Multiplikator for max daglig basal</string>
+    <string name="openapsama_current_basal_safety_multiplier">Multiplikator får gjeldende basal</string>
+    <string name="value_unavailable_short">n/a</string>
+    <string name="virtualpump_type">Virtuell pumpetype</string>
+    <string name="virtualpump_definition">Pumpedefinisjon</string>
+    <string name="virtualpump_pump_def">Bolus: Step=%1$s\nForlenget bolus: [Step=%2$s, Varighet=%3$smin-%4$sh]\nBasal: Step=%5$s\nTBR: %6$s (av %7$s), Varighet=%8$smin-%9$sh\n%10$s</string>
+    <string name="ns_autobackfill_title">Auto tilbakefyll BS</string>
+    <string name="wear_wizard_settings">Veiviser innstillinger</string>
+    <string name="wear_wizard_settings_summary">Beregninger inkludert i resultatet fra veiviseren:</string>
+    <string name="wear_display_settings">Visningsinnstillinger</string>
+    <string name="wear_general_settings">Generelle innstillinger</string>
+    <string name="enable_nsclient">Aktiver NSClient</string>
+    <string name="welcometosetupwizard">Velkommen til oppsettveiviseren. Den vil lede deg gjennom installasjonsprosessen\n</string>
+    <string name="pumpsetup">Oppsett av pumpe</string>
+    <string name="readstatus">Les status</string>
+    <string name="adjustprofileinns">Endringer må gjøres i NS</string>
+    <string name="exitwizard">Hopp over oppsettsveiviser</string>
+    <string name="setupwizard_loop_description">Trykk på knappen under for å tillate at AndroidAPS foreslår/gjør basal endringer</string>
+    <string name="apssetup">Konfigurer APS programtillegg</string>
+    <string name="sensitivitysetup">Konfigurer Sensitivitets plugin</string>
+    <string name="setupwizard_sensitivity_description">Sensitivitets plugin brukes til å oppdage insulinsensitivitet og COB beregninger. For mer info, se:</string>
+    <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
+    <string name="nsclientinfotext">NSClient håndterer tilkobling til Nightscout. Du kan hoppe over denne delen nå, men du vil ikke kunne bestå læringsmålene før den er satt opp.</string>
+    <string name="diawarning">Husk: nye insulinprofiler krever en DIA på minst 5t. DIA 5-6t på ny profil er lik DIA 3t på gamle insulinprofiler.</string>
+    <string name="bgsourcesetup">Konfigurer BS kilde</string>
+    <string name="setupwizard_profile_description">Vennligst velg kilde for din profil. Hvis pasienten er et barn anbefales det å bruke NS profil. Hvis ingen følger deg på Nightscout anbefales det å bruke en Lokal Profil. Husk at du her kun velger hvor profilen din ligger lagret. For å bruke den må du velge Profilbytte</string>
+    <string name="setupwizard_aps_description">Velg en av de tilgjengelige algoritmene. De er sortert fra eldst til nyest. De nyeste algoritmene er vanligvis mer kraftfull og aggressiv. Hvis du er en ny looper kan det være fornuftig å starte med AMA og ikke den siste. Ikke glem å lese OpenAPS dokumentasjonen og konfigurer algoritmen før den brukes.</string>
+    <string name="startobjective">Start første læringsmål</string>
+    <string name="permission">Tillatelse</string>
+    <string name="askforpermission">Spør om tillatelse</string>
+    <string name="needsystemwindowpermission">App trenger tillatelse til å bruke Varslinger for å vise meldinger</string>
+    <string name="needlocationpermission">App trenger tilgang til Posisjon for å søke etter Bluetooth og Wifi enheter</string>
+    <string name="needstoragepermission">App trenger tilgang til Lagring for lagre logg filer og eksportere innstillinger</string>
+    <string name="request">Forespørsel</string>
+    <string name="insulinsourcesetup">Konfigurer insulin plugin</string>
+    <string name="exit">Avslutt</string>
+    <string name="open_navigation">Åpne meny</string>
+    <string name="close_navigation">Lukk meny</string>
+    <string name="nav_plugin_preferences">Plugin innstillinger</string>
+    <string name="completed_well_done">Fullført, godt gjort!</string>
+    <string name="not_completed_yet">Enda Ikke fullført</string>
+    <string name="time_elapsed">Tid brukt</string>
+    <string name="poctech">Poctech</string>
+    <string name="description_source_poctech">Motta BS verdier fra Poctech app</string>
+    <string name="description_source_tomato">Motta BS verdier fra Tomato app (MiaoMiao enhet)</string>
+    <string name="high_temptarget_raises_sensitivity_title">Høy temp target øker sensitiviteten</string>
+    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Øk sensitiviteten for temp target >= 100]]></string>
+    <string name="low_temptarget_lowers_sensitivity_title">Lav temp target reduserer sensitiviteten</string>
+    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Reduser sensitiviteten for temp target < 100]]></string>
+    <string name="resistance_lowers_target_title">Resistens reduserer BS målverdi</string>
+    <string name="resistance_lowers_target_summary">Hvis resistens oppdages vil det redusere BS målverdi</string>
+    <string name="sensitivity_raises_target_title">Sensitivitet øker BS målverdi</string>
+    <string name="sensitivity_raises_target_summary">Når systemet oppdager økt insulinsensitivitet, vil BS målverdi økes</string>
+    <string name="combo_invalid_setup">Ugyldig oppsett av pumpen. Les dokumentasjonen og sjekk at Quick Info menyen heter QUICK INFO ved hjelp av 360 programvaren.</string>
+    <string name="custom">Tilpasset</string>
+    <string name="careportal_removestartedevents">Basis AndroidAPS startet</string>
+    <string name="storedsettingsfound">Lagrede innstillinger funnet</string>
+    <string name="allow_hardware_pump_text">Varsel: Hvis du aktiverer og kobler til en pumpe, så vil AndroidAPS kopiere basal innstillinger fra din profil over til pumpen og overskrive verdiene som er lagret der. Sjekk at du har riktige basal verdier i AndroidAPS. Hvis du ikke er sikker eller ikke ønsker å overskrive basal verdiene i pumpen, trykk avbryt og koble til pumpen senere.</string>
+    <string name="error_adding_treatment_title">Behandlingsdata er ufullstendige</string>
+    <string name="maintenance_settings">Vedlikeholds innstillinger</string>
+    <string name="maintenance_email">E-post mottaker</string>
+    <string name="maintenance_encrypt_exported_prefs">Krypter eksporterte innstillinger</string>
+    <string name="maintenance_amount">Antall logger du vil sende</string>
+    <string name="maintenance">Vedlikehold</string>
+    <string name="maintenance_shortname">VEDL</string>
+    <string name="description_maintenance">Flere funksjoner for vedlikehold (f.eks. loggsending, loggsletting).</string>
+    <string name="send_all_logs">Send logger via e-post</string>
+    <string name="delete_logs">Slett logger</string>
+    <string name="error_adding_treatment_message">En behandling (insulin: %1$.2f, karbohydrater: %2$d, tid: %3$s) kunne ikke legges til Behandlinger. Vennligst kontroller og manuelt legg til en registrering der det er aktuelt.</string>
+    <string name="generated_ecarbs_note">eKarbo: %1$d g (%2$d t), forsinkelse: %3$d m</string>
+    <string name="openaps_noasdata">Ingen data tilgjengelig for autosens</string>
+    <string name="nav_logsettings">Logginnstillinger</string>
+    <string name="resettodefaults">Gjenopprett standardinnstillinger</string>
+    <string name="nsmalfunction">NSClient feil. Vurder omstart av NS og NSClient.</string>
+    <string name="as">AS</string>
+    <string name="versionavailable">Versjon %1$s er tilgjengelig</string>
+    <string name="time_offset">Tidsforskyvning</string>
+    <string name="setupwizard_preferred_aps_mode">Foretrukket APS modus</string>
+    <string name="treatments_wizard_total_label">Total</string>
+    <string name="calculation_short">Kalkyle</string>
+    <string name="sendlogfiles">Send dagens loggfiler til utviklere og med dette tidspunktet. Uventet situasjon.</string>
+    <string name="loop_openmode_min_change">Minste endrings forespørsel [%]</string>
+    <string name="loop_openmode_min_change_summary" formatted="false">I åpen Loop modus vil AAPS be om en endring hvis forandringen er større enn denne verdien i %. Standard verdi er 20%</string>
+    <string name="searching_for_devices">Søker etter enheter…</string>
+    <string name="pairing_completed">Sammenkobling fullført</string>
+    <string name="code_compare">Stemmer de viste kodene overens mellom denne enheten og din pumpe?</string>
+    <string name="insight_pairing">Sammenkobling av Insight</string>
+    <string name="insight_local">Accu-Chek Insight</string>
+    <string name="insight_delivered">%1$.2f E / %2$.2f E levert</string>
+    <string name="insight_alert_formatter">%1$s: %2$s</string>
+    <string name="tube_changed">Slange byttet</string>
+    <string name="pump_time_updated">Pumpens tid oppdatert</string>
+    <string name="confirm">Bekreft</string>
+    <string name="mute_alert">Demp lyd</string>
+    <string name="pump_alert">Pumpe varsling</string>
+    <string name="log_site_changes">Logg kanyle bytte</string>
+    <string name="log_reservoir_changes">Logg reservoar bytte</string>
+    <string name="log_tube_changes">Logg slangesett bytte</string>
+    <string name="log_battery_changes">Logg batteri bytte</string>
+    <string name="log_operating_mode_changes">Logg endring i driftsmodus</string>
+    <string name="log_alerts">Logg varslinger</string>
+    <string name="enable_tbr_emulation">Aktiver emulering av TBR</string>
+    <string name="enable_tbr_emulation_summary">Bruk forlenget bolus i stedet for temp basaler for å omgå 250%% grensen</string>
+    <string name="disable_vibration">Slå av vibrasjoner på manuell bolus</string>
+    <string name="disable_vibration_summary">For bolus og forlenget bolus (bare tilgjengelig med Insight firmware 3.x)</string>
+    <string name="disable_vibration_auto">Slå av vibrasjoner ved automatisk bolus</string>
+    <string name="disable_vibration_auto_summary">For SMB og temp basal med TBR emulering (bare tilgjengelig med Insight firmware 3.x)</string>
+    <string name="disconnect_delay">Utsett frakobling [s]</string>
+    <string name="serial_number">Serienummer</string>
+    <string name="release_software_version">Programvare versjon</string>
+    <string name="ui_processor_software_version">UI prosessor programvare versjon</string>
+    <string name="pc_processor_software_version">PC prosessor programvare versjon</string>
+    <string name="md_tel_processor_software_version">MD tel prosessor programvare versjon</string>
+    <string name="safety_processor_software_version">Sikkerhetsprosessor programvare versjon</string>
+    <string name="bt_info_page_version">BT infoside versjon</string>
+    <string name="bluetooth_address">Bluetooth adresse</string>
+    <string name="system_id_appendix">System ID vedlegg</string>
+    <string name="manufacturing_date">Produksjonsdato</string>
+    <string name="delete_pairing">Slett sammenkobling</string>
+    <string name="pairing_information">Tilkoblingsinformasjon</string>
+    <string name="start_pump">Start pumpe</string>
+    <string name="stop_pump">Stopp pumpe</string>
+    <string name="operating_mode">Driftsmodus</string>
+    <string name="insight_status">Status</string>
+    <string name="tdd_bolus">TDD Bolus</string>
+    <string name="tdd_basal">TDD Basal</string>
+    <string name="tdd_total">TDD Total</string>
+    <string name="recovering">Gjenoppretter</string>
+    <string name="not_paired">Ikke sammenkoblet</string>
+    <string name="last_connected">Siste tilkobling</string>
+    <string name="started">Startet</string>
+    <string name="stopped">Stoppet</string>
+    <string name="tbr_formatter">%1$d%% i %2$d / %3$d min</string>
+    <string name="extended_bolus">Forlenget bolus</string>
+    <string name="multiwave_bolus">Kombinasjonsbolus</string>
+    <string name="eb_formatter">%1$.2f / %2$.2f E i %3$d min</string>
+    <string name="enable_tbr_over_notification">Aktiver varsel når slutt på temp basal\n(pumpeinnstilling)</string>
+    <string name="disable_tbr_over_notification">Slå av varsel når slutt på temp basal\n(pumpeinnstilling)</string>
+    <string name="refresh">Oppdater</string>
+    <string name="description_pump_insight_local">Integrasjon for Accu-Chek Insight pumper</string>
+    <string name="not_inserted">Ikke innsatt</string>
+    <string name="short_status_last_connected">Siste tilkobling: %1$d min siden</string>
+    <string name="short_status_tbr">TBR: %1$d%% i %2$d / %3$d min</string>
+    <string name="short_status_extended">Forlenget: %1$.2f / %2$.2f E i %3$d min</string>
+    <string name="short_status_multiwave">Kombinasjon: %1$.2f / %2$.2f E i %3$d min</string>
+    <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">Ampull: %1$.2f E</string>
+    <string name="short_status_battery">Batt.: %1$d%%</string>
+    <string name="max_recovery_duration">Maks pause mellom tilkoblingsforsøk [s]</string>
+    <string name="min_recovery_duration">Min pause mellom tilkoblingsforsøk [s]</string>
+    <string name="recovery_duration">Tilkoblingsforsøk</string>
+    <string name="timeout_during_handshake">En timeout oppstod i paringsprosessen - restart Bluetooth</string>
+    <string name="weekday_sunday_short">Søn</string>
+    <string name="weekday_saturday_short">Lør</string>
+    <string name="weekday_friday_short">Fre</string>
+    <string name="weekday_thursday_short">Tors</string>
+    <string name="weekday_wednesday_short">Ons</string>
+    <string name="weekday_tuesday_short">Tirs</string>
+    <string name="weekday_monday_short">Man</string>
+    <string name="automation_description">Brukerdefinerte automeringer</string>
+    <string name="automation_missing_task_name">Angi et navn på oppgaven.</string>
+    <string name="automation_missing_trigger">Oppgi minst en trigger.</string>
+    <string name="automation_missing_action">Oppgi minst en aksjon.</string>
+    <string name="alreadyenabled">Allerede aktivert</string>
+    <string name="alreadydisabled">Allerede avslått</string>
+    <string name="alreadysuspended">Allerede pauset</string>
+    <string name="resumeloop">Gjenoppta loop</string>
+    <string name="notsuspended">Ikke pauset</string>
+    <string name="starttemptarget">Start temp target</string>
+    <string name="stoptemptarget">Avbryt temp target</string>
+    <string name="islesser">er mindre enn</string>
+    <string name="isequalorlesser">er lik eller mindre enn</string>
+    <string name="isequal">er lik som</string>
+    <string name="isequalorgreater">er lik eller større enn</string>
+    <string name="isgreater">er større enn</string>
+    <string name="isnotavailable">er ikke tilgjengelig</string>
+    <string name="glucoseisnotavailable">BS data er ikke tilgjengelig</string>
+    <string name="glucosecomparedmgdl">BS %1$s %2$.0f %3$s</string>
+    <string name="glucosecomparedmmol">BS %1$s %2$.1f %3$s</string>
+    <string name="percentagecompared">Profil prosent %1$s %2$d</string>
+    <string name="iobcompared">IOB %1$s %2$.1f</string>
+    <string name="and">Og</string>
+    <string name="or">Eller</string>
+    <string name="xor">Eksklusiv eller</string>
+    <string name="atspecifiedtime">Kl %1$s</string>
+    <string name="use_network_location">Bruk nettverkslokasjon</string>
+    <string name="use_gps_location">Bruk GPS posisjon</string>
+    <string name="use_passive_location">Bruk passiv lokalisering</string>
+    <string name="locationservice">Posisjonstjeneste</string>
+    <string name="automation_short">Auto</string>
+    <string name="automation">Automering</string>
+    <string name="profile_total">== ∑  %1$s E</string>
+    <string name="dexcom_lognssensorchange_title">Logg sensor endring til NS</string>
+    <string name="dexcom_lognssensorchange_summary">Opprett hendelse \"Sensor bytte\" i NS automatisk ved start av sensoren</string>
+    <string name="tomato">Tomato (MiaoMiao)</string>
+    <string name="tomato_short">Tomato</string>
+    <string name="summary_tidepool_username">Ditt Tidepool brukernavn, normalt din e-postadresse</string>
+    <string name="title_tidepool_username">Brukernavn for innlogging</string>
+    <string name="summary_tidepool_password">Ditt passord for Tidepool</string>
+    <string name="title_tidepool_password">Passord</string>
+    <string name="title_tidepool_test_login">Test Tidepool innlogging</string>
+    <string name="summary_tidepool_dev_servers">Hvis aktivert, vil opplastinger gå til https://int-app.tidepool.org i stedet for vanlig https://app.tidepool.org/</string>
+    <string name="title_tidepool_dev_servers">Bruk integrasjon (test) servere</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Laster opp data til Tidepool</string>
+    <string name="tidepool_upload_cgm">Last opp CGM data</string>
+    <string name="tidepool_upload_bolus">Last opp behandlinger (insulin, karbohydrater)</string>
+    <string name="tidepool_upload_tbr">Last opp temp basaler</string>
+    <string name="tidepool_upload_profile">Last opp profilbytter, temp targets</string>
+    <string name="tidepool_upload_bg">Last opp BS tester</string>
+    <string name="dst_in_24h_warning">Sommer/vintertid inntreffer innen 24t</string>
+    <string name="dst_loop_disabled_warning">Sommer/vintertid inntreffer innen 3t - lukket loop er midlertidig deaktivert</string>
+    <string name="storage">intern lagringsbegrensning</string>
+    <string name="diskfull">Frigjør minst %1$d MB fra internminnet! Loop deaktivert!</string>
+    <string name="wrongformat">Feil format</string>
+    <string name="sms_wrongcode">Feil kode. Kommandoen avbrutt.</string>
+    <string name="notconfigured">Ikke konfigurert</string>
+    <string name="profileswitchcreated">Profilbytte opprettet</string>
+    <string name="recurringTime">Gjentakende tidspunkt</string>
+    <string name="every">Hver</string>
+    <string name="never">Aldri</string>
+    <string name="condition">Betingelse:</string>
+    <string name="action">Handling:</string>
+    <string name="iob_u">IOB [U]:</string>
+    <string name="glucose_u">Glukose [%1$s]:</string>
+    <string name="delete_short">SLETT</string>
+    <string name="add_short">ADD</string>
+    <string name="copy_short">KOPIER</string>
+    <string name="addnew">Legg til ny</string>
+    <string name="versionChecker">Versjonskontroll</string>
+    <string name="signature_verifier">Verifisering av signatur</string>
+    <string name="running_invalid_version">Vi har oppdaget at du kjører en ugyldig versjon. Loop deaktivert!</string>
+    <string name="old_version">gammel versjon</string>
+    <string name="very_old_version">veldig gammel versjon</string>
+    <string name="new_version_warning">Ny versjon tilgjengelig i minst %1$d dager! Systemet vil bytte til \"stopp innen lavt (LGS)\" etter %2$d dager og loop vil deaktiveres etter %3$d dager</string>
+    <string name="twohours">2t</string>
+    <string name="dexcom_app_patched">Dexcom App (patchet)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Motta BS verdier fra den patchede Dexcom appen.</string>
+    <string name="notification">Varsling</string>
+    <string name="notification_message">Varsel: %1$s</string>
+    <string name="message_short">Meld:</string>
+    <string name="profilepercentage">Profil prosent</string>
+    <string name="percent_u">Prosent [%]:</string>
+    <string name="startprofile">Start profil %1$d%% i %2$d min</string>
+    <string name="startprofileforever">Start profil %1$d%%</string>
+    <string name="exists">finnes</string>
+    <string name="notexists">finnes ikke</string>
+    <string name="temptargetcompared">Temp target %1$s</string>
+    <string name="btdevicecompared">Bluetooth tilkobling til enheten %1$s %2$s</string>
+    <string name="btdevice">Tilkobling til Bluetooth enhet </string>
+    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
+    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
+    <string name="autosenslabel">Autosens %</string>
+    <string name="deltacompared">%3$s %1$s %2$s</string>
+    <string name="deltalabel">BS forskjell</string>
+    <string name="deltalabel_u">BS forskjell [%1$s]</string>
+    <string name="currentlocation">Gjeldende plassering</string>
+    <string name="location">Plassering</string>
+    <string name="latitude_short">Lat:</string>
+    <string name="longitude_short">Long:</string>
+    <string name="distance_short">Dist [m]:</string>
+    <string name="name_short">Navn:</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Når </string>
+    <string name="location_inside">Når du er innenfor området</string>
+    <string name="location_outside">Når du er utenfor området</string>
+    <string name="location_going_in">Når du går inn i området som heter</string>
+    <string name="location_going_out">Når du forlater området som heter</string>
+    <string name="lastboluslabel">Siste bolus</string>
+    <string name="lastboluscompared">Siste bolus for %1$s %2$s min siden</string>
+    <string name="triggercoblabel">COB</string>
+    <string name="cobcompared">COB %1$s %2$.0f</string>
+    <string name="taskname">Oppgavenavn</string>
+    <string name="edit_short">REDIGER</string>
+    <string name="please_choose_an_action_type">Velg en handling</string>
+    <string name="please_choose_a_trigger_type">Velg en trigger type</string>
+    <string name="triggers">Triggere:</string>
+    <string name="remove_label">FJERN</string>
+    <string name="preconditions">Forutsetninger:</string>
+    <string name="profilename">Endre profil til</string>
+    <string name="changengetoprofilename">Endre profil til %1$s</string>
+    <string name="automation_trigger_pump_last_connection_label">Siste tilkobling til pumpen</string>
+    <string name="automation_trigger_pump_last_connection_description">Siste tilkobling til pumpen [minutters siden]</string>
+    <string name="automation_trigger_pump_last_connection_compared">Siste tilkobling til pumpen %1$s %2$s min siden</string>
+    <string name="sendsmsactionlabel">Send SMS: %1$s</string>
+    <string name="sendsmsactiondescription">Send SMS til alle numre</string>
+    <string name="sendsmsactiontext">Send SMS med tekst</string>
+    <string name="cobvsiob">COB vs IOB</string>
+    <string name="bolusconstraintappliedwarn">Bolus begrensning brukt: %1$.2f E til %2$.2f E</string>
+    <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Advarsel: Treg KH absorpsjon oppdaget: %2$d%% av tiden. Dobbeltsjekk din beregning. COB can være misvisende og du risikerer å få for mye insulin !!!!!</font>]]></string>
+    <string name="partialboluswizard">Doser denne delen av bolus wizard resultat [%]</string>
+    <string name="deliverpartofboluswizard">Bolus veiviser utfører beregninger, men bare denne del av beregnet insulin leveres. Nyttig ved bruk av SMB algoritmen.</string>
+    <string name="loading">Laster...</string>
+    <string name="snooze">Utsett</string>
+    <string name="time_range">Tidsintervall</string>
+    <string name="timerange_value">Tid er mellom %1$s og %2$s</string>
+    <string name="between">Mellom </string>
+    <string name="increasingmaxbasal">Øker maks basaldose fordi innstillingen er lavere enn din maks basal i profilen</string>
+    <string name="smscommunicator_messagebody">Ugyldig innhold i meldingen</string>
+    <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
+    <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
+    <string name="format_cob_ic">%1$.1fg IC: %2$.1f</string>
+    <string name="format_percent">%1$d%%</string>
+    <string name="boluswizard">Bolus wizard</string>
+    <string name="unit_minute_short">min</string>
+    <string name="profile_name">Profilnavn:</string>
+    <string name="selected_profile">Valgt:</string>
+    <string name="unitsnosemicolon">Enheter</string>
+    <string name="doyouwantswitchprofile">Ønsker du å bytte profil og forkaste endringer i gjeldende profil?</string>
+    <string name="common_on">På</string>
+    <string name="common_off">Av</string>
+    <string name="objectives_button_unfinish">Sletting ferdig</string>
+    <string name="objectives_button_unstart">Sletting startet</string>
+    <string name="doyouwantresetstart">Ønsker du å omstarte læringsmålet? Du vil miste fullførte trinn.</string>
+    <string name="nopumpselected">Ingen pumpe valgt</string>
+    <string name="setupwizard_units_prompt">Velg enheter som du vil vise verdier i</string>
+    <string name="ns_ploadlocalprofile">Last opp lokale profilendringer til NS</string>
+    <string name="dia_short">DIA</string>
+    <string name="ic_short">IC</string>
+    <string name="isf_short">ISF</string>
+    <string name="target_short">MÅL</string>
+    <string name="clone_label">Klon</string>
+    <string name="saveorresetchangesfirst">Lagre eller nullstill gjeldende endringer først</string>
+    <string name="deletecurrentprofile">Slette gjeldende profil?</string>
+    <string name="copytolocalprofile">Opprette ny lokal profil fra denne profilen?</string>
+    <string name="profilenamecontainsdot">Profilnavnet inneholder prikker.\nDette støttes ikke av NS.\nProfilen er ikke lastet opp til NS.</string>
+    <string name="low_mark_comment">Nedre verdi for målområdet (kun visning)</string>
+    <string name="high_mark_comment">Øvre verdi for målområdet (kun visning)</string>
+    <string name="reorder_label">Endre rekkefølge</string>
+    <string name="age">Alder:</string>
+    <string name="weight_label">Vekt:</string>
+    <string name="id">ID:</string>
+    <string name="submit">Lagre</string>
+    <string name="mostcommonprofile">Mest vanlig profil:</string>
+    <string name="survey_comment">Merk: Kun data synlig på denne skjermen vil bli anonymt lastet opp. ID er tilordnet denne installasjonen av AndroidAPS. Du kan sende inn data igjen hvis hovedprofilen din blir endret, men la den kjøre i minst en uke for å se effekten av resultatet i tidsperioden. Din hjelp blir verdsatt.</string>
+    <string name="nav_survey">Undersøkelse</string>
+    <string name="invalidage">Ugyldig alder</string>
+    <string name="invalidweight">Ugyldig vekt</string>
+    <string name="invalidpct">Ugyldig % oppføring</string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Lav: <b>%2$02d%%</b> Mål: <b>%3$02d%%</b> Høy: <b>%4$02d%%</b>]]></string>
+    <string name="average">Gjennomsnitt</string>
+    <string name="tir">TIR</string>
+    <string name="activitymonitor">Overvåking av aktivitet</string>
+    <string name="doyouwantresetstats">Vil du tilbakestille aktivitets statistikk?</string>
+    <string name="statistics">Statistikk</string>
+    <string name="randombg">Tilfeldig BS</string>
+    <string name="description_source_randombg">Generer tilfeldige BS data (kun demo formål)</string>
+    <string name="randombg_short">BS</string>
+    <string name="tools">Verktøy</string>
+    <string name="show_calculation">Vis beregning</string>
+    <string name="automation_event">Automasjons hendelse</string>
+    <string name="alreadyset">Allerede angitt</string>
+    <string name="clearqueueconfirm">Slett køen? All data i køen vil gå tapt!</string>
+    <string name="ebstopsloop">Bruk av forlenget bolus funksjon vil deaktivere lukket loop i perioden med forlenget bolus. Vil du virkelig dette?</string>
+    <string name="closed_loop_disabled_with_eb">Lukket loop deaktivert på grunn av forlenget bolus</string>
+    <string name="extended_bolus_short">FB</string>
+    <string name="phonechecker">\"Telefonkontroll \"</string>
+    <string name="chartmenu">Diagram meny</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">SMB forespurt</string>
+    <string name="loop_smbexecution_time_label">SMB utført</string>
+    <string name="loop_tbrrequest_time_label">Temp basal endring forespurt</string>
+    <string name="loop_tbrexecution_time_label">Temp basal utført</string>
+    <string name="insight_alert_notification_channel">Insight pumpe varsler</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">fra Authenticator appen for: %1$s etterfulgt av PIN</string>
+    <string name="smscommunicator_otp_enabled">Aktiver Authenticator</string>
+    <string name="smscommunicator_otp_enabled_summary">Godkjenn kommandoer ved å bruke engangs passord generert av Google Authenticator eller tilsvarende 2 factor autentiseringsapper (2FA).</string>
+    <string name="smscommunicator_otp_pin">PIN kode som legges til på slutten av token</string>
+    <string name="smscommunicator_otp_pin_summary">Ytterligere sifre som MÅ memoreres og legges til på slutten av hvert generert engangspassord</string>
+    <string name="smscomunicator_tab_otp_label">Oppsett for 2 faktor autentisering</string>
+    <string name="smscommunicator_code_verify_label">Kode som skal kontrolleres:</string>
+    <string name="smscommunicator_code_verify_hint">OTP + PIN</string>
+    <string name="smscommunicator_code_verify_info">Bekreftelseskoden består av 6 sifre som vises av Authenticator appen (kjent som OTP) etterfulgt av 3 eller flere siffer for obligatorisk PIN-kode.</string>
+    <string name="smscommunicator_otp_verify_label">OTP som skal sjekkes:</string>
+    <string name="smscommunicator_otp_reset_btn">Tilbakestill Authenticators</string>
+    <string name="smscommunicator_otp_reset_title">Tilbakestill Authenticator nøkkel</string>
+    <string name="smscommunicator_otp_reset_prompt">Er du sikker på at du vil tilbakestille Authenticator nøkkel? Dette vil gjøre alle lagrede Authenticators ugyldige, og du må sette dem opp på nytt igjen.</string>
+    <string name="smscommunicator_otp_reset_successful">Ny Authenticator nøkkel ble generert! Vennligst bruk oppdatert QR kode til å aktivere autentiserere.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Installer Authenticator</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Skann kode for å sette opp AndroidAPS OTP koder</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Test engangspassord</string>
+    <string name="smscommunicator_otp_reset_header">Tilbakestill Authenticators</string>
+    <string name="smscommunicator_otp_install_info">I hver følger telefon installerer du en Authenticator-app som støtter RFC 6238 TOTP token. Populære gratis apper er:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">IKKE DEL DENNE KODEN online!\nBruk den bare til å sette opp Authenticator app på følger telefoner.</string>
+    <string name="smscommunicator_otp_reset_warning">Ved å tilbakestille authenticator vil du gjøre alle lagrede autentiseringer ugyldige. Du må sette alle opp på nytt igjen!</string>
+    <string name="onconnect">Ved tilkobling</string>
+    <string name="ondisconnect">Ved frakobling</string>
+    <string name="overview_show_predictions">Prognoser</string>
+    <string name="overview_show_deviationslope">Avvikskurve</string>
+    <string name="authorizationfailed">Autentisering feilet</string>
+    <string name="overview_show_absinsulin">Absolutt insulinmengde</string>
+    <string name="master_password_summary">Hovedpassordet brukes for å beskytte backup og tilpasse enkelte sikkerhetsinnstillinger i appen. Husk passordet eller lagre det på et trygt sted.</string>
+    <string name="current_master_password">Nåværende hovedpassord</string>
+    <string name="statuslights">Statuslys</string>
+    <string name="statuslights_copy_ns">Kopier innstillingene fra NS</string>
+    <string name="copyexistingvalues">Kopiere NS innstillinger (hvis de eksisterer)?</string>
+    <string name="classic_description">Opprinnelig visningstema</string>
+    <string name="buttonson_description">Knapper vises alltid på bunnen av skjermen</string>
+    <string name="largedisplay_description">Stor skjerm</string>
+    <string name="skin">Tema</string>
+    <string name="comapareprofile">Sammenlign profiler</string>
+    <string name="nav_profilehelper">Profilhjelper</string>
+    <string name="motoldefaultprofile">Standard profil</string>
+    <string name="currentprofile">Gjeldende profil</string>
+    <string name="availableprofile">Tilgjengelige profiler</string>
+    <string name="profiletype">Profiltype</string>
+    <string name="formatwithtdd">Alder: %1$.0f TDD: %2$.0f E</string>
+    <string name="formatwittddandpct">Alder: %1$.0f TDD: %2$.0f E %3$d%%</string>
+    <string name="formatwithweight">Alder: %1$.0f Vekt: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% av basal</string>
+    <string name="dpvdefaultprofile">DPV standardprofil</string>
+    <string name="open_humans">Open Humans</string>
+    <string name="finishing_open_humans_setup">Avslutter oppsett av Open Humans…</string>
+    <string name="this_may_take_a_while">Dette kan ta litt tid. Ikke slå av telefonen eller avbryt prosessen.</string>
+    <string name="setup_finished">Oppsett ferdig</string>
+    <string name="your_phone_will_upload_data">Telefonen vil laste opp data til Open Humans snart.</string>
+    <string name="your_phone_is_upload_data">Telefonen laster opp data til Open Humans nå.</string>
+    <string name="setup_failed">Installasjonen mislyktes</string>
+    <string name="there_was_an_error">Det oppstod en feil. Prøv å logge inn igjen for å fortsette. Beklager &amp; Takk!</string>
+    <string name="open_humans_terms">Dette er et verktøy med åpen kildekode som vil kopiere data til Open Humans. Vi har ingen rettigheter til å dele dine data med tredjeparter uten din eksplisitte godkjenning. Alle data som app og prosjektet mottar vil ha en vilkårlig ID som bare vil bli oversendt Open Humans kontoen med din godkjennelse. Du kan avslutte opplasting og slette opplastede data når som helst via www.openhumans.org.</string>
+    <string name="i_understand_and_agree">Jeg forstår og godkjenner.</string>
+    <string name="login">Innlogging</string>
+    <string name="logout">Utlogging</string>
+    <string name="oh_logout_confirmation">Vil du virkelig logge ut og slutte å donere dine data til vitenskapen?</string>
+    <string name="project_member_id">Prosjektmedlems ID: %s</string>
+    <string name="queue_size">Kø størrelse: %d</string>
+    <string name="terms_of_use">Vilkår for bruk</string>
+    <string name="not_logged_in">Ikke logget inn</string>
+    <string name="you_need_to_accept_the_of_use_first">Du må først godta vilkårene for bruk.</string>
+    <string name="successfully_logged_in">Innlogging vellykket</string>
+    <string name="setup_will_continue_in_background">Oppsettet vil bli fullført i bakgrunnen nå. Takk for at du laster opp dine data.\n\nSørg for at AndroidAPS og telefonen er slått på i en kort periode for å fullføre oppsettet.</string>
+    <string name="completing_login">Fullfører innlogging…</string>
+    <string name="donate_your_data_to_science">Doner dine data til vitenskapen</string>
+    <string name="open_humans_short">OH</string>
+    <string name="you_have_been_signed_out_of_open_humans">Du har blitt logget ut fra Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klikk her for å logge inn igjen hvis dette ikke var hensikten.</string>
+    <string name="only_upload_if_connected_to_wifi">Last opp kun dersom du er koblet til WiFi</string>
+    <string name="only_upload_if_charging">Last opp kun ved mobillading</string>
+    <string name="worker_state">Fremdrift: %s</string>
+    <string name="uploaded_data">Opplastede data</string>
+    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Følgende data vil bli lastet opp til din Open Humans konto: glukoseverdier, boluser, karbohydrater, careportalhendelser (bortsett fra merknader), forlengede boluser, profilbytter, totale daglige doser, temp basaler, endringer i BS mål, innstillinger, app versjon, mobilmerke og skjermstørrelser. Hemmelig eller privat informasjon som din Nightscout URL eller API secret vil ikke bli lastet opp.</string>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index ca0c5919f3..16277cb6da 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -21,6 +21,7 @@
     <string name="description_food">Wyświetla dane posiłków zdefiniowanych w Nightscout</string>
     <string name="description_insulin_rapid">Profil insulinowy dla Humalog i Novorapid / NovoLog</string>
     <string name="description_insulin_ultra_rapid">Profil insulinowy dla Fiasp</string>
+    <string name="description_insulin_lyumjev">Profil insulinowy dla Lyumjev</string>
     <string name="description_insulin_free_peak">Pozwala na określenie czasu wartości szczytowej działania insuliny i powinno być używane tylko przez zaawansowanych użytkowników</string>
     <string name="description_loop">Włącz lub wyłącz działanie pętli.</string>
     <string name="description_ns_client">Synchronizuje twoje dane z Nightscout</string>
@@ -156,6 +157,7 @@
     <string name="overview_tempbasal_button">BazaTymczasowa</string>
     <string name="overview_extendedbolus_button">Bolus Przedłużony</string>
     <string name="configbuilder_nightscoutversion_label">Wersja Nightscout:</string>
+    <string name="missing_carbs">Brakuje %1$d g</string>
     <string name="exported">Ustawienia wyeksportowane</string>
     <string name="export_to">Eksportuj ustawienia do</string>
     <string name="import_from">Importuj ustawienia z</string>
@@ -171,6 +173,11 @@
     <string name="password_preferences_decrypt_prompt">Zostaniesz poproszony o hasło główne, które jest potrzebne do odszyfrowania zaimportowanych preferencji.</string>
     <string name="preferences_export_canceled">Eksportowanie anulowane! Ustawienia NIE zostały wyeksportowane!</string>
     <string name="preferences_import_canceled">Import anulowany! Ustawienia NIE zostały zaimportowane!</string>
+    <string name="preferences_import_impossible">Nie można zaimportować ustawień!</string>
+    <string name="goto_main_try_again">Wróć do ekranu głównego i spróbuj ponownie.</string>
+    <string name="old_master_password">Stare hasło główne</string>
+    <string name="different_password_used">Ten plik zaszyfrowano innym hasłem głównym. Podaj te stare hasło główne którego używałeś do eksportu, aby odszyfrować plik.</string>
+    <string name="master_password_will_be_replaced">W efekcie udanego importu bieżące hasło główne ZOSTANIE ZASTĄPIONE starym hasłem głównym z importowanych ustawień!</string>
     <string name="preferences_import_list_title">Wybierz plik do zaimportowania</string>
     <string name="check_preferences_before_import">Proszę sprawdzić ustawienia przed importem:</string>
     <string name="check_preferences_cannot_import">Ustawienia nie mogą być zaimportowane!</string>
@@ -232,6 +239,10 @@
     <string name="smscommunicator_remotebolusmindistance_summary">Minimalna liczba minut która musi upłynąć pomiędzy jednym a drugim zdalnie podawanym bolusem</string>
     <string name="smscommunicator_remotebolusmindistance">Ile co najmniej minut musi upłynąć pomiędzy jednym a drugim bolusem</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">Dla twojego bezpieczeństwa, aby zmienić to ustawienie musisz dodać co najmniej 2 numery telefonów.</string>
+    <string name="bolusdelivered">Bolus %1$.2f U podany prawidłowo</string>
+    <string name="bolusrequested">Zamierzam podać %1$.2f U</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %1$.2f U podany prawidłowo</string>
+    <string name="smscommunicator_mealbolusdelivered">Pomyślnie podano %1$.2f U bolusa posiłkowego</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Cel %1$s na %2$d minut</string>
     <string name="smscommunicator_tt_set">Pomyślnie ustawiono cel %1$s na %2$d minuty</string>
     <string name="smscommunicator_tt_canceled">Pomyślnie anulowano cel tymczasowy</string>
@@ -255,7 +266,9 @@
     <string name="smscommunicator_reconnect">Pompa ponownie podłączona</string>
     <string name="smscommunicator_remotecommandnotallowed">Zdalne komendy nie są dozwolone</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolus zdalny niedostępny. Spróbuj ponownie później.</string>
+    <string name="smscommunicator_basalreplywithcode">Aby rozpocząć bazę %1$.2f U/h przez %2$d min. odpowiedz kodem %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Aby przełączyć profil na %1$s %2$d%% odpowiedz kodem %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Aby rozpocząć bolus przedłużony %1$.2f U przez %2$d min. odpowiedz kodem %3$s</string>
     <string name="smscommunicator_carbsreplywithcode">Aby wprowadzić %1$dg o %2$s odeślij w SMS kod %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Aby rozpocząć bolus przedłużony %1$d%% przez %2$d min. odpowiedz kodem %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Aby wstrzymać pętle na %1$d minut odpowiedz kodem %2$s</string>
@@ -264,6 +277,7 @@
     <string name="smscommunicator_loopdisablereplywithcode">Aby wyłączyć pętlę odpowiedz kodem %1$s</string>
     <string name="smscommunicator_tempbasalset">Tymczasowa baza %1$.2fU/h przez %2$d min rozpoczęta</string>
     <string name="smscommunicator_extendedset">Bolus przedłużony %1$.2fU na %2$d min. rozpoczęty pomyślnie</string>
+    <string name="smscommunicator_carbsset">Pomyślnie wprowadzono %1$d g węglowodanów</string>
     <string name="smscommunicator_carbsfailed">Próba wprowadzenia %1$dg węglowodanów nie powiodła się</string>
     <string name="smscommunicator_tempbasalset_percent">Tymczasowa baza %1$d%% przez %2$d min. pomyślnie rozpoczęta</string>
     <string name="smscommunicator_tempbasalfailed">Rozpoczęcie tymczasowej bazy nie powiodło się</string>
@@ -523,6 +537,7 @@
     <string name="free_peak_oref">Swobodny-Pik Oref</string>
     <string name="rapid_acting_oref">Szybko-Działający Oref</string>
     <string name="ultrarapid_oref">Ultra-Szybki Oref</string>
+    <string name="lyumjev">Lyumjev</string>
     <string name="dia_too_short">DIA %1$f zbyt krótki - przyjmuję %2$f w zamian!</string>
     <string name="activate_profile">Aktywuj profil</string>
     <string name="invalid">NIEPRAWIDŁOWY</string>
@@ -550,6 +565,7 @@
     <string name="pump_unreachable">Pompa nieosiągalna</string>
     <string name="missed_bg_readings">Pominięte odczyty BG</string>
     <string name="raise_notifications_as_android_notifications">Użyj powiadomień systemowych dla alertów i powiadomień</string>
+    <string name="gradually_increase_notification_volume">Stopniowo zwiększaj głośność ostrzeżeń i powiadomień</string>
     <string name="localalertsettings_title">Alarmy lokalne</string>
     <string name="enable_missed_bg_readings_alert">Alarm, jeśli nie są odbierane odczyty BG</string>
     <string name="enable_pump_unreachable_alert">Alarm, gdy pompa jest nieosiągalna</string>
@@ -638,6 +654,7 @@
     <string name="enablesmbwithtemptarget">Włącz SMB z tymczasowym poziomem docelowym (TT)</string>
     <string name="enablesmbwithtemptarget_summary">Włącz SMB gdy tymczasowy poziom docelowy (TT) jest aktywny (TT WkrótcePosiłek, TT ćwiczenia)</string>
     <string name="enablesmbwithhightemptarget">Włącz SMB z wysokim tymczasowym poziomem docelowym</string>
+    <string name="enablesmbwithhightemptarget_summary">Włącz SMB, gdy aktywowano wysoki cel tymczasowy (Ćwiczenia, powyżej 100 mg/dl lub 5, 5 mmol/l)</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">Węglowod.</string>
     <string name="overview_buttons_selection">Przyciski</string>
@@ -671,6 +688,7 @@
     <string name="do_not_bolus_record_only">Nie podawaj bolusa, tylko zapisz rekord</string>
     <string name="category">Kategoria</string>
     <string name="subcategory">Podkategoria</string>
+    <string name="bolusrecordedonly">Bolus zostanie jedynie odnotowany (nie będzie podany przez pompę)</string>
     <string name="ns_autobackfill_summary">Automatycznie wypełnij brakujące BG z NS</string>
     <string name="loop_smbsetbypump_label">SMB ustawiony przez pompę</string>
     <string name="overview_show_activity">Aktywność</string>
@@ -787,6 +805,7 @@
     <string name="askforpermission">Zapytaj o uprawnienia</string>
     <string name="needsystemwindowpermission">Aplikacja wymaga uprawnienia systemowego okna dla powiadomień</string>
     <string name="needlocationpermission">Aplikacja wymaga dostępu do lokalizacji dla zarządzania bluetoothem i identyfikacją Wi-Fi</string>
+    <string name="needstoragepermission">Aplikacja wymaga zgody na zapis do pamięci, aby móc przechować pliki logów i eksportować ustawienia</string>
     <string name="request">Żądanie</string>
     <string name="insulinsourcesetup">Skonfiguruj wtyczkę insuliny</string>
     <string name="exit">Wyjście</string>
@@ -842,6 +861,7 @@
     <string name="code_compare">Czy kody wyświetlone na tym urządzeniu i na twojej pompie pasują?</string>
     <string name="insight_pairing">Parowanie Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
+    <string name="insight_delivered">podano %1$.2f U / %2$.2f U</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Dren zmieniony</string>
     <string name="pump_time_updated">Czas pompy uaktualniony</string>
@@ -899,6 +919,7 @@
     <string name="short_status_extended">Przedłużony: %1$.2f / %2$.2f U na %3$d min</string>
     <string name="short_status_multiwave">Multiwave (zwykły + przedłużony): %1$.2f / %2$.2f U for %3$d min</string>
     <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">Zbiornik: %1$.2f U</string>
     <string name="short_status_battery">Bat.: %1$d%%</string>
     <string name="max_recovery_duration">Max. czas odzyskiwania [s]</string>
     <string name="min_recovery_duration">Min. czas odzyskiwania [s]</string>
@@ -1041,6 +1062,8 @@
     <string name="sendsmsactionlabel">Wyślij SMS: %1$s</string>
     <string name="sendsmsactiondescription">Wyślij SMS do wszystkich numerów</string>
     <string name="sendsmsactiontext">Wyślij SMS z tekstem</string>
+    <string name="cobvsiob">COB vs IOB</string>
+    <string name="bolusconstraintappliedwarn">Zastosowano ograniczenie bolusa: %1$.2f U do %2$.2f U</string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Wykryto powolne wchłanianie węglowodanów: %2$d%% czasu. Sprawdź ponownie swoje obliczenia. COB mogły być przeszacowane przez co mogło być podane zbyt dużo insuliny !!!!!</font>]]></string>
     <string name="partialboluswizard">Dostarcz tą część dawki insuliny z wyniku kalkulatora bolusa [%]</string>
     <string name="deliverpartofboluswizard">Kreator bolusa wykonuje obliczenia, ale tylko ta część obliczonej dawki insuliny jest dostarczana. Pomocne z algorytmem SMB.</string>
@@ -1090,6 +1113,7 @@
     <string name="nav_survey">Ankieta</string>
     <string name="invalidage">Nieprawidłowy wpis wieku</string>
     <string name="invalidweight">Nieprawidłowy wpis wagi</string>
+    <string name="invalidpct">Nieprawidłowa wartość procentowa</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Od: <b>%2$02d%%</b> Cel: <b>%3$02d%%</b> Do: <b>%4$02d%%</b>]]></string>
     <string name="average">Średnio</string>
     <string name="tir">TIR</string>
@@ -1116,10 +1140,15 @@
     <string name="loop_tbrexecution_time_label">Czas wykonywania bazy tymczasowej</string>
     <string name="insight_alert_notification_channel">Alarmy pompy Insight</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">z aplikacji Authenticator dla: %1$s, z doklejonym PIN-em</string>
     <string name="smscommunicator_otp_enabled">Włącz uwierzytelnianie</string>
     <string name="smscommunicator_otp_enabled_summary">Uwierzytelnianie komend za pomocą haseł jednorazowych generowanych przez aplikację Google Authenticator lub podobnych aplikacji 2FA.</string>
+    <string name="smscommunicator_otp_pin">Dodatkowy obowiązkowy PIN na końcu tokenu</string>
     <string name="smscommunicator_otp_pin_summary">Dodatkowe cyfry, które powinny być zapamiętywane i przyklejone na końcu każdego wygenerowanego hasła jednorazowego</string>
     <string name="smscomunicator_tab_otp_label">Ustawienia uwierzytelnienia</string>
+    <string name="smscommunicator_code_verify_label">Kod do sprawdzenia:</string>
+    <string name="smscommunicator_code_verify_hint">OTP + PIN</string>
+    <string name="smscommunicator_code_verify_info">Kod weryfikacyjny składa się z 6 cyfr wyświetlanych przez aplikację uwierzytelniającą (tzw. OTP) po których następują co najmniej 3 cyfry obowiązkowego PIN-u.</string>
     <string name="smscommunicator_otp_verify_label">OTP do sprawdzenia:</string>
     <string name="smscommunicator_otp_reset_btn">Resetuj uwierzytelnianie</string>
     <string name="smscommunicator_otp_reset_title">Resetuj klucz uwierzytelniania</string>
@@ -1154,5 +1183,38 @@
     <string name="availableprofile">Dostępny profil</string>
     <string name="profiletype">Typ profilu</string>
     <string name="formatwithtdd">Wiek: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwittddandpct">Wiek: %1$.0f TDD: %2$.0f U %3$d%%</string>
     <string name="formatwithweight">Wiek: %1$.0f Waga: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% bazy</string>
+    <string name="dpvdefaultprofile">Domyślny profil DPV</string>
+    <string name="open_humans">Open Humans</string>
+    <string name="finishing_open_humans_setup">Kończenie konfiguracji Open Humans…</string>
+    <string name="this_may_take_a_while">To może chwilę potrwać. Nie wyłączaj telefonu ani tej wtyczki.</string>
+    <string name="setup_finished">Konfiguracja zakończona</string>
+    <string name="your_phone_will_upload_data">Twój telefon wkrótce prześle dane do Open Humans.</string>
+    <string name="your_phone_is_upload_data">Twój telefon przesyła teraz dane do Open Humans.</string>
+    <string name="setup_failed">Konfiguracja nie powiodła się</string>
+    <string name="there_was_an_error">Wystąpił błąd. Spróbuj zalogować się ponownie, aby kontynuować. Przepraszamy &amp; dziękujemy!</string>
+    <string name="open_humans_terms">To jest narzędzie open source, które skopiuje Twoje dane do projektu Open Humans. Nie zachowujemy żadnych praw do dzielenia się Twoimi danymi z osobami trzecimi bez Twojej wyraźnej zgody. Dane, które otrzymują projekt i aplikacja są identyfikowane za pomocą losowego identyfikatora użytkownika i będą bezpiecznie przesyłane na konto Open Humans za Twoją zgodą dla tego procesu. Możesz zatrzymać przesyłanie i usunąć swoje już przesłane dane w dowolnym momencie za pośrednictwem strony www.openhumans.org.</string>
+    <string name="i_understand_and_agree">Rozumiem i zgadzam się.</string>
+    <string name="login">Zaloguj się</string>
+    <string name="logout">Wyloguj się</string>
+    <string name="oh_logout_confirmation">Czy na pewno chcesz się wylogować i zaprzestać przekazywania danych na rzecz nauki?</string>
+    <string name="project_member_id">Identyfikator członka projektu: %s</string>
+    <string name="queue_size">Rozmiar kolejki: %d</string>
+    <string name="terms_of_use">Warunki użytkowania</string>
+    <string name="not_logged_in">Nie zalogowano</string>
+    <string name="you_need_to_accept_the_of_use_first">Najpierw musisz zaakceptować warunki użytkowania.</string>
+    <string name="successfully_logged_in">Pomyślnie zalogowano</string>
+    <string name="setup_will_continue_in_background">Konfiguracja zostanie teraz zakończona w tle. Dziękujemy za przesłanie swoich danych.\n\nProszę nie wyłączaj telefonu ani tej wtyczki jeszcze przez chwilę, aby umożliwić dokończenie się konfiguracji.</string>
+    <string name="completing_login">Kończenie logowania…</string>
+    <string name="donate_your_data_to_science">Przekaż swoje dane na rzecz nauki</string>
+    <string name="open_humans_short">OH</string>
+    <string name="you_have_been_signed_out_of_open_humans">Zostałeś wylogowany z Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Kliknij tutaj, aby zalogować się ponownie, jeśli wylogowanie nie było celowe.</string>
+    <string name="only_upload_if_connected_to_wifi">Prześlij tylko jeśli połączono poprzez WiFi</string>
+    <string name="only_upload_if_charging">Prześlij tylko gdy telefon jest ładowany</string>
+    <string name="worker_state">Stan procesu: %s</string>
+    <string name="uploaded_data">Przesłane dane</string>
+    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Następujące dane zostaną przesłane na konto Open Humans: wartości Glikemii, bolusy, węglowodany, zdarzenia z portalu opieki (z wyjątkiem notatek), rozszerzone bolusy, przełączenia profilu, całkowite dawki dobowe, bazy tymczasowe, cele tymczasowe, preferencje, wersja aplikacji, model urządzenia i wymiary ekranu. Dane niejawne lub prywatne, takie jak adres URL strony Nightscout lub klucz autoryzacji API, nie zostaną przesłane.</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index cfd783789c..ca6a31ce0e 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -21,6 +21,7 @@
     <string name="description_food">Exibe as predefinições de comida definidas no Nightscout</string>
     <string name="description_insulin_rapid">Predefinição de Insulina Humalog e NovoRapid / NovoLog</string>
     <string name="description_insulin_ultra_rapid">Predefinição de Insulina Fiasp</string>
+    <string name="description_insulin_lyumjev">Predefinição para Insulina Lyumjev</string>
     <string name="description_insulin_free_peak">Permite definir o pico de atividade da insulina e deve ser usado somente por usuários avançados</string>
     <string name="description_loop">Activar ou desactivar a aplicação que desencadeia o loop.</string>
     <string name="description_ns_client">Sincroniza os seus dados com o Nightscout</string>
@@ -535,6 +536,7 @@
     <string name="free_peak_oref">Oref Pico-Livre</string>
     <string name="rapid_acting_oref">Oref Acção Rápida</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
+    <string name="lyumjev">Lyumjev</string>
     <string name="dia_too_short">Duração de Acção da Insulina (DIA) de %1$f demasiado curto - corrigido para %2$f!</string>
     <string name="activate_profile">Activar perfil</string>
     <string name="invalid">INVÁLIDO</string>
@@ -1141,6 +1143,7 @@
     <string name="smscommunicator_otp_enabled_summary">Autenticar comandos usando Uma-Senha-Única que sejam geradas pelo Google Authenticator ou app 2FA similar.</string>
     <string name="smscommunicator_otp_pin_summary">Dígitos adicionais que devem ser memorizados e colados no final de cada Uma-Senha-Única que seja gerada</string>
     <string name="smscomunicator_tab_otp_label">Configuração do Autenticador</string>
+    <string name="smscommunicator_code_verify_label">Código para verificar:</string>
     <string name="smscommunicator_otp_verify_label">OTP para verificar:</string>
     <string name="smscommunicator_otp_reset_btn">Repor Autenticadores</string>
     <string name="smscommunicator_otp_reset_title">Repor Chave Autenticador</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index f4c19ab565..c65e40f1e1 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -13,7 +13,7 @@
     <string name="reset_db_confirm">Вы действительно хотите обнулить базы данных?</string>
     <string name="nav_exit">Выход</string>
     <string name="ns_sync_use_absolute_title">Всегда пользуйтесь абсолютными величинами для базала</string>
-    <string name="alert_dialog_storage_permission_text">Пожалуйста перезагрузите телефон или перезапустите AndroidAPS из системных настроек \иначе AndroidAPS не будет вести лог (важно для отслеживания и проверки алгоритмов)!</string>
+    <string name="alert_dialog_storage_permission_text">Пожалуйста перезагрузите телефон или перезапустите AndroidAPS из системных настроек, иначе AndroidAPS не будет вести лог (важно для отслеживания и проверки алгоритмов)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Это устройство не поддерживает меню оптимизации батареи - могут быть проблемы с производительностью.</string>
     <string name="description_actions">Кнопки быстрого доступа к некоторым распространенным настройкам</string>
     <string name="description_config_builder">Применяется для настройки активных плагинов</string>
@@ -21,6 +21,7 @@
     <string name="description_food">Показывает предварительные настройки приема пищи из Nightscout</string>
     <string name="description_insulin_rapid">Предустановки для Humalog и Novorapid / Novolog</string>
     <string name="description_insulin_ultra_rapid">Предустановки для Fiasp</string>
+    <string name="description_insulin_lyumjev">Параметры Lyumjev</string>
     <string name="description_insulin_free_peak">Позволяет самостоятельно задавать пик активности инсулина - только для опытных пользователей</string>
     <string name="description_loop">Активировать или деактивировать запуск цикла.</string>
     <string name="description_ns_client">Синхронизирует данные с Nightscout</string>
@@ -55,7 +56,7 @@
     <string name="treatments_iobactivitytotal_label_string">Общая активность IOB:</string>
     <string name="tempbasals_realduration_label_string">длит:</string>
     <string name="tempbasals_netratio_label_string">соотношение:</string>
-    <string name="tempbasals_netinsulin_label_string">инс:</string>
+    <string name="tempbasals_netinsulin_label_string">инсулин:</string>
     <string name="tempbasals_iob_label_string">IOB: активный инсулин</string>
     <string name="tempbasals_iobtotal_label_string">общий IOB</string>
     <string name="treatments_wizard_bg_label">гликемия</string>
@@ -105,7 +106,7 @@
     <string name="loop_aps_label">Система ИПЖ</string>
     <string name="loop_constraintsprocessed_label">после наложенных ограничений</string>
     <string name="loop_tbrsetbypump_label">Временный базал определяется помпой</string>
-    <string name="openapsma_lastenact_label">Последнее предпринятое</string>
+    <string name="openapsma_lastenact_label">Последнее выполненное</string>
     <string name="noapsselected">APS не выбрана или не выдала результат</string>
     <string name="safety">безопасность</string>
     <string name="openapsma_disabled">модуль не активен</string>
@@ -154,7 +155,7 @@
     <string name="careportal_newnstreatment_glucosetype">тип глюкозы</string>
     <string name="noprofile">профиль еще не загружен из NS</string>
     <string name="overview_tempbasal_button">ВремБазал</string>
-    <string name="overview_extendedbolus_button">расширенный болюс</string>
+    <string name="overview_extendedbolus_button">Пролонгированный болюс</string>
     <string name="configbuilder_nightscoutversion_label">версия Nightscout:</string>
     <string name="missing_carbs">Не хватает %1$d г</string>
     <string name="exported">настройки экспортированы</string>
@@ -257,7 +258,7 @@
     <string name="smscommunicator_loopisdisabled">зцикл не работает</string>
     <string name="smscommunicator_loopisenabled">зцикл работает</string>
     <string name="valuelimitedto">%1$.2f ограничено до %2$.2f</string>
-    <string name="valueoutofrange">Величина %1$s недопустима</string>
+    <string name="valueoutofrange">Значение %1$s недопустимо</string>
     <string name="smscommunicator_pumpconnectwithcode">Чтобы подсоединить помпу ответьте кодом %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Ошибка подключения к помпе</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Для разъединения с помпой на %1d мин ответьте кодом %2$s</string>
@@ -300,7 +301,7 @@
     <string name="correctionbous">коррекция</string>
     <string name="actions">действия</string>
     <string name="ns_upload_only">только передача в NS (синхронизация отсутствует)</string>
-    <string name="ns_upload_only_summary">только передача в NS. работает в SGV только если выбран местный источник вроде xdrip. не работает в профилях при действующем профиле NS</string>
+    <string name="ns_upload_only_summary">только передача в NS. Не работает в SGV пока не выбран местный источник вроде xdrip. Не работает в Профилях при действующем профиле NS.</string>
     <string name="pumpNotInitialized">помпа не инициализирована</string>
     <string name="primefill">прайм/заполнение</string>
     <string name="fillwarning">убедитесь что количество соответствует характеристикам вашей инфузионной системы</string>
@@ -358,7 +359,7 @@
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">сокращенные имена табул</string>
     <string name="always_use_shortavg">всегда используйте укороченное среднее приращение вместо простого</string>
-    <string name="always_use_shortavg_summary">полезно когда данные из нефильтруемых источников вроде Xdrip зашумляются</string>
+    <string name="always_use_shortavg_summary">Полезно когда данные из нефильтрованных источников вроде xDrip+ начинают \"шуметь\".</string>
     <string name="profile">профиль</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">значение по умолчанию:3 Это ключевой ограничитель безопасности OpenAPS. Он ограничивает величину вашего базала максимум до 3x максимума. Вам вероятно не понадобится менять эту величину но вам следует понимать, что она входит в формулу дуэта \"максимум 3x ежедневное; 4x текущее\"</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">значение по умолчанию: 4 . Это вторая половина обеспечения безопасности OpenAPS из дуэта \"максимум 3x ежедневное; 4x текущее\" Означает что ваша база независимо от установок помпы не может быть выше чем это число умноженное на текущее значение базала. Ограничение для того, чтобы предотвратить вторжение в опасную зону из-за высокого уровня установленных значений базы без понимания алгоритма работы приложения. Большинству людей никогда не потребуется изменять это значение, скорее всего нужно поменять другие настройки если вы чувствуете, что вам мешает это ограничение.</string>
@@ -374,7 +375,7 @@
     <string name="send_calibration">Отправить калибровку %1$.1f на xDrip?</string>
     <string name="xdripnotinstalled">xdrip+ не установлен</string>
     <string name="calibrationsent">калибровка передается на xdrip</string>
-    <string name="smscommunicator_calibrationsent">калибровка отправлена. в xdrip должен быть активирован прием</string>
+    <string name="smscommunicator_calibrationsent">Калибровка отправлена. Активируйте прием в xDrip+.</string>
     <string name="smscommunicator_calibrationfailed">xdrip не получает калибровок</string>
     <string name="pumpsuspended">Работа помпы остановлена</string>
     <string name="executing">выполнение</string>
@@ -478,7 +479,7 @@
     <string name="ns_noupload">данные не передаются в NS</string>
     <string name="ns_noupload_summary">данные передаваемые в NS не доходят. AAPS соединяется с NS но изменения туда не вносятся</string>
     <string name="overview_extendedbolus_cancel_button">Отмена удлиненного болюса</string>
-    <string name="careportal_sensorage_label">сенсор пропаботал</string>
+    <string name="careportal_sensorage_label">Сенсор проработал</string>
     <string name="careportal_canulaage_label">Катетер помпы проработал</string>
     <string name="careportal_insulinage_label">Инсулин проработал</string>
     <string name="doprofileswitch">Переключить профиль</string>
@@ -508,7 +509,7 @@
     <string name="careportal_pbage_label_short">ВозрБат</string>
     <string name="openaps_short">OAPS</string>
     <string name="uploader_short">ЗАГРУЗ</string>
-    <string name="basal_short">БАЗ</string>
+    <string name="basal_short">БАЗАЛ</string>
     <string name="virtualpump_extendedbolus_label_short">УДЛИНН</string>
     <string name="keep_screen_on_title">Не отключать экран</string>
     <string name="keep_screen_on_summary">Не давать системе Android отключать экран. Это увеличит потребление энергии при отключенной сети питания.</string>
@@ -535,6 +536,7 @@
     <string name="free_peak_oref">Свободный от пиков Oref</string>
     <string name="rapid_acting_oref">Быстро действующий Oref</string>
     <string name="ultrarapid_oref">Сверхбыстрый Oref</string>
+    <string name="lyumjev">Lyumjev</string>
     <string name="dia_too_short">Значение длительности работы инс %1$f слишком мало - применено %2$f!</string>
     <string name="activate_profile">АКТИВИРОВАТЬ ПРОФИЛЬ</string>
     <string name="invalid">НЕВЕРНО</string>
@@ -558,7 +560,7 @@
     <string name="shortprotein">Белки</string>
     <string name="shortfat">Жиры</string>
     <string name="active"><![CDATA[<Active>]]></string>
-    <string name="executingrightnow">Команда сейчас выполняется</string>
+    <string name="executingrightnow">Команда выполняется</string>
     <string name="pump_unreachable">Помпа недоступна</string>
     <string name="missed_bg_readings">Пропущенные данные СК</string>
     <string name="raise_notifications_as_android_notifications">Использовать системные уведомления для предупреждений и уведомлений</string>
@@ -710,7 +712,7 @@
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Только что импортировано несколько болюсов с одинаковым количеством инсулина в течение одной минуты. В лог лечения может быть добавлена только одна запись. Пожалуйста проверьте помпу и вручную введите запись о болюсе через вкладку портала назначений. Убедитесь, что данному времени соответствует только одна запись о болюсе.</string>
     <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de) \n\nfacebook:\nhttp://facebook.androidaps.org\nhttp://facebook.androidaps.de (de)</string>
     <string name="combo_check_date">Новый болюс старше 24 часов или запись относится к будущему. Пожалуйста убедитесь что дата на помпе установлена правильно.</string>
-    <string name="combo_suspious_bolus_time">Время/дата поданного болюса неверны. Вероятно, кол-во активного инсулина IOB также неверно. Пожалуйста, проверьте время/дату помпы.</string>
+    <string name="combo_suspious_bolus_time">Время/дата поданного болюса неверны. Вероятно, кол-во активного инсулина IOB также неверно. Проверьте время/дату помпы.</string>
     <string name="profileswitch_ismissing">Профиль не переключен. Пожалуйста переключите профиль или нажмите \"активировать профиль\" в LocalProfile.</string>
     <string name="combo_bolus_count">Отсчет болюса</string>
     <string name="combo_tbr_count">Отсчет временного базала TBR</string>
@@ -760,7 +762,7 @@
     <string name="firstcarbsincrement">Первый шаг увеличения углеводов</string>
     <string name="secondcarbsincrement">Второй шаг увеличения углеводов</string>
     <string name="thirdcarbsincrement">Третий шаг увеличения углеводов</string>
-    <string name="cgm">Мониторинг СК</string>
+    <string name="cgm">Мониторинг ГК</string>
     <string name="ns_wifionly">Использовать только WiFi соединение</string>
     <string name="ns_wifi_ssids">WiFi SSID</string>
     <string name="ns_chargingonly">Только при зарядке</string>
@@ -775,7 +777,7 @@
     <string name="value_unavailable_short">н/д</string>
     <string name="virtualpump_type">Тип виртуальной помпы</string>
     <string name="virtualpump_definition">Определение помпы</string>
-    <string name="virtualpump_pump_def">Болюс: Шаг =%1$s\nПродленный Болюс: [Шаг =%2$s, Длительность =%3$sмин -%4$sh] \nБазал: Шаг =%5$s\ nTBR: %6$s (на %7$s), Длительность =%8$sмин -%9$sh\n%10$s</string>
+    <string name="virtualpump_pump_def">Болюс: Шаг =%1$s\n Пролонгированный Болюс: [Шаг =%2$s, Продолжительность =%3$sмин -%4$sh] \nБазал: Шаг =%5$s\n ВБС: %6$s (на %7$s), Продолжительность =%8$sмин -%9$sh\n%10$s</string>
     <string name="ns_autobackfill_title">Автозаполнение пропущенных данных СК</string>
     <string name="wear_wizard_settings">Параметры мастера настройки смарт-часов wear</string>
     <string name="wear_wizard_settings_summary">Расчеты, включены в результат мастера настройки смарт-часов wear:</string>
@@ -914,7 +916,7 @@ Context | Edit Context</string>
     <string name="description_pump_insight_local">Интеграция с помпой Accu-Chek Insight</string>
     <string name="not_inserted">Не вставлено</string>
     <string name="short_status_last_connected">Недавнее соединение: %1$d мин. назад</string>
-    <string name="short_status_tbr">Суммарная скорость базала: %1$d%% за %2$d / %3$d мин</string>
+    <string name="short_status_tbr">Врем базал (TBR): %1$d%% на %2$d / %3$d мин</string>
     <string name="short_status_extended">Пролонгированный: %1$.2f / %2$.2f U за %3$d мин</string>
     <string name="short_status_multiwave">Пролонгированный: %1$.2f / %2$.2f U за %3$d мин</string>
     <string name="short_status_tdd">Суммарный инсулин TDD: %1$.2f</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index d655dbe451..2064179e64 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1213,4 +1213,5 @@
     <string name="only_upload_if_charging">Odoslať iba pri nabíjaní</string>
     <string name="worker_state">Stav procesu: %s</string>
     <string name="uploaded_data">Odoslané údaje</string>
+    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Následujúce dáta budú nahraté do vašeho účtu Open Humans: hodnoty glykémie, bolusy, sacharidy, udalosti starostlivosti (okrem poznámok), rozložené bolusy, prepnutia profilov, celkové denné dávky, dočasné bazály, nastavenia, verzia aplikácie, model zariadenia a rozmery obrazovky. Tajné, alebo súkromné informácie, ako je URL, alebo API heslo vašeho Nightscoutu, nahraté nebudú.</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 05014ba225..7ce5ed2790 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,6 +45,7 @@
     <string name="description_food">Displays the food presets defined in Nightscout</string>
     <string name="description_insulin_rapid">Insulin preset for Humalog and NovoRapid / NovoLog</string>
     <string name="description_insulin_ultra_rapid">Insulin preset for Fiasp</string>
+    <string name="description_insulin_lyumjev">Insulin preset for Lyumjev</string>
     <string name="description_insulin_free_peak">Allows you to define the peak of the insulin activity and should only be used by advanced users</string>
     <string name="description_loop">Activate or deactivate the implementation triggering the loop.</string>
     <string name="description_ns_client">Synchronizes your data with Nightscout</string>
@@ -630,6 +631,7 @@
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
+    <string name="lyumjev">Lyumjev</string>
     <string name="dia_too_short">DIA of %1$f too short - using %2$f instead!</string>
     <string name="activate_profile">Activate profile</string>
     <string name="invalid">INVALID</string>
@@ -949,6 +951,8 @@
     <string name="bgsourcesetup">Configure BG source</string>
     <string name="setupwizard_profile_description">Please select source of profile. If patient is a child you should use NS profile. If there is nobody following you on Nightscout you will probably prefer Local profile. Please remember that you are only selecting the profile source. To use it you must activate it by executing \"Profile switch\"</string>
     <string name="setupwizard_aps_description">Select one from availables algorithms. They are sorted from oldest to newest. Newer algorithm is usually more powerful and more aggressive. Thus if you are new looper you may probably start with AMA and not with latest one. Do not forget to read the OpenAPS documentation and configure it before use.</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Waiting for RileyLink connection…\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Note:</b> You can continue setup once the pump has been initialized.\n</string>
     <string name="startobjective">Start your first objective</string>
     <string name="permission">Permission</string>
     <string name="askforpermission">Ask for permission</string>
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinLyumjevPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinLyumjevPluginTest.kt
new file mode 100644
index 0000000000..01ea1f9b8a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinLyumjevPluginTest.kt
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps.plugins.insulin
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.InsulinInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.ArgumentMatchers.eq
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+
+class InsulinLyumjevPluginTest {
+
+    @get:Rule
+    val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+    private lateinit var sut: InsulinLyumjevPlugin
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var profileFunction: ProfileFunction
+    @Mock lateinit var aapsLogger: AAPSLogger
+
+    private var injector: HasAndroidInjector = HasAndroidInjector {
+        AndroidInjector {
+        }
+    }
+
+    @Before
+    fun setup() {
+        sut = InsulinLyumjevPlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger)
+    }
+
+    @Test
+    fun `simple peak test`() {
+        assertEquals(45, sut.peak)
+    }
+
+    @Test
+    fun getIdTest() {
+        assertEquals(InsulinInterface.OREF_LYUMJEV, sut.id)
+    }
+
+    @Test
+    fun commentStandardTextTest() {
+        `when`(resourceHelper.gs(eq(R.string.lyumjev))).thenReturn("Lyumjev")
+        assertEquals("Lyumjev", sut.commentStandardText())
+    }
+
+    @Test
+    fun getFriendlyNameTest() {
+        `when`(resourceHelper.gs(eq(R.string.lyumjev))).thenReturn("Lyumjev")
+        assertEquals("Lyumjev", sut.friendlyName)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
index b375602bfb..505a823937 100644
--- a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
@@ -11,6 +11,7 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.queue.commands.CustomCommand
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.commands.Command
@@ -192,4 +193,92 @@ class CommandQueueTest : TestBaseWithProfile() {
         Assert.assertFalse(queued)
         Assert.assertEquals(commandQueue.size(), 0)
     }
+
+    @Test
+    fun isCustomCommandRunning() {
+        // given
+        Assert.assertEquals(0, commandQueue.size())
+
+        // when
+        val queued1 = commandQueue.customCommand(CustomCommand1(), null)
+        val queued2 = commandQueue.customCommand(CustomCommand2(), null)
+        commandQueue.pickup()
+
+        // then
+        Assert.assertTrue(queued1)
+        Assert.assertTrue(queued2)
+        Assert.assertTrue(commandQueue.isCustomCommandInQueue(CustomCommand1::class.java))
+        Assert.assertTrue(commandQueue.isCustomCommandInQueue(CustomCommand2::class.java))
+        Assert.assertFalse(commandQueue.isCustomCommandInQueue(CustomCommand3::class.java))
+
+        Assert.assertTrue(commandQueue.isCustomCommandRunning(CustomCommand1::class.java))
+        Assert.assertFalse(commandQueue.isCustomCommandRunning(CustomCommand2::class.java))
+        Assert.assertFalse(commandQueue.isCustomCommandRunning(CustomCommand3::class.java))
+
+
+        Assert.assertEquals(1, commandQueue.size())
+    }
+
+    @Test
+    fun isCustomCommandInQueue() {
+        // given
+        Assert.assertEquals(0, commandQueue.size())
+
+        // when
+        val queued1 = commandQueue.customCommand(CustomCommand1(), null)
+        val queued2 = commandQueue.customCommand(CustomCommand2(), null)
+
+        // then
+        Assert.assertTrue(queued1)
+        Assert.assertTrue(queued2)
+        Assert.assertTrue(commandQueue.isCustomCommandInQueue(CustomCommand1::class.java))
+        Assert.assertTrue(commandQueue.isCustomCommandInQueue(CustomCommand2::class.java))
+        Assert.assertFalse(commandQueue.isCustomCommandInQueue(CustomCommand3::class.java))
+        Assert.assertEquals(2, commandQueue.size())
+    }
+
+    @Test
+    fun differentCustomCommandsAllowed() {
+        // given
+        Assert.assertEquals(0, commandQueue.size())
+
+        // when
+        val queued1 = commandQueue.customCommand(CustomCommand1(), null)
+        val queued2 = commandQueue.customCommand(CustomCommand2(), null)
+
+        // then
+        Assert.assertTrue(queued1)
+        Assert.assertTrue(queued2)
+        Assert.assertEquals(2, commandQueue.size())
+    }
+
+    @Test
+    fun sameCustomCommandNotAllowed() {
+        // given
+        Assert.assertEquals(0, commandQueue.size())
+
+        // when
+        val queued1 = commandQueue.customCommand(CustomCommand1(), null)
+        val queued2 = commandQueue.customCommand(CustomCommand1(), null)
+
+        // then
+        Assert.assertTrue(queued1)
+        Assert.assertFalse(queued2)
+        Assert.assertEquals(1, commandQueue.size())
+    }
+
+    private class CustomCommand1 : CustomCommand {
+        override val statusDescription: String
+            get() = "CUSTOM COMMAND 1"
+    }
+
+    private class CustomCommand2 : CustomCommand {
+        override val statusDescription: String
+            get() = "CUSTOM COMMAND 2"
+    }
+
+    private class CustomCommand3 : CustomCommand {
+        override val statusDescription: String
+            get() = "CUSTOM COMMAND 3"
+    }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index aeeb75768d..185f3010ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,8 @@ buildscript {
         coroutinesVersion = '1.3.7'
         activityVersion = '1.2.0-alpha06'
         fragmentVersion = '1.3.0-alpha07'
-        ormLiteVersion = "4.46"
+        ormLiteVersion = '4.46'
+        nav_version = '2.3.0'
     }
     repositories {
         google()
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
index a5f9bf21df..877dac9809 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.interfaces
 import android.text.Spanned
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.queue.commands.CustomCommand
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.commands.Command
 
@@ -33,6 +34,9 @@ interface CommandQueueProvider {
     fun setUserOptions(callback: Callback?): Boolean
     fun loadTDDs(callback: Callback?): Boolean
     fun loadEvents(callback: Callback?): Boolean
+    fun customCommand(customCommand: CustomCommand, callback: Callback?): Boolean
+    fun isCustomCommandRunning(customCommandType: Class<out CustomCommand>): Boolean
+    fun isCustomCommandInQueue(customCommandType: Class<out CustomCommand>): Boolean
     fun spannedStatus(): Spanned
     fun isThisProfileSet(profile: Profile): Boolean
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java
index d5e8ab399d..caeb77de9a 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java
@@ -13,6 +13,7 @@ public interface InsulinInterface {
     int OREF_RAPID_ACTING = 2;
     int OREF_ULTRA_RAPID_ACTING = 3;
     int OREF_FREE_PEAK = 4;
+    int OREF_LYUMJEV = 5;
 
 
     int getId();
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
index 8308cc34e2..6d895506f7 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.interfaces;
 
+import androidx.annotation.Nullable;
+
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 
@@ -11,7 +13,9 @@ import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
+import info.nightscout.androidaps.queue.commands.CustomCommand;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.utils.TimeChangeType;
 
 /**
@@ -105,10 +109,32 @@ public interface PumpInterface {
 
     boolean canHandleDST();
 
+    /**
+     * Provides a list of custom actions to be displayed in the Actions tab.
+     * Plese note that these actions will not be queued upon execution
+     *
+     * @return list of custom actions
+     */
+    @Nullable
     List<CustomAction> getCustomActions();
 
+    /**
+     * Executes a custom action. Please note that these actions will not be queued
+     *
+     * @param customActionType action to be executed
+     */
     void executeCustomAction(CustomActionType customActionType);
 
+    /**
+     * Executes a custom queued command
+     * See {@link CommandQueueProvider#customCommand(CustomCommand, Callback)} for queuing a custom command.
+     *
+     * @param customCommand the custom command to be executed
+     * @return PumpEnactResult that represents the command execution result
+     */
+    @Nullable
+    PumpEnactResult executeCustomCommand(CustomCommand customCommand);
+
     /**
      * This method will be called when time or Timezone changes, and pump driver can then do a specific action (for
      * example update clock on pump).
diff --git a/core/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt b/core/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt
index ea6a8b9196..149810ea35 100644
--- a/core/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt
+++ b/core/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt
@@ -31,7 +31,8 @@ abstract class Command(
         SET_USER_SETTINGS,  // so far only Dana specific,
         START_PUMP,
         STOP_PUMP,
-        INSIGHT_SET_TBR_OVER_ALARM // insight only
+        INSIGHT_SET_TBR_OVER_ALARM, // insight only
+        CUSTOM_COMMAND
     }
 
     init {
diff --git a/core/src/main/java/info/nightscout/androidaps/queue/commands/CustomCommand.kt b/core/src/main/java/info/nightscout/androidaps/queue/commands/CustomCommand.kt
new file mode 100644
index 0000000000..d0c5c26d51
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/queue/commands/CustomCommand.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.queue.commands
+
+import java.io.Serializable
+
+/**
+ * Implement this interface for every custom pump command that you want to be able to queue
+ * See [info.nightscout.androidaps.interfaces.CommandQueueProvider.customCommand] for queuing a custom command.
+ */
+interface CustomCommand : Serializable {
+
+    /**
+     * @return short description of this command to be used in [info.nightscout.androidaps.queue.commands.Command.status]
+     * The description is typically all caps.
+     */
+    val statusDescription: String
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt
index dd0da3b72f..873c751e2e 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt
@@ -1,11 +1,10 @@
 package info.nightscout.androidaps.utils
 
-import android.os.Build
 import android.text.Html
 import android.text.Spanned
 
 object HtmlHelper {
     fun fromHtml(source: String): Spanned {
-        return  Html.fromHtml(source, Html.FROM_HTML_MODE_LEGACY)
+        return Html.fromHtml(source, Html.FROM_HTML_MODE_LEGACY)
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
index 65e78f6543..696262459f 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
@@ -25,6 +25,7 @@ object AlertDialogHelper {
         val titleLayout = LayoutInflater.from(ContextThemeWrapper(context, themeResId)).inflate(layoutResource, null)
         (titleLayout.findViewById<View>(R.id.alertdialog_title) as TextView).text = title
         (titleLayout.findViewById<View>(R.id.alertdialog_icon) as ImageView).setImageResource(iconResource)
+        titleLayout.findViewById<View>(R.id.alertdialog_title).setSelected(true)
         return titleLayout
     }
 
diff --git a/core/src/main/res/layout/dialog_alert_custom.xml b/core/src/main/res/layout/dialog_alert_custom.xml
index 312be67ac7..c7818b902a 100644
--- a/core/src/main/res/layout/dialog_alert_custom.xml
+++ b/core/src/main/res/layout/dialog_alert_custom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   Loading this view directly, without proper Theme, will likely result in crash due to lack of ?dialog... attribute definitions
   Please use AlertDialogHelper or wrap inflater context with ContextThemeWrapper(context, R.style.AppTheme)
 -->
@@ -29,8 +28,14 @@
             android:layout_centerInParent="true"
             android:layout_gravity="center"
             android:layout_marginStart="2dp"
-            android:layout_marginEnd="50dp"
+            android:layout_marginEnd="40dp"
             android:layout_toEndOf="@id/alertdialog_icon"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textColor="?dialogTitleColor" />
diff --git a/core/src/main/res/values-no-rNO/strings.xml b/core/src/main/res/values-no-rNO/strings.xml
index b47480e9ec..58134736fd 100644
--- a/core/src/main/res/values-no-rNO/strings.xml
+++ b/core/src/main/res/values-no-rNO/strings.xml
@@ -2,27 +2,216 @@
 <resources>
     <!--    Keys-->
     <!--    General-->
+    <string name="error">Feil</string>
+    <string name="not_set_short">Ikke angitt</string>
+    <string name="failedupdatebasalprofile">Kunne ikke oppdatere basal profil</string>
+    <string name="profile_set_ok">Basal profil i pumpen er oppdatert</string>
+    <string name="invalidinput">Ugyldig inndata</string>
+    <string name="tempbasaldeliveryerror">Feil ved justering av Temp Basal</string>
+    <string name="goingtodeliver">Kommer til å levere %1$.2f enheter</string>
+    <string name="waitingforpump">Venter på pumpen</string>
+    <string name="connectingfor">Tilkobler i %1$d sek</string>
+    <string name="bolusdelivering">Leverer %1$.2f enheter</string>
+    <string name="handshaking">Tilkobling verifiseres</string>
+    <string name="connecting">Tilkobler</string>
+    <string name="connected">Tilkoblet</string>
+    <string name="disconnected">Frakoblet</string>
+    <string name="disconnecting">Frakobler</string>
+    <string name="androidaps_start">AndroidAPS startet</string>
+    <string name="formatinsulinunits1">%1$.1f E</string>
+    <string name="formatinsulinunits">%1$.2f E</string>
+    <string name="formatsignedinsulinunits">%1$+.2f E</string>
+    <string name="format_carbs">%1$d g</string>
+    <string name="reservoirvalue">%1$.0f / %2$d E</string>
+    <string name="pump_basebasalrate">%1$.2f E/t</string>
+    <string name="format_hours">%1$.2f t</string>
+    <string name="format_mins">%1$d min</string>
+    <string name="pumpbusy">Pumpen er opptatt</string>
+    <string name="connectionerror">Tilkoblingsfeil til pumpe</string>
+    <string name="youareonallowedlimit">Du har nådd din tillatte grense</string>
+    <string name="objectives">Opplæringsmål</string>
+    <string name="close">Lukk</string>
+    <string name="please_wait">Vennligst vent…</string>
+    <string name="mute">Lyd av</string>
+    <string name="reload">Last på nytt</string>
+    <string name="stoppressed">STOPP trykket</string>
+    <string name="stop">Stopp</string>
+    <string name="carbs">Karbohydrater</string>
+    <string name="invalidprofile">Ugyldig profil!!!</string>
+    <string name="noprofileset">INGEN PROFIL VALGT</string>
+    <string name="date">Dato</string>
+    <string name="units_label">Enheter</string>
+    <string name="dia_label">DIA</string>
+    <string name="ic_label">IK</string>
+    <string name="isf_label">ISF</string>
+    <string name="basal_label">Basal</string>
+    <string name="target_label">Målverdi</string>
+    <string name="initializing">Starter opp...</string>
+    <string name="serialnumber">Serienummer</string>
+    <string name="battery_label">Batteri</string>
+    <string name="lastconnection_label">Siste tilkobling</string>
+    <string name="lastbolus_label">Siste bolus</string>
+    <string name="dailyunits">Daglige enheter</string>
+    <string name="basebasalrate_label">Basis basal dose</string>
+    <string name="tempbasal_label">Temp basal</string>
+    <string name="virtualpump_extendedbolus_label">Forlenget bolus</string>
+    <string name="reservoir_label">Reservoar</string>
+    <string name="pumphistory">Pumpe historikk</string>
+    <string name="viewprofile">Vis profil</string>
+    <string name="eventtype">Hendelsestype</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="advancedsettings_title">Avanserte innstillinger</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT overvåker</string>
+    <string name="btwatchdog_summary">Restarter telefonens bluetooth i ett sekund hvis tilkobling til pumpen mislykkes. Dette hjelper på enkelte telefoner hvor bluetooth av og til stopper.</string>
+    <string name="pairing">Kobler sammen</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Begrenser maks basal dose til %1$.2f E/t på grunn av %2$s</string>
+    <string name="pumplimit">pumpebegrensning</string>
+    <string name="limitingpercentrate">Begrenser maks prosent sats til %1$d%% på grunn av %2$s</string>
+    <string name="itmustbepositivevalue">det på være positiv verdi</string>
+    <string name="limitingbolus">Begrenser bolus til %1$.1f E på grunn av %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Pumpen ikke initialisert, ingen profil valgt!</string>
     <!--    Dialogs-->
+    <string name="confirmation">Bekreftelse</string>
+    <string name="message">Melding</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Avbryt</string>
+    <string name="dismiss">Avvis</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Lavenergi Bluetooth BLE er ikke støttet.</string>
+    <string name="ble_not_enabled">Bluetooth er ikke aktivert.</string>
+    <string name="location_not_found_title">Stedstjeneste er ikke aktivert</string>
+    <string name="location_not_found_message">Bluetooth søk på nye mobiler virker bare når posisjonstjeneste er aktivert. AAPS lagrer ikke dine posisjonsdata og den kan derfor slås av etter vellykket sammenkobling.</string>
     <!--    DateUtil-->
+    <string name="minago">%1$d min siden</string>
+    <string name="hoursago">%1$.1f timer siden</string>
+    <string name="shorthour">t</string>
+    <string name="days">dager</string>
+    <string name="hours">timer</string>
+    <string name="unit_second">sekund</string>
+    <string name="unit_minute">minutt</string>
+    <string name="unit_hour">time</string>
+    <string name="unit_day">dag</string>
+    <string name="unit_week">uke</string>
+    <string name="unit_seconds">sekunder</string>
+    <string name="unit_minutes">minutter</string>
+    <string name="unit_hours">timer</string>
+    <string name="unit_days">dager</string>
+    <string name="unit_weeks">uker</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
     <!--    Protection-->
+    <string name="wrongpassword">Feil passord</string>
+    <string name="passwords_dont_match">Passord stemmer ikke overens</string>
     <!--    Profile-->
+    <string name="basalprofilenotaligned">Basal verdier er ikke angitt på hele timer: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Basal verdi erstattet med laveste tillate verdi: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Basal verdi erstattet med høyeste tillate verdi: %1$s</string>
+    <string name="profile_per_unit">/E</string>
+    <string name="profile_ins_units_per_hour">E/t</string>
+    <string name="profile_carbs_per_unit">g/E</string>
     <!--    ProfileFunction-->
+    <string name="noprofileselected">Ingen profil valgt</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Bare konkrete verdier støttes som granularitet for basal/bolus i virtuell pumpe, ingen verdiområder.</string>
     <!--    APSResult-->
+    <string name="canceltemp">Avbryt temp basal</string>
+    <string name="let_temp_basal_run">Fortsett temp basal</string>
+    <string name="rate">Dose</string>
+    <string name="duration">Varighet</string>
+    <string name="reason">Årsak</string>
+    <string name="nochangerequested">Ingen endring behøves</string>
     <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Ugyldig profil: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$d min</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f E</b> Bol: <b>%3$.2f E</b> Bas: <b>%4$.2f E(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f E</b> Bol: <b>%3$.2f E</b> Bas: <b>%4$.2f E(%5$.0f%%)</b> Karbo: <b>%6$.0f g</b>]]></string>
     <!--    Translator-->
+    <string name="careportal_bgcheck">BS kontroll</string>
+    <string name="careportal_mbg">Manuelt BS eller kalibrering</string>
+    <string name="careportal_announcement">Melding</string>
+    <string name="careportal_note">Merknad</string>
+    <string name="careportal_question">Spørsmål</string>
+    <string name="careportal_exercise">Trening</string>
+    <string name="careportal_pumpsitechange">Bytte av pumpens kanyle</string>
+    <string name="careportal_cgmsensorinsert">Bytte av CGM sensor</string>
+    <string name="careportal_cgmsensorstart">CGM sensor start</string>
+    <string name="careportal_insulincartridgechange">Bytte insulinreservoar</string>
+    <string name="careportal_profileswitch">Profil bytte</string>
+    <string name="careportal_snackbolus">Mellommåltids bolus</string>
+    <string name="careportal_mealbolus">Måltids bolus</string>
+    <string name="careportal_correctionbolus">Korreksjons bolus</string>
+    <string name="careportal_combobolus">Kombo bolus</string>
+    <string name="careportal_tempbasalstart">Temp Basal start</string>
+    <string name="careportal_tempbasalend">Temp basal slutt</string>
+    <string name="careportal_carbscorrection">Karbo korreksjon</string>
+    <string name="careportal_openapsoffline">OpenAPS offline</string>
+    <string name="careportal_pumpbatterychange">Bytte pumpebatteri</string>
+    <string name="careportal_temporarytarget">Temp mål</string>
+    <string name="careportal_temporarytargetcancel">Avbryt temp mål</string>
+    <string name="glucosetype_finger">Finger</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="manual">Manuell</string>
+    <string name="unknown">ukjent</string>
     <!--    Command-->
+    <string name="connectiontimedout">Tilkoblingen ble tidsavbrutt</string>
     <!--    PumpEnactResult-->
+    <string name="enacted">Utført</string>
+    <string name="comment">Kommentar</string>
+    <string name="success">Suksess</string>
+    <string name="percent">Prosent</string>
+    <string name="absolute">Absolutt</string>
+    <string name="configbuilder_insulin">Insulin</string>
+    <string name="insulin_unit_shortname">E</string>
+    <string name="waitingforpumpresult">Venter på resultat</string>
+    <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%d g ekstra karbo kreves innen %d minutter</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">Statistikk</string>
+    <string name="cumulative_tdd">Akkumulert TDD</string>
+    <string name="expweight">Eksponentielt vektet TDD</string>
+    <string name="basalrate">Basal</string>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">TDD</string>
+    <string name="ratio">Ratio</string>
+    <string name="amount_days">Antall dager</string>
+    <string name="weight">Vekt</string>
+    <string name="warning_Message">Kan vise feil hvis bolus brukes for priming/fylling!</string>
+    <string name="olddata_Message">Gamle data. Vennligst trykk \"HENT\"</string>
+    <string name="tbb">Total grunnbasal</string>
+    <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Tidsdetektering</string>
+    <string name="format_hour_minute">%1$dt %2$dm</string>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operasjonen støttes ikke av pumpen og/eller driveren.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operasjonen støttes ikke av pumpen ennå.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Aldri kontaktet</string>
+    <string name="pump_status_waking_up">Våkner opp</string>
+    <string name="pump_status_error_comm">Kommunikasjonsfeil</string>
+    <string name="pump_status_timeout_comm">Tidsavbrudd kommunikasjon</string>
+    <string name="pump_status_pump_unreachable">Pumpe utilgjengelig</string>
+    <string name="pump_status_invalid_config">Ugyldig oppsett</string>
+    <string name="pump_status_active">Aktiv</string>
+    <string name="pump_status_sleeping">Sover</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basaldoser</string>
+    <string name="history_group_configuration">Innstillinger</string>
+    <string name="history_group_notification">Varsler</string>
+    <string name="history_group_statistic">Statistikk</string>
+    <string name="history_group_unknown">Ukjente</string>
+    <string name="history_group_all">Alle</string>
+    <string name="history_group_bolus">Boluser</string>
+    <string name="history_group_prime">Prime</string>
+    <string name="history_group_alarm">Alarmer</string>
+    <string name="history_group_glucose">Glukose</string>
     <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
     <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
     <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index ab93c2f436..e1332c1f87 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -8,15 +8,22 @@
     <string name="profile_set_ok">Profil bazowy w pompie uaktualniony</string>
     <string name="invalidinput">Błędne dane wejściowe</string>
     <string name="tempbasaldeliveryerror">Błąd podania bazy tymczasowej</string>
+    <string name="goingtodeliver">Zamierzam podać %1$.2f U</string>
     <string name="waitingforpump">Czekam na pompę</string>
     <string name="connectingfor">Łączenie przez %1$d s</string>
+    <string name="bolusdelivering">Podaję %1$.2f U</string>
     <string name="handshaking">Uściskdłoni</string>
     <string name="connecting">Łączę</string>
     <string name="connected">Połączono</string>
     <string name="disconnected">Rozłączono</string>
     <string name="disconnecting">Rozłączanie</string>
     <string name="androidaps_start">AndroidAPS uruchomiony</string>
+    <string name="formatinsulinunits1">%1$.1f U</string>
+    <string name="formatinsulinunits">%1$.2f U</string>
+    <string name="formatsignedinsulinunits">%1$+.2f U</string>
+    <string name="format_carbs">%1$d g</string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="format_hours">%1$.2f h</string>
     <string name="format_mins">%1$d min.</string>
     <string name="pumpbusy">Pompa jest zajęta</string>
@@ -78,6 +85,8 @@
     <string name="location_not_found_title">Lokalizacja nie jest włączona</string>
     <string name="location_not_found_message">Aby uruchomić odnajdywanie Bluetooth na nowszych urządzeniach, lokalizacja musi być uruchomiona. AAPS nie śledzi twojej lokalizacji więc po udanym parowaniu urządzenia Bluetooth można wyłączyć lokalizację.</string>
     <!--    DateUtil-->
+    <string name="minago">%1$d min temu</string>
+    <string name="hoursago">%1$.1f godz. temu</string>
     <string name="shorthour">h</string>
     <string name="days">dni</string>
     <string name="hours">godzin</string>
@@ -94,6 +103,8 @@
     <string name="shortminute">m</string>
     <string name="shortday">d</string>
     <!--    Protection-->
+    <string name="wrongpassword">Złe hasło</string>
+    <string name="passwords_dont_match">Hasła się nie zgadzają</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Wartości bazy nie są ustawione w pełnych godzinach: %1$s</string>
     <string name="minimalbasalvaluereplaced">Wartość bazy zastąpiona minimalną obsługiwaną wartością: %1$s</string>
@@ -115,9 +126,13 @@
     <!--    ProfileSwitch-->
     <string name="zerovalueinprofile">Nieprawidłowy profil: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$d min</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f U</b> Bol: <b>%3$.2f U</b> Baz: <b>%4$.2f U(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f U</b> Bol: <b>%3$.2f U</b> Baz: <b>%4$.2f U(%5$.0f%%)</b> Węgl.: <b>%6$.0f g</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Sprawdź BG</string>
+    <string name="careportal_mbg">Ręczny pomiar cukru lub kalibracja</string>
     <string name="careportal_announcement">Powiadomienie</string>
     <string name="careportal_note">Notatka</string>
     <string name="careportal_question">Pytanie</string>
@@ -155,6 +170,7 @@
     <string name="waitingforpumpresult">Oczekiwanie na wynik</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">Zalecane podanie %d g węglowodanów w przeciągu %d minut</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statystyki</string>
     <string name="cumulative_tdd">Kumulatywna TDD (dawka dzienna)</string>
@@ -171,10 +187,31 @@
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Wykrywanie czasu</string>
+    <string name="format_hour_minute">%1$dh %2$dm</string>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operacja nie jest wspierana przez pompę i/lub sterownik pompy.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Operacja nie jest JESZCZE wspierana przez pompę.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Nigdy nie połączona</string>
+    <string name="pump_status_waking_up">Wybudzanie</string>
+    <string name="pump_status_error_comm">Błąd komunikacji</string>
+    <string name="pump_status_timeout_comm">Przekroczony limit czasu połączenia</string>
+    <string name="pump_status_pump_unreachable">Pompa nieosiągalna</string>
+    <string name="pump_status_invalid_config">Nieprawidłowe ustawienia</string>
+    <string name="pump_status_active">Aktywna</string>
+    <string name="pump_status_sleeping">Uśpiona</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Dawki Bazowe</string>
+    <string name="history_group_configuration">Ustawienia</string>
+    <string name="history_group_notification">Powiadomienia</string>
+    <string name="history_group_statistic">Statystyki</string>
+    <string name="history_group_unknown">Nieznane</string>
+    <string name="history_group_all">Wszystko</string>
+    <string name="history_group_bolus">Bolusy</string>
+    <string name="history_group_prime">Napełnianie</string>
+    <string name="history_group_alarm">Alarmy</string>
+    <string name="history_group_glucose">Glukoza</string>
     <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
     <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
     <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
diff --git a/dana/src/main/res/values-no-rNO/strings.xml b/dana/src/main/res/values-no-rNO/strings.xml
index 3ea04e700d..4a20ff14ca 100644
--- a/dana/src/main/res/values-no-rNO/strings.xml
+++ b/dana/src/main/res/values-no-rNO/strings.xml
@@ -1,2 +1,121 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">Kobler sammen</string>
+    <string name="danars_nodeviceavailable">Ingen enhet funnet foreløpig</string>
+    <string name="danars_pairingok">Sammenkobling OK</string>
+    <string name="danars_pairingtimedout">Sammenkobling ble tidsavbrutt</string>
+    <string name="danars_waitingforpairing">Venter på sammenkobling med pumpen</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Pumpeintegrasjon for DANA Diabecare RS-pumper</string>
+    <string name="maxbolusviolation">Max bolus nådd</string>
+    <string name="commanderror">Kommando feil</string>
+    <string name="speederror">Hastighetsfeil</string>
+    <string name="insulinlimitviolation">Insulingrensen nådd</string>
+    <string name="boluserrorcode">Forespurt: %1$.2fE Levert: %2$.2fE Feilkode: %3$s</string>
+    <string name="danar_valuenotsetproperly">Verdien er ikke satt riktig</string>
+    <string name="danar_setbasalstep001">Sett basaltrinn til 0,01 E/t</string>
+    <string name="resetpairing">Tilbakestill sammenkoblingsinformasjon?</string>
+    <string name="dana_model">%1$s\nModell: %2$02X\nProtokoll: %3$02X\nKode: %4$02X</string>
+    <string name="processinghistory">Behandler hendelse</string>
+    <string name="danar_enableextendedbolus">Aktiver forlenget bolus på pumpen</string>
+    <string name="overview_bolusprogress_delivered">Levert</string>
+    <string name="overview_bolusprogress_stoped">Stoppet</string>
+    <string name="unsupportedfirmware">Pumpens firmvare støttes ikke</string>
+    <string name="pumperror">Pumpe feil</string>
+    <string name="lowbattery">Lavt batterinivå</string>
+    <string name="basalcompare">Levert mindre enn innstilt basaldose</string>
+    <string name="pumpshutdown">Pumpe avstenging</string>
+    <string name="batterydischarged">Pumpebatteri utladet</string>
+    <string name="occlusion">Okklusjon</string>
+    <string name="emptyreservoir">Tomt reservoar</string>
+    <string name="checkshaft">Kontroller aksel</string>
+    <string name="basalmax">Basal maks</string>
+    <string name="dailymax">Daglig maks</string>
+    <string name="bloodsugarmeasurementalert">Varsel for blodsukkermåling</string>
+    <string name="remaininsulinalert">Gjenværende insulinnivå</string>
+    <string name="missedbolus">Tapt bolus</string>
+    <string name="invalidpairing">Ugyldig parringsinformasjon. Krever ny sammenkobling</string>
+    <string name="gettingpumpstatus">Henter pumpestatus</string>
+    <string name="gettingextendedbolusstatus">Henter forlenget bolus status</string>
+    <string name="gettingbolusstatus">Henter bolus status</string>
+    <string name="gettingtempbasalstatus">Henter temp basal status</string>
+    <string name="gettingpumpsettings">Henter pumpe innstillinger</string>
+    <string name="gettingpumptime">Henter pumpens tid</string>
+    <string name="largetimedifftitle">Stor tidsforskjell</string>
+    <string name="largetimediff">Stor tidsforskjell:\nTiden i pumpen skiller mer enn 1,5 timer fra mobilen.\nVennligst juster tid manuelt på pumpen og sørg for at lesing av loggen fra pumpen ikke fører til uventet oppførsel.\nHvis mulig, fjern loggen fra pumpen før du endrer klokkeslettet eller deaktiver lukket loop for én DIA periode etter siste feil oppføring i historikk, men minst én DIA fra nå.</string>
+    <string name="pairfirst">Vennligst koble pumpen til telefonen!</string>
+    <string name="approachingdailylimit">Maksimal daglig insulindose er snart nådd</string>
+    <string name="startingbolus">Starter bolus dosering</string>
+    <string name="waitingforestimatedbolusend">Venter på bolus slutt. Gjenværende %1$d sek.</string>
+    <string name="stoppingtempbasal">Stopper temp basal</string>
+    <string name="settingextendedbolus">Setter forlenget bolus</string>
+    <string name="stoppingextendedbolus">Stopper forlenget bolus</string>
+    <string name="updatingbasalrates">Oppdaterer basaldoser</string>
+    <string name="settingtempbasal">Setter temp basal</string>
+    <string name="waitingfortimesynchronization">Venter på tidsykronisering (%1$d sek)</string>
+    <string name="wrongpumppassword">Feil pumpepassord!</string>
+    <string name="danar_history_alarm">Alarmer</string>
+    <string name="danar_history_basalhours">Basal timer</string>
+    <string name="danar_history_bolus">Boluser</string>
+    <string name="danar_history_carbohydrates">Karbohydrater</string>
+    <string name="danar_history_dailyinsulin">Daglig insulin</string>
+    <string name="danar_history_errors">Feil</string>
+    <string name="danar_history_glucose">Glukose</string>
+    <string name="danar_history_refill">Påfyll</string>
+    <string name="danar_history_syspend">Pauset</string>
+    <string name="danar_history_prime">Prime</string>
+    <string name="danar_useroptions">Bruker valg</string>
+    <string name="danar_timedisplay">Format for visning av tid</string>
+    <string name="danar_buttonscroll">Knapprulling</string>
+    <string name="danar_beep">Pip ved knapptrykking</string>
+    <string name="danar_pumpalarm">Alarm</string>
+    <string name="danar_pumpalarm_sound">Lyd</string>
+    <string name="danar_pumpalarm_vibrate">Vibrer</string>
+    <string name="danar_pumpalarm_both">Begge</string>
+    <string name="danar_screentimeout">LCD i tid [seconds]</string>
+    <string name="danar_backlight">Bakgrunnsbelysning i tid [seconds]</string>
+    <string name="danar_glucoseunits">Glukoseenheter</string>
+    <string name="danar_shutdown">Stopp [hours]</string>
+    <string name="danar_lowreservoir">Lavt reservoar [Units]</string>
+    <string name="danar_saveuseroptions">Lagre valg til pumpen</string>
+    <string name="description_pump_dana_r">Pumpeintegrasjon for DANA Diabecare R pumper</string>
+    <string name="description_pump_dana_r_korean">Pumpeintegrasjon for DANA Diabecare R pumper, koreansk versjon</string>
+    <string name="description_pump_dana_r_v2">Pumpeintegrasjon for DANA Diabecare R pumper med oppgradert firmware</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Ingen bluetooth adapter funnet</string>
+    <string name="devicenotfound">Fant ikke valgte enhet</string>
+    <string name="danar_switchtouhmode">Bytt modus fra E/d til E/t på pumpe</string>
+    <string name="danarkoreanpump">DanaR Koreansk</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Pumpedriver korrigert</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Deaktiver EasyUI modus i pumpe</string>
+    <string name="profile_set_failed">Innstilling av basalprofil mislyktes</string>
+    <string name="danar_bluetooth_status">Status for Bluetooth</string>
+    <string name="danar_iob_label">Pumpens IOB</string>
+    <string name="basal_step">Basal trinn</string>
+    <string name="bolus_step">Bolus trinn</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Innstillinger for Dana pumpe</string>
+    <string name="timeformat12h">12t</string>
+    <string name="timeformat24h">24t</string>
+    <string name="option_on">På</string>
+    <string name="option_off">Av</string>
+    <string name="danar_bt_name_title">DanaR Bluetooth enhet</string>
+    <string name="danars_password_title">Pumpe passord (kun v1)</string>
+    <string name="danar_password_title">Pumpe passord</string>
+    <string name="danar_useextended_title">Bruk forlenget bolus i &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Vis forlenget bolus som %%</string>
+    <string name="bolusspeed">Bolus hastighet</string>
+    <string name="selectedpump">Valgt pumpe</string>
+    <string name="rs_loginsulinchange_title">Logg reservoar bytte</string>
+    <string name="rs_loginsulinchange_summary">Legg til \"Insulinbytte\" i Careportal når den oppdages i historikken</string>
+    <string name="rs_logcanulachange_title">Logg kanyle bytte</string>
+    <string name="rs_logcanulachange_summary">Legg til \"Kanylebytte\" i Careportal når den oppdages i historikken</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Trykk OK på pumpen\nog skriv inn de 2 viste tallene\nHold skjermen på pumpen PÅ ved å trykke minus knappen til du fullfører inntastingen.</string>
+    <string name="num1pin">1: (12 tall)</string>
+    <string name="num2pin">2: (8 tall)</string>
+</resources>
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
index f048c101ff..6650d1c913 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.danar;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -9,9 +10,9 @@ import java.util.Date;
 import java.util.List;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.dana.DanaPumpInterface;
 import info.nightscout.androidaps.dana.DanaFragment;
 import info.nightscout.androidaps.dana.DanaPump;
+import info.nightscout.androidaps.dana.DanaPumpInterface;
 import info.nightscout.androidaps.dana.comm.RecordTypes;
 import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.data.Profile;
@@ -37,6 +38,7 @@ import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
+import info.nightscout.androidaps.queue.commands.CustomCommand;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
@@ -511,7 +513,10 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     @Override
     public void executeCustomAction(CustomActionType customActionType) {
+    }
 
+    @Nullable @Override public PumpEnactResult executeCustomCommand(CustomCommand customCommand) {
+        return null;
     }
 
     @Override
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
index 291f2d3b9b..2979ab605a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
@@ -26,6 +26,7 @@ import info.nightscout.androidaps.plugins.common.ManufacturerType
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType
+import info.nightscout.androidaps.queue.commands.CustomCommand
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
@@ -658,6 +659,7 @@ class DanaRSPlugin @Inject constructor(
     override fun loadTDDs(): PumpEnactResult = loadHistory(info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_DAILY)
     override fun getCustomActions(): List<CustomAction>? = null
     override fun executeCustomAction(customActionType: CustomActionType) {}
+    override fun executeCustomCommand(customCommand: CustomCommand?): PumpEnactResult? = null
     override fun canHandleDST(): Boolean = false
     override fun timezoneOrDSTChanged(timeChangeType: TimeChangeType?) {}
     override fun clearPairing() {
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
index ee58a61b6b..2f9b88d5c9 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
@@ -48,6 +48,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
+import info.nightscout.androidaps.queue.commands.CustomCommand;
 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;
@@ -1583,6 +1584,10 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
     }
 
+    @Nullable @Override public PumpEnactResult executeCustomCommand(CustomCommand customCommand) {
+        return null;
+    }
+
     @Override
     public void timezoneOrDSTChanged(TimeChangeType changeType) {
 
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
index 3c1c4b35e1..2fc2313440 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
@@ -13,13 +13,11 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RFSpyResponse;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RLMessageType;
@@ -56,7 +54,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
  * functionality added.
  */
 @Singleton
-public class MedtronicCommunicationManager extends RileyLinkCommunicationManager {
+public class MedtronicCommunicationManager extends RileyLinkCommunicationManager<PumpMessage> {
 
     @Inject MedtronicPumpStatus medtronicPumpStatus;
     @Inject MedtronicPumpPlugin medtronicPumpPlugin;
@@ -75,7 +73,8 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
 
     // This empty constructor must be kept, otherwise dagger injection might break!
     @Inject
-    public MedtronicCommunicationManager() {}
+    public MedtronicCommunicationManager() {
+    }
 
     @Inject
     public void onInit() {
@@ -85,9 +84,8 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
     }
 
     @Override
-    public RLMessage createResponseMessage(byte[] payload) {
-        PumpMessage pumpMessage = new PumpMessage(aapsLogger, payload);
-        return pumpMessage;
+    public PumpMessage createResponseMessage(byte[] payload) {
+        return new PumpMessage(aapsLogger, payload);
     }
 
     @Override
@@ -170,7 +168,7 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
 
                 if (radioResponse.isValid()) {
 
-                    PumpMessage pumpResponse = (PumpMessage) createResponseMessage(radioResponse.getPayload());
+                    PumpMessage pumpResponse = createResponseMessage(radioResponse.getPayload());
 
                     if (!pumpResponse.isValid()) {
                         aapsLogger.warn(LTag.PUMPCOMM, "Response is invalid ! [interrupted={}, timeout={}]", rfSpyResponse.wasInterrupted(),
@@ -545,14 +543,15 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
     }
 
 
-    private PumpMessage sendAndListen(RLMessage msg) throws RileyLinkCommunicationException {
+    private PumpMessage sendAndListen(PumpMessage msg) throws RileyLinkCommunicationException {
         return sendAndListen(msg, 4000); // 2000
     }
 
 
     // All pump communications go through this function.
-    protected PumpMessage sendAndListen(RLMessage msg, int timeout_ms) throws RileyLinkCommunicationException {
-        return (PumpMessage) super.sendAndListen(msg, timeout_ms);
+    @Override
+    protected PumpMessage sendAndListen(PumpMessage msg, int timeout_ms) throws RileyLinkCommunicationException {
+        return super.sendAndListen(msg, timeout_ms);
     }
 
 
diff --git a/medtronic/src/main/res/values-no-rNO/strings.xml b/medtronic/src/main/res/values-no-rNO/strings.xml
index e370c4a256..c97199a08f 100644
--- a/medtronic/src/main/res/values-no-rNO/strings.xml
+++ b/medtronic/src/main/res/values-no-rNO/strings.xml
@@ -1,8 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Tilkobling av Medtronic pumpe krever en RileyLink enhet og spesifikk pumpemodell</string>
     <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Pumpens serienummer</string>
+    <string name="medtronic_pump_type">Pumpens modellnummer</string>
+    <string name="medtronic_pump_frequency">Pumpens frekvens</string>
+    <string name="medtronic_pump_bolus_delay">Forsinkelse før Bolus dose startes (sek)</string>
+    <string name="medtronic_pump_max_bolus">Maks Bolus dose på pumpen (Enheter)</string>
+    <string name="medtronic_pump_max_basal">Maks Basal på pumpen (Enheter/time)</string>
+    <string name="medtronic_pump_encoding">Medtronic koding</string>
+    <string name="medtronic_pump_frequency_us_ca">USA &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Worldwide (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Software 4b6b koding</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardware 4b6b koding</string>
+    <string name="medtronic_custom_action_wake_and_tune">Oppstart og enhetssøk</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Nullstill Bolus blokk</string>
+    <string name="medtronic_custom_action_reset_rileylink">Tilbakestill RileyLink oppsett</string>
+    <string name="medtronic_pump_battery_select">Batteri type (Strømvisning)</string>
+    <string name="medtronic_pump_battery_no">Ikke valgt (Enkel visning)</string>
+    <string name="medtronic_pump_battery_alkaline">Alkaline (Utvidet visning)</string>
+    <string name="medtronic_pump_battery_lithium">Lithium (Utvidet visning)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Utvidet visning)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Utvidet visning)</string>
+    <string name="medtronic_bolus_debugging">Feilsøking bolus/behandlingsinformasjon</string>
     <!-- MDT Errors -->
+    <string name="medtronic_errors">Feil</string>
+    <string name="medtronic_error_serial_not_set">Serienummer ikke definert.</string>
+    <string name="medtronic_error_serial_invalid">Serienummer ikke gyldig.</string>
+    <string name="medtronic_error_pump_type_not_set">Pumpetype ikke definert.</string>
+    <string name="medtronic_error_pump_type_invalid">Pumpetypen støttes ikke.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Pumpefrekvens ikke innstilt.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Pumpefrekvensen støttes ikke.</string>
+    <string name="medtronic_error_rileylink_address_invalid">RileyLink adressen er ugyldig.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Oppdaget pumpetype er forskjellig fra innstilt pumpetype.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basal profil/program innstilling ikke aktivert. Aktiver denne på pumpen.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basalprofil på pumpen er feil (må være STANDARD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Feil TBR valgt på pumpen (må være E/timen).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Feil maks bolus valgt på pumpe (må være %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Feil maks basal valgt på pumpe (må være %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operasjon ikke mulig.\n\n Du må konfigurere Medtronic pumpen før du kan bruke denne operasjonen.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Mer enn 24t tidsendring ble forespurt.</string>
     <!-- MDT History -->
     <!--    <string name="medtronic_history_group_basal">Basals</string>-->
     <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
@@ -10,8 +48,37 @@
     <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
     <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
     <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">Medtronic pumpe historie</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Du kansellerte bolus, etter at den var satt på pumpen. Siden Medtronic pumper ikke støtter kansellering må dette gjøres manuelt. STOPP pumpen og velg GJENOPPTA (hvis du fortsatt ønsker å kansellere). Applikasjon vil lese inn endringen på neste pumpeavlesing (innen 5 minutter).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Kunne ikke lese gjeldende TBR.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Kunne ikke avbryte gjeldende TBR. Stopper operasjonen.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Profil sett feilet fordi påfølgende basalverdi i programmet har for høy verdi: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus dose kunne ikke leveres.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus kunne ikke leveres fordi tilgjengelig insulinmengde (%1$.2f) er mindre enn nødvendig bolus (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR kunne ikke settes.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Kunne ikke avbryte gjeldende TBR.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basalprofilen kunne ikke settes.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basalprofilen er den samme, så den blir ikke satt igjen.</string>
+    <string name="medtronic_cmd_desc_get_history">Henter historikk - side %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Henter historikk - side %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Henter pumpe tid</string>
+    <string name="medtronic_cmd_desc_get_settings">Henter innstillinger</string>
+    <string name="medtronic_cmd_desc_get_model">Henter pumpe modell</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Henter basal profil</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Angi basal profil</string>
+    <string name="medtronic_cmd_desc_get_tbr">Henter Temp Basal</string>
+    <string name="medtronic_cmd_desc_set_tbr">Angi Temp Basal</string>
+    <string name="medtronic_cmd_desc_set_bolus">Angi Bolus</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pumpe utilgjengelig</string>
+    <string name="medtronic_warning">Advarsel</string>
     <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Nå</string>
     <!-- combo_pump_connected_now -->
+    <string name="ago">siden</string>
+    <string name="medtronic_notification_check_time_date">Pumpens tid må oppdateres</string>
     <!-- combo_notification_check_time_date -->
+    <string name="common_on">På</string>
+    <string name="common_off">Av</string>
+    <string name="pump_time_updated">Pumpens tid ble oppdatert</string>
 </resources>
diff --git a/medtronic/src/main/res/values-pl-rPL/strings.xml b/medtronic/src/main/res/values-pl-rPL/strings.xml
index 045f9fb5df..78804a3f34 100644
--- a/medtronic/src/main/res/values-pl-rPL/strings.xml
+++ b/medtronic/src/main/res/values-pl-rPL/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (widok rozszerzony)</string>
     <string name="medtronic_bolus_debugging">Bolus/Leczenie - debugowanie</string>
     <!-- MDT Errors -->
+    <string name="medtronic_errors">Błędy</string>
     <string name="medtronic_error_serial_not_set">Numer seryjny # nie ustawiony.</string>
     <string name="medtronic_error_serial_invalid">Numer seryjny # nieprawidłowy.</string>
     <string name="medtronic_error_pump_type_not_set">Tyo pompy nie ustawiony.</string>
@@ -47,6 +48,7 @@
     <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
     <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
     <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">Historia pompy Medtronic</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">Anulowałeś bolus po jego ustawieniu na pompie. Ponieważ pompa Medtronic nie wspiera polecenia anuluj, musisz wprowadzić zmianę ręcznie. Wprowadź pompę w stan zawieszenia, a następnie przywróć jej działanie (jeżeli wciąż chcesz anulować). Aplikacja pobierze zmiany przy następnym uaktualnieniu (poniżej 5 minut).</string>
     <string name="medtronic_cmd_cant_read_tbr">Nie udało się odczytać aktualnej dawki tymczasowej (TBR).</string>
@@ -68,8 +70,15 @@
     <string name="medtronic_cmd_desc_get_tbr">Pobierz tymczasową dawkę bazową</string>
     <string name="medtronic_cmd_desc_set_tbr">Ustaw tymczasową dawkę bazową</string>
     <string name="medtronic_cmd_desc_set_bolus">Ustaw bolus</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pompa nieosiągalna</string>
+    <string name="medtronic_warning">Ostrzeżenie</string>
     <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Teraz</string>
     <!-- combo_pump_connected_now -->
+    <string name="ago">temu</string>
+    <string name="medtronic_notification_check_time_date">Potrzebna aktualizacja zegara pompy</string>
     <!-- combo_notification_check_time_date -->
+    <string name="common_on">Włącz</string>
+    <string name="common_off">Wyłącz</string>
     <string name="pump_time_updated">Czas pompy uaktualniony</string>
 </resources>
diff --git a/omnipod/build.gradle b/omnipod/build.gradle
index c3b3a84f35..e520dc6323 100644
--- a/omnipod/build.gradle
+++ b/omnipod/build.gradle
@@ -75,6 +75,8 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
+    implementation "androidx.fragment:fragment:${fragmentVersion}"
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'com.google.android.material:material:1.1.0'
 
     implementation 'com.google.firebase:firebase-analytics-ktx:17.4.3'
@@ -86,12 +88,9 @@ dependencies {
 
     implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
 
-    // Omnipod - start
     implementation 'org.apache.commons:commons-lang3:3.10'
     implementation 'net.danlew:android.joda:2.10.6'
     implementation "com.google.code.gson:gson:2.8.6"
-    implementation(name: "com.atech-software.android.library.wizardpager-1.1.4", ext: "aar")
-    // Omnipod - end
 
     implementation "com.google.dagger:dagger-android:$dagger_version"
     implementation "com.google.dagger:dagger-android-support:$dagger_version"
@@ -100,6 +99,12 @@ dependencies {
     kapt "com.google.dagger:dagger-android-processor:$dagger_version"
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
 
+    // Navigation
+    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
+
+    implementation 'com.google.android.material:material:1.1.0'
+
     testImplementation 'junit:junit:4.13'
     testImplementation "org.mockito:mockito-core:2.8.47"
     testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion"
diff --git a/omnipod/libs/com.atech-software.android.library.wizardpager-1.1.4.aar b/omnipod/libs/com.atech-software.android.library.wizardpager-1.1.4.aar
deleted file mode 100644
index af0c6511cf..0000000000
Binary files a/omnipod/libs/com.atech-software.android.library.wizardpager-1.1.4.aar and /dev/null differ
diff --git a/omnipod/src/main/AndroidManifest.xml b/omnipod/src/main/AndroidManifest.xml
index ebf23405da..4c8d3b5305 100644
--- a/omnipod/src/main/AndroidManifest.xml
+++ b/omnipod/src/main/AndroidManifest.xml
@@ -9,8 +9,7 @@
 
         <activity android:name=".ui.PodManagementActivity" />
         <activity android:name=".ui.PodHistoryActivity" />
-        <activity
-            android:name="com.atech.android.library.wizardpager.WizardPagerActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
+        <activity android:name=".ui.wizard.activation.PodActivationWizardActivity" />
+        <activity android:name=".ui.wizard.deactivation.PodDeactivationWizardActivity" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index ffdc74eb19..6e1c85314b 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -12,15 +12,13 @@ import android.os.SystemClock;
 
 import androidx.annotation.NonNull;
 
-import org.jetbrains.annotations.NotNull;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -44,6 +42,7 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.interfaces.PumpPluginBase;
@@ -53,7 +52,6 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 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.data.TempBasalPair;
@@ -71,7 +69,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.data.ActiveBolus;
 import info.nightscout.androidaps.plugins.pump.omnipod.data.RLHistoryItemOmnipod;
 import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodCommandType;
 import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodCustomActionType;
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodStatusRequestType;
 import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodStorageKeys;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.service.ExpirationReminderBuilder;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoRecentPulseLog;
@@ -81,10 +78,15 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateMa
 import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodPumpValuesChanged;
 import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodTbrChanged;
 import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandHandleTimeChange;
+import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandUpdateAlertConfiguration;
+import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.OmnipodCustomCommand;
+import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.OmnipodCustomCommandType;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.service.RileyLinkOmnipodService;
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.OmnipodFragment;
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.OmnipodOverviewFragment;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.AapsOmnipodUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodAlertUtil;
+import info.nightscout.androidaps.queue.commands.CustomCommand;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
@@ -104,6 +106,7 @@ import io.reactivex.schedulers.Schedulers;
 public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface, RileyLinkPumpDevice {
     private static final long RILEY_LINK_CONNECT_TIMEOUT_MILLIS = 3 * 60 * 1000L; // 3 minutes
     private static final long STATUS_CHECK_INTERVAL_MILLIS = 60 * 1000L; // 1 minute
+    public static final int STARTUP_STATUS_REQUEST_TRIES = 2;
 
     private final PodStateManager podStateManager;
     private final RileyLinkServiceData rileyLinkServiceData;
@@ -112,6 +115,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
     private final AapsOmnipodUtil aapsOmnipodUtil;
     private final RileyLinkUtil rileyLinkUtil;
     private final OmnipodAlertUtil omnipodAlertUtil;
+    private final ProfileFunction profileFunction;
     private final AAPSLogger aapsLogger;
     private final RxBusWrapper rxBus;
     private final ActivePluginProvider activePlugin;
@@ -124,8 +128,8 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
     private final ServiceConnection serviceConnection;
     private final PumpType pumpType = PumpType.Insulet_Omnipod;
 
-    private final List<CustomAction> customActions = new ArrayList<>();
-    private final List<OmnipodStatusRequestType> statusRequestList = new ArrayList<>();
+    private final List<CustomAction> customActions = Collections.singletonList(new CustomAction(
+            R.string.omnipod_custom_action_reset_rileylink, OmnipodCustomActionType.RESET_RILEY_LINK_CONFIGURATION, true));
     private final CompositeDisposable disposables = new CompositeDisposable();
 
     // variables for handling statuses and history
@@ -136,12 +140,11 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
     private boolean busy = false;
     private int timeChangeRetries;
     private long nextPodCheck;
-    private boolean sentIdToFirebase;
     private long lastConnectionTimeMillis;
     private final Handler loopHandler = new Handler(Looper.getMainLooper());
 
     private final Runnable statusChecker;
-    private OmnipodCommandType currentCommand;
+    private boolean isCancelTempBasalRunning;
 
     @Inject
     public OmnipodPumpPlugin(
@@ -161,15 +164,16 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
             DateUtil dateUtil,
             AapsOmnipodUtil aapsOmnipodUtil,
             RileyLinkUtil rileyLinkUtil,
-            OmnipodAlertUtil omnipodAlertUtil
+            OmnipodAlertUtil omnipodAlertUtil,
+            ProfileFunction profileFunction
     ) {
         super(new PluginDescription() //
                         .mainType(PluginType.PUMP) //
-                        .fragmentClass(OmnipodFragment.class.getName()) //
+                        .fragmentClass(OmnipodOverviewFragment.class.getName()) //
                         .pluginName(R.string.omnipod_name) //
                         .shortName(R.string.omnipod_name_short) //
                         .preferencesId(R.xml.pref_omnipod) //
-                        .description(R.string.description_pump_omnipod), //
+                        .description(R.string.omnipod_pump_description), //
                 injector, aapsLogger, resourceHelper, commandQueue);
         this.aapsLogger = aapsLogger;
         this.rxBus = rxBus;
@@ -186,12 +190,10 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
         this.aapsOmnipodUtil = aapsOmnipodUtil;
         this.rileyLinkUtil = rileyLinkUtil;
         this.omnipodAlertUtil = omnipodAlertUtil;
+        this.profileFunction = profileFunction;
 
         pumpDescription = new PumpDescription(pumpType);
 
-        customActions.add(new CustomAction(
-                R.string.omnipod_custom_action_reset_rileylink, OmnipodCustomActionType.RESET_RILEY_LINK_CONFIGURATION, true));
-
         this.serviceConnection = new ServiceConnection() {
             @Override
             public void onServiceConnected(ComponentName name, IBinder service) {
@@ -228,14 +230,11 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
                     aapsOmnipodManager.createSuspendedFakeTbrIfNotExists();
                 }
 
-                if (!getCommandQueue().statusInQueue()) {
-                    if (!OmnipodPumpPlugin.this.statusRequestList.isEmpty()) {
-                        getCommandQueue().readStatus("Status Refresh Requested", null);
-                    } else if (OmnipodPumpPlugin.this.hasTimeDateOrTimeZoneChanged) {
-                        getCommandQueue().readStatus("Date or Time Zone Changed", null);
-                    } else if (!OmnipodPumpPlugin.this.verifyPodAlertConfiguration()) {
-                        getCommandQueue().readStatus("Expiration Alerts Changed", null);
-                    }
+                if (OmnipodPumpPlugin.this.hasTimeDateOrTimeZoneChanged) {
+                    getCommandQueue().customCommand(new CommandHandleTimeChange(false), null);
+                }
+                if (!OmnipodPumpPlugin.this.verifyPodAlertConfiguration()) {
+                    getCommandQueue().customCommand(new CommandUpdateAlertConfiguration(), null);
                 }
 
                 doPodCheck();
@@ -288,7 +287,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
                             event.isChanged(getResourceHelper(), R.string.key_omnipod_low_reservoir_alert_enabled) ||
                             event.isChanged(getResourceHelper(), R.string.key_omnipod_low_reservoir_alert_units)) {
                         if (!verifyPodAlertConfiguration() && !getCommandQueue().statusInQueue()) {
-                            getCommandQueue().readStatus("Expiration Alerts Changed", null);
+                            getCommandQueue().customCommand(new CommandUpdateAlertConfiguration(), null);
                         }
                     }
                 }, fabricPrivacy::logException)
@@ -316,13 +315,17 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
         );
     }
 
+    public boolean isRileyLinkReady() {
+        return rileyLinkServiceData.rileyLinkServiceState.isReady();
+    }
+
     private void updateAapsTbr() {
         // As per the characteristics of the Omnipod, we only know whether or not a TBR is currently active
         // But it doesn't tell us the duration or amount, so we can only update TBR status in AAPS if
         // The pod is not running a TBR, while AAPS thinks it is
         if (!podStateManager.isTempBasalRunning()) {
             // Only report TBR cancellations if they haven't been explicitly requested
-            if (currentCommand != OmnipodCommandType.CANCEL_TEMPORARY_BASAL) {
+            if (!isCancelTempBasalRunning) {
                 if (activePlugin.getActiveTreatments().isTempBasalInProgress() && !aapsOmnipodManager.hasSuspendedFakeTbr()) {
                     aapsOmnipodManager.reportCancelledTbr();
                 }
@@ -348,13 +351,9 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
                 Notification notification = new Notification(Notification.OMNIPOD_POD_NOT_ATTACHED, resourceHelper.gs(R.string.omnipod_error_pod_not_attached), Notification.NORMAL);
                 rxBus.send(new EventNewNotification(notification));
             } else {
-                rxBus.send(new EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED));
-
                 if (podStateManager.isSuspended()) {
-                    Notification notification = new Notification(Notification.OMNIPOD_POD_SUSPENDED, resourceHelper.gs(R.string.omnipod_error_pod_suspended), Notification.NORMAL);
+                    Notification notification = new Notification(Notification.OMNIPOD_POD_SUSPENDED, resourceHelper.gs(R.string.omnipod_confirmation_pod_suspended), Notification.NORMAL);
                     rxBus.send(new EventNewNotification(notification));
-                } else {
-                    rxBus.send(new EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED));
                 }
             }
 
@@ -362,7 +361,6 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
         }
     }
 
-    // TODO is this correct?
     @Override
     public boolean isInitialized() {
         return isConnected() && podStateManager.isPodActivationCompleted();
@@ -442,109 +440,23 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
         lastConnectionTimeMillis = System.currentTimeMillis();
     }
 
-    // We abuse getPumpStatus to squeeze commands in the queue
-    // The only actual status requests we send to the Pod are on startup (in initializeAfterRileyLinkConnection)
-    // And when the user explicitly requested it by clicking the Refresh button on the Omnipod tab
-    // We don't do periodical status requests because that can drain the Pod's battery
-    // However that should be fine because we get a StatusResponse from all insulin commands sent to the Pod
+    /**
+     * The only actual status requests we send to the Pod here are on startup (in {@link #initializeAfterRileyLinkConnection() initializeAfterRileyLinkConnection()})
+     * And when the user explicitly requested it by clicking the Refresh button on the Omnipod tab (which is executed through {@link #executeCustomCommand(CustomCommand)})
+     * We don't do periodical status requests because that could drain the Pod's battery
+     */
     @Override
     public void getPumpStatus() {
         if (firstRun) {
             initializeAfterRileyLinkConnection();
-        } else if (!statusRequestList.isEmpty()) {
-            Iterator<OmnipodStatusRequestType> iterator = statusRequestList.iterator();
-
-            while (iterator.hasNext()) {
-                OmnipodStatusRequestType statusRequest = iterator.next();
-                switch (statusRequest) {
-                    case GET_PULSE_LOG:
-                        try {
-                            PodInfoRecentPulseLog result = executeCommand(OmnipodCommandType.GET_POD_PULSE_LOG, aapsOmnipodManager::readPulseLog);
-                            Intent i = new Intent(context, ErrorHelperActivity.class);
-                            i.putExtra("soundid", 0);
-                            i.putExtra("status", "Pulse Log (copied to clipboard):\n" + result.toString());
-                            i.putExtra("title", resourceHelper.gs(R.string.omnipod_warning));
-                            i.putExtra("clipboardContent", result.toString());
-                            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            context.startActivity(i);
-                        } catch (Exception ex) {
-                            aapsLogger.warn(LTag.PUMP, "Failed to retrieve pulse log", ex);
-                            Intent i = new Intent(context, ErrorHelperActivity.class);
-                            i.putExtra("soundid", 0);
-                            i.putExtra("status", "Failed to retrieve pulse log");
-                            i.putExtra("title", resourceHelper.gs(R.string.omnipod_warning));
-                            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            context.startActivity(i);
-                        }
-                        break;
-                    case ACKNOWLEDGE_ALERTS:
-                        executeCommand(OmnipodCommandType.ACKNOWLEDGE_ALERTS, aapsOmnipodManager::acknowledgeAlerts);
-                        break;
-                    case GET_POD_STATE:
-                        executeCommand(OmnipodCommandType.GET_POD_STATUS, aapsOmnipodManager::getPodStatus);
-                        break;
-                    case SUSPEND_DELIVERY:
-                        executeCommand(OmnipodCommandType.SUSPEND_DELIVERY, aapsOmnipodManager::suspendDelivery);
-                        break;
-                    default:
-                        aapsLogger.error(LTag.PUMP, "Unknown status request: " + statusRequest.name());
-                }
-                iterator.remove();
-            }
-        } else if (this.hasTimeDateOrTimeZoneChanged) {
-            PumpEnactResult result = executeCommand(OmnipodCommandType.SET_TIME, aapsOmnipodManager::setTime);
-
-            if (result.success) {
-                this.hasTimeDateOrTimeZoneChanged = false;
-                timeChangeRetries = 0;
-
-                Notification notification = new Notification(
-                        Notification.TIME_OR_TIMEZONE_CHANGE,
-                        resourceHelper.gs(R.string.omnipod_time_or_timezone_change),
-                        Notification.INFO, 60);
-                rxBus.send(new EventNewNotification(notification));
-
-            } else {
-                timeChangeRetries++;
-
-                if (timeChangeRetries > 3) {
-                    this.hasTimeDateOrTimeZoneChanged = false;
-                    timeChangeRetries = 0;
-                }
-            }
-        } else if (!verifyPodAlertConfiguration()) {
-            Duration expirationReminderTimeBeforeShutdown = omnipodAlertUtil.getExpirationReminderTimeBeforeShutdown();
-            Integer lowReservoirAlertUnits = omnipodAlertUtil.getLowReservoirAlertUnits();
-
-            List<AlertConfiguration> alertConfigurations = new ExpirationReminderBuilder(podStateManager) //
-                    .expirationAdvisory(expirationReminderTimeBeforeShutdown != null,
-                            Optional.ofNullable(expirationReminderTimeBeforeShutdown).orElse(Duration.ZERO)) //
-                    .lowReservoir(lowReservoirAlertUnits != null, Optional.ofNullable(lowReservoirAlertUnits).orElse(0)) //
-                    .build();
-
-            PumpEnactResult result = executeCommand(OmnipodCommandType.CONFIGURE_ALERTS, () -> aapsOmnipodManager.configureAlerts(alertConfigurations));
-
-            if (result.success) {
-                aapsLogger.info(LTag.PUMP, "Successfully configured alerts in Pod");
-
-                podStateManager.setExpirationAlertTimeBeforeShutdown(expirationReminderTimeBeforeShutdown);
-                podStateManager.setLowReservoirAlertUnits(lowReservoirAlertUnits);
-
-                Notification notification = new Notification(
-                        Notification.OMNIPOD_POD_ALERTS_UPDATED,
-                        resourceHelper.gs(R.string.omnipod_expiration_alerts_updated),
-                        Notification.INFO, 60);
-                rxBus.send(new EventNewNotification(notification));
-            } else {
-                aapsLogger.warn(LTag.PUMP, "Failed to configure alerts in Pod");
-            }
+            firstRun = false;
         }
     }
 
-    @NotNull
+    @NonNull
     @Override
     public PumpEnactResult setNewBasalProfile(Profile profile) {
-        PumpEnactResult result = executeCommand(OmnipodCommandType.SET_BASAL_PROFILE, () -> aapsOmnipodManager.setBasalProfile(profile));
+        PumpEnactResult result = executeCommand(OmnipodCommandType.SET_BASAL_PROFILE, () -> aapsOmnipodManager.setBasalProfile(profile, true));
 
         aapsLogger.info(LTag.PUMP, "Basal Profile was set: " + result.success);
 
@@ -563,7 +475,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
 
     @Override
     public long lastDataTime() {
-        return podStateManager.isPodActivationCompleted() ? podStateManager.getLastSuccessfulCommunication().getMillis() : 0;
+        return podStateManager.isPodInitialized() ? podStateManager.getLastSuccessfulCommunication().getMillis() : 0;
     }
 
     @Override
@@ -618,7 +530,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
         executeCommand(OmnipodCommandType.CANCEL_BOLUS, aapsOmnipodManager::cancelBolus);
     }
 
-    // if enforceNew===true current temp basal is cancelled and new TBR set (duration is prolonged),
+    // if enforceNew is true, current temp basal is cancelled and new TBR set (duration is prolonged),
     // if false and the same rate is requested enacted=false and success=true is returned and TBR is not changed
     @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer
@@ -660,7 +572,12 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
             return new PumpEnactResult(getInjector()).success(true).enacted(false);
         }
 
-        return executeCommand(OmnipodCommandType.CANCEL_TEMPORARY_BASAL, aapsOmnipodManager::cancelTemporaryBasal);
+        isCancelTempBasalRunning = true;
+        try {
+            return executeCommand(OmnipodCommandType.CANCEL_TEMPORARY_BASAL, aapsOmnipodManager::cancelTemporaryBasal);
+        } finally {
+            isCancelTempBasalRunning = false;
+        }
     }
 
     // TODO improve (i8n and more)
@@ -719,12 +636,12 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
         return pumpType.getManufacturer();
     }
 
-    @Override @NotNull
+    @Override @NonNull
     public PumpType model() {
         return pumpType;
     }
 
-    @NotNull
+    @NonNull
     @Override
     public String serialNumber() {
         return podStateManager.isPodInitialized() ? String.valueOf(podStateManager.getAddress()) : "-";
@@ -779,18 +696,145 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
                 break;
 
             default:
-                aapsLogger.warn(LTag.PUMP, "Unknown custom action: {}" + mcat);
+                aapsLogger.warn(LTag.PUMP, "Unknown custom action: " + mcat);
                 break;
         }
     }
 
+    @Override
+    public PumpEnactResult executeCustomCommand(CustomCommand command) {
+        if (!(command instanceof OmnipodCustomCommand)) {
+            aapsLogger.warn(LTag.PUMP, "Unknown custom command: " + command.getClass().getName());
+            return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(resourceHelper.gs(R.string.omnipod_error_unknown_custom_command, command.getClass().getName()));
+        }
+
+        OmnipodCustomCommandType commandType = ((OmnipodCustomCommand) command).getType();
+
+        aapsLogger.debug(LTag.PUMP, "Executing custom command: " + commandType);
+
+        switch (commandType) {
+            case ACKNOWLEDGE_ALERTS:
+                return executeCommand(OmnipodCommandType.ACKNOWLEDGE_ALERTS, aapsOmnipodManager::acknowledgeAlerts);
+            case GET_POD_STATUS:
+                return executeCommand(OmnipodCommandType.GET_POD_STATUS, aapsOmnipodManager::getPodStatus);
+            case READ_PULSE_LOG:
+                return retrievePulseLog();
+            case SUSPEND_DELIVERY:
+                return executeCommand(OmnipodCommandType.SUSPEND_DELIVERY, aapsOmnipodManager::suspendDelivery);
+            case RESUME_DELIVERY:
+                return executeCommand(OmnipodCommandType.RESUME_DELIVERY, () -> aapsOmnipodManager.setBasalProfile(profileFunction.getProfile(), false));
+            case DEACTIVATE_POD:
+                return executeCommand(OmnipodCommandType.DEACTIVATE_POD, aapsOmnipodManager::deactivatePod);
+            case HANDLE_TIME_CHANGE:
+                return handleTimeChange(((CommandHandleTimeChange) command).isRequestedByUser());
+            case UPDATE_ALERT_CONFIGURATION:
+                return updateAlertConfiguration();
+            default:
+                aapsLogger.warn(LTag.PUMP, "Unknown custom command: " + commandType);
+                return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(resourceHelper.gs(R.string.omnipod_error_unknown_custom_command, commandType));
+        }
+    }
+
+    private PumpEnactResult retrievePulseLog() {
+        PodInfoRecentPulseLog result;
+        try {
+            result = executeCommand(OmnipodCommandType.READ_POD_PULSE_LOG, aapsOmnipodManager::readPulseLog);
+        } catch (Exception ex) {
+            return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(aapsOmnipodManager.translateException(ex));
+        }
+
+        Intent i = new Intent(context, ErrorHelperActivity.class);
+        i.putExtra("soundid", 0);
+        i.putExtra("status", resourceHelper.gs(R.string.omnipod_pulse_log_value) + ":\n" + result.toString());
+        i.putExtra("title", resourceHelper.gs(R.string.omnipod_pulse_log));
+        i.putExtra("clipboardContent", result.toString());
+        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(i);
+        return new PumpEnactResult(getInjector()).success(true).enacted(false);
+    }
+
+    @NonNull private PumpEnactResult updateAlertConfiguration() {
+        Duration expirationReminderTimeBeforeShutdown = omnipodAlertUtil.getExpirationReminderTimeBeforeShutdown();
+        Integer lowReservoirAlertUnits = omnipodAlertUtil.getLowReservoirAlertUnits();
+
+        List<AlertConfiguration> alertConfigurations = new ExpirationReminderBuilder(podStateManager) //
+                .expirationAdvisory(expirationReminderTimeBeforeShutdown != null,
+                        Optional.ofNullable(expirationReminderTimeBeforeShutdown).orElse(Duration.ZERO)) //
+                .lowReservoir(lowReservoirAlertUnits != null, Optional.ofNullable(lowReservoirAlertUnits).orElse(0)) //
+                .build();
+
+        PumpEnactResult result = executeCommand(OmnipodCommandType.CONFIGURE_ALERTS, () -> aapsOmnipodManager.configureAlerts(alertConfigurations));
+
+        if (result.success) {
+            aapsLogger.info(LTag.PUMP, "Successfully configured alerts in Pod");
+
+            podStateManager.setExpirationAlertTimeBeforeShutdown(expirationReminderTimeBeforeShutdown);
+            podStateManager.setLowReservoirAlertUnits(lowReservoirAlertUnits);
+
+            Notification notification = new Notification(
+                    Notification.OMNIPOD_POD_ALERTS_UPDATED,
+                    resourceHelper.gs(R.string.omnipod_confirmation_expiration_alerts_updated),
+                    Notification.INFO, 60);
+            rxBus.send(new EventNewNotification(notification));
+        } else {
+            aapsLogger.warn(LTag.PUMP, "Failed to configure alerts in Pod");
+        }
+
+        return result;
+    }
+
+    @NonNull private PumpEnactResult handleTimeChange(boolean requestedByUser) {
+        aapsLogger.debug(LTag.PUMP, "Setting time, requestedByUser={}", requestedByUser);
+
+        PumpEnactResult result;
+        if (requestedByUser || aapsOmnipodManager.isTimeChangeEventEnabled()) {
+            result = executeCommand(OmnipodCommandType.SET_TIME, () -> aapsOmnipodManager.setTime(!requestedByUser));
+        } else {
+            // Even if automatically changing the time is disabled, we still want to at least do a GetStatus request,
+            // in order to update the Pod's activation time, which we need for calculating the time on the Pod
+            result = executeCommand(OmnipodCommandType.GET_POD_STATUS, aapsOmnipodManager::getPodStatus);
+        }
+
+        if (result.success) {
+            this.hasTimeDateOrTimeZoneChanged = false;
+            timeChangeRetries = 0;
+
+            if (!requestedByUser && aapsOmnipodManager.isTimeChangeEventEnabled()) {
+                Notification notification = new Notification(
+                        Notification.TIME_OR_TIMEZONE_CHANGE,
+                        resourceHelper.gs(R.string.omnipod_confirmation_time_on_pod_updated),
+                        Notification.INFO, 60);
+                rxBus.send(new EventNewNotification(notification));
+            }
+
+        } else {
+            if (!requestedByUser) {
+                timeChangeRetries++;
+
+                if (timeChangeRetries > 3) {
+                    if (aapsOmnipodManager.isTimeChangeEventEnabled()) {
+                        Notification notification = new Notification(
+                                Notification.TIME_OR_TIMEZONE_CHANGE,
+                                resourceHelper.gs(R.string.omnipod_error_automatic_time_or_timezone_change_failed),
+                                Notification.INFO, 60);
+                        rxBus.send(new EventNewNotification(notification));
+                    }
+                    this.hasTimeDateOrTimeZoneChanged = false;
+                    timeChangeRetries = 0;
+                }
+            }
+        }
+
+        return result;
+    }
+
     @Override
     public void timezoneOrDSTChanged(TimeChangeType timeChangeType) {
         aapsLogger.warn(LTag.PUMP, "Time, Date and/or TimeZone changed. [changeType=" + timeChangeType.name() + ", eventHandlingEnabled=" + aapsOmnipodManager.isTimeChangeEventEnabled() + "]");
 
-        if (aapsOmnipodManager.isTimeChangeEventEnabled() && podStateManager.isPodRunning()) {
+        if (podStateManager.isPodRunning()) {
             aapsLogger.info(LTag.PUMP, "Time, Date and/or TimeZone changed event received and will be consumed by driver.");
-            this.hasTimeDateOrTimeZoneChanged = true;
+            hasTimeDateOrTimeZoneChanged = true;
         }
     }
 
@@ -819,10 +863,6 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
         return false;
     }
 
-    public void addPodStatusRequest(OmnipodStatusRequestType pumpStatusRequest) {
-        statusRequestList.add(pumpStatusRequest);
-    }
-
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
         return false;
@@ -853,50 +893,47 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
             aapsLogger.debug(LTag.PUMP, "stopConnecting [PumpPluginAbstract] - default (empty) implementation.");
     }
 
-    @NotNull @Override public PumpEnactResult setTempBasalPercent(Integer percent, Integer
+    @NonNull @Override public PumpEnactResult setTempBasalPercent(Integer percent, Integer
             durationInMinutes, Profile profile, boolean enforceNew) {
         aapsLogger.debug(LTag.PUMP, "setTempBasalPercent [OmnipodPumpPlugin] - Not implemented.");
         return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.core.R.string.pump_operation_not_supported_by_pump_driver);
     }
 
-    @NotNull @Override public PumpEnactResult setExtendedBolus(Double insulin, Integer
+    @NonNull @Override public PumpEnactResult setExtendedBolus(Double insulin, Integer
             durationInMinutes) {
         aapsLogger.debug(LTag.PUMP, "setExtendedBolus [OmnipodPumpPlugin] - Not implemented.");
         return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.core.R.string.pump_operation_not_supported_by_pump_driver);
     }
 
-    @NotNull @Override public PumpEnactResult cancelExtendedBolus() {
+    @NonNull @Override public PumpEnactResult cancelExtendedBolus() {
         aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus [OmnipodPumpPlugin] - Not implemented.");
         return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.core.R.string.pump_operation_not_supported_by_pump_driver);
     }
 
-    @NotNull @Override public PumpEnactResult loadTDDs() {
+    @NonNull @Override public PumpEnactResult loadTDDs() {
         aapsLogger.debug(LTag.PUMP, "loadTDDs [OmnipodPumpPlugin] - Not implemented.");
         return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.core.R.string.pump_operation_not_supported_by_pump_driver);
     }
 
     private void initializeAfterRileyLinkConnection() {
         if (podStateManager.isPodInitialized() && podStateManager.getPodProgressStatus().isAtLeast(PodProgressStatus.PAIRING_COMPLETED)) {
-            PumpEnactResult result = executeCommand(OmnipodCommandType.GET_POD_STATUS, aapsOmnipodManager::getPodStatus);
-            if (result.success) {
-                aapsLogger.debug(LTag.PUMP, "Successfully retrieved Pod status on startup");
-            } else {
-                aapsLogger.warn(LTag.PUMP, "Failed to retrieve Pod status on startup");
+            for (int i = 0; STARTUP_STATUS_REQUEST_TRIES > i; i++) {
+                PumpEnactResult result = executeCommand(OmnipodCommandType.GET_POD_STATUS, aapsOmnipodManager::getPodStatus);
+                if (result.success) {
+                    aapsLogger.debug(LTag.PUMP, "Successfully retrieved Pod status on startup");
+                    break;
+                } else {
+                    aapsLogger.warn(LTag.PUMP, "Failed to retrieve Pod status on startup");
+                }
             }
         } else {
             aapsLogger.debug(LTag.PUMP, "Not retrieving Pod status on startup: no Pod running");
         }
 
-        if (!sentIdToFirebase) {
-            Bundle params = new Bundle();
-            params.putString("version", BuildConfig.VERSION);
+        Bundle params = new Bundle();
+        params.putString("version", BuildConfig.VERSION);
 
-            fabricPrivacy.getFirebaseAnalytics().logEvent("OmnipodPumpInit", params);
-
-            sentIdToFirebase = true;
-        }
-
-        this.firstRun = false;
+        fabricPrivacy.getFirebaseAnalytics().logEvent("OmnipodPumpInit", params);
     }
 
     @NonNull private PumpEnactResult deliverBolus(final DetailedBolusInfo detailedBolusInfo) {
@@ -914,19 +951,14 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
 
     private <T> T executeCommand(OmnipodCommandType commandType, Supplier<T> supplier) {
         try {
-            currentCommand = commandType;
             aapsLogger.debug(LTag.PUMP, "Executing command: {}", commandType);
 
             rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItemOmnipod(getInjector(), commandType));
 
-            T pumpEnactResult = supplier.get();
-
+            return supplier.get();
+        } finally {
             rxBus.send(new EventRefreshOverview("Omnipod command: " + commandType.name(), false));
             rxBus.send(new EventOmnipodPumpValuesChanged());
-
-            return pumpEnactResult;
-        } finally {
-            currentCommand = null;
         }
     }
 
@@ -946,7 +978,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
         return true;
     }
 
-    private void incrementStatistics(String statsKey) {
+    private void incrementStatistics(int statsKey) {
         long currentCount = sp.getLong(statsKey, 0L);
         currentCount++;
         sp.putLong(statsKey, currentCount);
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodInjectHelpers.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodInjectHelpers.kt
new file mode 100644
index 0000000000..cd932bad82
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodInjectHelpers.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dagger
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import dagger.MapKey
+import javax.inject.Inject
+import javax.inject.Provider
+import javax.inject.Qualifier
+import javax.inject.Scope
+import kotlin.reflect.KClass
+
+@Qualifier
+annotation class OmnipodPluginQualifier
+
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
+@kotlin.annotation.Retention(AnnotationRetention.RUNTIME)
+@MapKey
+internal annotation class ViewModelKey(val value: KClass<out ViewModel>)
+
+// TODO: These annotations and Factories could be used globally -> move to core or app
+
+@Suppress("UNCHECKED_CAST")
+class ViewModelFactory @Inject constructor(
+    private val viewModels: MutableMap<Class<out ViewModel>, @JvmSuppressWildcards Provider<ViewModel>>
+) : ViewModelProvider.Factory {
+
+    override fun <T : ViewModel> create(modelClass: Class<T>): T = viewModels[modelClass]?.get() as T
+}
+
+@MustBeDocumented
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class ActivityScope
+
+@MustBeDocumented
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class FragmentScope
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodModule.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodModule.kt
index 225b1bb5ca..fd2b49ae1c 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodModule.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodModule.kt
@@ -9,11 +9,8 @@ import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsPodStateManag
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager
 import info.nightscout.androidaps.plugins.pump.omnipod.ui.PodHistoryActivity
 import info.nightscout.androidaps.plugins.pump.omnipod.ui.PodManagementActivity
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod.InitActionFragment
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod.InitPodTask
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.pages.InitPodRefreshAction
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.pages.PodInfoFragment
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.removepod.RemoveActionFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.PodActivationWizardActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.PodDeactivationWizardActivity
 
 @Module
 @Suppress("unused")
@@ -24,21 +21,23 @@ abstract class OmnipodModule {
     abstract fun contributesPodManagementActivity(): PodManagementActivity
     @ContributesAndroidInjector abstract fun contributesPodHistoryActivity(): PodHistoryActivity
 
-    // Fragments
-    @ContributesAndroidInjector abstract fun initActionFragment(): InitActionFragment
-    @ContributesAndroidInjector abstract fun removeActionFragment(): RemoveActionFragment
-    @ContributesAndroidInjector abstract fun podInfoFragment(): PodInfoFragment
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [OmnipodWizardModule::class])
+    abstract fun contributesActivationWizardActivity(): PodActivationWizardActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [OmnipodWizardModule::class])
+    abstract fun contributesDeactivationWizardActivity(): PodDeactivationWizardActivity
 
     // Service
     @ContributesAndroidInjector
     abstract fun omnipodCommunicationManagerProvider(): OmnipodRileyLinkCommunicationManager
 
     // Data
-    @ContributesAndroidInjector abstract fun initPodRefreshAction(): InitPodRefreshAction
-    @ContributesAndroidInjector abstract fun initPodTask(): InitPodTask
     @ContributesAndroidInjector abstract fun rlHistoryItemOmnipod(): RLHistoryItemOmnipod
 
     companion object {
+
         @Provides
         fun podStateManagerProvider(aapsPodStateManager: AapsPodStateManager): PodStateManager = aapsPodStateManager
     }
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodWizardModule.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodWizardModule.kt
new file mode 100644
index 0000000000..4421900b15
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dagger/OmnipodWizardModule.kt
@@ -0,0 +1,92 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dagger
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import dagger.multibindings.IntoMap
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.AttachPodInfoFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.FillPodInfoFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.InitializePodActionFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.InsertCannulaActionFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.PodActivatedInfoFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel.InitializePodActionViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel.InsertCannulaActionViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.DeactivatePodActionFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.DeactivatePodInfoFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.PodDeactivatedInfoFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.PodDiscardedInfoFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.viewmodel.DeactivatePodActionViewModel
+import javax.inject.Provider
+
+@Module
+abstract class OmnipodWizardModule {
+
+    companion object {
+        @Provides
+        @OmnipodPluginQualifier
+        fun providesViewModelFactory(@OmnipodPluginQualifier viewModels: MutableMap<Class<out ViewModel>, @JvmSuppressWildcards Provider<ViewModel>>): ViewModelProvider.Factory {
+            return ViewModelFactory(viewModels)
+        }
+    }
+
+    // #### VIEW MODELS ############################################################################
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(InitializePodActionViewModel::class)
+    internal abstract fun initializePodActionViewModel(viewModel: InitializePodActionViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(InsertCannulaActionViewModel::class)
+    internal abstract fun insertCannulaActionViewModel(viewModel: InsertCannulaActionViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(DeactivatePodActionViewModel::class)
+    internal abstract fun deactivatePodActionViewModel(viewModel: DeactivatePodActionViewModel): ViewModel
+
+    // #### FRAGMENTS ##############################################################################
+    @FragmentScope
+    @ContributesAndroidInjector
+    internal abstract fun contributesDeactivatePodActionFragment(): DeactivatePodActionFragment
+
+    @FragmentScope
+    @ContributesAndroidInjector
+    internal abstract fun contributesInsertCannulaActionFragment(): InsertCannulaActionFragment
+
+    @FragmentScope
+    @ContributesAndroidInjector
+    internal abstract fun contributesInitializePodActionFragment(): InitializePodActionFragment
+
+    @FragmentScope
+    @ContributesAndroidInjector
+    internal abstract fun contributesAttachPodInfoFragment(): AttachPodInfoFragment
+
+    @FragmentScope
+    @ContributesAndroidInjector
+    internal abstract fun contributesDeactivatePodInfoFragment(): DeactivatePodInfoFragment
+
+    @FragmentScope
+    @ContributesAndroidInjector
+    internal abstract fun contributesFillPodInfoFragment(): FillPodInfoFragment
+
+    @FragmentScope
+    @ContributesAndroidInjector
+    internal abstract fun contributesPodDeactivatedInfoFragment(): PodDeactivatedInfoFragment
+
+    @FragmentScope
+    @ContributesAndroidInjector
+    internal abstract fun contributesPodDiscardedInfoFragment(): PodDiscardedInfoFragment
+
+    @FragmentScope
+    @ContributesAndroidInjector
+    internal abstract fun contributesPodActivatedInfoFragment(): PodActivatedInfoFragment
+}
+
+
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCommandType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCommandType.java
index b7be57c864..8d9b250ac4 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCommandType.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCommandType.java
@@ -6,8 +6,8 @@ import info.nightscout.androidaps.plugins.pump.omnipod.R;
  * Created by andy on 4.8.2019
  */
 public enum OmnipodCommandType {
-    PAIR_AND_PRIME_POD(R.string.omnipod_cmd_pair_and_prime), // First step of Pod activation
-    FILL_CANNULA_AND_SET_BASAL_PROFILE(R.string.omnipod_cmd_fill_cannula_set_basal_profile), // Second step of Pod activation
+    INITIALIZE_POD(R.string.omnipod_cmd_initialize_pod), // First step of Pod activation
+    INSERT_CANNULA(R.string.omnipod_cmd_insert_cannula), // Second step of Pod activation
     DEACTIVATE_POD(R.string.omnipod_cmd_deactivate_pod), //
     SET_BASAL_PROFILE(R.string.omnipod_cmd_set_basal_schedule), //
     SET_BOLUS(R.string.omnipod_cmd_set_bolus), //
@@ -19,8 +19,9 @@ public enum OmnipodCommandType {
     SET_TIME(R.string.omnipod_cmd_set_time), //
     CONFIGURE_ALERTS(R.string.omnipod_cmd_configure_alerts), //
     ACKNOWLEDGE_ALERTS(R.string.omnipod_cmd_acknowledge_alerts), //
-    GET_POD_PULSE_LOG(R.string.omnipod_cmd_get_pulse_log), //
-    SUSPEND_DELIVERY(R.string.omnipod_cmd_suspend_delivery);
+    READ_POD_PULSE_LOG(R.string.omnipod_cmd_read_pulse_log), //
+    SUSPEND_DELIVERY(R.string.omnipod_cmd_suspend_delivery),
+    RESUME_DELIVERY(R.string.omnipod_cmd_resume_delivery);
 
     private int resourceId;
 
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStatusRequestType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStatusRequestType.java
deleted file mode 100644
index c657f6fc6e..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStatusRequestType.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.definition;
-
-public enum OmnipodStatusRequestType {
-    ACKNOWLEDGE_ALERTS,
-    GET_POD_STATE,
-    GET_PULSE_LOG,
-    SUSPEND_DELIVERY
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java
index 9dae97c900..557e8352db 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java
@@ -3,11 +3,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.definition;
 import info.nightscout.androidaps.plugins.pump.omnipod.R;
 
 public class OmnipodStorageKeys {
-    private static final String PREFIX = "AAPS.Omnipod.";
-
     public static class Preferences {
-        public static final String POD_STATE = PREFIX + "pod_state";
-        public static final String ACTIVE_BOLUS = PREFIX + "current_bolus";
+        public static final int POD_STATE = R.string.key_omnipod_pod_state;
+        public static final int ACTIVE_BOLUS = R.string.key_omnipod_current_bolus;
         public static final int BASAL_BEEPS_ENABLED = R.string.key_omnipod_basal_beeps_enabled;
         public static final int BOLUS_BEEPS_ENABLED = R.string.key_omnipod_bolus_beeps_enabled;
         public static final int SMB_BEEPS_ENABLED = R.string.key_omnipod_smb_beeps_enabled;
@@ -22,8 +20,8 @@ public class OmnipodStorageKeys {
     }
 
     public static class Statistics {
-        public static final String TBRS_SET = PREFIX + "tbrs_set";
-        public static final String STANDARD_BOLUSES_DELIVERED = PREFIX + "std_boluses_delivered";
-        public static final String SMB_BOLUSES_DELIVERED = PREFIX + "smb_boluses_delivered";
+        public static final int TBRS_SET = R.string.key_omnipod_tbrs_set;
+        public static final int STANDARD_BOLUSES_DELIVERED = R.string.key_omnipod_std_boluses_delivered;
+        public static final int SMB_BOLUSES_DELIVERED = R.string.key_omnipod_smb_boluses_delivered;
     }
 }
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java
index cd15bac1a4..89560786e0 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java
@@ -13,10 +13,10 @@ import info.nightscout.androidaps.plugins.pump.omnipod.R;
  */
 public enum PodHistoryEntryType {
 
-    PAIR_AND_PRIME(1, R.string.omnipod_init_pod_wizard_step2_title, PumpHistoryEntryGroup.Prime),
-    FILL_CANNULA_SET_BASAL_PROFILE(2, R.string.omnipod_init_pod_wizard_step4_title, PumpHistoryEntryGroup.Prime),
+    INITIALIZE_POD(1, R.string.omnipod_cmd_initialize_pod, PumpHistoryEntryGroup.Prime),
+    INSERT_CANNULA(2, R.string.omnipod_cmd_insert_cannula, PumpHistoryEntryGroup.Prime),
     DEACTIVATE_POD(3, R.string.omnipod_cmd_deactivate_pod, PumpHistoryEntryGroup.Prime),
-    RESET_POD_STATE(4, R.string.omnipod_cmd_discard_pod, PumpHistoryEntryGroup.Prime),
+    DISCARD_POD(4, R.string.omnipod_cmd_discard_pod, PumpHistoryEntryGroup.Prime),
 
     SET_TEMPORARY_BASAL(10, R.string.omnipod_cmd_set_tbr, PumpHistoryEntryGroup.Basal),
     CANCEL_TEMPORARY_BASAL_BY_DRIVER(11, R.string.omnipod_cmd_cancel_tbr_by_driver, PumpHistoryEntryGroup.Basal),
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodInitActionType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodInitActionType.java
deleted file mode 100644
index 1424712010..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodInitActionType.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.definition;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.R;
-
-public enum PodInitActionType {
-
-    PAIR_AND_PRIME_WIZARD_STEP(), //
-    PAIR_POD(R.string.omnipod_init_pod_pair_pod, PAIR_AND_PRIME_WIZARD_STEP), //
-    PRIME_POD(R.string.omnipod_init_pod_prime_pod, PAIR_AND_PRIME_WIZARD_STEP), //
-
-    FILL_CANNULA_SET_BASAL_PROFILE_WIZARD_STEP(), //
-    FILL_CANNULA(R.string.omnipod_init_pod_fill_cannula, FILL_CANNULA_SET_BASAL_PROFILE_WIZARD_STEP), //
-    SET_BASAL_PROFILE(R.string.omnipod_init_pod_set_basal_profile, FILL_CANNULA_SET_BASAL_PROFILE_WIZARD_STEP), //
-
-    DEACTIVATE_POD_WIZARD_STEP(), //
-    CANCEL_DELIVERY(R.string.omnipod_deactivate_pod_cancel_delivery, DEACTIVATE_POD_WIZARD_STEP), //
-    DEACTIVATE_POD(R.string.omnipod_deactivate_pod_deactivate_pod, DEACTIVATE_POD_WIZARD_STEP);
-
-    private int resourceId;
-    private PodInitActionType parent;
-
-    PodInitActionType(int resourceId, PodInitActionType parent) {
-        this.resourceId = resourceId;
-        this.parent = parent;
-    }
-
-    PodInitActionType() {
-    }
-
-    public boolean isParent() {
-        return this.parent == null;
-    }
-
-    public List<PodInitActionType> getChildren() {
-
-        List<PodInitActionType> outList = new ArrayList<>();
-
-        for (PodInitActionType value : values()) {
-            if (value.parent == this) {
-                outList.add(value);
-            }
-        }
-
-        return outList;
-    }
-
-    public int getResourceId() {
-        return resourceId;
-    }
-
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodInitReceiver.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodInitReceiver.java
deleted file mode 100644
index 35f9f41229..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodInitReceiver.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.definition;
-
-public interface PodInitReceiver {
-
-    void returnInitTaskStatus(PodInitActionType podInitActionType, boolean isSuccess, String errorMessage);
-
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AcknowledgeAlertsAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AcknowledgeAlertsAction.java
index 6ae13b159c..5b6da7d781 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AcknowledgeAlertsAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/AcknowledgeAlertsAction.java
@@ -6,7 +6,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.mess
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSet;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertSlot;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
@@ -16,12 +15,12 @@ public class AcknowledgeAlertsAction implements OmnipodAction<StatusResponse> {
 
     public AcknowledgeAlertsAction(PodStateManager podStateManager, AlertSet alerts) {
         if (podStateManager == null) {
-            throw new ActionInitializationException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Pod state manager cannot be null");
         }
         if (alerts == null) {
-            throw new ActionInitializationException("Alert set can not be null");
+            throw new IllegalArgumentException("Alert set can not be null");
         } else if (alerts.size() == 0) {
-            throw new ActionInitializationException("Alert set can not be empty");
+            throw new IllegalArgumentException("Alert set can not be empty");
         }
         this.podStateManager = podStateManager;
         this.alerts = alerts;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/BolusAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/BolusAction.java
index c87ccdb497..b58935eeb5 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/BolusAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/BolusAction.java
@@ -9,7 +9,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.mess
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.SetInsulinScheduleCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BolusDeliverySchedule;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
@@ -23,10 +22,10 @@ public class BolusAction implements OmnipodAction<StatusResponse> {
     public BolusAction(PodStateManager podStateManager, double units, Duration timeBetweenPulses,
                        boolean acknowledgementBeep, boolean completionBeep) {
         if (podStateManager == null) {
-            throw new ActionInitializationException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Pod state manager cannot be null");
         }
         if (timeBetweenPulses == null) {
-            throw new ActionInitializationException("Time between pulses cannot be null");
+            throw new IllegalArgumentException("Time between pulses cannot be null");
         }
         this.podStateManager = podStateManager;
         this.units = units;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/CancelDeliveryAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/CancelDeliveryAction.java
index 7b83b3ee96..b0b4c0ad18 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/CancelDeliveryAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/CancelDeliveryAction.java
@@ -10,7 +10,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.mess
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepType;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryType;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
@@ -22,10 +21,10 @@ public class CancelDeliveryAction implements OmnipodAction<StatusResponse> {
     public CancelDeliveryAction(PodStateManager podStateManager, EnumSet<DeliveryType> deliveryTypes,
                                 boolean acknowledgementBeep) {
         if (podStateManager == null) {
-            throw new ActionInitializationException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Pod state manager cannot be null");
         }
         if (deliveryTypes == null) {
-            throw new ActionInitializationException("Delivery types cannot be null");
+            throw new IllegalArgumentException("Delivery types cannot be null");
         }
         this.podStateManager = podStateManager;
         this.deliveryTypes = deliveryTypes;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureAlertsAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureAlertsAction.java
index bc4235c2e0..345127e91e 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureAlertsAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/ConfigureAlertsAction.java
@@ -5,7 +5,6 @@ import java.util.List;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.ConfigureAlertsCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertConfiguration;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
@@ -15,10 +14,10 @@ public class ConfigureAlertsAction implements OmnipodAction<StatusResponse> {
 
     public ConfigureAlertsAction(PodStateManager podStateManager, List<AlertConfiguration> alertConfigurations) {
         if (podStateManager == null) {
-            throw new ActionInitializationException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Pod state manager cannot be null");
         }
         if (alertConfigurations == null) {
-            throw new ActionInitializationException("Alert configurations cannot be null");
+            throw new IllegalArgumentException("Alert configurations cannot be null");
         }
         this.podStateManager = podStateManager;
         this.alertConfigurations = alertConfigurations;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/DeactivatePodAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/DeactivatePodAction.java
index efe855b82f..266396d6e4 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/DeactivatePodAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/DeactivatePodAction.java
@@ -5,7 +5,6 @@ import java.util.EnumSet;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.DeactivatePodCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.DeliveryType;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodFaultException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
@@ -16,7 +15,7 @@ public class DeactivatePodAction implements OmnipodAction<StatusResponse> {
 
     public DeactivatePodAction(PodStateManager podStateManager, boolean acknowledgementBeep) {
         if (podStateManager == null) {
-            throw new ActionInitializationException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Pod state manager cannot be null");
         }
         this.podStateManager = podStateManager;
         this.acknowledgementBeep = acknowledgementBeep;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetPodInfoAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetPodInfoAction.java
index cc925c6e4c..217c768a78 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetPodInfoAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetPodInfoAction.java
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.act
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.GetStatusCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
@@ -13,10 +12,10 @@ public class GetPodInfoAction implements OmnipodAction<PodInfoResponse> {
 
     public GetPodInfoAction(PodStateManager podStateManager, PodInfoType podInfoType) {
         if (podStateManager == null) {
-            throw new ActionInitializationException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Pod state manager cannot be null");
         }
         if (podInfoType == null) {
-            throw new ActionInitializationException("Pod info type cannot be null");
+            throw new IllegalArgumentException("Pod info type cannot be null");
         }
         this.podStateManager = podStateManager;
         this.podInfoType = podInfoType;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetStatusAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetStatusAction.java
index aac7b55d6c..27d1f3a129 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetStatusAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/GetStatusAction.java
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.act
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.GetStatusCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
@@ -12,7 +11,7 @@ public class GetStatusAction implements OmnipodAction<StatusResponse> {
 
     public GetStatusAction(PodStateManager podState) {
         if (podState == null) {
-            throw new ActionInitializationException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Pod state manager cannot be null");
         }
         this.podStateManager = podState;
     }
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/InsertCannulaAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/InsertCannulaAction.java
index b364aa8c81..7dae20fea9 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/InsertCannulaAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/InsertCannulaAction.java
@@ -11,7 +11,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.AlertCo
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPodProgressException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
@@ -26,10 +25,10 @@ public class InsertCannulaAction implements OmnipodAction<StatusResponse> {
     public InsertCannulaAction(PodStateManager podStateManager, BasalSchedule initialBasalSchedule,
                                Duration expirationReminderTimeBeforeShutdown, Integer lowReservoirAlertUnits) {
         if (podStateManager == null) {
-            throw new ActionInitializationException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Pod state manager cannot be null");
         }
         if (initialBasalSchedule == null) {
-            throw new ActionInitializationException("Initial basal schedule cannot be null");
+            throw new IllegalArgumentException("Initial basal schedule cannot be null");
         }
         this.podStateManager = podStateManager;
         this.initialBasalSchedule = initialBasalSchedule;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/PrimeAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/PrimeAction.java
index 115ad1c6b1..44c50e1a38 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/PrimeAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/PrimeAction.java
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.act
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.service.PrimeService;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPodProgressException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
@@ -15,10 +14,10 @@ public class PrimeAction implements OmnipodAction<StatusResponse> {
 
     public PrimeAction(PrimeService primeService, PodStateManager podStateManager) {
         if (primeService == null) {
-            throw new ActionInitializationException("Prime service cannot be null");
+            throw new IllegalArgumentException("Prime service cannot be null");
         }
         if (podStateManager == null) {
-            throw new ActionInitializationException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Pod state manager cannot be null");
         }
         this.service = primeService;
         this.podStateManager = podStateManager;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetBasalScheduleAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetBasalScheduleAction.java
index a64766c5d3..4b35bb781c 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetBasalScheduleAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetBasalScheduleAction.java
@@ -9,7 +9,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.mess
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.SetInsulinScheduleCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
@@ -23,13 +22,13 @@ public class SetBasalScheduleAction implements OmnipodAction<StatusResponse> {
     public SetBasalScheduleAction(PodStateManager podStateManager, BasalSchedule basalSchedule,
                                   boolean confidenceReminder, Duration scheduleOffset, boolean acknowledgementBeep) {
         if (podStateManager == null) {
-            throw new ActionInitializationException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Pod state manager cannot be null");
         }
         if (basalSchedule == null) {
-            throw new ActionInitializationException("Basal schedule cannot be null");
+            throw new IllegalArgumentException("Basal schedule cannot be null");
         }
         if (scheduleOffset == null) {
-            throw new ActionInitializationException("Schedule offset cannot be null");
+            throw new IllegalArgumentException("Schedule offset cannot be null");
         }
         this.podStateManager = podStateManager;
         this.basalSchedule = basalSchedule;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetTempBasalAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetTempBasalAction.java
index cadb602f68..e33de1f8c5 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetTempBasalAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/SetTempBasalAction.java
@@ -10,7 +10,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.mess
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.SetInsulinScheduleCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.TempBasalExtraCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
@@ -24,10 +23,10 @@ public class SetTempBasalAction implements OmnipodAction<StatusResponse> {
     public SetTempBasalAction(PodStateManager podStateManager, double rate, Duration duration,
                               boolean acknowledgementBeep, boolean completionBeep) {
         if (podStateManager == null) {
-            throw new ActionInitializationException("Pod state manager cannot be null");
+            throw new IllegalArgumentException("Pod state manager cannot be null");
         }
         if (duration == null) {
-            throw new ActionInitializationException("Duration cannot be null");
+            throw new IllegalArgumentException("Duration cannot be null");
         }
         this.podStateManager = podStateManager;
         this.rate = rate;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/ExpirationReminderBuilder.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/ExpirationReminderBuilder.java
index 990bed5de6..0c39fefd99 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/ExpirationReminderBuilder.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/action/service/ExpirationReminderBuilder.java
@@ -17,11 +17,9 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.util.AlertConfigur
 public final class ExpirationReminderBuilder {
     private final Map<AlertSlot, AlertConfiguration> alerts = new HashMap<>();
     private final DateTime endOfServiceTime;
-    private final PodStateManager podStateManager;
 
     public ExpirationReminderBuilder(PodStateManager podStateManager) {
         this.endOfServiceTime = podStateManager.getActivatedAt().plus(OmnipodConstants.SERVICE_DURATION);
-        this.podStateManager = podStateManager;
     }
 
     public ExpirationReminderBuilder defaults() {
@@ -45,21 +43,17 @@ public final class ExpirationReminderBuilder {
     public ExpirationReminderBuilder expirationAdvisory(boolean active, Duration timeBeforeShutdown) {
         DateTime expirationAdvisoryAlarmTime = endOfServiceTime.minus(timeBeforeShutdown);
 
-        if (DateTime.now().isBefore(expirationAdvisoryAlarmTime)) {
-            Duration timeUntilExpirationAdvisoryAlarm = new Duration(DateTime.now(),
-                    expirationAdvisoryAlarmTime);
-            AlertConfiguration expirationAdvisoryAlertConfiguration = AlertConfigurationUtil.createExpirationAdvisoryAlertConfiguration(active,
-                    timeUntilExpirationAdvisoryAlarm, timeBeforeShutdown);
-            alerts.put(expirationAdvisoryAlertConfiguration.getAlertSlot(), expirationAdvisoryAlertConfiguration);
-        }
+        Duration timeUntilExpirationAdvisoryAlarm = DateTime.now().isBefore(expirationAdvisoryAlarmTime) ? new Duration(DateTime.now(),
+                expirationAdvisoryAlarmTime) : Duration.ZERO;
+        AlertConfiguration expirationAdvisoryAlertConfiguration = AlertConfigurationUtil.createExpirationAdvisoryAlertConfiguration(active,
+                timeUntilExpirationAdvisoryAlarm, timeBeforeShutdown);
+        alerts.put(expirationAdvisoryAlertConfiguration.getAlertSlot(), expirationAdvisoryAlertConfiguration);
         return this;
     }
 
     public ExpirationReminderBuilder lowReservoir(boolean active, int units) {
-        if (podStateManager.getReservoirLevel() == null || podStateManager.getReservoirLevel().intValue() > units) {
-            AlertConfiguration lowReservoirAlertConfiguration = AlertConfigurationUtil.createLowReservoirAlertConfiguration(active, (double) units);
-            alerts.put(lowReservoirAlertConfiguration.getAlertSlot(), lowReservoirAlertConfiguration);
-        }
+        AlertConfiguration lowReservoirAlertConfiguration = AlertConfigurationUtil.createLowReservoirAlertConfiguration(active, (double) units);
+        alerts.put(lowReservoirAlertConfiguration.getAlertSlot(), lowReservoirAlertConfiguration);
         return this;
     }
 
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodMessage.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodMessage.java
index 995121c1c3..7531631b12 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodMessage.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/OmnipodMessage.java
@@ -3,10 +3,13 @@ package info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.mes
 import java.util.ArrayList;
 import java.util.List;
 
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.command.GetStatusCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodCrc;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PacketType;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CrcMismatchException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.MessageDecodingException;
@@ -91,8 +94,11 @@ public class OmnipodMessage {
         return encodedData;
     }
 
-    public void padWithGetStatusCommands(int packetSize) {
-        while (getEncoded().length < packetSize) {
+    public void padWithGetStatusCommands(int packetSize, AAPSLogger aapsLogger) {
+        while (getEncoded().length <= packetSize) {
+            if (getEncoded().length == PacketType.PDM.getMaxBodyLength()) {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Message length equals max body length: {}", this);
+            }
             messageBlocks.add(new GetStatusCommand(PodInfoType.NORMAL));
         }
     }
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommand.java
index 465d1dee13..6ec315aa16 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommand.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/BolusExtraCommand.java
@@ -6,7 +6,6 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.MessageBlock;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CommandInitializationException;
 
 public class BolusExtraCommand extends MessageBlock {
     private final boolean acknowledgementBeep;
@@ -29,9 +28,9 @@ public class BolusExtraCommand extends MessageBlock {
                              boolean acknowledgementBeep, boolean completionBeep,
                              Duration programReminderInterval, Duration timeBetweenPulses) {
         if (units <= 0D) {
-            throw new CommandInitializationException("Units should be > 0");
+            throw new IllegalArgumentException("Units should be > 0");
         } else if (units > OmnipodConstants.MAX_BOLUS) {
-            throw new CommandInitializationException("Units exceeds max bolus");
+            throw new IllegalArgumentException("Units exceeds max bolus");
         }
         this.units = units;
         this.squareWaveUnits = squareWaveUnits;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommand.java
index 88ad5d206d..c9089559cb 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommand.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/SetInsulinScheduleCommand.java
@@ -12,7 +12,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedul
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BolusDeliverySchedule;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.DeliverySchedule;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.TempBasalDeliverySchedule;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CommandInitializationException;
 
 public class SetInsulinScheduleCommand extends NonceResyncableMessageBlock {
 
@@ -51,12 +50,12 @@ public class SetInsulinScheduleCommand extends NonceResyncableMessageBlock {
     // Temp basal
     public SetInsulinScheduleCommand(int nonce, double tempBasalRate, Duration duration) {
         if (tempBasalRate < 0D) {
-            throw new CommandInitializationException("Rate should be >= 0");
+            throw new IllegalArgumentException("Rate should be >= 0");
         } else if (tempBasalRate > OmnipodConstants.MAX_BASAL_RATE) {
-            throw new CommandInitializationException("Rate exceeds max basal rate");
+            throw new IllegalArgumentException("Rate exceeds max basal rate");
         }
         if (duration.isLongerThan(OmnipodConstants.MAX_TEMP_BASAL_DURATION)) {
-            throw new CommandInitializationException("Duration exceeds max temp basal duration");
+            throw new IllegalArgumentException("Duration exceeds max temp basal duration");
         }
         int pulsesPerHour = (int) Math.round(tempBasalRate / OmnipodConstants.POD_PULSE_SIZE);
         int pulsesPerSegment = pulsesPerHour / 2;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommand.java
index 031b36af71..baac0f9305 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommand.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/command/TempBasalExtraCommand.java
@@ -10,7 +10,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.mess
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.MessageBlockType;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.RateEntry;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CommandInitializationException;
 
 public class TempBasalExtraCommand extends MessageBlock {
     private final boolean acknowledgementBeep;
@@ -24,12 +23,12 @@ public class TempBasalExtraCommand extends MessageBlock {
     public TempBasalExtraCommand(double rate, Duration duration, boolean acknowledgementBeep, boolean completionBeep,
                                  Duration programReminderInterval) {
         if (rate < 0D) {
-            throw new CommandInitializationException("Rate should be >= 0");
+            throw new IllegalArgumentException("Rate should be >= 0");
         } else if (rate > OmnipodConstants.MAX_BASAL_RATE) {
-            throw new CommandInitializationException("Rate exceeds max basal rate");
+            throw new IllegalArgumentException("Rate exceeds max basal rate");
         }
         if (duration.isLongerThan(OmnipodConstants.MAX_TEMP_BASAL_DURATION)) {
-            throw new CommandInitializationException("Duration exceeds max temp basal duration");
+            throw new IllegalArgumentException("Duration exceeds max temp basal duration");
         }
 
         this.acknowledgementBeep = acknowledgementBeep;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultEvent.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultEvent.java
index d099894ab6..13a782fdf7 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultEvent.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoFaultEvent.java
@@ -69,7 +69,9 @@ public class PodInfoFaultEvent extends PodInfo implements StatusUpdatableRespons
 
         unacknowledgedAlerts = new AlertSet(encodedData[15]);
         faultAccessingTables = encodedData[16] == 0x02;
-        logEventErrorType = LogEventErrorCode.fromByte((byte) (encodedData[17] >>> 4));
+        int i = ByteUtil.convertUnsignedByteToInt(encodedData[17]);
+        byte value = (byte) (i >>> 4);
+        logEventErrorType = LogEventErrorCode.fromByte(value);
         logEventErrorPodProgressStatus = PodProgressStatus.fromByte((byte) (encodedData[17] & 0x0f));
         receiverLowGain = (byte) (ByteUtil.convertUnsignedByteToInt(encodedData[18]) >>> 6);
         radioRSSI = (byte) (encodedData[18] & 0x3f);
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodConstants.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodConstants.java
index b36dc765c7..b5b65f0f58 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodConstants.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/definition/OmnipodConstants.java
@@ -21,10 +21,8 @@ public class OmnipodConstants {
     public static final Duration AVERAGE_TEMP_BASAL_COMMAND_COMMUNICATION_DURATION = Duration.millis(1500);
 
     public static final Duration SERVICE_DURATION = Duration.standardHours(80);
-    public static final Duration EXPIRATION_ADVISORY_WINDOW = Duration.standardHours(9);
     public static final Duration END_OF_SERVICE_IMMINENT_WINDOW = Duration.standardHours(1);
     public static final Duration NOMINAL_POD_LIFE = Duration.standardHours(72);
-    public static final double LOW_RESERVOIR_ALERT = 20.0;
 
     public static final double POD_PRIME_BOLUS_UNITS = 2.6;
     public static final double POD_CANNULA_INSERTION_BOLUS_UNITS = 0.5;
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/ActionInitializationException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/ActionInitializationException.java
deleted file mode 100644
index 1de5bf13dc..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/ActionInitializationException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception;
-
-public class ActionInitializationException extends OmnipodException {
-    public ActionInitializationException(String message) {
-        super(message, true);
-    }
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CommandInitializationException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CommandInitializationException.java
deleted file mode 100644
index 57bd2c0189..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CommandInitializationException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception;
-
-public class CommandInitializationException extends OmnipodException {
-    public CommandInitializationException(String message) {
-        super(message, true);
-    }
-
-    public CommandInitializationException(String message, Throwable cause) {
-        super(message, cause, true);
-    }
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CommunicationException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CommunicationException.java
deleted file mode 100644
index e9a7eb3bd0..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/CommunicationException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception;
-
-public class CommunicationException extends OmnipodException {
-    private final Type type;
-
-    public CommunicationException(Type type) {
-        super(type.getDescription(), false);
-        this.type = type;
-    }
-
-    public CommunicationException(Type type, Throwable cause) {
-        super(type.getDescription() + ": " + cause, cause, false);
-        this.type = type;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-    public enum Type {
-        TIMEOUT("Communication timeout"),
-        UNEXPECTED_EXCEPTION("Caught an unexpected Exception");
-
-        private final String description;
-
-        Type(String description) {
-            this.description = description;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-    }
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodProgressStatusVerificationFailedException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodProgressStatusVerificationFailedException.java
new file mode 100644
index 0000000000..d429e6a900
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/PodProgressStatusVerificationFailedException.java
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception;
+
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus;
+
+public class PodProgressStatusVerificationFailedException extends OmnipodException {
+    private final PodProgressStatus expectedStatus;
+
+    public PodProgressStatusVerificationFailedException(PodProgressStatus expectedStatus, Throwable cause) {
+        super("Failed to verify Pod progress status (expected=" + expectedStatus + ")", cause, false);
+        this.expectedStatus = expectedStatus;
+    }
+
+    public PodProgressStatus getExpectedStatus() {
+        return expectedStatus;
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkInterruptedException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkInterruptedException.java
new file mode 100644
index 0000000000..3cb5f18267
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkInterruptedException.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception;
+
+public class RileyLinkInterruptedException extends OmnipodException {
+    public RileyLinkInterruptedException() {
+        super("RileyLink interrupted", false);
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkTimeoutException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkTimeoutException.java
new file mode 100644
index 0000000000..7e4b48a226
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkTimeoutException.java
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception;
+
+// Response indicating that there was a timeout in communication between the RileyLink and the Pod
+public class RileyLinkTimeoutException extends OmnipodException {
+    public RileyLinkTimeoutException() {
+        super("Timeout in communication between RileyLink and Pod", false);
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnexpectedException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnexpectedException.java
new file mode 100644
index 0000000000..e844eca158
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnexpectedException.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception;
+
+public class RileyLinkUnexpectedException extends OmnipodException {
+    public RileyLinkUnexpectedException(Throwable cause) {
+        super("Unexpected Exception during RileyLink communication", cause, false);
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnreachableException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnreachableException.java
new file mode 100644
index 0000000000..05320c051d
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/exception/RileyLinkUnreachableException.java
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.driver.exception;
+
+// Indicates that we didn't get any response from the RL
+public class RileyLinkUnreachableException extends OmnipodException {
+    public RileyLinkUnreachableException() {
+        super("Timeout in communication between phone and RileyLink", false);
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java
index 9da707a26b..e642fd1f71 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/OmnipodManager.java
@@ -41,7 +41,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfo
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CommandFailedAfterChangingDeliveryStatusException;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CommunicationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.DeliveryStatusVerificationFailedException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalDeliveryStatusException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPacketTypeException;
@@ -49,6 +48,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalP
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.NonceOutOfSyncException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.OmnipodException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodFaultException;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodProgressStatusVerificationFailedException;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.Completable;
@@ -59,7 +59,7 @@ import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.SingleSubject;
 
 public class OmnipodManager {
-    private static final int ACTION_VERIFICATION_TRIES = 3;
+    private static final int ACTION_VERIFICATION_TRIES = 2;
 
     private final OmnipodRileyLinkCommunicationManager communicationService;
     private PodStateManager podStateManager;
@@ -87,7 +87,7 @@ public class OmnipodManager {
         this.podStateManager = podStateManager;
     }
 
-    public synchronized Single<SetupActionResult> pairAndPrime() {
+    public synchronized Single<Boolean> pairAndPrime() {
         logStartingCommandExecution("pairAndPrime");
 
         try {
@@ -126,14 +126,14 @@ public class OmnipodManager {
             logCommandExecutionFinished("pairAndPrime");
         }
 
-        long delayInSeconds = calculateBolusDuration(OmnipodConstants.POD_PRIME_BOLUS_UNITS, OmnipodConstants.POD_PRIMING_DELIVERY_RATE).getStandardSeconds();
+        long delayInMillis = calculateEstimatedBolusDuration(DateTime.now().minus(OmnipodConstants.AVERAGE_BOLUS_COMMAND_COMMUNICATION_DURATION), OmnipodConstants.POD_PRIME_BOLUS_UNITS, OmnipodConstants.POD_PRIMING_DELIVERY_RATE).getMillis();
 
-        return Single.timer(delayInSeconds, TimeUnit.SECONDS) //
-                .map(o -> verifySetupAction(PodProgressStatus.PRIMING_COMPLETED)) //
-                .observeOn(Schedulers.io());
+        return Single.timer(delayInMillis, TimeUnit.MILLISECONDS) //
+                .map(o -> verifyPodProgressStatus(PodProgressStatus.PRIMING_COMPLETED)) //
+                .subscribeOn(Schedulers.io());
     }
 
-    public synchronized Single<SetupActionResult> insertCannula(
+    public synchronized Single<Boolean> insertCannula(
             BasalSchedule basalSchedule, Duration expirationReminderTimeBeforeShutdown, Integer lowReservoirAlertUnits) {
         if (!podStateManager.isPodInitialized() || podStateManager.getPodProgressStatus().isBefore(PodProgressStatus.PRIMING_COMPLETED)) {
             throw new IllegalPodProgressException(PodProgressStatus.PRIMING_COMPLETED, !podStateManager.isPodInitialized() ? null : podStateManager.getPodProgressStatus());
@@ -154,11 +154,11 @@ public class OmnipodManager {
             logCommandExecutionFinished("insertCannula");
         }
 
-        long delayInSeconds = calculateBolusDuration(OmnipodConstants.POD_CANNULA_INSERTION_BOLUS_UNITS, OmnipodConstants.POD_CANNULA_INSERTION_DELIVERY_RATE).getStandardSeconds();
+        long delayInMillis = calculateEstimatedBolusDuration(DateTime.now().minus(OmnipodConstants.AVERAGE_BOLUS_COMMAND_COMMUNICATION_DURATION), OmnipodConstants.POD_CANNULA_INSERTION_BOLUS_UNITS, OmnipodConstants.POD_CANNULA_INSERTION_DELIVERY_RATE).getMillis();
 
-        return Single.timer(delayInSeconds, TimeUnit.SECONDS) //
-                .map(o -> verifySetupAction(PodProgressStatus.ABOVE_FIFTY_UNITS)) //
-                .observeOn(Schedulers.io());
+        return Single.timer(delayInMillis, TimeUnit.MILLISECONDS) //
+                .map(o -> verifyPodProgressStatus(PodProgressStatus.ABOVE_FIFTY_UNITS)) //
+                .subscribeOn(Schedulers.io());
     }
 
     public synchronized StatusResponse getPodStatus() {
@@ -224,13 +224,10 @@ public class OmnipodManager {
                 suspendDelivery(acknowledgementBeep);
             }
 
-            // Store the new Basal schedule after successfully suspending delivery, so that if setting the Basal schedule fails,
-            // And we later try to resume delivery, the new schedule is used
-            podStateManager.setBasalSchedule(schedule);
-
             try {
                 executeAndVerify(() -> communicationService.executeAction(new SetBasalScheduleAction(podStateManager, schedule,
                         false, podStateManager.getScheduleOffset(), acknowledgementBeep)));
+                podStateManager.setBasalSchedule(schedule);
             } catch (OmnipodException ex) {
                 if (ex.isCertainFailure()) {
                     if (!wasSuspended) {
@@ -240,7 +237,9 @@ public class OmnipodManager {
                 }
 
                 // verifyDeliveryStatus will throw an exception if verification fails
-                if (!verifyDeliveryStatus(DeliveryStatus.NORMAL, ex)) {
+                if (verifyDeliveryStatus(DeliveryStatus.NORMAL, ex)) {
+                    podStateManager.setBasalSchedule(schedule);
+                } else {
                     if (!wasSuspended) {
                         throw new CommandFailedAfterChangingDeliveryStatusException("Suspending delivery succeeded but setting the new basal schedule did not", ex);
                     }
@@ -248,6 +247,8 @@ public class OmnipodManager {
                     throw ex;
                 }
             }
+
+
         } finally {
             logCommandExecutionFinished("setBasalSchedule");
         }
@@ -270,10 +271,14 @@ public class OmnipodManager {
                         throw ex;
                     }
 
-                    // verifyDeliveryStatus will throw an exception if verification fails
-                    if (!verifyDeliveryStatus(DeliveryStatus.NORMAL, ex)) {
-                        ex.setCertainFailure(true);
-                        throw ex;
+                    try {
+                        if (!verifyDeliveryStatus(DeliveryStatus.NORMAL, ex)) {
+                            ex.setCertainFailure(true);
+                            throw ex;
+                        }
+                    } catch (DeliveryStatusVerificationFailedException ex2) {
+                        podStateManager.setTempBasalCertain(false);
+                        throw ex2;
                     }
                 }
             }
@@ -321,7 +326,23 @@ public class OmnipodManager {
     }
 
     public synchronized void cancelTemporaryBasal(boolean acknowledgementBeep) {
-        cancelDelivery(EnumSet.of(DeliveryType.TEMP_BASAL), acknowledgementBeep);
+        try {
+            cancelDelivery(EnumSet.of(DeliveryType.TEMP_BASAL), acknowledgementBeep);
+        } catch (OmnipodException ex) {
+            if (ex.isCertainFailure()) {
+                throw ex;
+            }
+
+            try {
+                if (!verifyDeliveryStatus(DeliveryStatus.NORMAL, ex)) {
+                    ex.setCertainFailure(true);
+                    throw ex;
+                }
+            } catch (DeliveryStatusVerificationFailedException ex2) {
+                podStateManager.setTempBasalCertain(false);
+                throw ex2;
+            }
+        }
     }
 
     private synchronized StatusResponse cancelDelivery(EnumSet<DeliveryType> deliveryTypes, boolean acknowledgementBeep) {
@@ -367,7 +388,7 @@ public class OmnipodManager {
         }
 
         DateTime estimatedBolusStartDate = DateTime.now().minus(OmnipodConstants.AVERAGE_BOLUS_COMMAND_COMMUNICATION_DURATION);
-        Duration estimatedBolusDuration = calculateBolusDuration(units, OmnipodConstants.POD_BOLUS_DELIVERY_RATE);
+        Duration estimatedBolusDuration = calculateEstimatedBolusDuration(estimatedBolusStartDate, units, OmnipodConstants.POD_BOLUS_DELIVERY_RATE);
         Duration estimatedRemainingBolusDuration = estimatedBolusDuration.minus(OmnipodConstants.AVERAGE_BOLUS_COMMAND_COMMUNICATION_DURATION);
 
         podStateManager.setLastBolus(estimatedBolusStartDate, units, estimatedBolusDuration, commandDeliveryStatus == CommandDeliveryStatus.SUCCESS);
@@ -376,11 +397,11 @@ public class OmnipodManager {
 
         if (progressIndicationConsumer != null) {
 
-            int numberOfProgressReports = Math.max(20, Math.min(100, (int) Math.ceil(units) * 10));
+            long numberOfProgressReports = Math.max(10, Math.min(100, estimatedRemainingBolusDuration.getStandardSeconds()));
             long progressReportInterval = estimatedRemainingBolusDuration.getMillis() / numberOfProgressReports;
 
             disposables.add(Flowable.intervalRange(0, numberOfProgressReports + 1, 0, progressReportInterval, TimeUnit.MILLISECONDS) //
-                    .observeOn(Schedulers.io()) //
+                    .subscribeOn(Schedulers.io()) //
                     .subscribe(count -> {
                         int percentage = (int) ((double) count / numberOfProgressReports * 100);
                         double estimatedUnitsDelivered = activeBolusData == null ? 0 : activeBolusData.estimateUnitsDelivered();
@@ -400,8 +421,8 @@ public class OmnipodManager {
         bolusCommandExecutionSubject = null;
 
         disposables.add(Completable.complete() //
-                .delay(estimatedRemainingBolusDuration.getMillis() + 250, TimeUnit.MILLISECONDS) //
-                .observeOn(Schedulers.io()) //
+                .delay(estimatedRemainingBolusDuration.getMillis(), TimeUnit.MILLISECONDS) //
+                .subscribeOn(Schedulers.io()) //
                 .doOnComplete(() -> {
                     synchronized (bolusDataMutex) {
                         double bolusNotDelivered = 0.0d;
@@ -412,9 +433,8 @@ public class OmnipodManager {
                                 StatusResponse statusResponse = getPodStatus();
                                 if (statusResponse.getDeliveryStatus().isBolusing()) {
                                     throw new IllegalDeliveryStatusException(DeliveryStatus.NORMAL, statusResponse.getDeliveryStatus());
-                                } else {
-                                    break;
                                 }
+                                break;
                             } catch (PodFaultException ex) {
                                 // Subtract units not delivered in case of a Pod failure
                                 bolusNotDelivered = ex.getFaultEvent().getBolusNotDelivered();
@@ -513,6 +533,8 @@ public class OmnipodManager {
                 podStateManager.setTimeZone(oldTimeZone);
                 throw ex;
             }
+
+            podStateManager.updateActivatedAt();
         } finally {
             logCommandExecutionFinished("setTime");
         }
@@ -529,9 +551,9 @@ public class OmnipodManager {
         try {
             PodInfoResponse podInfoResponse = communicationService.executeAction(new GetPodInfoAction(podStateManager, PodInfoType.RECENT_PULSE_LOG));
             PodInfoRecentPulseLog pulseLogInfo = (PodInfoRecentPulseLog) podInfoResponse.getPodInfo();
-            aapsLogger.info(LTag.PUMPCOMM, "Retrieved pulse log from the pod: {}", pulseLogInfo.toString());
+            aapsLogger.info(LTag.PUMPCOMM, "Read pulse log from the pod: {}", pulseLogInfo.toString());
         } catch (Exception ex) {
-            aapsLogger.warn(LTag.PUMPCOMM, "Failed to retrieve pulse log from the pod", ex);
+            aapsLogger.warn(LTag.PUMPCOMM, "Failed to read pulse log", ex);
         }
 
         try {
@@ -573,7 +595,7 @@ public class OmnipodManager {
         logStartingCommandExecution("verifyCommand");
         try {
             return supplier.get();
-        } catch (Exception originalException) {
+        } catch (OmnipodException originalException) {
             if (isCertainFailure(originalException)) {
                 throw originalException;
             } else {
@@ -586,18 +608,11 @@ public class OmnipodManager {
 
                     return statusResponse;
                 } catch (NonceOutOfSyncException verificationException) {
-                    aapsLogger.error(LTag.PUMPCOMM, "Command resolved to FAILURE (CERTAIN_FAILURE)", verificationException);
-
-                    if (originalException instanceof OmnipodException) {
-                        ((OmnipodException) originalException).setCertainFailure(true);
-                        throw originalException;
-                    } else {
-                        OmnipodException newException = new CommunicationException(CommunicationException.Type.UNEXPECTED_EXCEPTION, originalException);
-                        newException.setCertainFailure(true);
-                        throw newException;
-                    }
+                    aapsLogger.info(LTag.PUMPCOMM, "Command resolved to FAILURE (CERTAIN_FAILURE)", verificationException);
+                    originalException.setCertainFailure(true);
+                    throw originalException;
                 } catch (Exception verificationException) {
-                    aapsLogger.error(LTag.PUMPCOMM, "Command unresolved (UNCERTAIN_FAILURE)", verificationException);
+                    aapsLogger.warn(LTag.PUMPCOMM, "Command unresolved (UNCERTAIN_FAILURE)", verificationException);
                     throw originalException;
                 }
             }
@@ -612,26 +627,36 @@ public class OmnipodManager {
         }
     }
 
-    private SetupActionResult verifySetupAction(PodProgressStatus expectedPodProgressStatus) {
-        SetupActionResult result = null;
+    /**
+     * @param expectedPodProgressStatus expected Pod progress status
+     * @return true if the Pod's progress status matches the expected status, otherwise false
+     * @throws PodProgressStatusVerificationFailedException in case reading the Pod status fails
+     */
+    private boolean verifyPodProgressStatus(PodProgressStatus expectedPodProgressStatus) {
+        Boolean result = null;
+        Throwable lastException = null;
+
         for (int i = 0; ACTION_VERIFICATION_TRIES > i; i++) {
             try {
                 StatusResponse statusResponse = getPodStatus();
 
                 if (statusResponse.getPodProgressStatus().equals(expectedPodProgressStatus)) {
-                    result = new SetupActionResult(SetupActionResult.ResultType.SUCCESS);
-                    break;
+                    return true;
                 } else {
-                    result = new SetupActionResult(SetupActionResult.ResultType.FAILURE) //
-                            .podProgressStatus(statusResponse.getPodProgressStatus());
-                    break;
+                    result = false;
                 }
             } catch (Exception ex) {
-                result = new SetupActionResult(SetupActionResult.ResultType.VERIFICATION_FAILURE) //
-                        .exception(ex);
+                lastException = ex;
             }
         }
-        return result;
+
+        if (result != null) {
+            return result;
+        }
+
+        final Throwable ex = lastException;
+
+        throw new PodProgressStatusVerificationFailedException(expectedPodProgressStatus, ex);
     }
 
     /**
@@ -664,14 +689,27 @@ public class OmnipodManager {
         aapsLogger.debug(LTag.PUMPCOMM, "Command execution finished for action: " + action);
     }
 
-    private static Duration calculateBolusDuration(double units, double deliveryRate) {
-        // TODO take current (temp) basal into account
-        //  Be aware that the Pod possibly doesn't have a Basal Schedule yet
-        return Duration.standardSeconds((long) Math.ceil(units / deliveryRate));
-    }
+    private Duration calculateEstimatedBolusDuration(DateTime startTime, double units, double deliveryRateInUnitsPerSecond) {
+        if (!podStateManager.isPodActivationCompleted()) {
+            // No basal or temp basal is active yet
+            return Duration.standardSeconds((long) Math.ceil(units / deliveryRateInUnitsPerSecond));
+        }
 
-    public static Duration calculateBolusDuration(double units) {
-        return calculateBolusDuration(units, OmnipodConstants.POD_BOLUS_DELIVERY_RATE);
+        double pulseIntervalInSeconds = OmnipodConstants.POD_PULSE_SIZE / deliveryRateInUnitsPerSecond;
+        long numberOfPulses = Math.round(units / OmnipodConstants.POD_PULSE_SIZE);
+        double totalEstimatedDurationInSeconds = 0D;
+
+        for (int i = 0; numberOfPulses > i; i++) {
+            DateTime estimatedTimeAtPulse = startTime.plusMillis((int) (totalEstimatedDurationInSeconds * 1000));
+            double effectiveBasalRateAtPulse = podStateManager.getEffectiveBasalRateAt(estimatedTimeAtPulse);
+            double effectivePulsesPerHourAtPulse = effectiveBasalRateAtPulse / OmnipodConstants.POD_PULSE_SIZE;
+            double effectiveBasalPulsesPerSecondAtPulse = effectivePulsesPerHourAtPulse / 3600;
+            double effectiveBasalPulsesPerBolusPulse = pulseIntervalInSeconds * effectiveBasalPulsesPerSecondAtPulse;
+
+            totalEstimatedDurationInSeconds += pulseIntervalInSeconds * (1 + effectiveBasalPulsesPerBolusPulse);
+        }
+
+        return Duration.millis(Math.round(totalEstimatedDurationInSeconds * 1000));
     }
 
     public static boolean isCertainFailure(Exception ex) {
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/PodStateManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/PodStateManager.java
index 4aed1057f6..f7fa1ee694 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/PodStateManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/PodStateManager.java
@@ -84,6 +84,7 @@ public abstract class PodStateManager {
 
     /**
      * @return true if we have a Pod state and the Pod is running, meaning the activation process has completed and the Pod is not deactivated or in a fault state
+     * This does not mean the Pod is actually delivering insulin, combine with {@link #isSuspended() isSuspended()} for that
      */
     public final boolean isPodRunning() {
         return isPodInitialized() && getPodProgressStatus().isRunning();
@@ -295,8 +296,21 @@ public abstract class PodStateManager {
     }
 
     public final DateTime getTime() {
-        DateTime now = DateTime.now();
-        return now.withZone(getSafe(() -> podState.getTimeZone()));
+        DateTimeZone timeZone = getSafe(() -> podState.getTimeZone());
+        if (timeZone == null) {
+            return DateTime.now();
+        }
+        Duration timeActive = getSafe(() -> podState.getTimeActive());
+        DateTime activatedAt = getSafe(() -> podState.getActivatedAt());
+        DateTime lastUpdatedFromResponse = getSafe(() -> podState.getLastUpdatedFromResponse());
+        if (timeActive == null || activatedAt == null) {
+            return DateTime.now().withZone(timeZone);
+        }
+        return activatedAt.plus(timeActive).plus(new Duration(lastUpdatedFromResponse, DateTime.now()));
+    }
+
+    public final boolean timeDeviatesMoreThan(Duration duration) {
+        return new Duration(getTime(), DateTime.now().withZoneRetainFields(getSafe(() -> podState.getTimeZone()))).abs().isLongerThan(duration);
     }
 
     public final DateTime getActivatedAt() {
@@ -304,22 +318,23 @@ public abstract class PodStateManager {
         return activatedAt == null ? null : activatedAt.withZone(getSafe(() -> podState.getTimeZone()));
     }
 
+    public final void updateActivatedAt() {
+        setAndStore(() -> podState.setActivatedAt(DateTime.now().withZone(getSafe(() -> podState.getTimeZone())).minus(getSafe(this::getTimeActive))));
+    }
+
+    public final Duration getTimeActive() {
+        return getSafe(() -> podState.getTimeActive());
+    }
+
     public final DateTime getExpiresAt() {
-        DateTime expiresAt = getSafe(() -> podState.getExpiresAt());
-        return expiresAt == null ? null : expiresAt.withZone(getSafe(() -> podState.getTimeZone()));
+        DateTime activatedAt = getSafe(() -> podState.getActivatedAt());
+        return activatedAt == null ? null : activatedAt.withZone(getSafe(() -> podState.getTimeZone())).plus(OmnipodConstants.NOMINAL_POD_LIFE);
     }
 
     public final PodProgressStatus getPodProgressStatus() {
         return getSafe(() -> podState.getPodProgressStatus());
     }
 
-    public final void setPodProgressStatus(PodProgressStatus podProgressStatus) {
-        if (podProgressStatus == null) {
-            throw new IllegalArgumentException("Pod progress status can not be null");
-        }
-        setAndStore(() -> podState.setPodProgressStatus(podProgressStatus));
-    }
-
     public final boolean isSuspended() {
         return getSafe(() -> podState.isSuspended());
     }
@@ -392,6 +407,10 @@ public abstract class PodStateManager {
         return certain == null || certain;
     }
 
+    public final void setTempBasalCertain(boolean certain) {
+        setSafe(() -> podState.setTempBasalCertain(certain));
+    }
+
     public final void setTempBasal(DateTime startTime, Double amount, Duration duration, boolean certain) {
         setTempBasal(startTime, amount, duration, certain, true);
     }
@@ -427,16 +446,50 @@ public abstract class PodStateManager {
     }
 
     /**
-     * @return true when a Temp Basal is stored in the Pod Stated and this temp basal is currently running (based on start time and duration)
+     * @return true when a Temp Basal is stored in the Pod State and this temp basal is currently running (based on start time and duration)
      */
     public final boolean isTempBasalRunning() {
+        return isTempBasalRunningAt(DateTime.now());
+    }
+
+    /**
+     * @return true when a Temp Basal is stored in the Pod State and this temp basal is running at the given time (based on start time and duration)
+     */
+    public final boolean isTempBasalRunningAt(DateTime time) {
         if (hasTempBasal()) {
-            DateTime tempBasalEndTime = getTempBasalStartTime().plus(getTempBasalDuration());
-            return DateTime.now().isBefore(tempBasalEndTime);
+            DateTime tempBasalStartTime = getTempBasalStartTime();
+            DateTime tempBasalEndTime = tempBasalStartTime.plus(getTempBasalDuration());
+            return (time.isAfter(tempBasalStartTime) || time.isEqual(tempBasalStartTime)) && time.isBefore(tempBasalEndTime);
         }
         return false;
     }
 
+    /**
+     * @return the current effective basal rate (taking Pod suspension, TBR, and basal profile into account)
+     */
+    public final double getEffectiveBasalRate() {
+        if (isSuspended()) {
+            return 0d;
+        }
+        return getEffectiveBasalRateAt(DateTime.now());
+    }
+
+    /**
+     * @return the effective basal rate at the given time (taking TBR, and basal profile into account)
+     * Suspension is not taken into account as we don't keep historic data of that
+     */
+    public final double getEffectiveBasalRateAt(DateTime time) {
+        BasalSchedule basalSchedule = getSafe(() -> podState.getBasalSchedule());
+        if (basalSchedule == null) {
+            return 0d;
+        }
+        if (isTempBasalRunningAt(time)) {
+            return getTempBasalAmount();
+        }
+        Duration offset = new Duration(time.withTimeAtStartOfDay(), time);
+        return basalSchedule.rateAt(offset);
+    }
+
     public final DeliveryStatus getLastDeliveryStatus() {
         return getSafe(() -> podState.getLastDeliveryStatus());
     }
@@ -463,21 +516,16 @@ public abstract class PodStateManager {
     public final void updateFromResponse(StatusUpdatableResponse statusResponse) {
         setSafe(() -> {
             if (podState.getActivatedAt() == null) {
-                DateTime activatedAtCalculated = getTime().minus(statusResponse.getTimeActive());
+                DateTime activatedAtCalculated = DateTime.now().withZone(podState.getTimeZone()).minus(statusResponse.getTimeActive());
                 podState.setActivatedAt(activatedAtCalculated);
             }
-            DateTime expiresAt = podState.getExpiresAt();
-            DateTime expiresAtCalculated = podState.getActivatedAt().plus(OmnipodConstants.NOMINAL_POD_LIFE);
-            if (expiresAt == null || expiresAtCalculated.isBefore(expiresAt) || expiresAtCalculated.isAfter(expiresAt.plusMinutes(1))) {
-                podState.setExpiresAt(expiresAtCalculated);
-            }
-
             podState.setSuspended(statusResponse.getDeliveryStatus() == DeliveryStatus.SUSPENDED);
             podState.setActiveAlerts(statusResponse.getUnacknowledgedAlerts());
             podState.setLastDeliveryStatus(statusResponse.getDeliveryStatus());
             podState.setReservoirLevel(statusResponse.getReservoirLevel());
             podState.setTotalTicksDelivered(statusResponse.getTicksDelivered());
             podState.setPodProgressStatus(statusResponse.getPodProgressStatus());
+            podState.setTimeActive(statusResponse.getTimeActive());
             if (statusResponse.getDeliveryStatus().isTbrRunning()) {
                 if (!isTempBasalCertain() && isTempBasalRunning()) {
                     podState.setTempBasalCertain(true);
@@ -577,7 +625,7 @@ public abstract class PodStateManager {
         private DateTime lastUpdatedFromResponse;
         private DateTimeZone timeZone;
         private DateTime activatedAt;
-        private DateTime expiresAt;
+        private Duration timeActive;
         private PodInfoFaultEvent faultEvent;
         private Double reservoirLevel;
         private Integer totalTicksDelivered;
@@ -695,12 +743,12 @@ public abstract class PodStateManager {
             this.activatedAt = activatedAt;
         }
 
-        DateTime getExpiresAt() {
-            return expiresAt;
+        public Duration getTimeActive() {
+            return timeActive;
         }
 
-        void setExpiresAt(DateTime expiresAt) {
-            this.expiresAt = expiresAt;
+        public void setTimeActive(Duration timeActive) {
+            this.timeActive = timeActive;
         }
 
         PodInfoFaultEvent getFaultEvent() {
@@ -881,7 +929,7 @@ public abstract class PodStateManager {
                     ", lastUpdatedFromResponse=" + lastUpdatedFromResponse +
                     ", timeZone=" + timeZone +
                     ", activatedAt=" + activatedAt +
-                    ", expiresAt=" + expiresAt +
+                    ", timeActive=" + timeActive +
                     ", faultEvent=" + faultEvent +
                     ", reservoirLevel=" + reservoirLevel +
                     ", totalTicksDelivered=" + totalTicksDelivered +
@@ -899,7 +947,7 @@ public abstract class PodStateManager {
                     ", tempBasalStartTime=" + tempBasalStartTime +
                     ", tempBasalDuration=" + tempBasalDuration +
                     ", tempBasalCertain=" + tempBasalCertain +
-                    ", expirationAlertHoursBeforeShutdown=" + expirationAlertTimeBeforeShutdown +
+                    ", expirationAlertTimeBeforeShutdown=" + expirationAlertTimeBeforeShutdown +
                     ", lowReservoirAlertUnits=" + lowReservoirAlertUnits +
                     ", configuredAlerts=" + configuredAlerts +
                     '}';
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/SetupActionResult.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/SetupActionResult.java
deleted file mode 100644
index 867c56aa9f..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/SetupActionResult.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.driver.manager;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus;
-
-public class SetupActionResult {
-    private final ResultType resultType;
-    private String message;
-    private Exception exception;
-    private PodProgressStatus podProgressStatus;
-
-    public SetupActionResult(ResultType resultType) {
-        this.resultType = resultType;
-    }
-
-    public SetupActionResult message(String message) {
-        this.message = message;
-        return this;
-    }
-
-    public SetupActionResult exception(Exception ex) {
-        exception = ex;
-        return this;
-    }
-
-    public SetupActionResult podProgressStatus(PodProgressStatus podProgressStatus) {
-        this.podProgressStatus = podProgressStatus;
-        return this;
-    }
-
-    public ResultType getResultType() {
-        return resultType;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public Exception getException() {
-        return exception;
-    }
-
-    public PodProgressStatus getPodProgressStatus() {
-        return podProgressStatus;
-    }
-
-    public enum ResultType {
-        SUCCESS(true),
-        VERIFICATION_FAILURE(false),
-        FAILURE(false);
-
-        private final boolean success;
-
-        ResultType(boolean success) {
-            this.success = success;
-        }
-
-        public boolean isSuccess() {
-            return success;
-        }
-    }
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/AlertConfigurationUtil.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/AlertConfigurationUtil.java
index 0d223458d6..92e2d2d74d 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/AlertConfigurationUtil.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/util/AlertConfigurationUtil.java
@@ -18,12 +18,12 @@ public class AlertConfigurationUtil {
 
     public static AlertConfiguration createExpirationAdvisoryAlertConfiguration(boolean active, Duration timeUntilAlert, Duration duration) {
         return new AlertConfiguration(AlertType.EXPIRATION_ADVISORY_ALERT, AlertSlot.SLOT7, active, false, duration,
-                new TimerAlertTrigger(timeUntilAlert), BeepType.BIP_BEEP_BIP_BEEP_BIP_BEEP_BIP_BEEP, BeepRepeat.EVERY_15_MINUTES);
+                new TimerAlertTrigger(timeUntilAlert), BeepType.BIP_BEEP_BIP_BEEP_BIP_BEEP_BIP_BEEP, BeepRepeat.EVERY_MINUTE_FOR_3_MINUTES_REPEAT_EVERY_15_MINUTES);
     }
 
     public static AlertConfiguration createShutdownImminentAlertConfiguration(Duration timeUntilAlert) {
         return new AlertConfiguration(AlertType.SHUTDOWN_IMMINENT_ALARM, AlertSlot.SLOT2, true, false, Duration.ZERO,
-                new TimerAlertTrigger(timeUntilAlert), BeepType.BIP_BEEP_BIP_BEEP_BIP_BEEP_BIP_BEEP, BeepRepeat.EVERY_MINUTE_FOR_3_MINUTES_REPEAT_EVERY_15_MINUTES);
+                new TimerAlertTrigger(timeUntilAlert), BeepType.BIP_BEEP_BIP_BEEP_BIP_BEEP_BIP_BEEP, BeepRepeat.EVERY_15_MINUTES);
     }
 
     public static AlertConfiguration createAutoOffAlertConfiguration(boolean active, Duration countdownDuration) {
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
index 97a2123d76..cddf3b2692 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
@@ -2,10 +2,13 @@ package info.nightscout.androidaps.plugins.pump.omnipod.manager;
 
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.function.Supplier;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -14,15 +17,19 @@ import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.OmnipodHistoryRecord;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.Event;
+import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -32,10 +39,9 @@ import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.data.ActiveBolus;
+import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodCommandType;
 import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodStorageKeys;
 import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodHistoryEntryType;
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitActionType;
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitReceiver;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoRecentPulseLog;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoResponse;
@@ -44,12 +50,10 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.Deliver
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.FaultEventCode;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalSchedule;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.schedule.BasalScheduleEntry;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CommandFailedAfterChangingDeliveryStatusException;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CommandInitializationException;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CommunicationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CrcMismatchException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.DeliveryStatusVerificationFailedException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalDeliveryStatusException;
@@ -66,16 +70,19 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.NotEnoug
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.OmnipodException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodFaultException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodReturnedErrorResponseException;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkInterruptedException;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkTimeoutException;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkUnexpectedException;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkUnreachableException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.OmnipodManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.SetupActionResult;
 import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodPumpValuesChanged;
 import info.nightscout.androidaps.plugins.pump.omnipod.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.AapsOmnipodUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodAlertUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
-import io.reactivex.disposables.Disposable;
 import io.reactivex.subjects.SingleSubject;
 
 @Singleton
@@ -92,6 +99,8 @@ public class AapsOmnipodManager {
     private final OmnipodManager delegate;
     private final DatabaseHelperInterface databaseHelper;
     private final OmnipodAlertUtil omnipodAlertUtil;
+    private final NSUpload nsUpload;
+    private final ProfileFunction profileFunction;
 
     private boolean basalBeepsEnabled;
     private boolean bolusBeepsEnabled;
@@ -112,20 +121,22 @@ public class AapsOmnipodManager {
                               HasAndroidInjector injector,
                               ActivePluginProvider activePlugin,
                               DatabaseHelperInterface databaseHelper,
-                              OmnipodAlertUtil omnipodAlertUtil) {
-        if (podStateManager == null) {
-            throw new IllegalArgumentException("Pod state manager can not be null");
-        }
+                              OmnipodAlertUtil omnipodAlertUtil,
+                              NSUpload nsUpload,
+                              ProfileFunction profileFunction
+    ) {
         this.podStateManager = podStateManager;
         this.aapsOmnipodUtil = aapsOmnipodUtil;
         this.aapsLogger = aapsLogger;
         this.rxBus = rxBus;
+        this.sp = sp;
         this.resourceHelper = resourceHelper;
         this.injector = injector;
         this.activePlugin = activePlugin;
         this.databaseHelper = databaseHelper;
-        this.sp = sp;
         this.omnipodAlertUtil = omnipodAlertUtil;
+        this.nsUpload = nsUpload;
+        this.profileFunction = profileFunction;
 
         delegate = new OmnipodManager(aapsLogger, sp, communicationService, podStateManager);
 
@@ -142,141 +153,159 @@ public class AapsOmnipodManager {
         timeChangeEventEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.TIME_CHANGE_EVENT_ENABLED, true);
     }
 
-    public PumpEnactResult pairAndPrime(PodInitActionType podInitActionType, PodInitReceiver podInitReceiver) {
-        if (podInitActionType != PodInitActionType.PAIR_AND_PRIME_WIZARD_STEP) {
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(getStringResource(R.string.omnipod_error_illegal_init_action_type, podInitActionType.name()));
-        }
-
+    public PumpEnactResult initializePod() {
+        PumpEnactResult result = new PumpEnactResult(injector);
         try {
-            Disposable disposable = delegate.pairAndPrime().subscribe(res -> //
-                    handleSetupActionResult(podInitActionType, podInitReceiver, res, System.currentTimeMillis(), null));
+            Boolean res = executeCommand(delegate::pairAndPrime)
+                    .blockingGet();
 
-            return new PumpEnactResult(injector).success(true).enacted(true);
+            result.success(res).enacted(res);
+
+            if (!res) {
+                result.comment(R.string.omnipod_error_failed_to_initialize_pod);
+            }
         } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            podInitReceiver.returnInitTaskStatus(podInitActionType, false, comment);
-            addFailureToHistory(System.currentTimeMillis(), PodHistoryEntryType.PAIR_AND_PRIME, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            result.success(false).enacted(false).comment(translateException(ex));
         }
+
+        addToHistory(System.currentTimeMillis(), PodHistoryEntryType.INITIALIZE_POD, result.comment, result.success);
+
+        return result;
     }
 
-    public PumpEnactResult setInitialBasalScheduleAndInsertCannula(PodInitActionType podInitActionType, PodInitReceiver podInitReceiver, Profile profile) {
-        if (podInitActionType != PodInitActionType.FILL_CANNULA_SET_BASAL_PROFILE_WIZARD_STEP) {
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(getStringResource(R.string.omnipod_error_illegal_init_action_type, podInitActionType.name()));
-        }
-
-        try {
-            BasalSchedule basalSchedule;
-            try {
-                basalSchedule = mapProfileToBasalSchedule(profile);
-            } catch (Exception ex) {
-                throw new CommandInitializationException("Basal profile mapping failed", ex);
-            }
-
-            Disposable disposable = delegate.insertCannula(basalSchedule, omnipodAlertUtil.getExpirationReminderTimeBeforeShutdown(), omnipodAlertUtil.getLowReservoirAlertUnits()).subscribe(res -> //
-                    handleSetupActionResult(podInitActionType, podInitReceiver, res, System.currentTimeMillis(), profile));
-
-            rxBus.send(new EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED));
-
-            cancelSuspendedFakeTbrIfExists();
-
-            return new PumpEnactResult(injector).success(true).enacted(true);
-        } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            podInitReceiver.returnInitTaskStatus(podInitActionType, false, comment);
-            addFailureToHistory(PodHistoryEntryType.FILL_CANNULA_SET_BASAL_PROFILE, comment);
+    public PumpEnactResult insertCannula(Profile profile) {
+        if (profile == null) {
+            String comment = getStringResource(R.string.omnipod_error_set_initial_basal_schedule_no_profile);
             return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
         }
+
+        PumpEnactResult result = new PumpEnactResult(injector);
+
+        try {
+            BasalSchedule basalSchedule = mapProfileToBasalSchedule(profile);
+
+            Boolean res = executeCommand(() -> delegate.insertCannula(basalSchedule, omnipodAlertUtil.getExpirationReminderTimeBeforeShutdown(), omnipodAlertUtil.getLowReservoirAlertUnits())) //
+                    .blockingGet();
+
+            result.success(res).enacted(res);
+            if (!res) {
+                result.comment(R.string.omnipod_error_failed_to_insert_cannula);
+            }
+        } catch (Exception ex) {
+            result.success(false).enacted(false).comment(translateException(ex));
+        }
+
+        addToHistory(System.currentTimeMillis(), PodHistoryEntryType.INSERT_CANNULA, result.comment, result.success);
+
+        if (result.success) {
+            uploadCareportalEvent(System.currentTimeMillis() - 2000, CareportalEvent.PUMPBATTERYCHANGE);
+            uploadCareportalEvent(System.currentTimeMillis() - 1000, CareportalEvent.INSULINCHANGE);
+            uploadCareportalEvent(System.currentTimeMillis(), CareportalEvent.SITECHANGE);
+
+            sendEvent(new EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED));
+
+            cancelSuspendedFakeTbrIfExists();
+        }
+
+        return result;
     }
 
     public PumpEnactResult configureAlerts(List<AlertConfiguration> alertConfigurations) {
         try {
-            StatusResponse statusResponse = delegate.configureAlerts(alertConfigurations);
-            addSuccessToHistory(PodHistoryEntryType.CONFIGURE_ALERTS, alertConfigurations);
-            return new PumpEnactResult(injector).success(true).enacted(false);
+            executeCommand(() -> delegate.configureAlerts(alertConfigurations));
         } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            addFailureToHistory(PodHistoryEntryType.CONFIGURE_ALERTS, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            String errorMessage = translateException(ex);
+            addFailureToHistory(PodHistoryEntryType.CONFIGURE_ALERTS, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
+
+        addSuccessToHistory(PodHistoryEntryType.CONFIGURE_ALERTS, alertConfigurations);
+        return new PumpEnactResult(injector).success(true).enacted(false);
     }
 
     public PumpEnactResult getPodStatus() {
+        StatusResponse statusResponse;
+
         try {
-            StatusResponse statusResponse = delegate.getPodStatus();
-            addSuccessToHistory(PodHistoryEntryType.GET_POD_STATUS, statusResponse);
-            return new PumpEnactResult(injector).success(true).enacted(false);
+            statusResponse = executeCommand(delegate::getPodStatus);
         } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            addFailureToHistory(PodHistoryEntryType.GET_POD_STATUS, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            String errorMessage = translateException(ex);
+            addFailureToHistory(PodHistoryEntryType.GET_POD_STATUS, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
+
+        addSuccessToHistory(PodHistoryEntryType.GET_POD_STATUS, statusResponse);
+        return new PumpEnactResult(injector).success(true).enacted(false);
     }
 
-    public PumpEnactResult deactivatePod(PodInitReceiver podInitReceiver) {
+    public PumpEnactResult deactivatePod() {
         try {
-            delegate.deactivatePod();
+            executeCommand(delegate::deactivatePod);
         } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            podInitReceiver.returnInitTaskStatus(PodInitActionType.DEACTIVATE_POD_WIZARD_STEP, false, comment);
-            addFailureToHistory(PodHistoryEntryType.DEACTIVATE_POD, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            String errorMessage = translateException(ex);
+            addFailureToHistory(PodHistoryEntryType.DEACTIVATE_POD, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
 
         addSuccessToHistory(PodHistoryEntryType.DEACTIVATE_POD, null);
-
         createSuspendedFakeTbrIfNotExists();
 
-        podInitReceiver.returnInitTaskStatus(PodInitActionType.DEACTIVATE_POD_WIZARD_STEP, true, null);
-
         return new PumpEnactResult(injector).success(true).enacted(true);
     }
 
-    public PumpEnactResult setBasalProfile(Profile profile) {
+    public PumpEnactResult setBasalProfile(Profile profile, boolean showNotifications) {
+        if (profile == null) {
+            String note = getStringResource(R.string.omnipod_error_failed_to_set_profile_empty_profile);
+            showNotification(Notification.FAILED_UDPATE_PROFILE, note, Notification.URGENT, R.raw.boluserror);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(note);
+        }
+
         PodHistoryEntryType historyEntryType = podStateManager.isSuspended() ? PodHistoryEntryType.RESUME_DELIVERY : PodHistoryEntryType.SET_BASAL_SCHEDULE;
 
         try {
-            BasalSchedule basalSchedule;
-            try {
-                basalSchedule = mapProfileToBasalSchedule(profile);
-            } catch (Exception ex) {
-                throw new CommandInitializationException("Basal profile mapping failed", ex);
-            }
-            delegate.setBasalSchedule(basalSchedule, isBasalBeepsEnabled());
-
-            if (historyEntryType == PodHistoryEntryType.RESUME_DELIVERY) {
-                cancelSuspendedFakeTbrIfExists();
-            }
-            addSuccessToHistory(historyEntryType, profile.getBasalValues());
+            BasalSchedule basalSchedule = mapProfileToBasalSchedule(profile);
+            executeCommand(() -> delegate.setBasalSchedule(basalSchedule, isBasalBeepsEnabled()));
         } catch (CommandFailedAfterChangingDeliveryStatusException ex) {
             createSuspendedFakeTbrIfNotExists();
-            String comment = getStringResource(R.string.omnipod_error_set_basal_failed_delivery_suspended);
-            showNotification(Notification.FAILED_UDPATE_PROFILE, comment, Notification.URGENT, R.raw.boluserror);
-            addFailureToHistory(historyEntryType, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
-        } catch (DeliveryStatusVerificationFailedException ex) {
-            String comment;
-            if (ex.getExpectedStatus() == DeliveryStatus.SUSPENDED) {
-                // Happened when suspending delivery before setting the new profile
-                comment = getStringResource(R.string.omnipod_error_set_basal_failed_delivery_might_be_suspended);
-            } else {
-                // Happened when setting the new profile (after suspending delivery)
-                comment = getStringResource(R.string.omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended);
+            if (showNotifications) {
+                showNotification(Notification.FAILED_UDPATE_PROFILE, getStringResource(R.string.omnipod_error_set_basal_failed_delivery_suspended), Notification.URGENT, R.raw.boluserror);
             }
-            showNotification(Notification.FAILED_UDPATE_PROFILE, comment, Notification.URGENT, R.raw.boluserror);
-            addFailureToHistory(historyEntryType, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            String errorMessage = translateException(ex.getCause());
+            addFailureToHistory(historyEntryType, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
+        } catch (DeliveryStatusVerificationFailedException ex) {
+            if (showNotifications) {
+                String note;
+                if (ex.getExpectedStatus() == DeliveryStatus.SUSPENDED) {
+                    // Happened when suspending delivery before setting the new profile
+                    note = getStringResource(R.string.omnipod_error_set_basal_failed_delivery_might_be_suspended);
+                } else {
+                    // Happened when setting the new profile (after suspending delivery)
+                    note = getStringResource(R.string.omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended);
+                }
+                showNotification(Notification.FAILED_UDPATE_PROFILE, note, Notification.URGENT, R.raw.boluserror);
+            }
+            String errorMessage = translateException(ex.getCause());
+            addFailureToHistory(historyEntryType, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            showNotification(Notification.FAILED_UDPATE_PROFILE, comment, Notification.URGENT, R.raw.boluserror);
-            addFailureToHistory(historyEntryType, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            if (showNotifications) {
+                showNotification(Notification.FAILED_UDPATE_PROFILE, getStringResource(R.string.omnipod_error_set_basal_failed), Notification.URGENT, R.raw.boluserror);
+            }
+            String errorMessage = translateException(ex);
+            addFailureToHistory(historyEntryType, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
 
-        rxBus.send(new EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED));
-        showNotification(Notification.PROFILE_SET_OK,
-                resourceHelper.gs(R.string.profile_set_ok),
-                Notification.INFO, null);
+        if (historyEntryType == PodHistoryEntryType.RESUME_DELIVERY) {
+            cancelSuspendedFakeTbrIfExists();
+            sendEvent(new EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED));
+        }
+        addSuccessToHistory(historyEntryType, profile.getBasalValues());
+
+        if (showNotifications) {
+            showNotification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, null);
+        }
 
         return new PumpEnactResult(injector).success(true).enacted(true);
     }
@@ -284,10 +313,13 @@ public class AapsOmnipodManager {
     public PumpEnactResult discardPodState() {
         podStateManager.discardState();
 
-        addSuccessToHistory(System.currentTimeMillis(), PodHistoryEntryType.RESET_POD_STATE, null);
+        addSuccessToHistory(System.currentTimeMillis(), PodHistoryEntryType.DISCARD_POD, null);
 
         createSuspendedFakeTbrIfNotExists();
 
+        sendEvent(new EventOmnipodPumpValuesChanged());
+        rxBus.send(new EventRefreshOverview("Omnipod command: " + OmnipodCommandType.DISCARD_POD, false));
+
         return new PumpEnactResult(injector).success(true).enacted(true);
     }
 
@@ -298,27 +330,27 @@ public class AapsOmnipodManager {
 
         Date bolusStarted;
         try {
-            bolusCommandResult = delegate.bolus(PumpType.Insulet_Omnipod.determineCorrectBolusSize(detailedBolusInfo.insulin), beepsEnabled, beepsEnabled, detailedBolusInfo.isSMB ? null :
+            bolusCommandResult = executeCommand(() -> delegate.bolus(PumpType.Insulet_Omnipod.determineCorrectBolusSize(detailedBolusInfo.insulin), beepsEnabled, beepsEnabled, detailedBolusInfo.isSMB ? null :
                     (estimatedUnitsDelivered, percentage) -> {
                         EventOverviewBolusProgress progressUpdateEvent = EventOverviewBolusProgress.INSTANCE;
                         progressUpdateEvent.setStatus(getStringResource(R.string.bolusdelivering, detailedBolusInfo.insulin));
                         progressUpdateEvent.setPercent(percentage);
                         sendEvent(progressUpdateEvent);
-                    });
+                    }));
 
             bolusStarted = new Date();
         } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            addFailureToHistory(System.currentTimeMillis(), PodHistoryEntryType.SET_BOLUS, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            String errorMessage = translateException(ex);
+            addFailureToHistory(System.currentTimeMillis(), PodHistoryEntryType.SET_BOLUS, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
 
         if (OmnipodManager.CommandDeliveryStatus.UNCERTAIN_FAILURE.equals(bolusCommandResult.getCommandDeliveryStatus())) {
             // For safety reasons, we treat this as a bolus that has successfully been delivered, in order to prevent insulin overdose
             if (detailedBolusInfo.isSMB) {
-                showNotification(getStringResource(R.string.omnipod_bolus_failed_uncertain_smb, detailedBolusInfo.insulin), Notification.URGENT, R.raw.boluserror);
+                showNotification(getStringResource(R.string.omnipod_error_bolus_failed_uncertain_smb, detailedBolusInfo.insulin), Notification.URGENT, R.raw.boluserror);
             } else {
-                showNotification(getStringResource(R.string.omnipod_bolus_failed_uncertain), Notification.URGENT, R.raw.boluserror);
+                showNotification(getStringResource(R.string.omnipod_error_bolus_failed_uncertain), Notification.URGENT, R.raw.boluserror);
             }
         }
 
@@ -378,7 +410,7 @@ public class AapsOmnipodManager {
                 aapsLogger.debug(LTag.PUMP, "Bolus command successfully executed. Proceeding bolus cancellation");
             } else {
                 aapsLogger.debug(LTag.PUMP, "Not cancelling bolus: bolus command failed");
-                String comment = getStringResource(R.string.omnipod_bolus_did_not_succeed);
+                String comment = getStringResource(R.string.omnipod_error_bolus_did_not_succeed);
                 addFailureToHistory(System.currentTimeMillis(), PodHistoryEntryType.CANCEL_BOLUS, comment);
                 return new PumpEnactResult(injector).success(true).enacted(false).comment(comment);
             }
@@ -387,19 +419,19 @@ public class AapsOmnipodManager {
         String comment = null;
         for (int i = 1; delegate.hasActiveBolus(); i++) {
             aapsLogger.debug(LTag.PUMP, "Attempting to cancel bolus (#{})", i);
+
             try {
-                delegate.cancelBolus(isBolusBeepsEnabled());
+                executeCommand(() -> delegate.cancelBolus(isBolusBeepsEnabled()));
                 aapsLogger.debug(LTag.PUMP, "Successfully cancelled bolus", i);
                 addSuccessToHistory(System.currentTimeMillis(), PodHistoryEntryType.CANCEL_BOLUS, null);
                 return new PumpEnactResult(injector).success(true).enacted(true);
             } catch (PodFaultException ex) {
                 aapsLogger.debug(LTag.PUMP, "Successfully cancelled bolus (implicitly because of a Pod Fault)");
-                showPodFaultNotification(ex.getFaultEvent().getFaultEventCode());
                 addSuccessToHistory(System.currentTimeMillis(), PodHistoryEntryType.CANCEL_BOLUS, null);
                 return new PumpEnactResult(injector).success(true).enacted(true);
             } catch (Exception ex) {
                 aapsLogger.debug(LTag.PUMP, "Failed to cancel bolus", ex);
-                comment = handleAndTranslateException(ex);
+                comment = translateException(ex);
             }
         }
 
@@ -410,19 +442,18 @@ public class AapsOmnipodManager {
     public PumpEnactResult setTemporaryBasal(TempBasalPair tempBasalPair) {
         boolean beepsEnabled = isTbrBeepsEnabled();
         try {
-            delegate.setTemporaryBasal(PumpType.Insulet_Omnipod.determineCorrectBasalSize(tempBasalPair.getInsulinRate()), Duration.standardMinutes(tempBasalPair.getDurationMinutes()), beepsEnabled, beepsEnabled);
+            executeCommand(() -> delegate.setTemporaryBasal(PumpType.Insulet_Omnipod.determineCorrectBasalSize(tempBasalPair.getInsulinRate()), Duration.standardMinutes(tempBasalPair.getDurationMinutes()), beepsEnabled, beepsEnabled));
         } catch (CommandFailedAfterChangingDeliveryStatusException ex) {
-            String comment = getStringResource(R.string.omnipod_cancelled_old_tbr_failed_to_set_new);
-            addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, comment);
-            showNotification(comment, Notification.NORMAL, null);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            String errorMessage = translateException(ex.getCause());
+            addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         } catch (DeliveryStatusVerificationFailedException ex) {
-            String comment;
+            String errorMessage = translateException(ex.getCause());
+
+            String note;
             if (ex.getExpectedStatus() == DeliveryStatus.TEMP_BASAL_RUNNING) {
                 // Happened after cancelling the old TBR, when attempting to set new TBR
-
-                comment = getStringResource(R.string.omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed);
-                long pumpId = addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, comment);
+                note = getStringResource(R.string.omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed);
 
                 // Assume that setting the temp basal succeeded here, because in case it didn't succeed,
                 // The next StatusResponse that we receive will allow us to recover from the wrong state
@@ -430,19 +461,20 @@ public class AapsOmnipodManager {
                 // If we would assume that the TBR didn't succeed, we couldn't properly recover upon the next StatusResponse,
                 // as we could only see that the Pod is running a TBR, but we don't know the rate and duration as
                 // the Pod doesn't provide this information
+                long pumpId = addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, errorMessage);
                 addTempBasalTreatment(System.currentTimeMillis(), pumpId, tempBasalPair);
             } else {
                 // Happened when attempting to cancel the old TBR
-                comment = getStringResource(R.string.omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled);
-                addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, comment);
+                note = getStringResource(R.string.omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled);
+                addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, errorMessage);
             }
+            showNotification(note, Notification.URGENT, R.raw.boluserror);
 
-            showNotification(comment, Notification.URGENT, R.raw.boluserror);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            String errorMessage = translateException(ex);
+            addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
 
         long pumpId = addSuccessToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, tempBasalPair);
@@ -454,11 +486,14 @@ public class AapsOmnipodManager {
 
     public PumpEnactResult cancelTemporaryBasal() {
         try {
-            delegate.cancelTemporaryBasal(isTbrBeepsEnabled());
+            executeCommand(() -> delegate.cancelTemporaryBasal(isTbrBeepsEnabled()));
         } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            addFailureToHistory(PodHistoryEntryType.CANCEL_TEMPORARY_BASAL, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            if (ex instanceof OmnipodException && !((OmnipodException) ex).isCertainFailure()) {
+                showNotification(getStringResource(R.string.omnipod_error_cancel_temp_basal_failed_uncertain), Notification.URGENT, R.raw.boluserror);
+            }
+            String errorMessage = translateException(ex);
+            addFailureToHistory(PodHistoryEntryType.CANCEL_TEMPORARY_BASAL, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
 
         long pumpId = addSuccessToHistory(PodHistoryEntryType.CANCEL_TEMPORARY_BASAL, null);
@@ -476,59 +511,63 @@ public class AapsOmnipodManager {
 
     public PumpEnactResult acknowledgeAlerts() {
         try {
-            delegate.acknowledgeAlerts();
-            addSuccessToHistory(PodHistoryEntryType.ACKNOWLEDGE_ALERTS, null);
+            executeCommand(delegate::acknowledgeAlerts);
         } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            addFailureToHistory(PodHistoryEntryType.ACKNOWLEDGE_ALERTS, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            String errorMessage = translateException(ex);
+            addFailureToHistory(PodHistoryEntryType.ACKNOWLEDGE_ALERTS, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
+
+        addSuccessToHistory(PodHistoryEntryType.ACKNOWLEDGE_ALERTS, null);
         return new PumpEnactResult(injector).success(true).enacted(true);
     }
 
     public PumpEnactResult suspendDelivery() {
         try {
-            delegate.suspendDelivery(isBasalBeepsEnabled());
+            executeCommand(() -> delegate.suspendDelivery(isBasalBeepsEnabled()));
         } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            addFailureToHistory(PodHistoryEntryType.SUSPEND_DELIVERY, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            String errorMessage = translateException(ex);
+            addFailureToHistory(PodHistoryEntryType.SUSPEND_DELIVERY, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
 
         addSuccessToHistory(PodHistoryEntryType.SUSPEND_DELIVERY, null);
-
         createSuspendedFakeTbrIfNotExists();
 
         return new PumpEnactResult(injector).success(true).enacted(true);
     }
 
     // Updates the pods current time based on the device timezone and the pod's time zone
-    public PumpEnactResult setTime() {
+    public PumpEnactResult setTime(boolean showNotifications) {
         try {
-            delegate.setTime(isBasalBeepsEnabled());
-            addSuccessToHistory(PodHistoryEntryType.SET_TIME, null);
+            executeCommand(() -> delegate.setTime(isBasalBeepsEnabled()));
         } catch (CommandFailedAfterChangingDeliveryStatusException ex) {
             createSuspendedFakeTbrIfNotExists();
-            String comment = getStringResource(R.string.omnipod_error_set_time_failed_delivery_suspended);
-            showNotification(comment, Notification.URGENT, R.raw.boluserror);
-            addFailureToHistory(PodHistoryEntryType.SET_TIME, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            if (showNotifications) {
+                showNotification(getStringResource(R.string.omnipod_error_set_time_failed_delivery_suspended), Notification.URGENT, R.raw.boluserror);
+            }
+            String errorMessage = translateException(ex.getCause());
+            addFailureToHistory(PodHistoryEntryType.SET_TIME, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         } catch (DeliveryStatusVerificationFailedException ex) {
-            String comment = getStringResource(R.string.omnipod_error_set_time_failed_delivery_might_be_suspended);
-            showNotification(comment, Notification.URGENT, R.raw.boluserror);
-            addFailureToHistory(PodHistoryEntryType.SET_TIME, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            if (showNotifications) {
+                showNotification(getStringResource(R.string.omnipod_error_set_time_failed_delivery_might_be_suspended), Notification.URGENT, R.raw.boluserror);
+            }
+            String errorMessage = translateException(ex.getCause());
+            addFailureToHistory(PodHistoryEntryType.SET_TIME, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         } catch (Exception ex) {
-            String comment = handleAndTranslateException(ex);
-            addFailureToHistory(PodHistoryEntryType.SET_TIME, comment);
-            return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
+            String errorMessage = translateException(ex);
+            addFailureToHistory(PodHistoryEntryType.SET_TIME, errorMessage);
+            return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
 
+        addSuccessToHistory(PodHistoryEntryType.SET_TIME, null);
         return new PumpEnactResult(injector).success(true).enacted(true);
     }
 
     public PodInfoRecentPulseLog readPulseLog() {
-        PodInfoResponse response = delegate.getPodInfo(PodInfoType.RECENT_PULSE_LOG);
+        PodInfoResponse response = executeCommand(() -> delegate.getPodInfo(PodInfoType.RECENT_PULSE_LOG));
         return (PodInfoRecentPulseLog) response.getPodInfo();
     }
 
@@ -660,7 +699,8 @@ public class AapsOmnipodManager {
         return addSuccessToHistory(System.currentTimeMillis(), entryType, data);
     }
 
-    private long addSuccessToHistory(long requestTime, PodHistoryEntryType entryType, Object data) {
+    private long addSuccessToHistory(long requestTime, PodHistoryEntryType entryType, Object
+            data) {
         return addToHistory(requestTime, entryType, data, true);
     }
 
@@ -668,11 +708,13 @@ public class AapsOmnipodManager {
         return addFailureToHistory(System.currentTimeMillis(), entryType, data);
     }
 
-    private long addFailureToHistory(long requestTime, PodHistoryEntryType entryType, Object data) {
+    private long addFailureToHistory(long requestTime, PodHistoryEntryType entryType, Object
+            data) {
         return addToHistory(requestTime, entryType, data, false);
     }
 
-    private long addToHistory(long requestTime, PodHistoryEntryType entryType, Object data, boolean success) {
+    private long addToHistory(long requestTime, PodHistoryEntryType entryType, Object data,
+                              boolean success) {
         OmnipodHistoryRecord omnipodHistoryRecord = new OmnipodHistoryRecord(requestTime, entryType.getCode());
 
         if (data != null) {
@@ -691,88 +733,91 @@ public class AapsOmnipodManager {
         return omnipodHistoryRecord.getPumpId();
     }
 
-    private void handleSetupActionResult(PodInitActionType podInitActionType, PodInitReceiver podInitReceiver, SetupActionResult res, long time, Profile profile) {
-        String comment = null;
-        switch (res.getResultType()) {
-            case FAILURE: {
-                aapsLogger.error(LTag.PUMP, "Setup action failed: illegal setup progress: {}", res.getPodProgressStatus());
-                comment = getStringResource(R.string.omnipod_driver_error_invalid_progress_state, res.getPodProgressStatus());
-            }
-            break;
-            case VERIFICATION_FAILURE: {
-                aapsLogger.error(LTag.PUMP, "Setup action verification failed: caught exception", res.getException());
-                comment = getStringResource(R.string.omnipod_driver_error_setup_action_verification_failed);
-            }
-            break;
+    private void executeCommand(Runnable runnable) {
+        try {
+            runnable.run();
+        } catch (Exception ex) {
+            handleException(ex);
+            throw ex;
         }
-
-        if (podInitActionType == PodInitActionType.PAIR_AND_PRIME_WIZARD_STEP) {
-            addToHistory(time, PodHistoryEntryType.PAIR_AND_PRIME, comment, res.getResultType().isSuccess());
-        } else {
-            addToHistory(time, PodHistoryEntryType.FILL_CANNULA_SET_BASAL_PROFILE, res.getResultType().isSuccess() ? profile.getBasalValues() : comment, res.getResultType().isSuccess());
-        }
-
-        podInitReceiver.returnInitTaskStatus(podInitActionType, res.getResultType().isSuccess(), comment);
     }
 
-    private String handleAndTranslateException(Exception ex) {
+    private <T> T executeCommand(Supplier<T> supplier) {
+        try {
+            return supplier.get();
+        } catch (Exception ex) {
+            handleException(ex);
+            throw ex;
+        }
+    }
+
+    private void handleException(Exception ex) {
+        if (ex instanceof OmnipodException) {
+            aapsLogger.error(LTag.PUMP, String.format("Caught OmnipodException[certainFailure=%s] from OmnipodManager", ((OmnipodException) ex).isCertainFailure()), ex);
+            if (ex instanceof PodFaultException) {
+                FaultEventCode faultEventCode = ((PodFaultException) ex).getFaultEvent().getFaultEventCode();
+                if (!(faultEventCode == FaultEventCode.NO_FAULTS && podStateManager.isPodInitialized() && podStateManager.getPodProgressStatus() == PodProgressStatus.ACTIVATION_TIME_EXCEEDED)) {
+                    showPodFaultNotification(faultEventCode);
+                }
+            }
+        } else {
+            aapsLogger.error(LTag.PUMP, "Caught an unexpected non-OmnipodException from OmnipodManager", ex);
+        }
+    }
+
+    public String translateException(Throwable ex) {
         String comment;
 
-        if (ex instanceof OmnipodException) {
-            if (ex instanceof ActionInitializationException || ex instanceof CommandInitializationException) {
-                comment = getStringResource(R.string.omnipod_driver_error_invalid_parameters);
-            } else if (ex instanceof CommunicationException) {
-                if (((CommunicationException) ex).getType() == CommunicationException.Type.TIMEOUT) {
-                    comment = getStringResource(R.string.omnipod_driver_error_communication_failed_timeout);
-                } else {
-                    comment = getStringResource(R.string.omnipod_driver_error_communication_failed_unexpected_exception);
-                }
-            } else if (ex instanceof CrcMismatchException) {
-                comment = getStringResource(R.string.omnipod_driver_error_crc_mismatch);
-            } else if (ex instanceof IllegalPacketTypeException) {
-                comment = getStringResource(R.string.omnipod_driver_error_invalid_packet_type);
-            } else if (ex instanceof IllegalPodProgressException || ex instanceof IllegalDeliveryStatusException) {
-                comment = getStringResource(R.string.omnipod_driver_error_invalid_progress_state);
-            } else if (ex instanceof IllegalVersionResponseTypeException) {
-                comment = getStringResource(R.string.omnipod_driver_error_invalid_response);
-            } else if (ex instanceof IllegalResponseException) {
-                comment = getStringResource(R.string.omnipod_driver_error_invalid_response);
-            } else if (ex instanceof IllegalMessageSequenceNumberException) {
-                comment = getStringResource(R.string.omnipod_driver_error_invalid_message_sequence_number);
-            } else if (ex instanceof IllegalMessageAddressException) {
-                comment = getStringResource(R.string.omnipod_driver_error_invalid_message_address);
-            } else if (ex instanceof MessageDecodingException) {
-                comment = getStringResource(R.string.omnipod_driver_error_message_decoding_failed);
-            } else if (ex instanceof NonceOutOfSyncException) {
-                comment = getStringResource(R.string.omnipod_driver_error_nonce_out_of_sync);
-            } else if (ex instanceof NonceResyncException) {
-                comment = getStringResource(R.string.omnipod_driver_error_nonce_resync_failed);
-            } else if (ex instanceof NotEnoughDataException) {
-                comment = getStringResource(R.string.omnipod_driver_error_not_enough_data);
-            } else if (ex instanceof PodFaultException) {
-                FaultEventCode faultEventCode = ((PodFaultException) ex).getFaultEvent().getFaultEventCode();
-                showPodFaultNotification(faultEventCode);
-                comment = createPodFaultErrorMessage(faultEventCode);
-            } else if (ex instanceof PodReturnedErrorResponseException) {
-                comment = getStringResource(R.string.omnipod_driver_error_pod_returned_error_response);
-            } else {
-                // Shouldn't be reachable
-                comment = getStringResource(R.string.omnipod_driver_error_unexpected_exception_type, ex.getClass().getName());
-            }
-            aapsLogger.error(LTag.PUMP, String.format("Caught OmnipodException[certainFailure=%s] from OmnipodManager (user-friendly error message: %s)", ((OmnipodException) ex).isCertainFailure(), comment), ex);
+        if (ex instanceof CrcMismatchException) {
+            comment = getStringResource(R.string.omnipod_error_crc_mismatch);
+        } else if (ex instanceof IllegalPacketTypeException) {
+            comment = getStringResource(R.string.omnipod_error_invalid_packet_type);
+        } else if (ex instanceof IllegalPodProgressException || ex instanceof IllegalDeliveryStatusException) {
+            comment = getStringResource(R.string.omnipod_error_invalid_progress_state);
+        } else if (ex instanceof IllegalVersionResponseTypeException) {
+            comment = getStringResource(R.string.omnipod_error_invalid_response);
+        } else if (ex instanceof IllegalResponseException) {
+            comment = getStringResource(R.string.omnipod_error_invalid_response);
+        } else if (ex instanceof IllegalMessageSequenceNumberException) {
+            comment = getStringResource(R.string.omnipod_error_invalid_message_sequence_number);
+        } else if (ex instanceof IllegalMessageAddressException) {
+            comment = getStringResource(R.string.omnipod_error_invalid_message_address);
+        } else if (ex instanceof MessageDecodingException) {
+            comment = getStringResource(R.string.omnipod_error_message_decoding_failed);
+        } else if (ex instanceof NonceOutOfSyncException) {
+            comment = getStringResource(R.string.omnipod_error_nonce_out_of_sync);
+        } else if (ex instanceof NonceResyncException) {
+            comment = getStringResource(R.string.omnipod_error_nonce_resync_failed);
+        } else if (ex instanceof NotEnoughDataException) {
+            comment = getStringResource(R.string.omnipod_error_not_enough_data);
+        } else if (ex instanceof PodFaultException) {
+            FaultEventCode faultEventCode = ((PodFaultException) ex).getFaultEvent().getFaultEventCode();
+            comment = createPodFaultErrorMessage(faultEventCode);
+        } else if (ex instanceof PodReturnedErrorResponseException) {
+            comment = getStringResource(R.string.omnipod_error_pod_returned_error_response);
+        } else if (ex instanceof RileyLinkUnreachableException) {
+            comment = getStringResource(R.string.omnipod_error_communication_failed_no_response_from_riley_link);
+        } else if (ex instanceof RileyLinkInterruptedException) {
+            comment = getStringResource(R.string.omnipod_error_communication_failed_riley_link_interrupted);
+        } else if (ex instanceof RileyLinkTimeoutException) {
+            comment = getStringResource(R.string.omnipod_error_communication_failed_no_response_from_pod);
+        } else if (ex instanceof RileyLinkUnexpectedException) {
+            Throwable cause = ex.getCause();
+            comment = getStringResource(R.string.omnipod_error_unexpected_exception, cause.getClass().getName(), cause.getMessage());
         } else {
-            comment = getStringResource(R.string.omnipod_driver_error_unexpected_exception_type, ex.getClass().getName());
-            aapsLogger.error(LTag.PUMP, String.format("Caught unexpected exception type[certainFailure=false] from OmnipodManager (user-friendly error message: %s)", comment), ex);
+            // Shouldn't be reachable
+            comment = getStringResource(R.string.omnipod_error_unexpected_exception, ex.getClass().getName(), ex.getMessage());
         }
 
         return comment;
     }
 
     private String createPodFaultErrorMessage(FaultEventCode faultEventCode) {
-        String comment;
-        comment = getStringResource(R.string.omnipod_driver_error_pod_fault,
+        if (faultEventCode == FaultEventCode.NO_FAULTS && podStateManager.getPodProgressStatus() == PodProgressStatus.ACTIVATION_TIME_EXCEEDED) {
+            return getStringResource(R.string.omnipod_error_pod_fault_activation_time_exceeded);
+        }
+        return getStringResource(R.string.omnipod_error_pod_fault,
                 ByteUtil.convertUnsignedByteToInt(faultEventCode.getValue()), faultEventCode.name());
-        return comment;
     }
 
     private void sendEvent(Event event) {
@@ -822,4 +867,29 @@ public class AapsOmnipodManager {
 
         return new BasalSchedule(entries);
     }
+
+    private void uploadCareportalEvent(long date, String event) {
+        if (databaseHelper.getCareportalEventFromTimestamp(date) != null)
+            return;
+        try {
+            JSONObject data = new JSONObject();
+            String enteredBy = sp.getString("careportal_enteredby", "");
+            if (enteredBy.isEmpty()) {
+                data.put("enteredBy", enteredBy);
+            }
+            data.put("created_at", DateUtil.toISOString(date));
+            data.put("mills", date);
+            data.put("eventType", event);
+            data.put("units", profileFunction.getUnits());
+            CareportalEvent careportalEvent = new CareportalEvent(injector);
+            careportalEvent.date = date;
+            careportalEvent.source = Source.USER;
+            careportalEvent.eventType = event;
+            careportalEvent.json = data.toString();
+            databaseHelper.createOrUpdate(careportalEvent);
+            nsUpload.uploadCareportalEntryToNS(data);
+        } catch (JSONException e) {
+            aapsLogger.error(LTag.PUMPCOMM, "Unhandled exception when uploading SiteChange event.", e);
+        }
+    }
 }
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandAcknowledgeAlerts.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandAcknowledgeAlerts.java
new file mode 100644
index 0000000000..649623e05e
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandAcknowledgeAlerts.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.queue.command;
+
+public final class CommandAcknowledgeAlerts extends OmnipodCustomCommand {
+    public CommandAcknowledgeAlerts() {
+        super(OmnipodCustomCommandType.ACKNOWLEDGE_ALERTS);
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandDeactivatePod.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandDeactivatePod.java
new file mode 100644
index 0000000000..3921ec19d7
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandDeactivatePod.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.queue.command;
+
+public final class CommandDeactivatePod extends OmnipodCustomCommand {
+    public CommandDeactivatePod() {
+        super(OmnipodCustomCommandType.DEACTIVATE_POD);
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandGetPodStatus.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandGetPodStatus.java
new file mode 100644
index 0000000000..0dfe7880f8
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandGetPodStatus.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.queue.command;
+
+public final class CommandGetPodStatus extends OmnipodCustomCommand {
+    public CommandGetPodStatus() {
+        super(OmnipodCustomCommandType.GET_POD_STATUS);
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandHandleTimeChange.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandHandleTimeChange.java
new file mode 100644
index 0000000000..c760b401b5
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandHandleTimeChange.java
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.queue.command;
+
+public final class CommandHandleTimeChange extends OmnipodCustomCommand {
+    private final boolean requestedByUser;
+
+    public CommandHandleTimeChange(boolean requestedByUser) {
+        super(OmnipodCustomCommandType.HANDLE_TIME_CHANGE);
+        this.requestedByUser = requestedByUser;
+    }
+
+    public boolean isRequestedByUser() {
+        return requestedByUser;
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandReadPulseLog.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandReadPulseLog.java
new file mode 100644
index 0000000000..5eb910c6db
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandReadPulseLog.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.queue.command;
+
+public final class CommandReadPulseLog extends OmnipodCustomCommand {
+    public CommandReadPulseLog() {
+        super(OmnipodCustomCommandType.READ_PULSE_LOG);
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandResumeDelivery.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandResumeDelivery.java
new file mode 100644
index 0000000000..fe3b07de9f
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandResumeDelivery.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.queue.command;
+
+public final class CommandResumeDelivery extends OmnipodCustomCommand {
+    public CommandResumeDelivery() {
+        super(OmnipodCustomCommandType.RESUME_DELIVERY);
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandSuspendDelivery.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandSuspendDelivery.java
new file mode 100644
index 0000000000..12dc8e8d42
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandSuspendDelivery.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.queue.command;
+
+public final class CommandSuspendDelivery extends OmnipodCustomCommand {
+    public CommandSuspendDelivery() {
+        super(OmnipodCustomCommandType.SUSPEND_DELIVERY);
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandUpdateAlertConfiguration.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandUpdateAlertConfiguration.java
new file mode 100644
index 0000000000..4edc243845
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/CommandUpdateAlertConfiguration.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.queue.command;
+
+public final class CommandUpdateAlertConfiguration extends OmnipodCustomCommand {
+    public CommandUpdateAlertConfiguration() {
+        super(OmnipodCustomCommandType.UPDATE_ALERT_CONFIGURATION);
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommand.java
new file mode 100644
index 0000000000..06b2e2a051
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommand.java
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.queue.command;
+
+import androidx.annotation.NonNull;
+
+import info.nightscout.androidaps.queue.commands.CustomCommand;
+
+public abstract class OmnipodCustomCommand implements CustomCommand {
+    private final OmnipodCustomCommandType type;
+
+    OmnipodCustomCommand(@NonNull OmnipodCustomCommandType type) {
+        this.type = type;
+    }
+
+    public final OmnipodCustomCommandType getType() {
+        return type;
+    }
+
+    @Override public final String getStatusDescription() {
+        return type.getDescription();
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java
new file mode 100644
index 0000000000..e6df62c47b
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.queue.command;
+
+public enum OmnipodCustomCommandType {
+    ACKNOWLEDGE_ALERTS("ACKNOWLEDGE ALERTS"),
+    GET_POD_STATUS("GET POD STATUS"),
+    READ_PULSE_LOG("READ PULSE LOG"),
+    SUSPEND_DELIVERY("SUSPEND DELIVERY"),
+    RESUME_DELIVERY("RESUME DELIVERY"),
+    DEACTIVATE_POD("DEACTIVATE POD"),
+    HANDLE_TIME_CHANGE("HANDLE TIME CHANGE"),
+    UPDATE_ALERT_CONFIGURATION("UPDATE ALERT CONFIGURATION");
+
+    private final String description;
+
+    OmnipodCustomCommandType(String description) {
+        this.description = description;
+    }
+
+    String getDescription() {
+        return description;
+    }
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/manager/OmnipodRileyLinkCommunicationManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/manager/OmnipodRileyLinkCommunicationManager.java
index 19b6b6a4a0..adb9e97e69 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/manager/OmnipodRileyLinkCommunicationManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/manager/OmnipodRileyLinkCommunicationManager.java
@@ -12,7 +12,6 @@ import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RLMessageType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkBLEError;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
@@ -30,7 +29,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.Message
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PacketType;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodInfoType;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.CommunicationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalMessageAddressException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalMessageSequenceNumberException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.IllegalPacketTypeException;
@@ -41,13 +39,16 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.NotEnoug
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.OmnipodException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodFaultException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.PodReturnedErrorResponseException;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkTimeoutException;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkUnexpectedException;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.exception.RileyLinkUnreachableException;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
 
 /**
  * Created by andy on 6/29/18.
  */
 @Singleton
-public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunicationManager {
+public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunicationManager<OmnipodPacket> {
     // This empty constructor must be kept, otherwise dagger injection might break!
     @Inject
     public OmnipodRileyLinkCommunicationManager() {
@@ -69,7 +70,7 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
     }
 
     @Override
-    public RLMessage createResponseMessage(byte[] payload) {
+    public OmnipodPacket createResponseMessage(byte[] payload) {
         return new OmnipodPacket(payload);
     }
 
@@ -137,7 +138,7 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
 
                 if (responseClass.isInstance(responseMessageBlock)) {
                     podStateManager.setLastSuccessfulCommunication(DateTime.now());
-                    return (T) responseMessageBlock;
+                    return responseClass.cast(responseMessageBlock);
                 } else {
                     if (responseMessageBlock.getType() == MessageBlockType.ERROR_RESPONSE) {
                         ErrorResponse error = (ErrorResponse) responseMessageBlock;
@@ -194,13 +195,13 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
         // receive an ACK instead of a normal response, or a partial response and a communication timeout
         if (message.isNonceResyncable() && !message.containsBlock(DeactivatePodCommand.class)) {
             OmnipodMessage paddedMessage = new OmnipodMessage(message);
-            // If messages are nonce resyncable, we want do distinguish between certain and uncertain failures for verification purposes
+            // If messages are nonce resyncable, we want to distinguish between certain and uncertain failures for verification purposes
             // However, some commands (e.g. cancel delivery) are single packet command by nature. When we get a timeout with a single packet,
             // we are unsure whether or not the command was received by the pod
             // However, if we send > 1 packet, we know that the command wasn't received if we never send the subsequent packets,
             // because the last packet contains the CRC.
             // So we pad the message with get status commands to make it > packet
-            paddedMessage.padWithGetStatusCommands(PacketType.PDM.getMaxBodyLength()); // First packet is of type PDM
+            paddedMessage.padWithGetStatusCommands(PacketType.PDM.getMaxBodyLength(), aapsLogger); // First packet is of type PDM
             encodedMessage = paddedMessage.getEncoded();
         } else {
             encodedMessage = message.getEncoded();
@@ -219,23 +220,16 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
             try {
                 // We actually ignore previous (ack) responses if it was not last packet to send
                 response = exchangePackets(podStateManager, packet);
-            } catch (Exception ex) {
-                OmnipodException newException;
-                if (ex instanceof OmnipodException) {
-                    newException = (OmnipodException) ex;
-                } else {
-                    newException = new CommunicationException(CommunicationException.Type.UNEXPECTED_EXCEPTION, ex);
-                }
-
+            } catch (OmnipodException ex) {
                 boolean lastPacket = encodedMessage.length == 0;
 
                 // If this is not the last packet, the message wasn't fully sent,
                 // so it's impossible for the pod to have received the message
-                newException.setCertainFailure(!lastPacket);
+                ex.setCertainFailure(!lastPacket);
 
-                aapsLogger.debug(LTag.PUMPBTCOMM, "Caught exception in transportMessages. Set certainFailure to {} because encodedMessage.length={}", newException.isCertainFailure(), encodedMessage.length);
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Caught OmnipodException in transportMessages. Set certainFailure to {} because encodedMessage.length={}", ex.isCertainFailure(), encodedMessage.length);
 
-                throw newException;
+                throw ex;
             }
         }
 
@@ -247,6 +241,7 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
         byte[] receivedMessageData = response.getEncodedMessage();
         while (receivedMessage == null) {
             try {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Attempting to decode message: {}", ByteUtil.shortHexStringWithoutSpaces(receivedMessageData));
                 receivedMessage = OmnipodMessage.decodeMessage(receivedMessageData);
                 if (receivedMessage.getAddress() != message.getAddress()) {
                     throw new IllegalMessageAddressException(message.getAddress(), receivedMessage.getAddress());
@@ -261,18 +256,11 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
 
                 OmnipodPacket ackForCon = createAckPacket(podStateManager, packetAddress, ackAddressOverride);
 
-                try {
-                    OmnipodPacket conPacket = exchangePackets(podStateManager, ackForCon, 3, 40);
-                    if (conPacket.getPacketType() != PacketType.CON) {
-                        throw new IllegalPacketTypeException(PacketType.CON, conPacket.getPacketType());
-                    }
-                    receivedMessageData = ByteUtil.concat(receivedMessageData, conPacket.getEncodedMessage());
-                } catch (OmnipodException ex2) {
-                    throw ex2;
-                } catch (Exception ex2) {
-                    throw new CommunicationException(CommunicationException.Type.UNEXPECTED_EXCEPTION, ex2);
+                OmnipodPacket conPacket = exchangePackets(podStateManager, ackForCon, 3, 40);
+                if (conPacket.getPacketType() != PacketType.CON) {
+                    throw new IllegalPacketTypeException(PacketType.CON, conPacket.getPacketType());
                 }
-
+                receivedMessageData = ByteUtil.concat(receivedMessageData, conPacket.getEncodedMessage());
             }
         }
 
@@ -317,8 +305,6 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
             }
         } catch (OmnipodException ex) {
             aapsLogger.debug(LTag.PUMPBTCOMM, "Ignoring exception in ackUntilQuiet", ex);
-        } catch (Exception ex) {
-            throw new CommunicationException(CommunicationException.Type.UNEXPECTED_EXCEPTION, ex);
         }
 
         podStateManager.increasePacketNumber();
@@ -337,24 +323,32 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
 
         podStateManager.increasePacketNumber();
 
+        boolean gotResponseFromRileyLink = false;
+
         while (System.currentTimeMillis() < timeoutTime) {
             OmnipodPacket response;
             try {
-                response = (OmnipodPacket) sendAndListen(packet, responseTimeoutMilliseconds, repeatCount, 9, preambleExtensionMilliseconds);
-            } catch (RileyLinkCommunicationException | OmnipodException ex) {
+                response = sendAndListen(packet, responseTimeoutMilliseconds, repeatCount, 9, preambleExtensionMilliseconds);
+                gotResponseFromRileyLink = true;
+            } catch (RileyLinkCommunicationException ex) {
+                if (ex.getErrorCode() != RileyLinkBLEError.NoResponse) {
+                    gotResponseFromRileyLink = true;
+                }
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Ignoring exception in exchangePackets: " + ex.getClass().getSimpleName() + ": " + ex.getMessage());
+                continue;
+            } catch (OmnipodException ex) {
+                gotResponseFromRileyLink = true;
                 aapsLogger.debug(LTag.PUMPBTCOMM, "Ignoring exception in exchangePackets: " + ex.getClass().getSimpleName() + ": " + ex.getMessage());
                 continue;
             } catch (Exception ex) {
-                throw new CommunicationException(CommunicationException.Type.UNEXPECTED_EXCEPTION, ex);
+                throw new RileyLinkUnexpectedException(ex);
             }
 
-            if (response == null) {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "exchangePackets response is null");
-                continue;
-            } else if (!response.isValid()) {
+            if (!response.isValid()) {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "exchangePackets response is invalid: " + response);
                 continue;
             }
+
             if (response.getAddress() != packet.getAddress() &&
                     response.getAddress() != OmnipodConstants.DEFAULT_ADDRESS) { // In some (strange) cases, the Pod remains a packet address of 0xffffffff during it's lifetime
                 aapsLogger.debug(LTag.PUMPBTCOMM, "Packet address " + response.getAddress() + " doesn't match " + packet.getAddress());
@@ -371,7 +365,12 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
 
             return response;
         }
-        throw new CommunicationException(CommunicationException.Type.TIMEOUT);
+
+        if (gotResponseFromRileyLink) {
+            throw new RileyLinkTimeoutException();
+        }
+
+        throw new RileyLinkUnreachableException();
     }
 
 }
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt
similarity index 55%
rename from omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt
index ca7382149e..055e7550d2 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt
@@ -11,6 +11,7 @@ import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
@@ -22,14 +23,14 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyL
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
 import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.plugins.pump.omnipod.R
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodStatusRequestType
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager
+import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.*
 import info.nightscout.androidaps.plugins.pump.omnipod.util.AapsOmnipodUtil
-import info.nightscout.androidaps.queue.commands.Command
+import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.events.EventQueueChanged
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -42,17 +43,18 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.omnipod_fragment.*
+import kotlinx.android.synthetic.main.omnipod_overview.*
 import org.apache.commons.lang3.StringUtils
 import org.joda.time.DateTime
 import org.joda.time.Duration
+import java.util.*
 import javax.inject.Inject
+import kotlin.collections.ArrayList
 
-class OmnipodFragment : DaggerFragment() {
+class OmnipodOverviewFragment : DaggerFragment() {
     companion object {
-        private val REFRESH_INTERVAL_MILLIS = 15 * 1000L; // 15 seconds
-        private val PLACEHOLDER = "-"; // 15 seconds
+        private val REFRESH_INTERVAL_MILLIS = 15 * 1000L // 15 seconds
+        private val PLACEHOLDER = "-" // 15 seconds
     }
 
     @Inject lateinit var fabricPrivacy: FabricPrivacy
@@ -83,18 +85,13 @@ class OmnipodFragment : DaggerFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.omnipod_fragment, container, false)
+        return inflater.inflate(R.layout.omnipod_overview, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        omnipod_button_resume_delivery.setOnClickListener {
-            disablePodActionButtons()
-            commandQueue.startPump(null)
-        }
-
-        omnipod_button_pod_mgmt.setOnClickListener {
+        omnipod_overview_button_pod_management.setOnClickListener {
             if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
                 activity?.let { activity ->
                     protectionCheck.queryProtection(
@@ -107,13 +104,19 @@ class OmnipodFragment : DaggerFragment() {
             }
         }
 
-        omnipod_button_refresh_status.setOnClickListener {
+        omnipod_overview_button_resume_delivery.setOnClickListener {
             disablePodActionButtons()
-            omnipodPumpPlugin.addPodStatusRequest(OmnipodStatusRequestType.GET_POD_STATE);
-            commandQueue.readStatus("Clicked Refresh", null)
+            commandQueue.customCommand(CommandResumeDelivery(),
+                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_error_failed_to_resume_delivery), true).messageOnSuccess(resourceHelper.gs(R.string.omnipod_confirmation_delivery_resumed)))
         }
 
-        omnipod_button_rileylink_stats.setOnClickListener {
+        omnipod_overview_button_refresh_status.setOnClickListener {
+            disablePodActionButtons()
+            commandQueue.customCommand(CommandGetPodStatus(),
+                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_error_failed_to_refresh_status), false))
+        }
+
+        omnipod_overview_button_rileylink_stats.setOnClickListener {
             if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
                 startActivity(Intent(context, RileyLinkStatusActivity::class.java))
             } else {
@@ -121,22 +124,31 @@ class OmnipodFragment : DaggerFragment() {
             }
         }
 
-        omnipod_button_acknowledge_active_alerts.setOnClickListener {
+        omnipod_overview_button_acknowledge_active_alerts.setOnClickListener {
             disablePodActionButtons()
-            omnipodPumpPlugin.addPodStatusRequest(OmnipodStatusRequestType.ACKNOWLEDGE_ALERTS);
-            commandQueue.readStatus("Clicked Acknowledge Alert", null)
+            commandQueue.customCommand(CommandAcknowledgeAlerts(),
+                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_error_failed_to_acknowledge_alerts), false)
+                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_confirmation_acknowledged_alerts)))
         }
 
-        omnipod_button_suspend_delivery.setOnClickListener {
+        omnipod_overview_button_suspend_delivery.setOnClickListener {
             disablePodActionButtons()
-            omnipodPumpPlugin.addPodStatusRequest(OmnipodStatusRequestType.SUSPEND_DELIVERY);
-            commandQueue.readStatus("Clicked Suspend Delivery", null)
+            commandQueue.customCommand(CommandSuspendDelivery(),
+                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_error_failed_to_suspend_delivery), true)
+                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_confirmation_suspended_delivery)))
         }
 
-        omnipod_button_pulse_log.setOnClickListener {
+        omnipod_overview_button_set_time.setOnClickListener {
             disablePodActionButtons()
-            omnipodPumpPlugin.addPodStatusRequest(OmnipodStatusRequestType.GET_PULSE_LOG);
-            commandQueue.readStatus("Clicked Pulse Log", null)
+            commandQueue.customCommand(CommandHandleTimeChange(true),
+                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_error_failed_to_set_time), true)
+                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_confirmation_time_on_pod_updated)))
+        }
+
+        omnipod_overview_button_pulse_log.setOnClickListener {
+            disablePodActionButtons()
+            commandQueue.customCommand(CommandReadPulseLog(),
+                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_error_failed_to_read_pulse_log), false))
         }
     }
 
@@ -166,9 +178,9 @@ class OmnipodFragment : DaggerFragment() {
             }, { fabricPrivacy.logException(it) })
         disposables += rxBus
             .toObservable(EventPreferenceChange::class.java)
-            .observeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
-                updatePulseLogButton()
+                updatePodActionButtons()
             }, { fabricPrivacy.logException(it) })
         updateUi()
     }
@@ -193,7 +205,7 @@ class OmnipodFragment : DaggerFragment() {
         val resourceId = rileyLinkServiceState.getResourceId()
         val rileyLinkError = rileyLinkServiceData.rileyLinkError
 
-        omnipod_rl_status.text =
+        omnipod_overview_riley_link_status.text =
             when {
                 rileyLinkServiceState == RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
                 rileyLinkServiceState.isConnecting                        -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
@@ -201,7 +213,7 @@ class OmnipodFragment : DaggerFragment() {
                 rileyLinkServiceState.isError && rileyLinkError != null   -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.Omnipod))
                 else                                                      -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
             }
-        omnipod_rl_status.setTextColor(if (rileyLinkServiceState.isError || rileyLinkError != null) Color.RED else Color.WHITE)
+        omnipod_overview_riley_link_status.setTextColor(if (rileyLinkServiceState.isError || rileyLinkError != null) Color.RED else Color.WHITE)
     }
 
     private fun updateOmnipodStatus() {
@@ -210,7 +222,7 @@ class OmnipodFragment : DaggerFragment() {
         updateTempBasal()
         updatePodStatus()
 
-        val errors = ArrayList<String>();
+        val errors = ArrayList<String>()
         if (omnipodPumpPlugin.rileyLinkService != null) {
             val rileyLinkErrorDescription = omnipodPumpPlugin.rileyLinkService.errorDescription
             if (StringUtils.isNotEmpty(rileyLinkErrorDescription)) {
@@ -219,32 +231,41 @@ class OmnipodFragment : DaggerFragment() {
         }
 
         if (!podStateManager.hasPodState() || !podStateManager.isPodInitialized) {
-            omnipod_pod_address.text = if (podStateManager.hasPodState()) {
+            omnipod_overview_pod_address.text = if (podStateManager.hasPodState()) {
                 podStateManager.address.toString()
             } else {
                 PLACEHOLDER
             }
-            omnipod_pod_lot.text = PLACEHOLDER
-            omnipod_pod_tid.text = PLACEHOLDER
-            omnipod_pod_firmware_version.text = PLACEHOLDER
-            omnipod_pod_expiry.text = PLACEHOLDER
-            omnipod_pod_expiry.setTextColor(Color.WHITE)
-            omnipod_base_basal_rate.text = PLACEHOLDER
-            omnipod_total_delivered.text = PLACEHOLDER
-            omnipod_reservoir.text = PLACEHOLDER
-            omnipod_pod_active_alerts.text = PLACEHOLDER
+            omnipod_overview_pod_lot.text = PLACEHOLDER
+            omnipod_overview_pod_tid.text = PLACEHOLDER
+            omnipod_overview_firmware_version.text = PLACEHOLDER
+            omnipod_overview_time_on_pod.text = PLACEHOLDER
+            omnipod_overview_pod_expiry_date.text = PLACEHOLDER
+            omnipod_overview_pod_expiry_date.setTextColor(Color.WHITE)
+            omnipod_overview_base_basal_rate.text = PLACEHOLDER
+            omnipod_overview_total_delivered.text = PLACEHOLDER
+            omnipod_overview_reservoir.text = PLACEHOLDER
+            omnipod_overview_reservoir.setTextColor(Color.WHITE)
+            omnipod_overview_pod_active_alerts.text = PLACEHOLDER
         } else {
-            omnipod_pod_address.text = podStateManager.address.toString()
-            omnipod_pod_lot.text = podStateManager.lot.toString()
-            omnipod_pod_tid.text = podStateManager.tid.toString()
-            omnipod_pod_firmware_version.text = resourceHelper.gs(R.string.omnipod_pod_firmware_version_value, podStateManager.pmVersion.toString(), podStateManager.piVersion.toString())
+            omnipod_overview_pod_address.text = podStateManager.address.toString()
+            omnipod_overview_pod_lot.text = podStateManager.lot.toString()
+            omnipod_overview_pod_tid.text = podStateManager.tid.toString()
+            omnipod_overview_firmware_version.text = resourceHelper.gs(R.string.omnipod_firmware_version_value, podStateManager.pmVersion.toString(), podStateManager.piVersion.toString())
+
+            omnipod_overview_time_on_pod.text = readableZonedTime(podStateManager.time)
+            omnipod_overview_time_on_pod.setTextColor(if (podStateManager.timeDeviatesMoreThan(Duration.standardMinutes(5))) {
+                Color.RED
+            } else {
+                Color.WHITE
+            })
             val expiresAt = podStateManager.expiresAt
             if (expiresAt == null) {
-                omnipod_pod_expiry.text = PLACEHOLDER
-                omnipod_pod_expiry.setTextColor(Color.WHITE)
+                omnipod_overview_pod_expiry_date.text = PLACEHOLDER
+                omnipod_overview_pod_expiry_date.setTextColor(Color.WHITE)
             } else {
-                omnipod_pod_expiry.text = dateUtil.dateAndTimeString(expiresAt.toDate())
-                omnipod_pod_expiry.setTextColor(if (DateTime.now().isAfter(expiresAt)) {
+                omnipod_overview_pod_expiry_date.text = readableZonedTime(expiresAt)
+                omnipod_overview_pod_expiry_date.setTextColor(if (DateTime.now().isAfter(expiresAt)) {
                     Color.RED
                 } else {
                     Color.WHITE
@@ -259,29 +280,29 @@ class OmnipodFragment : DaggerFragment() {
             val now = DateTime.now()
 
             // base basal rate
-            omnipod_base_basal_rate.text = if (podStateManager.isPodActivationCompleted) {
+            omnipod_overview_base_basal_rate.text = if (podStateManager.isPodActivationCompleted) {
                 resourceHelper.gs(R.string.pump_basebasalrate, omnipodPumpPlugin.model().determineCorrectBasalSize(podStateManager.basalSchedule.rateAt(Duration(now.withTimeAtStartOfDay(), now))))
             } else {
                 PLACEHOLDER
             }
 
             // total delivered
-            omnipod_total_delivered.text = if (podStateManager.isPodActivationCompleted && podStateManager.totalInsulinDelivered != null) {
-                resourceHelper.gs(R.string.omnipod_total_delivered, podStateManager.totalInsulinDelivered - OmnipodConstants.POD_SETUP_UNITS);
+            omnipod_overview_total_delivered.text = if (podStateManager.isPodActivationCompleted && podStateManager.totalInsulinDelivered != null) {
+                resourceHelper.gs(R.string.omnipod_overview_total_delivered_value, podStateManager.totalInsulinDelivered - OmnipodConstants.POD_SETUP_UNITS)
             } else {
                 PLACEHOLDER
             }
 
             // reservoir
             if (podStateManager.reservoirLevel == null) {
-                omnipod_reservoir.text = resourceHelper.gs(R.string.omnipod_reservoir_over50)
-                omnipod_reservoir.setTextColor(Color.WHITE)
+                omnipod_overview_reservoir.text = resourceHelper.gs(R.string.omnipod_overview_reservoir_value_over50)
+                omnipod_overview_reservoir.setTextColor(Color.WHITE)
             } else {
-                omnipod_reservoir.text = resourceHelper.gs(R.string.omnipod_reservoir_left, podStateManager.reservoirLevel)
-                warnColors.setColorInverse(omnipod_reservoir, podStateManager.reservoirLevel, 50.0, 20.0)
+                omnipod_overview_reservoir.text = resourceHelper.gs(R.string.omnipod_overview_reservoir_value, podStateManager.reservoirLevel)
+                warnColors.setColorInverse(omnipod_overview_reservoir, podStateManager.reservoirLevel, 50.0, 20.0)
             }
 
-            omnipod_pod_active_alerts.text = if (podStateManager.hasActiveAlerts()) {
+            omnipod_overview_pod_active_alerts.text = if (podStateManager.hasActiveAlerts()) {
                 TextUtils.join(System.lineSeparator(), omnipodUtil.getTranslatedActiveAlerts(podStateManager))
             } else {
                 PLACEHOLDER
@@ -289,27 +310,27 @@ class OmnipodFragment : DaggerFragment() {
         }
 
         if (errors.size == 0) {
-            omnipod_errors.text = PLACEHOLDER
-            omnipod_errors.setTextColor(Color.WHITE)
+            omnipod_overview_errors.text = PLACEHOLDER
+            omnipod_overview_errors.setTextColor(Color.WHITE)
         } else {
-            omnipod_errors.text = StringUtils.join(errors, System.lineSeparator())
-            omnipod_errors.setTextColor(Color.RED)
+            omnipod_overview_errors.text = StringUtils.join(errors, System.lineSeparator())
+            omnipod_overview_errors.setTextColor(Color.RED)
         }
     }
 
     private fun updateLastConnection() {
         if (podStateManager.isPodInitialized && podStateManager.lastSuccessfulCommunication != null) {
-            omnipod_last_connection.text = readableDuration(podStateManager.lastSuccessfulCommunication)
+            omnipod_overview_last_connection.text = readableDuration(podStateManager.lastSuccessfulCommunication)
             val lastConnectionColor =
                 if (omnipodPumpPlugin.isUnreachableAlertTimeoutExceeded(getPumpUnreachableTimeout().millis)) {
                     Color.RED
                 } else {
                     Color.WHITE
                 }
-            omnipod_last_connection.setTextColor(lastConnectionColor)
+            omnipod_overview_last_connection.setTextColor(lastConnectionColor)
         } else {
-            omnipod_last_connection.setTextColor(Color.WHITE)
-            omnipod_last_connection.text = if (podStateManager.hasPodState() && podStateManager.lastSuccessfulCommunication != null) {
+            omnipod_overview_last_connection.setTextColor(Color.WHITE)
+            omnipod_overview_last_connection.text = if (podStateManager.hasPodState() && podStateManager.lastSuccessfulCommunication != null) {
                 readableDuration(podStateManager.lastSuccessfulCommunication)
             } else {
                 PLACEHOLDER
@@ -318,16 +339,16 @@ class OmnipodFragment : DaggerFragment() {
     }
 
     private fun updatePodStatus() {
-        omnipod_pod_status.text = if (!podStateManager.hasPodState()) {
+        omnipod_overview_pod_status.text = if (!podStateManager.hasPodState()) {
             resourceHelper.gs(R.string.omnipod_pod_status_no_active_pod)
         } else if (!podStateManager.isPodActivationCompleted) {
             if (!podStateManager.isPodInitialized) {
-                resourceHelper.gs(R.string.omnipod_pod_status_waiting_for_pair_and_prime)
+                resourceHelper.gs(R.string.omnipod_pod_status_waiting_for_activation)
             } else {
                 if (PodProgressStatus.ACTIVATION_TIME_EXCEEDED == podStateManager.podProgressStatus) {
                     resourceHelper.gs(R.string.omnipod_pod_status_activation_time_exceeded)
                 } else if (podStateManager.podProgressStatus.isBefore(PodProgressStatus.PRIMING_COMPLETED)) {
-                    resourceHelper.gs(R.string.omnipod_pod_status_waiting_for_pair_and_prime)
+                    resourceHelper.gs(R.string.omnipod_pod_status_waiting_for_activation)
                 } else {
                     resourceHelper.gs(R.string.omnipod_pod_status_waiting_for_cannula_insertion)
                 }
@@ -353,12 +374,12 @@ class OmnipodFragment : DaggerFragment() {
         } else {
             Color.WHITE
         }
-        omnipod_pod_status.setTextColor(podStatusColor)
+        omnipod_overview_pod_status.setTextColor(podStatusColor)
     }
 
     private fun updateLastBolus() {
         if (podStateManager.isPodActivationCompleted && podStateManager.hasLastBolus()) {
-            var text = resourceHelper.gs(R.string.omnipod_last_bolus, omnipodPumpPlugin.model().determineCorrectBolusSize(podStateManager.lastBolusAmount), resourceHelper.gs(R.string.insulin_unit_shortname), readableDuration(podStateManager.lastBolusStartTime))
+            var text = resourceHelper.gs(R.string.omnipod_overview_last_bolus_value, omnipodPumpPlugin.model().determineCorrectBolusSize(podStateManager.lastBolusAmount), resourceHelper.gs(R.string.insulin_unit_shortname), readableDuration(podStateManager.lastBolusStartTime))
             val textColor: Int
 
             if (podStateManager.isLastBolusCertain) {
@@ -368,12 +389,12 @@ class OmnipodFragment : DaggerFragment() {
                 text += " (" + resourceHelper.gs(R.string.omnipod_uncertain) + ")"
             }
 
-            omnipod_last_bolus.text = text;
-            omnipod_last_bolus.setTextColor(textColor)
+            omnipod_overview_last_bolus.text = text
+            omnipod_overview_last_bolus.setTextColor(textColor)
 
         } else {
-            omnipod_last_bolus.text = PLACEHOLDER
-            omnipod_last_bolus.setTextColor(Color.WHITE)
+            omnipod_overview_last_bolus.text = PLACEHOLDER
+            omnipod_overview_last_bolus.setTextColor(Color.WHITE)
         }
     }
 
@@ -381,15 +402,15 @@ class OmnipodFragment : DaggerFragment() {
         if (podStateManager.isPodActivationCompleted && podStateManager.isTempBasalRunning) {
             val now = DateTime.now()
 
-            val startTime = podStateManager.tempBasalStartTime;
+            val startTime = podStateManager.tempBasalStartTime
             val amount = podStateManager.tempBasalAmount
-            val duration = podStateManager.tempBasalDuration;
+            val duration = podStateManager.tempBasalDuration
 
             val minutesRunning = Duration(startTime, now).standardMinutes
 
             var text: String
             val textColor: Int
-            text = resourceHelper.gs(R.string.omnipod_temp_basal, amount, dateUtil.timeString(startTime.millis), minutesRunning, duration.standardMinutes)
+            text = resourceHelper.gs(R.string.omnipod_overview_temp_basal_value, amount, dateUtil.timeString(startTime.millis), minutesRunning, duration.standardMinutes)
             if (podStateManager.isTempBasalCertain) {
                 textColor = Color.WHITE
             } else {
@@ -397,20 +418,20 @@ class OmnipodFragment : DaggerFragment() {
                 text += " (" + resourceHelper.gs(R.string.omnipod_uncertain) + ")"
             }
 
-            omnipod_temp_basal.text = text;
-            omnipod_temp_basal.setTextColor(textColor)
+            omnipod_overview_temp_basal.text = text
+            omnipod_overview_temp_basal.setTextColor(textColor)
         } else {
-            omnipod_temp_basal.text = PLACEHOLDER
-            omnipod_temp_basal.setTextColor(Color.WHITE)
+            omnipod_overview_temp_basal.text = PLACEHOLDER
+            omnipod_overview_temp_basal.setTextColor(Color.WHITE)
         }
     }
 
     private fun updateQueueStatus() {
         if (isQueueEmpty()) {
-            omnipod_queue.visibility = View.GONE
+            omnipod_overview_queue.visibility = View.GONE
         } else {
-            omnipod_queue.visibility = View.VISIBLE
-            omnipod_queue.text = commandQueue.spannedStatus().toString()
+            omnipod_overview_queue.visibility = View.VISIBLE
+            omnipod_overview_queue.text = commandQueue.spannedStatus().toString()
         }
     }
 
@@ -419,62 +440,111 @@ class OmnipodFragment : DaggerFragment() {
         updateResumeDeliveryButton()
         updateAcknowledgeAlertsButton()
         updateSuspendDeliveryButton()
+        updateSetTimeButton()
         updatePulseLogButton()
     }
 
     private fun disablePodActionButtons() {
-        omnipod_button_acknowledge_active_alerts.isEnabled = false
-        omnipod_button_resume_delivery.isEnabled = false
-        omnipod_button_refresh_status.isEnabled = false
-        omnipod_button_pulse_log.isEnabled = false
+        omnipod_overview_button_acknowledge_active_alerts.isEnabled = false
+        omnipod_overview_button_resume_delivery.isEnabled = false
+        omnipod_overview_button_suspend_delivery.isEnabled = false
+        omnipod_overview_button_set_time.isEnabled = false
+        omnipod_overview_button_refresh_status.isEnabled = false
+        omnipod_overview_button_pulse_log.isEnabled = false
     }
 
     private fun updateRefreshStatusButton() {
-        omnipod_button_refresh_status.isEnabled = podStateManager.isPodInitialized && podStateManager.podProgressStatus.isAtLeast(PodProgressStatus.PAIRING_COMPLETED)
+        omnipod_overview_button_refresh_status.isEnabled = podStateManager.isPodInitialized && podStateManager.podProgressStatus.isAtLeast(PodProgressStatus.PAIRING_COMPLETED)
             && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
     }
 
     private fun updateResumeDeliveryButton() {
-        val queueEmptyOrStartingPump = isQueueEmpty() || commandQueue.isRunning(Command.CommandType.START_PUMP)
-        if (podStateManager.isPodActivationCompleted && podStateManager.isSuspended && queueEmptyOrStartingPump) {
-            omnipod_button_resume_delivery.visibility = View.VISIBLE
-            omnipod_button_resume_delivery.isEnabled = rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
+        if (podStateManager.isPodRunning && (podStateManager.isSuspended || commandQueue.isCustomCommandInQueue(CommandResumeDelivery::class.java))) {
+            omnipod_overview_button_resume_delivery.visibility = View.VISIBLE
+            omnipod_overview_button_resume_delivery.isEnabled = rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
         } else {
-            omnipod_button_resume_delivery.visibility = View.GONE
+            omnipod_overview_button_resume_delivery.visibility = View.GONE
         }
     }
 
     private fun updateAcknowledgeAlertsButton() {
-        omnipod_button_acknowledge_active_alerts.isEnabled = podStateManager.isPodActivationCompleted && podStateManager.hasActiveAlerts()
-            && !podStateManager.isPodDead && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
+        if (podStateManager.isPodRunning && (podStateManager.hasActiveAlerts() || commandQueue.isCustomCommandInQueue(CommandAcknowledgeAlerts::class.java))) {
+            omnipod_overview_button_acknowledge_active_alerts.visibility = View.VISIBLE
+            omnipod_overview_button_acknowledge_active_alerts.isEnabled = rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
+        } else {
+            omnipod_overview_button_acknowledge_active_alerts.visibility = View.GONE
+        }
     }
 
     private fun updateSuspendDeliveryButton() {
         // If the Pod is currently suspended, we show the Resume delivery button instead.
-        if (omnipodManager.isSuspendDeliveryButtonEnabled && !(podStateManager.isPodRunning && podStateManager.isSuspended)) {
-            omnipod_button_suspend_delivery.visibility = View.VISIBLE
-            omnipod_button_suspend_delivery.isEnabled = podStateManager.isPodRunning && !podStateManager.isSuspended && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
+        if (omnipodManager.isSuspendDeliveryButtonEnabled && podStateManager.isPodRunning && (!podStateManager.isSuspended || commandQueue.isCustomCommandInQueue(CommandSuspendDelivery::class.java))) {
+            omnipod_overview_button_suspend_delivery.visibility = View.VISIBLE
+            omnipod_overview_button_suspend_delivery.isEnabled = podStateManager.isPodRunning && !podStateManager.isSuspended && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
         } else {
-            omnipod_button_suspend_delivery.visibility = View.GONE
+            omnipod_overview_button_suspend_delivery.visibility = View.GONE
+        }
+    }
+
+    private fun updateSetTimeButton() {
+        if (podStateManager.isPodRunning && (podStateManager.timeDeviatesMoreThan(Duration.standardMinutes(5)) || commandQueue.isCustomCommandInQueue(CommandHandleTimeChange::class.java))) {
+            omnipod_overview_button_set_time.visibility = View.VISIBLE
+            omnipod_overview_button_set_time.isEnabled = !podStateManager.isSuspended && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
+        } else {
+            omnipod_overview_button_set_time.visibility = View.GONE
         }
     }
 
     private fun updatePulseLogButton() {
         if (omnipodManager.isPulseLogButtonEnabled) {
-            omnipod_button_pulse_log.visibility = View.VISIBLE
-            omnipod_button_pulse_log.isEnabled = podStateManager.isPodActivationCompleted && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
+            omnipod_overview_button_pulse_log.visibility = View.VISIBLE
+            omnipod_overview_button_pulse_log.isEnabled = podStateManager.isPodActivationCompleted && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
         } else {
-            omnipod_button_pulse_log.visibility = View.GONE
+            omnipod_overview_button_pulse_log.visibility = View.GONE
         }
     }
 
     private fun displayNotConfiguredDialog() {
         context?.let {
-            OKDialog.show(it, resourceHelper.gs(R.string.omnipod_warning),
-                resourceHelper.gs(R.string.omnipod_error_operation_not_possible_no_configuration), null)
+            UIRunnable(Runnable {
+                OKDialog.show(it, resourceHelper.gs(R.string.omnipod_warning),
+                    resourceHelper.gs(R.string.omnipod_error_operation_not_possible_no_configuration), null)
+            }).run()
         }
     }
 
+    private fun displayErrorDialog(title: String, message: String, withSound: Boolean) {
+        context?.let {
+            val i = Intent(it, ErrorHelperActivity::class.java)
+            i.putExtra("soundid", if (withSound) R.raw.boluserror else 0)
+            i.putExtra("status", message)
+            i.putExtra("title", title)
+            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            it.startActivity(i)
+        }
+    }
+
+    private fun displayOkDialog(title: String, message: String) {
+        context?.let {
+            UIRunnable(Runnable {
+                OKDialog.show(it, title, message, null)
+            }).run()
+        }
+    }
+
+    private fun readableZonedTime(time: DateTime): String {
+        val timeAsJavaData = time.toLocalDateTime().toDate()
+        val timeZone = podStateManager.timeZone.toTimeZone()
+        if (timeZone == TimeZone.getDefault()) {
+            return dateUtil.dateAndTimeString(timeAsJavaData)
+        }
+
+        val isDaylightTime = timeZone.inDaylightTime(timeAsJavaData)
+        val locale = resources.configuration.locales.get(0)
+        val timeZoneDisplayName = timeZone.getDisplayName(isDaylightTime, TimeZone.SHORT, locale) + " " + timeZone.getDisplayName(isDaylightTime, TimeZone.LONG, locale)
+        return resourceHelper.gs(R.string.omnipod_time_with_timezone, dateUtil.dateAndTimeString(timeAsJavaData), timeZoneDisplayName)
+    }
+
     private fun readableDuration(dateTime: DateTime): String {
         val duration = Duration(dateTime, DateTime.now())
         val hours = duration.standardHours.toInt()
@@ -521,4 +591,24 @@ class OmnipodFragment : DaggerFragment() {
         return Duration.standardMinutes(sp.getInt(resourceHelper.gs(R.string.key_pump_unreachable_threshold_minutes), Constants.DEFAULT_PUMP_UNREACHABLE_THRESHOLD_MINUTES).toLong())
     }
 
+    inner class DisplayResultDialogCallback(private val errorMessagePrefix: String, private val withSoundOnError: Boolean) : Callback() {
+        private var messageOnSuccess: String? = null
+
+        override fun run() {
+            if (result.success) {
+                val messageOnSuccess = this.messageOnSuccess
+                if (messageOnSuccess != null) {
+                    displayOkDialog(resourceHelper.gs(R.string.omnipod_confirmation), messageOnSuccess)
+                }
+            } else {
+                displayErrorDialog(resourceHelper.gs(R.string.omnipod_warning), resourceHelper.gs(R.string.omnipod_two_strings_concatenated_by_colon, errorMessagePrefix, result.comment), withSoundOnError)
+            }
+        }
+
+        fun messageOnSuccess(message: String): DisplayResultDialogCallback {
+            messageOnSuccess = message
+            return this
+        }
+    }
+
 }
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java
index 4913bb6614..ff8319a557 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java
@@ -250,11 +250,11 @@ public class PodHistoryActivity extends NoSplashAppCompatActivity {
 
                     case SET_TEMPORARY_BASAL: {
                         TempBasalPair tempBasalPair = aapsOmnipodUtil.getGsonInstance().fromJson(historyEntry.getData(), TempBasalPair.class);
-                        valueView.setText(resourceHelper.gs(R.string.omnipod_cmd_tbr_value, tempBasalPair.getInsulinRate(), tempBasalPair.getDurationMinutes()));
+                        valueView.setText(resourceHelper.gs(R.string.omnipod_history_tbr_value, tempBasalPair.getInsulinRate(), tempBasalPair.getDurationMinutes()));
                     }
                     break;
 
-                    case FILL_CANNULA_SET_BASAL_PROFILE:
+                    case INSERT_CANNULA:
                     case SET_BASAL_SCHEDULE: {
                         if (historyEntry.getData() != null) {
                             setProfileValue(historyEntry.getData(), valueView);
@@ -265,9 +265,9 @@ public class PodHistoryActivity extends NoSplashAppCompatActivity {
                     case SET_BOLUS: {
                         if (historyEntry.getData().contains(";")) {
                             String[] splitVal = historyEntry.getData().split(";");
-                            valueView.setText(resourceHelper.gs(R.string.omnipod_cmd_bolus_value_with_carbs, Double.valueOf(splitVal[0]), Double.valueOf(splitVal[1])));
+                            valueView.setText(resourceHelper.gs(R.string.omnipod_history_bolus_value_with_carbs, Double.valueOf(splitVal[0]), Double.valueOf(splitVal[1])));
                         } else {
-                            valueView.setText(resourceHelper.gs(R.string.omnipod_cmd_bolus_value, Double.valueOf(historyEntry.getData())));
+                            valueView.setText(resourceHelper.gs(R.string.omnipod_history_bolus_value, Double.valueOf(historyEntry.getData())));
                         }
                     }
                     break;
@@ -275,13 +275,13 @@ public class PodHistoryActivity extends NoSplashAppCompatActivity {
                     case GET_POD_STATUS:
                     case GET_POD_INFO:
                     case SET_TIME:
-                    case PAIR_AND_PRIME:
+                    case INITIALIZE_POD:
                     case CANCEL_TEMPORARY_BASAL_BY_DRIVER:
                     case CANCEL_TEMPORARY_BASAL:
                     case CONFIGURE_ALERTS:
                     case CANCEL_BOLUS:
                     case DEACTIVATE_POD:
-                    case RESET_POD_STATE:
+                    case DISCARD_POD:
                     case ACKNOWLEDGE_ALERTS:
                     case SUSPEND_DELIVERY:
                     case RESUME_DELIVERY:
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt
index 43f4046a5e..03ee8035ae 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt
@@ -2,13 +2,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.ui
 
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
-import android.widget.LinearLayout
-import androidx.fragment.app.FragmentStatePagerAdapter
-import com.atech.android.library.wizardpager.WizardPagerActivity
-import com.atech.android.library.wizardpager.WizardPagerContext
-import com.atech.android.library.wizardpager.data.WizardPagerSettings
-import com.atech.android.library.wizardpager.defs.WizardStepsWayType
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
@@ -16,22 +9,19 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
 import info.nightscout.androidaps.plugins.pump.omnipod.R
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.defs.PodActionType
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.model.FullInitPodWizardModel
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.model.RemovePodWizardModel
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.model.ShortInitPodWizardModel
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.pages.InitPodRefreshAction
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.PodActivationWizardActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.PodDeactivationWizardActivity
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.extensions.toVisibility
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
-import kotlinx.android.synthetic.main.omnipod_pod_mgmt.*
+import kotlinx.android.synthetic.main.omnipod_pod_management.*
 import javax.inject.Inject
 
 /**
@@ -52,22 +42,25 @@ class PodManagementActivity : NoSplashAppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.omnipod_pod_mgmt)
+        setContentView(R.layout.omnipod_pod_management)
 
-        initpod_init_pod.setOnClickListener {
-            initPodAction()
+        omnipod_pod_management_button_activate_pod.setOnClickListener {
+            startActivity(Intent(this, PodActivationWizardActivity::class.java))
         }
 
-        initpod_remove_pod.setOnClickListener {
-            deactivatePodAction()
+        omnipod_pod_management_button_deactivate_pod.setOnClickListener {
+            startActivity(Intent(this, PodDeactivationWizardActivity::class.java))
         }
 
-        initpod_reset_pod.setOnClickListener {
-            discardPodAction()
+        omnipod_pod_management_button_discard_pod.setOnClickListener {
+            OKDialog.showConfirmation(this,
+                resourceHelper.gs(R.string.omnipod_pod_management_discard_pod_state_confirmation), Thread {
+                aapsOmnipodManager.discardPodState()
+            })
         }
 
-        initpod_pod_history.setOnClickListener {
-            showPodHistory()
+        omnipod_pod_management_button_pod_history.setOnClickListener {
+            startActivity(Intent(this, PodHistoryActivity::class.java))
         }
     }
 
@@ -90,86 +83,27 @@ class PodManagementActivity : NoSplashAppCompatActivity() {
         disposables.clear()
     }
 
-    private fun initPodAction() {
-
-        val pagerSettings = WizardPagerSettings()
-        var refreshAction = InitPodRefreshAction(injector, PodActionType.INIT_POD)
-
-        pagerSettings.setWizardStepsWayType(WizardStepsWayType.CancelNext)
-        pagerSettings.setFinishStringResourceId(R.string.close)
-        pagerSettings.setFinishButtonBackground(R.drawable.finish_background)
-        pagerSettings.setNextButtonBackground(R.drawable.selectable_item_background)
-        pagerSettings.setBackStringResourceId(R.string.cancel)
-        pagerSettings.cancelAction = refreshAction
-        pagerSettings.finishAction = refreshAction
-        pagerSettings.pagerAdapterBehavior = FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT
-
-        val wizardPagerContext = WizardPagerContext.getInstance()
-
-        wizardPagerContext.clearContext()
-        wizardPagerContext.pagerSettings = pagerSettings
-        val isFullInit = !podStateManager.isPodInitialized || podStateManager.podProgressStatus.isBefore(PodProgressStatus.PRIMING_COMPLETED)
-        if (isFullInit) {
-            wizardPagerContext.wizardModel = FullInitPodWizardModel(applicationContext)
-        } else {
-            wizardPagerContext.wizardModel = ShortInitPodWizardModel(applicationContext)
-        }
-
-        val myIntent = Intent(this@PodManagementActivity, WizardPagerActivity::class.java)
-        this@PodManagementActivity.startActivity(myIntent)
-    }
-
-    private fun deactivatePodAction() {
-        val pagerSettings = WizardPagerSettings()
-        var refreshAction = InitPodRefreshAction(injector, PodActionType.DEACTIVATE_POD)
-
-        pagerSettings.setWizardStepsWayType(WizardStepsWayType.CancelNext)
-        pagerSettings.setFinishStringResourceId(R.string.close)
-        pagerSettings.setFinishButtonBackground(R.drawable.finish_background)
-        pagerSettings.setNextButtonBackground(R.drawable.selectable_item_background)
-        pagerSettings.setBackStringResourceId(R.string.cancel)
-        pagerSettings.cancelAction = refreshAction
-        pagerSettings.finishAction = refreshAction
-        pagerSettings.pagerAdapterBehavior = FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT
-
-        val wizardPagerContext = WizardPagerContext.getInstance();
-
-        wizardPagerContext.clearContext()
-        wizardPagerContext.pagerSettings = pagerSettings
-        wizardPagerContext.wizardModel = RemovePodWizardModel(applicationContext)
-
-        val myIntent = Intent(this@PodManagementActivity, WizardPagerActivity::class.java)
-        this@PodManagementActivity.startActivity(myIntent)
-
-    }
-
-    private fun discardPodAction() {
-        OKDialog.showConfirmation(this,
-            resourceHelper.gs(R.string.omnipod_cmd_discard_pod_desc), Thread {
-            aapsOmnipodManager.discardPodState()
-            rxBus.send(EventOmnipodPumpValuesChanged())
-        })
-    }
-
-    private fun showPodHistory() {
-        startActivity(Intent(applicationContext, PodHistoryActivity::class.java))
-    }
-
     private fun refreshButtons() {
-        initpod_init_pod.isEnabled = !podStateManager.isPodActivationCompleted
-        initpod_remove_pod.isEnabled = podStateManager.isPodInitialized
-        initpod_reset_pod.isEnabled = podStateManager.hasPodState()
-
-        val waitingForRlView = findViewById<LinearLayout>(R.id.initpod_waiting_for_rl_layout)
+        // Only show the discard button to reset a cached Pod address before the Pod has actually been initialized
+        // Otherwise, users should use the Deactivate Pod Wizard. In case proper deactivation fails,
+        // they will get an option to discard the Pod state there
+        // TODO maybe rename this button and the confirmation dialog text (see onCreate)
+        val discardButtonEnabled = podStateManager.hasPodState() && !podStateManager.isPodInitialized
+        omnipod_pod_management_button_discard_pod.visibility = discardButtonEnabled.toVisibility()
+        omnipod_pod_management_waiting_for_rl_layout.visibility = (!rileyLinkServiceData.rileyLinkServiceState.isReady).toVisibility()
 
         if (rileyLinkServiceData.rileyLinkServiceState.isReady) {
-            waitingForRlView.visibility = View.GONE
+            omnipod_pod_management_button_activate_pod.isEnabled = !podStateManager.isPodActivationCompleted
+            omnipod_pod_management_button_deactivate_pod.isEnabled = podStateManager.isPodInitialized
+            if (discardButtonEnabled) {
+                omnipod_pod_management_button_discard_pod.isEnabled = true
+            }
         } else {
-            // if rileylink is not running we disable all operations that require a RL connection
-            waitingForRlView.visibility = View.VISIBLE
-            initpod_init_pod.isEnabled = false
-            initpod_remove_pod.isEnabled = false
-            initpod_reset_pod.isEnabled = false
+            omnipod_pod_management_button_activate_pod.isEnabled = false
+            omnipod_pod_management_button_deactivate_pod.isEnabled = false
+            if (discardButtonEnabled) {
+                omnipod_pod_management_button_discard_pod.isEnabled = false
+            }
         }
     }
 
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/PodActivationWizardActivity.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/PodActivationWizardActivity.kt
new file mode 100644
index 0000000000..183c3c239c
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/PodActivationWizardActivity.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation
+
+import android.os.Bundle
+import androidx.annotation.IdRes
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.activity.OmnipodWizardActivityBase
+import javax.inject.Inject
+
+class PodActivationWizardActivity : OmnipodWizardActivityBase() {
+    companion object {
+        const val KEY_START_DESTINATION = "startDestination"
+    }
+
+    @Inject
+    lateinit var podStateManager: PodStateManager
+
+    @IdRes
+    private var startDestination: Int = R.id.fillPodInfoFragment
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.omnipod_pod_activation_wizard_activity)
+
+        startDestination = savedInstanceState?.getInt(KEY_START_DESTINATION, R.id.fillPodInfoFragment)
+            ?: if (!podStateManager.isPodInitialized || podStateManager.podProgressStatus.isBefore(PodProgressStatus.PRIMING_COMPLETED)) {
+                R.id.fillPodInfoFragment
+            } else {
+                R.id.attachPodInfoFragment
+            }
+
+        setStartDestination(startDestination)
+    }
+
+    private fun setStartDestination(@IdRes startDestination: Int) {
+        this.startDestination = startDestination
+        val navController = getNavController()
+        val navInflater = navController.navInflater
+        val graph = navInflater.inflate(R.navigation.omnipod_pod_activation_wizard_navigation_graph)
+        graph.startDestination = startDestination
+        navController.graph = graph
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putInt(KEY_START_DESTINATION, startDestination)
+    }
+
+    override fun getTotalDefinedNumberOfSteps(): Int = 5
+
+    override fun getActualNumberOfSteps(): Int {
+        if (startDestination == R.id.attachPodInfoFragment) {
+            return 3
+        }
+        return 5
+    }
+
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/AttachPodInfoFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/AttachPodInfoFragment.kt
new file mode 100644
index 0000000000..5642750a20
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/AttachPodInfoFragment.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment
+
+import android.app.AlertDialog
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import androidx.navigation.fragment.findNavController
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase
+import kotlinx.android.synthetic.main.omnipod_wizard_nav_buttons.*
+
+class AttachPodInfoFragment : InfoFragmentBase() {
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_pod_activation_wizard_attach_pod_title
+
+    @StringRes
+    override fun getTextId(): Int = R.string.omnipod_pod_activation_wizard_attach_pod_text
+
+    @IdRes
+    override fun getNextPageActionId(): Int = R.id.action_attachPodInfoFragment_to_insertCannulaActionFragment
+
+    override fun getIndex(): Int = 3
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        omnipod_wizard_button_next.setOnClickListener {
+            AlertDialog.Builder(context)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setTitle(getString(getTitleId()))
+                .setMessage(getString(R.string.omnipod_pod_activation_wizard_attach_pod_confirm_insert_cannula_text))
+                .setPositiveButton(getString(R.string.omnipod_ok)) { _, _ -> findNavController().navigate(getNextPageActionId()) }
+                .setNegativeButton(getString(R.string.omnipod_cancel), null)
+                .show()
+        }
+    }
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/FillPodInfoFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/FillPodInfoFragment.kt
new file mode 100644
index 0000000000..425ff1e7ea
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/FillPodInfoFragment.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment
+
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase
+
+class FillPodInfoFragment : InfoFragmentBase() {
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_pod_activation_wizard_fill_pod_title
+
+    @StringRes
+    override fun getTextId(): Int = R.string.omnipod_pod_activation_wizard_fill_pod_text
+
+    @IdRes
+    override fun getNextPageActionId(): Int = R.id.action_fillPodInfoFragment_to_initializePodActionFragment
+
+    override fun getIndex(): Int = 1
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InitializePodActionFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InitializePodActionFragment.kt
new file mode 100644
index 0000000000..bc10c3daf1
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InitializePodActionFragment.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment
+
+import android.os.Bundle
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModelProvider
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel.InitializePodActionViewModel
+import javax.inject.Inject
+
+class InitializePodActionFragment : PodActivationActionFragmentBase() {
+    @Inject
+    @OmnipodPluginQualifier
+    lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val vm: InitializePodActionViewModel by viewModels { viewModelFactory }
+        this.viewModel = vm
+    }
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_pod_activation_wizard_initialize_pod_title
+
+    @StringRes
+    override fun getTextId(): Int = R.string.omnipod_pod_activation_wizard_initialize_pod_text
+
+    @IdRes
+    override fun getNextPageActionId(): Int = R.id.action_initializePodActionFragment_to_attachPodInfoFragment
+
+    override fun getIndex(): Int = 2
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt
new file mode 100644
index 0000000000..009318c60d
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/InsertCannulaActionFragment.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment
+
+import android.os.Bundle
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModelProvider
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel.InsertCannulaActionViewModel
+import javax.inject.Inject
+
+class InsertCannulaActionFragment : PodActivationActionFragmentBase() {
+    @Inject
+    @OmnipodPluginQualifier
+    lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val vm: InsertCannulaActionViewModel by viewModels { viewModelFactory }
+        this.viewModel = vm
+    }
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_pod_activation_wizard_insert_cannula_title
+
+    @StringRes
+    override fun getTextId(): Int = R.string.omnipod_pod_activation_wizard_insert_cannula_text
+
+    @IdRes
+    override fun getNextPageActionId(): Int = R.id.action_insertCannulaActionFragment_to_PodActivatedInfoFragment
+
+    override fun getIndex(): Int = 4
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt
new file mode 100644
index 0000000000..455a8063a3
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivatedInfoFragment.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment
+
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase
+
+class PodActivatedInfoFragment : InfoFragmentBase() {
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_pod_activation_wizard_pod_activated_title
+
+    @StringRes
+    override fun getTextId(): Int = R.string.omnipod_pod_activation_wizard_pod_activated_text
+
+    @IdRes
+    override fun getNextPageActionId(): Int? = null
+
+    override fun getIndex(): Int = 5
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt
new file mode 100644
index 0000000000..2055d895e0
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/PodActivationActionFragmentBase.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.ActionFragmentBase
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.PodDeactivationWizardActivity
+import kotlinx.android.synthetic.main.omnipod_wizard_action_page_fragment.*
+import javax.inject.Inject
+
+abstract class PodActivationActionFragmentBase : ActionFragmentBase() {
+    @Inject
+    protected lateinit var podStateManager: PodStateManager
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        omnipod_wizard_button_deactivate_pod.setOnClickListener {
+            activity?.let {
+                startActivity(Intent(it, PodDeactivationWizardActivity::class.java))
+                it.finish()
+            }
+        }
+    }
+
+    override fun onActionFailure() {
+        if (podStateManager.isPodInitialized && podStateManager.podProgressStatus == PodProgressStatus.ACTIVATION_TIME_EXCEEDED) {
+            omnipod_wizard_action_error.setText(R.string.omnipod_error_pod_fault_activation_time_exceeded)
+            omnipod_wizard_button_retry.visibility = View.GONE
+            omnipod_wizard_button_deactivate_pod.visibility = View.VISIBLE
+        }
+    }
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt
new file mode 100644
index 0000000000..429b1170d2
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InitializePodActionViewModel.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel
+
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.viewmodel.ActionViewModelBase
+import javax.inject.Inject
+
+class InitializePodActionViewModel @Inject constructor(private val aapsOmnipodManager: AapsOmnipodManager) : ActionViewModelBase() {
+    override fun doExecuteAction(): PumpEnactResult = aapsOmnipodManager.initializePod()
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt
new file mode 100644
index 0000000000..fe042a4a03
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/viewmodel/InsertCannulaActionViewModel.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.viewmodel
+
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.viewmodel.ActionViewModelBase
+import javax.inject.Inject
+
+class InsertCannulaActionViewModel @Inject constructor(private val aapsOmnipodManager: AapsOmnipodManager, private val profileFunction: ProfileFunction) : ActionViewModelBase() {
+    override fun doExecuteAction(): PumpEnactResult = aapsOmnipodManager.insertCannula(profileFunction.getProfile())
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/activity/OmnipodWizardActivityBase.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/activity/OmnipodWizardActivityBase.kt
new file mode 100644
index 0000000000..b15e1a8012
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/activity/OmnipodWizardActivityBase.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.activity
+
+import android.app.AlertDialog
+import androidx.navigation.NavController
+import androidx.navigation.fragment.NavHostFragment
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+
+abstract class OmnipodWizardActivityBase : NoSplashAppCompatActivity() {
+    override fun onBackPressed() {
+        exitActivityAfterConfirmation()
+    }
+
+    fun exitActivityAfterConfirmation() {
+        if (getNavController().previousBackStackEntry == null) {
+            finish()
+        } else {
+            AlertDialog.Builder(this)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setTitle(getString(R.string.omnipod_wizard_exit_confirmation_title))
+                .setMessage(getString(R.string.omnipod_wizard_exit_confirmation_text))
+                .setPositiveButton(getString(R.string.omnipod_yes)) { _, _ -> finish() }
+                .setNegativeButton(getString(R.string.omnipod_no), null)
+                .show()
+        }
+    }
+
+    protected fun getNavController(): NavController =
+        (supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment).navController
+
+    abstract fun getTotalDefinedNumberOfSteps(): Int
+
+    abstract fun getActualNumberOfSteps(): Int
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/ActionFragmentBase.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/ActionFragmentBase.kt
new file mode 100644
index 0000000000..1b0d8e41f6
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/ActionFragmentBase.kt
@@ -0,0 +1,79 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment
+
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.LayoutRes
+import androidx.annotation.StringRes
+import androidx.lifecycle.Observer
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.viewmodel.ActionViewModelBase
+import info.nightscout.androidaps.utils.extensions.toVisibility
+import kotlinx.android.synthetic.main.omnipod_wizard_action_page_fragment.*
+import kotlinx.android.synthetic.main.omnipod_wizard_nav_buttons.*
+
+abstract class ActionFragmentBase : WizardFragmentBase() {
+    protected lateinit var viewModel: ActionViewModelBase
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        omnipod_wizard_button_next.isEnabled = false
+        omnipod_wizard_action_page_text.setText(getTextId())
+
+        omnipod_wizard_button_retry.setOnClickListener { viewModel.executeAction() }
+
+        viewModel.isActionExecutingLiveData.observe(viewLifecycleOwner, Observer { isExecuting ->
+            if (isExecuting) {
+                omnipod_wizard_action_error.visibility = View.GONE
+                omnipod_wizard_button_deactivate_pod.visibility = View.GONE
+                omnipod_wizard_button_discard_pod.visibility = View.GONE
+                omnipod_wizard_button_retry.visibility = View.GONE
+            }
+            omnipod_wizard_action_progress_indication.visibility = isExecuting.toVisibility()
+            omnipod_wizard_button_cancel.isEnabled = !isExecuting
+        })
+
+        viewModel.actionResultLiveData.observe(viewLifecycleOwner, Observer { result ->
+            result?.let {
+                val isExecuting = isActionExecuting()
+
+                omnipod_wizard_button_next.isEnabled = result.success
+                omnipod_wizard_action_success.visibility = result.success.toVisibility()
+                omnipod_wizard_action_error.visibility = (!isExecuting && !result.success).toVisibility()
+                omnipod_wizard_button_retry.visibility = (!isExecuting && !result.success).toVisibility()
+
+                if (result.success) {
+                    onActionSuccess()
+                } else {
+                    omnipod_wizard_action_error.text = result.comment
+                    onActionFailure()
+                }
+            }
+        })
+
+        if (savedInstanceState == null && !isActionExecuting()) {
+            viewModel.executeAction()
+        }
+
+    }
+
+    protected fun isActionExecuting() = viewModel.isActionExecutingLiveData.value!!
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        viewModel.isActionExecutingLiveData.removeObservers(viewLifecycleOwner)
+        viewModel.actionResultLiveData.removeObservers(viewLifecycleOwner)
+    }
+
+    fun onActionSuccess() {}
+
+    open fun onActionFailure() {}
+
+    @StringRes
+    abstract fun getTextId(): Int
+
+    @LayoutRes
+    override fun getLayoutId(): Int {
+        return R.layout.omnipod_wizard_action_page_fragment
+    }
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/InfoFragmentBase.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/InfoFragmentBase.kt
new file mode 100644
index 0000000000..d1008a1bea
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/InfoFragmentBase.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment
+
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.LayoutRes
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import kotlinx.android.synthetic.main.omnipod_wizard_info_page_fragment.*
+
+abstract class InfoFragmentBase : WizardFragmentBase() {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        omnipod_wizard_info_page_text.setText(getTextId())
+    }
+
+    @StringRes
+    abstract fun getTextId(): Int
+
+    @LayoutRes
+    override fun getLayoutId(): Int {
+        return R.layout.omnipod_wizard_info_page_fragment
+    }
+
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt
new file mode 100644
index 0000000000..cd6f135f08
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt
@@ -0,0 +1,84 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment
+
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewStub
+import androidx.annotation.IdRes
+import androidx.annotation.LayoutRes
+import androidx.annotation.StringRes
+import androidx.navigation.fragment.findNavController
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.activity.OmnipodWizardActivityBase
+import kotlinx.android.synthetic.main.omnipod_wizard_base_fragment.*
+import kotlinx.android.synthetic.main.omnipod_wizard_nav_buttons.*
+import kotlinx.android.synthetic.main.omnipod_wizard_progress_indication.*
+import kotlin.math.roundToInt
+
+abstract class WizardFragmentBase : DaggerFragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        val baseView = inflater.inflate(R.layout.omnipod_wizard_base_fragment, container, false)
+        val contentView = baseView.findViewById<ViewStub>(R.id.omnipod_wizard_base_fragment_content)
+        contentView?.let {
+            it.layoutResource = getLayoutId()
+            it.inflate()
+        }
+        return baseView
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        omnipod_wizard_base_fragment_title.setText(getTitleId())
+
+        val nextPage = getNextPageActionId()
+
+        if (nextPage == null) {
+            omnipod_wizard_button_next.text = getString(R.string.omnipod_wizard_button_finish)
+            omnipod_wizard_button_next.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.review_green, context?.theme))
+        }
+
+        updateProgressIndication()
+
+        omnipod_wizard_button_next.setOnClickListener {
+            if (nextPage == null) {
+                activity?.finish()
+            } else {
+                findNavController().navigate(nextPage)
+            }
+        }
+
+        omnipod_wizard_button_cancel.setOnClickListener {
+            (activity as? OmnipodWizardActivityBase)?.exitActivityAfterConfirmation()
+        }
+    }
+
+    private fun updateProgressIndication() {
+        (activity as? OmnipodWizardActivityBase)?.let {
+            val numberOfSteps = it.getActualNumberOfSteps()
+
+            val currentFragment = getIndex() - (it.getTotalDefinedNumberOfSteps() - numberOfSteps)
+            val progressPercentage = (currentFragment / numberOfSteps.toDouble() * 100).roundToInt()
+
+            omnipod_wizard_progress_indication.progress = progressPercentage
+        }
+    }
+
+    @LayoutRes
+    protected abstract fun getLayoutId(): Int
+
+    @IdRes
+    protected abstract fun getNextPageActionId(): Int?
+
+    @StringRes
+    protected abstract fun getTitleId(): Int
+
+    protected abstract fun getIndex(): Int
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/viewmodel/ActionViewModelBase.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/viewmodel/ActionViewModelBase.kt
new file mode 100644
index 0000000000..1590f752e2
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/viewmodel/ActionViewModelBase.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.viewmodel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import info.nightscout.androidaps.data.PumpEnactResult
+import io.reactivex.schedulers.Schedulers
+import io.reactivex.subjects.SingleSubject
+
+abstract class ActionViewModelBase : ViewModel() {
+
+    private val _isActionExecutingLiveData = MutableLiveData<Boolean>(false)
+    val isActionExecutingLiveData: LiveData<Boolean> = _isActionExecutingLiveData
+
+    private val _actionResultLiveData = MutableLiveData<PumpEnactResult?>(null)
+    val actionResultLiveData: LiveData<PumpEnactResult?> = _actionResultLiveData
+
+    fun executeAction() {
+        _isActionExecutingLiveData.postValue(true)
+        val disposable = SingleSubject.fromCallable<PumpEnactResult>(this::doExecuteAction)
+            .subscribeOn(Schedulers.io())
+            .doOnSuccess { result ->
+                _isActionExecutingLiveData.postValue(false)
+                _actionResultLiveData.postValue(result)
+            }
+            .subscribe()
+    }
+
+    protected abstract fun doExecuteAction(): PumpEnactResult
+}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/PodDeactivationWizardActivity.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/PodDeactivationWizardActivity.kt
new file mode 100644
index 0000000000..892d85a97e
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/PodDeactivationWizardActivity.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation
+
+import android.os.Bundle
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.activity.OmnipodWizardActivityBase
+
+class PodDeactivationWizardActivity : OmnipodWizardActivityBase() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.omnipod_pod_deactivation_wizard_activity)
+    }
+
+    override fun getTotalDefinedNumberOfSteps(): Int = 3
+
+    override fun getActualNumberOfSteps(): Int = 3
+
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt
new file mode 100644
index 0000000000..a88b5866be
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodActionFragment.kt
@@ -0,0 +1,65 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment
+
+import android.app.AlertDialog
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModelProvider
+import androidx.navigation.fragment.findNavController
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.ActionFragmentBase
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.viewmodel.DeactivatePodActionViewModel
+import info.nightscout.androidaps.utils.extensions.toVisibility
+import kotlinx.android.synthetic.main.omnipod_wizard_action_page_fragment.*
+import javax.inject.Inject
+
+class DeactivatePodActionFragment : ActionFragmentBase() {
+    @Inject
+    @OmnipodPluginQualifier
+    lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    @Inject
+    lateinit var aapsOmnipodManager: AapsOmnipodManager
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val vm: DeactivatePodActionViewModel by viewModels { viewModelFactory }
+        this.viewModel = vm
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        omnipod_wizard_button_discard_pod.setOnClickListener {
+            AlertDialog.Builder(context)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setTitle(getString(R.string.omnipod_pod_deactivation_wizard_discard_pod))
+                .setMessage(getString(R.string.omnipod_pod_deactivation_wizard_discard_pod_confirmation))
+                .setPositiveButton(getString(R.string.omnipod_yes)) { _, _ ->
+                    aapsOmnipodManager.discardPodState()
+                    findNavController().navigate(R.id.action_deactivatePodActionFragment_to_podDiscardedInfoFragment)
+                }
+                .setNegativeButton(getString(R.string.omnipod_no), null)
+                .show()
+        }
+    }
+
+    override fun onActionFailure() {
+        omnipod_wizard_button_discard_pod.visibility = (!isActionExecuting()).toVisibility()
+    }
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_pod_deactivation_wizard_deactivating_pod_title
+
+    @StringRes
+    override fun getTextId(): Int = R.string.omnipod_pod_deactivation_wizard_deactivating_pod_text
+
+    @IdRes
+    override fun getNextPageActionId(): Int = R.id.action_deactivatePodActionFragment_to_podDeactivatedInfoFragment
+
+    override fun getIndex(): Int = 2
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt
new file mode 100644
index 0000000000..5fefcfc549
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/DeactivatePodInfoFragment.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment
+
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase
+
+class DeactivatePodInfoFragment : InfoFragmentBase() {
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_pod_deactivation_wizard_deactivate_pod_title
+
+    @StringRes
+    override fun getTextId(): Int = R.string.omnipod_pod_deactivation_wizard_deactivate_pod_text
+
+    @IdRes
+    override fun getNextPageActionId(): Int = R.id.action_deactivatePodInfoFragment_to_deactivatePodActionFragment
+
+    override fun getIndex(): Int = 1
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt
new file mode 100644
index 0000000000..3b1c80cbb1
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDeactivatedInfoFragment.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment
+
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase
+
+class PodDeactivatedInfoFragment : InfoFragmentBase() {
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_pod_deactivation_wizard_pod_deactivated_title
+
+    @StringRes
+    override fun getTextId(): Int = R.string.omnipod_pod_deactivation_wizard_pod_deactivated_text
+
+    @IdRes
+    override fun getNextPageActionId(): Int? = null
+
+    override fun getIndex(): Int = 3
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt
new file mode 100644
index 0000000000..7b53f4abc4
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/fragment/PodDiscardedInfoFragment.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment
+
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.R
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase
+
+class PodDiscardedInfoFragment : InfoFragmentBase() {
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_pod_deactivation_wizard_pod_discarded_title
+
+    @StringRes
+    override fun getTextId(): Int = R.string.omnipod_pod_deactivation_wizard_pod_discarded_text
+
+    @IdRes
+    override fun getNextPageActionId(): Int? = null
+
+    override fun getIndex(): Int = 3
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt
new file mode 100644
index 0000000000..80296603f2
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/deactivation/viewmodel/DeactivatePodActionViewModel.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.viewmodel
+
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager
+import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.CommandDeactivatePod
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.viewmodel.ActionViewModelBase
+import info.nightscout.androidaps.queue.Callback
+import io.reactivex.subjects.SingleSubject
+import javax.inject.Inject
+
+class DeactivatePodActionViewModel @Inject constructor(private val aapsOmnipodManager: AapsOmnipodManager, private val commandQueueProvider: CommandQueueProvider) : ActionViewModelBase() {
+    override fun doExecuteAction(): PumpEnactResult {
+        val singleSubject = SingleSubject.create<PumpEnactResult>()
+        commandQueueProvider.customCommand(CommandDeactivatePod(), object : Callback() {
+            override fun run() {
+                singleSubject.onSuccess(result)
+            }
+        })
+        return singleSubject.blockingGet()
+    }
+}
\ No newline at end of file
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/defs/PodActionType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/defs/PodActionType.java
deleted file mode 100644
index 48380638c2..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/defs/PodActionType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.defs;
-
-public enum PodActionType {
-    INIT_POD,
-    DEACTIVATE_POD,
-    DISCARD_POD
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/initpod/InitActionFragment.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/initpod/InitActionFragment.java
deleted file mode 100644
index e05c86ec5b..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/initpod/InitActionFragment.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.graphics.Color;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import androidx.fragment.app.FragmentActivity;
-
-import com.atech.android.library.wizardpager.util.WizardPagesUtil;
-import com.tech.freak.wizardpager.model.Page;
-import com.tech.freak.wizardpager.ui.PageFragmentCallbacks;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.plugins.pump.omnipod.R;
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitActionType;
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitReceiver;
-
-/**
- * Created by andy on 12/11/2019
- */
-public class InitActionFragment extends DaggerFragment implements PodInitReceiver {
-    protected static final String ARG_KEY = "key";
-    protected static final String ARG_POD_INIT_ACTION_TYPE = "podInitActionType";
-
-    private static boolean isFirstView;
-
-    private PageFragmentCallbacks mCallbacks;
-    private String mKey;
-    protected InitActionPage mPage;
-
-    protected ProgressBar progressBar;
-    protected TextView errorView;
-    protected Button retryButton;
-
-    PodInitActionType podInitActionType;
-    private List<PodInitActionType> children;
-    protected Map<PodInitActionType, CheckBox> mapCheckBoxes;
-
-    protected PumpEnactResult callResult;
-
-    @Inject HasAndroidInjector injector;
-
-    public static InitActionFragment create(String key, PodInitActionType podInitActionType) {
-        Bundle args = new Bundle();
-        args.putString(ARG_KEY, key);
-        args.putSerializable(ARG_POD_INIT_ACTION_TYPE, podInitActionType);
-
-        InitActionFragment fragment = new InitActionFragment();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @SuppressLint("SourceLockedOrientationActivity")
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (savedInstanceState == null) {
-            isFirstView = true;
-        }
-
-        getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-
-        Bundle args = getArguments();
-        mKey = args.getString(ARG_KEY);
-        podInitActionType = (PodInitActionType) args.getSerializable(ARG_POD_INIT_ACTION_TYPE);
-        mPage = (InitActionPage) mCallbacks.onGetPage(mKey);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-
-        View rootView = inflater.inflate(R.layout.omnipod_initpod_init_action, container, false);
-        WizardPagesUtil.setTitle(mPage, rootView);
-
-        this.progressBar = rootView.findViewById(R.id.initAction_progressBar);
-        this.errorView = rootView.findViewById(R.id.initAction_textErrorMessage);
-
-        TextView headerView = rootView.findViewById(R.id.initAction_header);
-
-        LinearLayout linearLayout = rootView.findViewById(R.id.initAction_ItemsHolder);
-
-        children = podInitActionType.getChildren();
-        mapCheckBoxes = new HashMap<>();
-
-        for (PodInitActionType child : children) {
-            CheckBox checkBox1 = new CheckBox(getContext());
-            checkBox1.setText(child.getResourceId());
-            checkBox1.setClickable(false);
-            checkBox1.setTextAppearance(R.style.WizardPagePodListItem);
-            checkBox1.setHeight(120);
-            checkBox1.setTextSize(15);
-            checkBox1.setTextColor(headerView.getTextColors().getDefaultColor());
-
-            linearLayout.addView(checkBox1);
-
-            mapCheckBoxes.put(child, checkBox1);
-        }
-
-        if (podInitActionType == PodInitActionType.FILL_CANNULA_SET_BASAL_PROFILE_WIZARD_STEP) {
-            headerView.setText(R.string.omnipod_init_pod_wizard_step4_action_header);
-        } else if (podInitActionType == PodInitActionType.DEACTIVATE_POD_WIZARD_STEP) {
-            headerView.setText(R.string.omnipod_remove_pod_wizard_step2_action_header);
-        }
-
-        this.retryButton = rootView.findViewById(R.id.initAction_RetryButton);
-
-        this.retryButton.setOnClickListener(view -> {
-
-            getActivity().runOnUiThread(() -> {
-                for (PodInitActionType actionType : mapCheckBoxes.keySet()) {
-                    mapCheckBoxes.get(actionType).setChecked(false);
-                    mapCheckBoxes.get(actionType).setTextColor(headerView.getTextColors().getDefaultColor());
-                }
-            });
-
-            new InitPodTask(injector, this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-        });
-
-        return rootView;
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-
-        FragmentActivity activity = getActivity();
-
-        if (!(activity instanceof PageFragmentCallbacks)) {
-            throw new ClassCastException("Activity must implement PageFragmentCallbacks");
-        }
-
-        mCallbacks = (PageFragmentCallbacks) activity;
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mCallbacks = null;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (isFirstView) {
-            isFirstView = false;
-            new InitPodTask(injector, this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-        }
-    }
-
-    public void actionOnReceiveResponse(String result) {
-    }
-
-    @Override
-    public void returnInitTaskStatus(PodInitActionType podInitActionType, boolean isSuccess, String errorMessage) {
-        if (podInitActionType.isParent()) {
-            for (PodInitActionType actionType : mapCheckBoxes.keySet()) {
-                setCheckBox(actionType, isSuccess);
-            }
-
-            // special handling for init
-            processOnFinishedActions(isSuccess, errorMessage);
-
-        } else {
-            setCheckBox(podInitActionType, isSuccess);
-        }
-    }
-
-    private void processOnFinishedActions(boolean isOk, String errorMessage) {
-        FragmentActivity activity = getActivity();
-        if (activity != null) {
-            activity.runOnUiThread(() -> {
-                progressBar.setVisibility(View.GONE);
-
-                if (!isOk) {
-                    errorView.setVisibility(View.VISIBLE);
-                    errorView.setText(errorMessage);
-
-                    retryButton.setVisibility(View.VISIBLE);
-                }
-
-                mPage.setActionCompleted(isOk);
-
-                mPage.getData().putString(Page.SIMPLE_DATA_KEY, UUID.randomUUID().toString());
-                mPage.notifyDataChanged();
-
-            });
-        }
-    }
-
-    protected void setCheckBox(PodInitActionType podInitActionType, boolean isSuccess) {
-        FragmentActivity activity = getActivity();
-        if (activity != null) {
-            activity.runOnUiThread(() -> {
-                mapCheckBoxes.get(podInitActionType).setChecked(isSuccess);
-                mapCheckBoxes.get(podInitActionType).setTextColor(isSuccess ? Color.rgb(34, 135, 91) :
-                        Color.rgb(168, 36, 15));
-            });
-        }
-    }
-
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/initpod/InitActionPage.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/initpod/InitActionPage.java
deleted file mode 100644
index 8c086ffe6e..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/initpod/InitActionPage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod;
-
-import androidx.annotation.StringRes;
-import androidx.fragment.app.Fragment;
-
-import com.tech.freak.wizardpager.model.ModelCallbacks;
-import com.tech.freak.wizardpager.model.Page;
-import com.tech.freak.wizardpager.model.ReviewItem;
-
-import java.util.ArrayList;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitActionType;
-
-
-/**
- * Created by andy on 12/11/2019
- * <p>
- * This page is for InitPod and RemovePod, but Fragments called for this 2 actions are different
- */
-public class InitActionPage extends Page {
-
-    protected PodInitActionType podInitActionType;
-
-    private boolean actionCompleted = false;
-    private boolean actionSuccess = false;
-
-    protected InitActionPage(ModelCallbacks callbacks, String title) {
-        super(callbacks, title);
-    }
-
-    public InitActionPage(ModelCallbacks callbacks, @StringRes int titleId, PodInitActionType podInitActionType) {
-        super(callbacks, titleId);
-        this.podInitActionType = podInitActionType;
-    }
-
-    @Override
-    public Fragment createFragment() {
-        return InitActionFragment.create(getKey(), this.podInitActionType);
-    }
-
-    @Override
-    public void getReviewItems(ArrayList<ReviewItem> dest) {
-    }
-
-    @Override
-    public boolean isCompleted() {
-        return actionCompleted;
-    }
-
-    public void setActionCompleted(boolean success) {
-        this.actionCompleted = success;
-        this.actionSuccess = success;
-    }
-
-    /**
-     * This is used just if we want to override default behavior (for example when we enter Page we want prevent any action, until something happens.
-     *
-     * @return
-     */
-    @Override public boolean isBackActionPossible() {
-        return actionCompleted;
-    }
-
-    /**
-     * This is used just if we want to override default behavior (for example when we enter Page we want prevent any action, until something happens.
-     *
-     * @return
-     */
-    @Override public boolean isNextActionPossible() {
-        return actionSuccess;
-    }
-
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/initpod/InitPodTask.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/initpod/InitPodTask.java
deleted file mode 100644
index 12742ff108..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/initpod/InitPodTask.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod;
-
-import android.os.AsyncTask;
-import android.view.View;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitActionType;
-import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodPumpValuesChanged;
-import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager;
-
-/**
- * Created by andy on 11/12/2019
- */
-public class InitPodTask extends AsyncTask<Void, Void, String> {
-
-    @Inject ProfileFunction profileFunction;
-    @Inject AapsOmnipodManager aapsOmnipodManager;
-    @Inject RxBusWrapper rxBus;
-    private final InitActionFragment initActionFragment;
-
-    public InitPodTask(HasAndroidInjector injector, InitActionFragment initActionFragment) {
-        injector.androidInjector().inject(this);
-        this.initActionFragment = initActionFragment;
-    }
-
-    @Override
-    protected void onPreExecute() {
-        super.onPreExecute();
-        initActionFragment.progressBar.setVisibility(View.VISIBLE);
-        initActionFragment.errorView.setVisibility(View.GONE);
-        initActionFragment.retryButton.setVisibility(View.GONE);
-    }
-
-    @Override
-    protected String doInBackground(Void... params) {
-        if (initActionFragment.podInitActionType == PodInitActionType.PAIR_AND_PRIME_WIZARD_STEP) {
-            initActionFragment.callResult = aapsOmnipodManager.pairAndPrime(
-                    initActionFragment.podInitActionType,
-                    initActionFragment
-            );
-        } else if (initActionFragment.podInitActionType == PodInitActionType.FILL_CANNULA_SET_BASAL_PROFILE_WIZARD_STEP) {
-            initActionFragment.callResult = aapsOmnipodManager.setInitialBasalScheduleAndInsertCannula(
-                    initActionFragment.podInitActionType,
-                    initActionFragment,
-                    profileFunction.getProfile()
-            );
-        } else if (initActionFragment.podInitActionType == PodInitActionType.DEACTIVATE_POD_WIZARD_STEP) {
-            initActionFragment.callResult = aapsOmnipodManager.deactivatePod(initActionFragment);
-        }
-
-        rxBus.send(new EventOmnipodPumpValuesChanged());
-
-        return "OK";
-    }
-
-    @Override
-    protected void onPostExecute(String result) {
-        super.onPostExecute(result);
-
-        initActionFragment.actionOnReceiveResponse(result);
-    }
-
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/FullInitPodWizardModel.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/FullInitPodWizardModel.java
deleted file mode 100644
index af364324ae..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/FullInitPodWizardModel.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.model;
-
-import android.content.Context;
-
-import com.atech.android.library.wizardpager.model.DisplayTextPage;
-import com.tech.freak.wizardpager.model.PageList;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.R;
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitActionType;
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod.InitActionPage;
-
-/**
- * Created by andy on 12/11/2019
- */
-// Full init pod wizard model
-// Cannot be merged with ShortInitPodWizardModel, because we can't set any instance variables
-// before the onNewRootPageList method is called (which happens in the super constructor)
-public class FullInitPodWizardModel extends InitPodWizardModel {
-
-    public FullInitPodWizardModel(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected PageList onNewRootPageList() {
-        return new PageList(
-                new DisplayTextPage(this,
-                        R.string.omnipod_init_pod_wizard_step1_title,
-                        R.string.omnipod_init_pod_wizard_step1_desc,
-                        R.style.WizardPagePodContent).setRequired(true).setCancelReason("None"),
-
-                new InitActionPage(this,
-                        R.string.omnipod_init_pod_wizard_step2_title,
-                        PodInitActionType.PAIR_AND_PRIME_WIZARD_STEP
-                ).setRequired(true).setCancelReason("Cancel"),
-
-                new DisplayTextPage(this,
-                        R.string.omnipod_init_pod_wizard_step3_title,
-                        R.string.omnipod_init_pod_wizard_step3_desc,
-                        R.style.WizardPagePodContent).setRequired(true).setCancelReason("Cancel"),
-
-                new InitActionPage(this,
-                        R.string.omnipod_init_pod_wizard_step4_title,
-                        PodInitActionType.FILL_CANNULA_SET_BASAL_PROFILE_WIZARD_STEP
-                ).setRequired(true).setCancelReason("Cancel")
-        );
-    }
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/InitPodWizardModel.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/InitPodWizardModel.java
deleted file mode 100644
index e3c4e9c1fe..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/InitPodWizardModel.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.model;
-
-import android.content.Context;
-
-import androidx.fragment.app.Fragment;
-
-import com.tech.freak.wizardpager.model.AbstractWizardModel;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.pages.PodInfoFragment;
-
-abstract class InitPodWizardModel extends AbstractWizardModel {
-    InitPodWizardModel(Context context) {
-        super(context);
-    }
-
-    @Override
-    public Fragment getReviewFragment() {
-        return PodInfoFragment.create(true);
-    }
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/RemovePodWizardModel.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/RemovePodWizardModel.java
deleted file mode 100644
index 381dcb1950..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/RemovePodWizardModel.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2012 Roman Nurik
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.model;
-
-import android.content.Context;
-
-import androidx.fragment.app.Fragment;
-
-import com.atech.android.library.wizardpager.model.DisplayTextPage;
-import com.tech.freak.wizardpager.model.AbstractWizardModel;
-import com.tech.freak.wizardpager.model.PageList;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.R;
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitActionType;
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.pages.PodInfoFragment;
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.removepod.RemovePodActionPage;
-
-/**
- * Created by andy on 12/11/2019
- */
-public class RemovePodWizardModel extends AbstractWizardModel {
-
-    public RemovePodWizardModel(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected PageList onNewRootPageList() {
-        return new PageList(
-                new DisplayTextPage(this,
-                        R.string.omnipod_remove_pod_wizard_step1_title,
-                        R.string.omnipod_remove_pod_wizard_step1_desc,
-                        R.style.WizardPagePodContent).setRequired(true).setCancelReason("None"),
-
-                new RemovePodActionPage(this,
-                        R.string.omnipod_remove_pod_wizard_step2_title,
-                        PodInitActionType.DEACTIVATE_POD_WIZARD_STEP
-                ).setRequired(true).setCancelReason("Cancel")
-
-        );
-    }
-
-    @Override public Fragment getReviewFragment() {
-        return PodInfoFragment.create(false);
-    }
-
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/ShortInitPodWizardModel.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/ShortInitPodWizardModel.java
deleted file mode 100644
index 3813520e80..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/model/ShortInitPodWizardModel.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.model;
-
-import android.content.Context;
-
-import com.atech.android.library.wizardpager.model.DisplayTextPage;
-import com.tech.freak.wizardpager.model.PageList;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.R;
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitActionType;
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod.InitActionPage;
-
-/**
- * Created by andy on 12/11/2019
- */
-// Init pod wizard model without the pair and prime step
-// Cannot be merged with FullInitPodWizardModel, because we can't set any instance variables
-// before the onNewRootPageList method is called (which happens in the super constructor)
-public class ShortInitPodWizardModel extends InitPodWizardModel {
-
-    public ShortInitPodWizardModel(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected PageList onNewRootPageList() {
-        return new PageList(
-                new DisplayTextPage(this,
-                        R.string.omnipod_init_pod_wizard_step3_title,
-                        R.string.omnipod_init_pod_wizard_step3_desc,
-                        R.style.WizardPagePodContent).setRequired(true).setCancelReason("Cancel"),
-
-                new InitActionPage(this,
-                        R.string.omnipod_init_pod_wizard_step4_title,
-                        PodInitActionType.FILL_CANNULA_SET_BASAL_PROFILE_WIZARD_STEP
-                ).setRequired(true).setCancelReason("Cancel")
-        );
-
-    }
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/pages/InitPodRefreshAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/pages/InitPodRefreshAction.java
deleted file mode 100644
index 9f7c47be2b..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/pages/InitPodRefreshAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.pages;
-
-import com.atech.android.library.wizardpager.defs.action.AbstractCancelAction;
-import com.atech.android.library.wizardpager.defs.action.FinishActionInterface;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.defs.PodActionType;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-
-
-/**
- * Created by andy on 12/11/2019
- */
-public class InitPodRefreshAction extends AbstractCancelAction implements FinishActionInterface {
-
-    private final PodActionType actionType;
-    private final HasAndroidInjector injector;
-
-    @Inject PodStateManager podStateManager;
-    @Inject AAPSLogger aapsLogger;
-    @Inject SP sp;
-    @Inject NSUpload nsUpload;
-    @Inject DatabaseHelperInterface databaseHelper;
-    @Inject ProfileFunction profileFunction;
-
-    public InitPodRefreshAction(HasAndroidInjector injector, PodActionType actionType) {
-        this.injector = injector;
-        injector.androidInjector().inject(this);
-        this.actionType = actionType;
-    }
-
-    @Override
-    public void execute(String cancelReason) {
-        if (cancelReason != null && cancelReason.trim().length() > 0) {
-            this.cancelActionText = cancelReason;
-        }
-    }
-
-    @Override
-    public void execute() {
-        if (actionType == PodActionType.INIT_POD) {
-            if (podStateManager.isPodRunning()) {
-                uploadCareportalEvent(System.currentTimeMillis() - 2000, CareportalEvent.PUMPBATTERYCHANGE);
-                uploadCareportalEvent(System.currentTimeMillis() - 1000, CareportalEvent.INSULINCHANGE);
-                uploadCareportalEvent(System.currentTimeMillis(), CareportalEvent.SITECHANGE);
-            }
-        }
-    }
-
-    private void uploadCareportalEvent(long date, String event) {
-        if (databaseHelper.getCareportalEventFromTimestamp(date) != null)
-            return;
-        try {
-            JSONObject data = new JSONObject();
-            String enteredBy = sp.getString("careportal_enteredby", "");
-            if (enteredBy.isEmpty()) {
-                data.put("enteredBy", enteredBy);
-            }
-            data.put("created_at", DateUtil.toISOString(date));
-            data.put("mills", date);
-            data.put("eventType", event);
-            data.put("units", profileFunction.getUnits());
-            CareportalEvent careportalEvent = new CareportalEvent(injector);
-            careportalEvent.date = date;
-            careportalEvent.source = Source.USER;
-            careportalEvent.eventType = event;
-            careportalEvent.json = data.toString();
-            databaseHelper.createOrUpdate(careportalEvent);
-            nsUpload.uploadCareportalEntryToNS(data);
-        } catch (JSONException e) {
-            aapsLogger.error(LTag.PUMPCOMM, "Unhandled exception when uploading SiteChange event.", e);
-        }
-    }
-
-    @Override
-    public String getFinishActionText() {
-        return "Finish_OK";
-    }
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/pages/PodInfoFragment.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/pages/PodInfoFragment.java
deleted file mode 100644
index 83dbeb0125..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/pages/PodInfoFragment.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.pages;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import androidx.fragment.app.FragmentActivity;
-
-import com.tech.freak.wizardpager.model.ReviewItem;
-import com.tech.freak.wizardpager.ui.PageFragmentCallbacks;
-
-import java.util.ArrayList;
-
-import javax.inject.Inject;
-
-import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.plugins.pump.omnipod.R;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager;
-import info.nightscout.androidaps.plugins.pump.omnipod.util.AapsOmnipodUtil;
-
-
-/**
- * Created by andy on 12/11/2019
- */
-public class PodInfoFragment extends DaggerFragment {
-    private static final String ARG_INIT_POD = "initPod";
-
-    @Inject AapsOmnipodUtil aapsOmnipodUtil;
-    @Inject PodStateManager podStateManager;
-
-    private boolean isInitPod;
-    private ArrayList<ReviewItem> mCurrentReviewItems;
-
-    public static PodInfoFragment create(boolean initPod) {
-        Bundle args = new Bundle();
-        args.putBoolean(ARG_INIT_POD, initPod);
-
-        PodInfoFragment fragment = new PodInfoFragment();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @SuppressLint("SourceLockedOrientationActivity") @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-
-        Bundle args = getArguments();
-        isInitPod = args.getBoolean(ARG_INIT_POD);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.omnipod_initpod_pod_info, container, false);
-
-        TextView titleView = rootView.findViewById(R.id.podInfoTitle);
-        titleView.setText(R.string.omnipod_init_pod_wizard_pod_info_title);
-        titleView.setTextColor(getResources().getColor(com.tech.freak.wizardpager.R.color.review_green));
-
-        TextView headerText = rootView.findViewById(R.id.podInfoText);
-        headerText.setText(isInitPod ? //
-                R.string.omnipod_init_pod_wizard_pod_info_init_pod_description : //
-                R.string.omnipod_init_pod_wizard_pod_info_remove_pod_description);
-
-        if (isInitPod) {
-            if (createDataOfPod()) {
-
-                ListView listView = (ListView) rootView.findViewById(R.id.podInfoList);
-                listView.setAdapter(new PodInfoAdapter(mCurrentReviewItems, getContext()));
-                listView.setChoiceMode(ListView.CHOICE_MODE_NONE);
-            }
-        }
-
-        return rootView;
-    }
-
-    private boolean createDataOfPod() {
-        if (podStateManager == null)
-            return false;
-
-        mCurrentReviewItems = new ArrayList<>();
-        mCurrentReviewItems.add(new ReviewItem("Pod Address", "" + podStateManager.getAddress(), "33"));
-        mCurrentReviewItems.add(new ReviewItem("Activated At", podStateManager.getActivatedAt() == null ? "Not activated yet" : podStateManager.getActivatedAt().toString("dd.MM.yyyy HH:mm:ss"), "34"));
-        if (podStateManager.getLot() != null) {
-            mCurrentReviewItems.add(new ReviewItem("LOT", "" + podStateManager.getLot(), "35"));
-        }
-        if (podStateManager.getTid() != null) {
-            mCurrentReviewItems.add(new ReviewItem("TID", "" + podStateManager.getLot(), "36"));
-        }
-        if (podStateManager.getPiVersion() != null) {
-            mCurrentReviewItems.add(new ReviewItem("Pi Version", podStateManager.getPiVersion().toString(), "37"));
-        }
-        if (podStateManager.getPmVersion() != null) {
-            mCurrentReviewItems.add(new ReviewItem("Pm Version", podStateManager.getPmVersion().toString(), "38"));
-        }
-
-        return true;
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-
-        FragmentActivity activity = getActivity();
-
-        if (!(activity instanceof PageFragmentCallbacks)) {
-            throw new ClassCastException("Activity must implement PageFragmentCallbacks");
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-    }
-
-    private static class PodInfoAdapter extends ArrayAdapter<ReviewItem> {
-        PodInfoAdapter(ArrayList<ReviewItem> data, Context context) {
-            super(context, com.tech.freak.wizardpager.R.layout.list_item_review, data);
-        }
-
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            // Get the data item for this position
-            ReviewItem dataModel = getItem(position);
-            // Check if an existing view is being reused, otherwise inflate the view
-            ViewHolder viewHolder; // view lookup cache stored in tag
-
-            if (convertView == null) {
-
-                viewHolder = new ViewHolder();
-                LayoutInflater inflater = LayoutInflater.from(getContext());
-                convertView = inflater.inflate(R.layout.omnipod_initpod_pod_info_item, parent, false);
-                viewHolder.txtName = (TextView) convertView.findViewById(android.R.id.text1);
-                viewHolder.txtType = (TextView) convertView.findViewById(android.R.id.text2);
-
-                convertView.setTag(viewHolder);
-            } else {
-                viewHolder = (ViewHolder) convertView.getTag();
-            }
-
-            viewHolder.txtName.setText(dataModel.getTitle());
-            viewHolder.txtType.setText(dataModel.getDisplayValue());
-
-            // Return the completed view to render on screen
-            return convertView;
-        }
-    }
-
-    private static class ViewHolder {
-        TextView txtName;
-        TextView txtType;
-    }
-
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/removepod/RemoveActionFragment.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/removepod/RemoveActionFragment.java
deleted file mode 100644
index 2ca5a1d198..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/removepod/RemoveActionFragment.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.removepod;
-
-import android.os.Bundle;
-import android.view.View;
-
-import com.tech.freak.wizardpager.model.Page;
-
-import java.util.UUID;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitActionType;
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitReceiver;
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod.InitActionFragment;
-
-/**
- * Created by andy on 29/11/2019
- */
-public class RemoveActionFragment extends InitActionFragment implements PodInitReceiver {
-    public static RemoveActionFragment create(String key, PodInitActionType podInitActionType) {
-        Bundle args = new Bundle();
-        args.putString(ARG_KEY, key);
-        args.putSerializable(ARG_POD_INIT_ACTION_TYPE, podInitActionType);
-
-        RemoveActionFragment fragment = new RemoveActionFragment();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void actionOnReceiveResponse(String result) {
-        System.out.println("ACTION: actionOnReceiveResponse: " + result);
-
-        boolean isOk = callResult.success;
-
-        progressBar.setVisibility(View.GONE);
-
-        if (!isOk) {
-            errorView.setVisibility(View.VISIBLE);
-            errorView.setText(callResult.comment);
-
-            retryButton.setVisibility(View.VISIBLE);
-        }
-
-        mPage.setActionCompleted(isOk);
-
-        mPage.getData().putString(Page.SIMPLE_DATA_KEY, UUID.randomUUID().toString());
-        mPage.notifyDataChanged();
-    }
-
-
-    @Override
-    public void returnInitTaskStatus(PodInitActionType podInitActionType, boolean isSuccess, String errorMessage) {
-        if (podInitActionType.isParent()) {
-            for (PodInitActionType actionType : mapCheckBoxes.keySet()) {
-                setCheckBox(actionType, isSuccess);
-            }
-        } else {
-            setCheckBox(podInitActionType, isSuccess);
-        }
-    }
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/removepod/RemovePodActionPage.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/removepod/RemovePodActionPage.java
deleted file mode 100644
index 7d1b319d8c..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/removepod/RemovePodActionPage.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.removepod;
-
-import androidx.annotation.StringRes;
-import androidx.fragment.app.Fragment;
-
-import com.tech.freak.wizardpager.model.ModelCallbacks;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodInitActionType;
-import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.initpod.InitActionPage;
-
-
-/**
- * Created by andy on 12/11/2019
- */
-public class RemovePodActionPage extends InitActionPage {
-
-    public RemovePodActionPage(ModelCallbacks callbacks, String title) {
-        super(callbacks, title);
-    }
-
-    public RemovePodActionPage(ModelCallbacks callbacks, @StringRes int titleId, PodInitActionType podInitActionType) {
-        super(callbacks, titleId, podInitActionType);
-    }
-
-    @Override
-    public Fragment createFragment() {
-        return RemoveActionFragment.create(getKey(), this.podInitActionType);
-    }
-
-}
diff --git a/omnipod/src/main/res/drawable/ic_access_alarm.xml b/omnipod/src/main/res/drawable/ic_access_alarm.xml
new file mode 100644
index 0000000000..48a463f81b
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_access_alarm.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#72a8ff"
+        android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_actions_temptarget.xml b/omnipod/src/main/res/drawable/ic_actions_temptarget.xml
index 5dbd5d8b0c..28aed597c8 100644
--- a/omnipod/src/main/res/drawable/ic_actions_temptarget.xml
+++ b/omnipod/src/main/res/drawable/ic_actions_temptarget.xml
@@ -3,7 +3,7 @@
     android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M18.71,11.606h-0.736c-0.198,-3.001 -2.579,-5.382 -5.58,-5.58V5.29c0,-0.218 -0.177,-0.394 -0.394,-0.394s-0.394,0.177 -0.394,0.394v0.736c-3.001,0.198 -5.382,2.579 -5.58,5.58H5.29c-0.218,0 -0.394,0.177 -0.394,0.394s0.177,0.394 0.394,0.394h0.736c0.198,3.001 2.579,5.382 5.58,5.58v0.736c0,0.217 0.177,0.394 0.394,0.394s0.394,-0.177 0.394,-0.394v-0.736c3.001,-0.198 5.382,-2.579 5.58,-5.58h0.736c0.217,0 0.394,-0.177 0.394,-0.394S18.927,11.606 18.71,11.606zM17.143,11.606h-1.944c-0.179,-1.478 -1.331,-2.643 -2.804,-2.841V6.85C14.939,7.044 16.953,9.06 17.143,11.606zM13.542,12.394h0.938c-0.171,1.079 -1.01,1.93 -2.085,2.115v-0.967c0,-0.217 -0.177,-0.394 -0.394,-0.394s-0.394,0.177 -0.394,0.394v0.975c-1.111,-0.156 -1.988,-1.017 -2.163,-2.122h1.016c0.218,0 0.394,-0.177 0.394,-0.394s-0.177,-0.394 -0.394,-0.394H9.442c0.171,-1.111 1.049,-1.978 2.164,-2.134v0.987c0,0.218 0.177,0.394 0.394,0.394s0.394,-0.177 0.394,-0.394v-0.98c1.079,0.185 1.92,1.041 2.086,2.126h-0.939c-0.217,0 -0.394,0.177 -0.394,0.394S13.324,12.394 13.542,12.394zM11.606,6.851v1.906C10.095,8.921 8.903,10.1 8.72,11.606H6.864C7.053,9.062 9.064,7.047 11.606,6.851zM6.866,12.394H8.72c0.183,1.505 1.374,2.684 2.885,2.849v1.884C9.071,16.931 7.065,14.928 6.866,12.394zM12.394,17.128v-1.893c1.473,-0.197 2.625,-1.362 2.804,-2.841h1.942C16.941,14.93 14.932,16.935 12.394,17.128z"
-      android:fillColor="#36FF00"/>
+    <path
+        android:pathData="M18.71,11.606h-0.736c-0.198,-3.001 -2.579,-5.382 -5.58,-5.58V5.29c0,-0.218 -0.177,-0.394 -0.394,-0.394s-0.394,0.177 -0.394,0.394v0.736c-3.001,0.198 -5.382,2.579 -5.58,5.58H5.29c-0.218,0 -0.394,0.177 -0.394,0.394s0.177,0.394 0.394,0.394h0.736c0.198,3.001 2.579,5.382 5.58,5.58v0.736c0,0.217 0.177,0.394 0.394,0.394s0.394,-0.177 0.394,-0.394v-0.736c3.001,-0.198 5.382,-2.579 5.58,-5.58h0.736c0.217,0 0.394,-0.177 0.394,-0.394S18.927,11.606 18.71,11.606zM17.143,11.606h-1.944c-0.179,-1.478 -1.331,-2.643 -2.804,-2.841V6.85C14.939,7.044 16.953,9.06 17.143,11.606zM13.542,12.394h0.938c-0.171,1.079 -1.01,1.93 -2.085,2.115v-0.967c0,-0.217 -0.177,-0.394 -0.394,-0.394s-0.394,0.177 -0.394,0.394v0.975c-1.111,-0.156 -1.988,-1.017 -2.163,-2.122h1.016c0.218,0 0.394,-0.177 0.394,-0.394s-0.177,-0.394 -0.394,-0.394H9.442c0.171,-1.111 1.049,-1.978 2.164,-2.134v0.987c0,0.218 0.177,0.394 0.394,0.394s0.394,-0.177 0.394,-0.394v-0.98c1.079,0.185 1.92,1.041 2.086,2.126h-0.939c-0.217,0 -0.394,0.177 -0.394,0.394S13.324,12.394 13.542,12.394zM11.606,6.851v1.906C10.095,8.921 8.903,10.1 8.72,11.606H6.864C7.053,9.062 9.064,7.047 11.606,6.851zM6.866,12.394H8.72c0.183,1.505 1.374,2.684 2.885,2.849v1.884C9.071,16.931 7.065,14.928 6.866,12.394zM12.394,17.128v-1.893c1.473,-0.197 2.625,-1.362 2.804,-2.841h1.942C16.941,14.93 14.932,16.935 12.394,17.128z"
+        android:fillColor="#36FF00" />
 </vector>
diff --git a/omnipod/src/main/res/drawable/ic_cp_aaps_offline.xml b/omnipod/src/main/res/drawable/ic_cp_aaps_offline.xml
index 0b267a6d88..ab562c35a6 100644
--- a/omnipod/src/main/res/drawable/ic_cp_aaps_offline.xml
+++ b/omnipod/src/main/res/drawable/ic_cp_aaps_offline.xml
@@ -3,19 +3,19 @@
     android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,17.813m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#E93057"/>
-  <path
-      android:pathData="M19.357,6.125c0.195,-0.196 0.195,-0.512 0,-0.708c-0.195,-0.195 -0.512,-0.195 -0.707,0l-2.364,2.364C14.916,7.314 13.477,7.062 12,7.062c-2.902,0 -5.674,0.925 -8.015,2.675c-0.222,0.166 -0.267,0.479 -0.102,0.7c0.166,0.222 0.479,0.266 0.7,0.102C6.751,8.919 9.315,8.063 12,8.063c1.198,0 2.369,0.177 3.493,0.512l-1.829,1.829c-0.547,-0.093 -1.1,-0.154 -1.663,-0.154c-2.212,0 -4.325,0.705 -6.111,2.039c-0.222,0.166 -0.267,0.479 -0.102,0.701c0.166,0.221 0.478,0.267 0.7,0.101C8.099,11.887 10.005,11.25 12,11.25c0.26,0 0.516,0.022 0.773,0.044l-2.215,2.215c-1.012,0.201 -1.989,0.596 -2.839,1.231c-0.222,0.165 -0.267,0.479 -0.102,0.7c0.166,0.22 0.479,0.268 0.7,0.101c0.192,-0.143 0.392,-0.271 0.597,-0.389l-2.618,2.618c-0.195,0.195 -0.195,0.512 0,0.707c0.098,0.098 0.226,0.146 0.354,0.146s0.256,-0.049 0.354,-0.146L19.357,6.125z"
-      android:fillColor="#E93057"/>
-  <path
-      android:pathData="M20.016,9.737c-0.562,-0.42 -1.15,-0.789 -1.757,-1.113L17.513,9.37c0.66,0.331 1.299,0.717 1.903,1.169c0.09,0.067 0.195,0.1 0.3,0.1c0.152,0 0.303,-0.069 0.4,-0.201C20.282,10.216 20.236,9.902 20.016,9.737z"
-      android:fillColor="#E93057"/>
-  <path
-      android:pathData="M15.867,11.016l-0.776,0.776c0.856,0.307 1.671,0.739 2.421,1.298c0.09,0.067 0.195,0.1 0.3,0.1c0.152,0 0.303,-0.069 0.4,-0.2c0.166,-0.222 0.12,-0.535 -0.101,-0.701C17.409,11.764 16.656,11.341 15.867,11.016z"
-      android:fillColor="#E93057"/>
-  <path
-      android:pathData="M13.394,13.489l-0.887,0.887c1.13,0.091 2.24,0.467 3.176,1.166c0.09,0.067 0.195,0.1 0.3,0.1c0.152,0 0.303,-0.069 0.4,-0.2c0.166,-0.222 0.12,-0.535 -0.101,-0.7C15.418,14.095 14.424,13.688 13.394,13.489z"
-      android:fillColor="#E93057"/>
+    <path
+        android:pathData="M12,17.813m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
+        android:fillColor="#E93057" />
+    <path
+        android:pathData="M19.357,6.125c0.195,-0.196 0.195,-0.512 0,-0.708c-0.195,-0.195 -0.512,-0.195 -0.707,0l-2.364,2.364C14.916,7.314 13.477,7.062 12,7.062c-2.902,0 -5.674,0.925 -8.015,2.675c-0.222,0.166 -0.267,0.479 -0.102,0.7c0.166,0.222 0.479,0.266 0.7,0.102C6.751,8.919 9.315,8.063 12,8.063c1.198,0 2.369,0.177 3.493,0.512l-1.829,1.829c-0.547,-0.093 -1.1,-0.154 -1.663,-0.154c-2.212,0 -4.325,0.705 -6.111,2.039c-0.222,0.166 -0.267,0.479 -0.102,0.701c0.166,0.221 0.478,0.267 0.7,0.101C8.099,11.887 10.005,11.25 12,11.25c0.26,0 0.516,0.022 0.773,0.044l-2.215,2.215c-1.012,0.201 -1.989,0.596 -2.839,1.231c-0.222,0.165 -0.267,0.479 -0.102,0.7c0.166,0.22 0.479,0.268 0.7,0.101c0.192,-0.143 0.392,-0.271 0.597,-0.389l-2.618,2.618c-0.195,0.195 -0.195,0.512 0,0.707c0.098,0.098 0.226,0.146 0.354,0.146s0.256,-0.049 0.354,-0.146L19.357,6.125z"
+        android:fillColor="#E93057" />
+    <path
+        android:pathData="M20.016,9.737c-0.562,-0.42 -1.15,-0.789 -1.757,-1.113L17.513,9.37c0.66,0.331 1.299,0.717 1.903,1.169c0.09,0.067 0.195,0.1 0.3,0.1c0.152,0 0.303,-0.069 0.4,-0.201C20.282,10.216 20.236,9.902 20.016,9.737z"
+        android:fillColor="#E93057" />
+    <path
+        android:pathData="M15.867,11.016l-0.776,0.776c0.856,0.307 1.671,0.739 2.421,1.298c0.09,0.067 0.195,0.1 0.3,0.1c0.152,0 0.303,-0.069 0.4,-0.2c0.166,-0.222 0.12,-0.535 -0.101,-0.701C17.409,11.764 16.656,11.341 15.867,11.016z"
+        android:fillColor="#E93057" />
+    <path
+        android:pathData="M13.394,13.489l-0.887,0.887c1.13,0.091 2.24,0.467 3.176,1.166c0.09,0.067 0.195,0.1 0.3,0.1c0.152,0 0.303,-0.069 0.4,-0.2c0.166,-0.222 0.12,-0.535 -0.101,-0.7C15.418,14.095 14.424,13.688 13.394,13.489z"
+        android:fillColor="#E93057" />
 </vector>
diff --git a/omnipod/src/main/res/drawable/ic_cp_bolus_correction.xml b/omnipod/src/main/res/drawable/ic_cp_bolus_correction.xml
index e14bb7c14f..49d6332c8e 100644
--- a/omnipod/src/main/res/drawable/ic_cp_bolus_correction.xml
+++ b/omnipod/src/main/res/drawable/ic_cp_bolus_correction.xml
@@ -3,10 +3,10 @@
     android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
-      android:fillColor="#E93057"/>
-  <path
-      android:pathData="M2.852,13.946c-0.248,0 -0.498,-0.123 -0.74,-0.366c-0.49,-0.49 -0.492,-0.986 -0.004,-1.474l3.125,-3.125C5.106,8.737 5.048,8.435 5.048,8.136c0,-1.336 1.172,-2.508 2.508,-2.508c0.282,0 0.572,0.055 0.864,0.163c0.186,0.069 0.347,0.148 0.493,0.242L8.547,6.484L7.431,7.6l0.731,0.661l1.046,-1.116l0.374,-0.374c0.171,0.154 0.25,0.315 0.319,0.501c0.108,0.292 0.163,0.583 0.163,0.864c0,0.67 -0.261,1.3 -0.734,1.773c-0.473,0.474 -1.103,0.734 -1.773,0.735c-0.298,0 -0.6,-0.058 -0.898,-0.173l-3.072,3.113C3.346,13.824 3.099,13.946 2.852,13.946zM7.556,6.237c-0.507,0 -0.984,0.198 -1.342,0.556C5.855,7.152 5.657,7.629 5.657,8.136c0,0.153 0.024,0.313 0.076,0.5c0.046,0.168 0.114,0.326 0.2,0.47l0.022,0.037c0,0 -0.139,0.115 -0.168,0.146l-3.249,3.248c-0.26,0.26 -0.227,0.381 0.004,0.612c0.134,0.134 0.219,0.186 0.304,0.186c0.085,0 0.184,-0.058 0.308,-0.182l3.249,-3.249c0.03,-0.03 0.104,-0.12 0.104,-0.12l0.078,-0.026c0.146,0.087 0.304,0.155 0.471,0.2c0.186,0.052 0.344,0.076 0.499,0.076c1.009,0 1.896,-0.887 1.898,-1.898c0,-0.134 -0.018,-0.274 -0.054,-0.43L8.342,8.872C8.284,8.929 8.208,8.961 8.126,8.961c-0.081,0 -0.158,-0.032 -0.215,-0.089L6.82,7.78c-0.119,-0.119 -0.119,-0.313 0,-0.431l1.143,-1.142C7.886,6.235 7.807,6.241 7.729,6.241C7.67,6.241 7.556,6.237 7.556,6.237z"
-      android:fillColor="#E93057"/>
+    <path
+        android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
+        android:fillColor="#E93057" />
+    <path
+        android:pathData="M2.852,13.946c-0.248,0 -0.498,-0.123 -0.74,-0.366c-0.49,-0.49 -0.492,-0.986 -0.004,-1.474l3.125,-3.125C5.106,8.737 5.048,8.435 5.048,8.136c0,-1.336 1.172,-2.508 2.508,-2.508c0.282,0 0.572,0.055 0.864,0.163c0.186,0.069 0.347,0.148 0.493,0.242L8.547,6.484L7.431,7.6l0.731,0.661l1.046,-1.116l0.374,-0.374c0.171,0.154 0.25,0.315 0.319,0.501c0.108,0.292 0.163,0.583 0.163,0.864c0,0.67 -0.261,1.3 -0.734,1.773c-0.473,0.474 -1.103,0.734 -1.773,0.735c-0.298,0 -0.6,-0.058 -0.898,-0.173l-3.072,3.113C3.346,13.824 3.099,13.946 2.852,13.946zM7.556,6.237c-0.507,0 -0.984,0.198 -1.342,0.556C5.855,7.152 5.657,7.629 5.657,8.136c0,0.153 0.024,0.313 0.076,0.5c0.046,0.168 0.114,0.326 0.2,0.47l0.022,0.037c0,0 -0.139,0.115 -0.168,0.146l-3.249,3.248c-0.26,0.26 -0.227,0.381 0.004,0.612c0.134,0.134 0.219,0.186 0.304,0.186c0.085,0 0.184,-0.058 0.308,-0.182l3.249,-3.249c0.03,-0.03 0.104,-0.12 0.104,-0.12l0.078,-0.026c0.146,0.087 0.304,0.155 0.471,0.2c0.186,0.052 0.344,0.076 0.499,0.076c1.009,0 1.896,-0.887 1.898,-1.898c0,-0.134 -0.018,-0.274 -0.054,-0.43L8.342,8.872C8.284,8.929 8.208,8.961 8.126,8.961c-0.081,0 -0.158,-0.032 -0.215,-0.089L6.82,7.78c-0.119,-0.119 -0.119,-0.313 0,-0.431l1.143,-1.142C7.886,6.235 7.807,6.241 7.729,6.241C7.67,6.241 7.556,6.237 7.556,6.237z"
+        android:fillColor="#E93057" />
 </vector>
diff --git a/omnipod/src/main/res/drawable/ic_cp_pump_canula.xml b/omnipod/src/main/res/drawable/ic_cp_pump_canula.xml
index b43de7ceaa..f302f9770c 100644
--- a/omnipod/src/main/res/drawable/ic_cp_pump_canula.xml
+++ b/omnipod/src/main/res/drawable/ic_cp_pump_canula.xml
@@ -3,7 +3,7 @@
     android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M23.706,7.373c-0.149,-0.541 -0.728,-0.854 -1.294,-0.699L19.87,7.373c-0.325,-0.913 -1.301,-1.438 -2.255,-1.175l-3.008,0.826c-0.954,0.262 -1.525,1.212 -1.338,2.163l-2.542,0.698c-0.499,0.137 -0.799,0.593 -0.767,1.07c-1.696,0.439 -3.037,0.067 -4.101,-0.248c-1.047,-0.309 -1.951,-0.578 -2.713,0.152c-1.307,1.253 -0.369,2.87 0.384,4.17c0.501,0.863 1.019,1.757 0.766,2.3c-0.519,1.124 -2.729,1.128 -3.537,1.033c-0.203,-0.022 -0.392,0.122 -0.417,0.328c-0.024,0.206 0.123,0.391 0.329,0.414c0.086,0.01 1.376,0.152 2.554,-0.172c0.734,-0.202 1.424,-0.585 1.753,-1.292c0.416,-0.896 -0.173,-1.912 -0.797,-2.987c-0.844,-1.456 -1.336,-2.47 -0.515,-3.257c0.426,-0.409 0.972,-0.272 1.977,0.026c1.128,0.334 2.648,0.808 4.674,0.215c0.255,0.206 0.598,0.304 0.949,0.207l5.63,-1.547l2.016,7.338l0.127,-1.203l-1.718,-6.252l5.63,-1.547C23.517,8.479 23.855,7.914 23.706,7.373z"
-      android:fillColor="#67DFE8"/>
+    <path
+        android:pathData="M23.706,7.373c-0.149,-0.541 -0.728,-0.854 -1.294,-0.699L19.87,7.373c-0.325,-0.913 -1.301,-1.438 -2.255,-1.175l-3.008,0.826c-0.954,0.262 -1.525,1.212 -1.338,2.163l-2.542,0.698c-0.499,0.137 -0.799,0.593 -0.767,1.07c-1.696,0.439 -3.037,0.067 -4.101,-0.248c-1.047,-0.309 -1.951,-0.578 -2.713,0.152c-1.307,1.253 -0.369,2.87 0.384,4.17c0.501,0.863 1.019,1.757 0.766,2.3c-0.519,1.124 -2.729,1.128 -3.537,1.033c-0.203,-0.022 -0.392,0.122 -0.417,0.328c-0.024,0.206 0.123,0.391 0.329,0.414c0.086,0.01 1.376,0.152 2.554,-0.172c0.734,-0.202 1.424,-0.585 1.753,-1.292c0.416,-0.896 -0.173,-1.912 -0.797,-2.987c-0.844,-1.456 -1.336,-2.47 -0.515,-3.257c0.426,-0.409 0.972,-0.272 1.977,0.026c1.128,0.334 2.648,0.808 4.674,0.215c0.255,0.206 0.598,0.304 0.949,0.207l5.63,-1.547l2.016,7.338l0.127,-1.203l-1.718,-6.252l5.63,-1.547C23.517,8.479 23.855,7.914 23.706,7.373z"
+        android:fillColor="#67DFE8" />
 </vector>
diff --git a/omnipod/src/main/res/drawable/ic_exit_to_app.xml b/omnipod/src/main/res/drawable/ic_exit_to_app.xml
deleted file mode 100644
index 37a6c7d058..0000000000
--- a/omnipod/src/main/res/drawable/ic_exit_to_app.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M16.495,12.092l-4.921,-4.92l-1.444,1.444l2.468,2.467l-9.765,0l0,2.042l9.765,0l-2.468,2.467l1.444,1.444l4.921,-4.92l-0.012,-0.012z"
-      android:fillColor="@color/white"/>
-  <path
-      android:pathData="M18.682,2.975H5.152c-1.272,0 -2.307,1.035 -2.307,2.307v3.801h2.126V5.282c0,-0.1 0.081,-0.181 0.181,-0.181h13.53c0.1,0 0.181,0.081 0.181,0.181v13.436c0,0.1 -0.081,0.181 -0.181,0.181H5.152c-0.1,0 -0.181,-0.081 -0.181,-0.181v-3.593H2.845v3.593c0,1.272 1.035,2.307 2.307,2.307h13.53c1.272,0 2.308,-1.034 2.308,-2.307V5.282C20.989,4.01 19.954,2.975 18.682,2.975z"
-      android:fillColor="@color/white"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/ic_local_activate.xml b/omnipod/src/main/res/drawable/ic_local_activate.xml
index 905ade57d3..c171fe367e 100644
--- a/omnipod/src/main/res/drawable/ic_local_activate.xml
+++ b/omnipod/src/main/res/drawable/ic_local_activate.xml
@@ -3,10 +3,10 @@
     android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12.069,20.423c-4.644,0 -8.422,-3.779 -8.422,-8.423s3.778,-8.422 8.422,-8.422S20.492,7.355 20.492,12S16.713,20.423 12.069,20.423zM12.069,4.943c-3.891,0 -7.057,3.166 -7.057,7.057c0,3.891 3.166,7.057 7.057,7.057c3.891,0 7.057,-3.166 7.057,-7.057C19.126,8.109 15.961,4.943 12.069,4.943z"
-      android:fillColor="#67DFE8"/>
-  <path
-      android:pathData="M9.945,16.362c-0.113,0 -0.227,-0.028 -0.33,-0.085c-0.217,-0.12 -0.353,-0.349 -0.353,-0.598V8.32c0,-0.249 0.135,-0.478 0.353,-0.598c0.218,-0.12 0.485,-0.112 0.694,0.021l5.827,3.679c0.198,0.125 0.318,0.343 0.318,0.577s-0.12,0.452 -0.318,0.577l-5.827,3.679C10.198,16.326 10.072,16.362 9.945,16.362zM10.627,9.559v4.881L14.493,12L10.627,9.559z"
-      android:fillColor="#67DFE8"/>
+    <path
+        android:pathData="M12.069,20.423c-4.644,0 -8.422,-3.779 -8.422,-8.423s3.778,-8.422 8.422,-8.422S20.492,7.355 20.492,12S16.713,20.423 12.069,20.423zM12.069,4.943c-3.891,0 -7.057,3.166 -7.057,7.057c0,3.891 3.166,7.057 7.057,7.057c3.891,0 7.057,-3.166 7.057,-7.057C19.126,8.109 15.961,4.943 12.069,4.943z"
+        android:fillColor="#67DFE8" />
+    <path
+        android:pathData="M9.945,16.362c-0.113,0 -0.227,-0.028 -0.33,-0.085c-0.217,-0.12 -0.353,-0.349 -0.353,-0.598V8.32c0,-0.249 0.135,-0.478 0.353,-0.598c0.218,-0.12 0.485,-0.112 0.694,0.021l5.827,3.679c0.198,0.125 0.318,0.343 0.318,0.577s-0.12,0.452 -0.318,0.577l-5.827,3.679C10.198,16.326 10.072,16.362 9.945,16.362zM10.627,9.559v4.881L14.493,12L10.627,9.559z"
+        android:fillColor="#67DFE8" />
 </vector>
diff --git a/omnipod/src/main/res/drawable/ic_loop_disabled.xml b/omnipod/src/main/res/drawable/ic_loop_disabled.xml
index ed79c96429..81dabea9d6 100644
--- a/omnipod/src/main/res/drawable/ic_loop_disabled.xml
+++ b/omnipod/src/main/res/drawable/ic_loop_disabled.xml
@@ -3,13 +3,13 @@
     android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="#FF1313"/>
-  <path
-      android:pathData="M10.2429,8.7408l5.0162,5.0162l-1.5026,1.5026l-5.0162,-5.0162z"
-      android:fillColor="#FF1313"/>
-  <path
-      android:pathData="M8.7408,13.7571l5.0162,-5.0162l1.5026,1.5026l-5.0162,5.0162z"
-      android:fillColor="#FF1313"/>
+    <path
+        android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
+        android:fillColor="#FF1313" />
+    <path
+        android:pathData="M10.2429,8.7408l5.0162,5.0162l-1.5026,1.5026l-5.0162,-5.0162z"
+        android:fillColor="#FF1313" />
+    <path
+        android:pathData="M8.7408,13.7571l5.0162,-5.0162l1.5026,1.5026l-5.0162,5.0162z"
+        android:fillColor="#FF1313" />
 </vector>
diff --git a/omnipod/src/main/res/drawable/ic_toast_check.xml b/omnipod/src/main/res/drawable/ic_toast_check.xml
new file mode 100644
index 0000000000..01efa0f6e3
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_toast_check.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:tint="@color/toastOk"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M10,17L5,12L6.41,10.58L10,14.17L17.59,6.58L19,8M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/omnipod/src/main/res/drawable/ic_toast_delete_confirm.xml b/omnipod/src/main/res/drawable/ic_toast_delete_confirm.xml
new file mode 100644
index 0000000000..e5be03e8ec
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_toast_delete_confirm.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="@color/toastInfo"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19M8.46,11.88L9.87,10.47L12,12.59L14.12,10.47L15.53,11.88L13.41,14L15.53,16.12L14.12,17.53L12,15.41L9.88,17.53L8.47,16.12L10.59,14L8.46,11.88M15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z" />
+</vector>
\ No newline at end of file
diff --git a/omnipod/src/main/res/layout/omnipod_initpod.xml b/omnipod/src/main/res/layout/omnipod_initpod.xml
deleted file mode 100644
index af83f9583c..0000000000
--- a/omnipod/src/main/res/layout/omnipod_initpod.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <ImageButton
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_weight="1"
-            android:background="@android:color/transparent"
-            android:onClick="exitPressed"
-            app:srcCompat="@drawable/ic_exit_to_app" />
-
-        <TextView
-            android:id="@+id/sw_exit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginStart="10dp"
-            android:layout_weight="1"
-            android:text="@string/omnipod_wizard_button_exit"
-            android:textAppearance="@android:style/TextAppearance.Material.Medium"
-            android:textStyle="bold" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/sw_content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:keepScreenOn="true"
-        android:textAlignment="center"
-        android:textColor="#FFFFFF"
-        android:textSize="32sp"
-        tools:text="Title" />
-
-    <ScrollView
-        android:id="@+id/sw_scrollview"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <LinearLayout
-            android:id="@+id/sw_content_fields"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical|center_horizontal"
-            android:orientation="vertical"
-            android:padding="16dp" />
-    </ScrollView>
-
-    <LinearLayout
-        android:id="@+id/sw_content_controls"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center_horizontal"
-        android:background="@color/black_overlay"
-        android:orientation="horizontal"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
-
-        <Button
-            android:id="@+id/previous_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:onClick="showPreviousPage"
-            android:text="@string/omnipod_wizard_button_previous"
-            android:textColor="#FFFFFF" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1" />
-
-        <Button
-            android:id="@+id/next_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:onClick="showNextPage"
-            android:text="@string/omnipod_wizard_button_next"
-            android:textColor="#FFFFFF" />
-
-        <Button
-            android:id="@+id/finish_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:onClick="finishSetupWizard"
-            android:text="@string/omnipod_wizard_button_finish"
-            android:textColor="#FFFFFF" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/omnipod/src/main/res/layout/omnipod_initpod_init_action.xml b/omnipod/src/main/res/layout/omnipod_initpod_init_action.xml
deleted file mode 100644
index b9eb1e7ae5..0000000000
--- a/omnipod/src/main/res/layout/omnipod_initpod_init_action.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/WizardPageContainer"
-    android:orientation="vertical">
-
-    <TextView style="@style/WizardPageTitle" />
-
-    <TextView
-        android:id="@+id/initAction_header"
-        android:layout_width="match_parent"
-        android:layout_height="160dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="20dp"
-        android:layout_marginLeft="25dp"
-        android:layout_marginRight="25dp"
-        style="@style/WizardPagePodContent"
-        android:textSize="15sp"
-        android:text="@string/omnipod_init_pod_wizard_step2_action_header" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginLeft="70dp"
-        android:layout_marginRight="70dp"
-        android:layout_weight="1">
-
-        <LinearLayout
-            android:id="@+id/initAction_ItemsHolder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-        </LinearLayout>
-    </ScrollView>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:orientation="horizontal"
-        android:weightSum="1">
-
-        <TextView
-            android:id="@+id/initAction_textErrorMessage"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="5dp"
-            android:textSize="15sp"
-            android:layout_weight="0.3"
-            style="@style/WizardPagePodContent"
-            android:visibility="gone" />
-
-        <Button
-            android:id="@+id/initAction_RetryButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.7"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="15dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp"
-            android:drawableTop="@drawable/ic_actions_refill"
-            android:visibility="gone" />
-    </LinearLayout>
-
-
-    <ProgressBar
-        android:id="@+id/initAction_progressBar"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="25dp"
-        android:layout_marginRight="25dp"
-        android:layout_height="80dp" />
-
-    <TextView
-        android:id="@+id/initAction_footer"
-        android:layout_width="match_parent"
-        android:textSize="15sp"
-        android:layout_height="30dp" />
-
-
-</LinearLayout>
diff --git a/omnipod/src/main/res/layout/omnipod_initpod_pod_info.xml b/omnipod/src/main/res/layout/omnipod_initpod_pod_info.xml
deleted file mode 100644
index 2f06de192d..0000000000
--- a/omnipod/src/main/res/layout/omnipod_initpod_pod_info.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-  Copyright 2012 Roman Nurik
-  
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/WizardPageContainer"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/podInfoTitle"
-        style="@style/WizardPageTitle" />
-
-    <TextView
-        android:id="@+id/podInfoText"
-        android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="40dp"
-        android:layout_marginLeft="25dp"
-        android:layout_marginRight="25dp"
-        style="@style/WizardPagePodContent"
-         />
-
-    <LinearLayout
-        style="@style/ButtonBar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-
-        <ListView android:id="@+id/podInfoList"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:saveEnabled="false"
-            android:layout_marginLeft="25dp"
-            android:layout_marginRight="25dp"
-            style="@style/PodInfoListView"
-            android:listSelector="@color/ribbonWarning"
-            android:scrollbarStyle="outsideInset" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/omnipod/src/main/res/layout/omnipod_initpod_pod_info_item.xml b/omnipod/src/main/res/layout/omnipod_initpod_pod_info_item.xml
deleted file mode 100644
index 30c84771fb..0000000000
--- a/omnipod/src/main/res/layout/omnipod_initpod_pod_info_item.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-  Copyright 2012 Roman Nurik
-  
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="@dimen/list_item_height_small"
-    android:orientation="horizontal"
-    android:baselineAligned="true"
-    android:paddingStart="@dimen/list_item_padding_left"
-    android:paddingEnd="@dimen/list_item_padding_right"
-    android:paddingTop="12dp"
-    android:paddingBottom="12dp">
-
-    <TextView android:id="@android:id/text1"
-        style="?android:textAppearanceSmall"
-        android:textColor="@color/text_light"
-        android:textAllCaps="false"
-        android:textStyle="bold"
-        android:ellipsize="end"
-        android:layout_width="100sp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp" />
-
-    <TextView android:id="@android:id/text2"
-        style="?android:textAppearanceMedium"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textColor="@color/design_default_color_primary_dark"
-        android:layout_weight="1" />
-
-</LinearLayout>
diff --git a/omnipod/src/main/res/layout/omnipod_fragment.xml b/omnipod/src/main/res/layout/omnipod_overview.xml
similarity index 84%
rename from omnipod/src/main/res/layout/omnipod_fragment.xml
rename to omnipod/src/main/res/layout/omnipod_overview.xml
index cad9139a1a..ff36031400 100644
--- a/omnipod/src/main/res/layout/omnipod_fragment.xml
+++ b/omnipod/src/main/res/layout/omnipod_overview.xml
@@ -2,8 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.plugins.pump.omnipod.ui.OmnipodFragment">
-
+    tools:context="info.nightscout.androidaps.plugins.pump.omnipod.ui.OmnipodOverviewFragment">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -12,17 +11,15 @@
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_above="@+id/omnipod_buttons"
+            android:layout_above="@+id/omnipod_overview_buttons"
             android:fillViewport="true">
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <LinearLayout
-                    android:id="@+id/overview_pumpstatuslayout_omnipod"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
@@ -31,7 +28,6 @@
                     android:visibility="gone">
 
                     <TextView
-                        android:id="@+id/overview_pump_omnipod"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="5dp"
@@ -76,7 +72,7 @@
                         android:textSize="14sp" />
 
                     <com.joanzapata.iconify.widget.IconTextView
-                        android:id="@+id/omnipod_rl_status"
+                        android:id="@+id/omnipod_overview_riley_link_status"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -111,7 +107,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/omnipod_pod_address"
+                        android:text="@string/omnipod_overview_pod_address"
                         android:textSize="14sp" />
 
                     <TextView
@@ -125,7 +121,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_pod_address"
+                        android:id="@+id/omnipod_overview_pod_address"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -147,7 +143,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/omnipod_pod_lot"
+                        android:text="@string/omnipod_lot"
                         android:textSize="14sp" />
 
                     <TextView
@@ -161,7 +157,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_pod_lot"
+                        android:id="@+id/omnipod_overview_pod_lot"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -183,7 +179,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/omnipod_pod_tid"
+                        android:text="@string/omnipod_tid"
                         android:textSize="14sp" />
 
                     <TextView
@@ -197,7 +193,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_pod_tid"
+                        android:id="@+id/omnipod_overview_pod_tid"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -219,7 +215,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/omnipod_pod_firmware_version"
+                        android:text="@string/omnipod_overview_firmware_version"
                         android:textSize="14sp" />
 
                     <TextView
@@ -233,7 +229,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_pod_firmware_version"
+                        android:id="@+id/omnipod_overview_firmware_version"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -243,6 +239,42 @@
                         android:textSize="14sp" />
                 </LinearLayout>
 
+                <!-- Pod Time -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.5"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/omnipod_overview_time_on_pod"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingStart="2dp"
+                        android:paddingEnd="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/omnipod_overview_time_on_pod"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
 
                 <!-- Pod Expires -->
                 <LinearLayout
@@ -256,7 +288,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/omnipod_pod_expiry"
+                        android:text="@string/omnipod_overview_pod_expiry_date"
                         android:textSize="14sp" />
 
                     <TextView
@@ -270,7 +302,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_pod_expiry"
+                        android:id="@+id/omnipod_overview_pod_expiry_date"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -293,7 +325,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/omnipod_pod_status"
+                        android:text="@string/omnipod_overview_pod_status"
                         android:textSize="14sp" />
 
                     <TextView
@@ -307,7 +339,7 @@
                         android:textSize="14sp" />
 
                     <com.joanzapata.iconify.widget.IconTextView
-                        android:id="@+id/omnipod_pod_status"
+                        android:id="@+id/omnipod_overview_pod_status"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -321,7 +353,7 @@
                 </LinearLayout>
 
                 <TextView
-                    android:id="@+id/omnipod_queue"
+                    android:id="@+id/omnipod_overview_queue"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text=""
@@ -347,7 +379,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/lastconnection_label"
+                        android:text="@string/omnipod_overview_last_connection"
                         android:textSize="14sp" />
 
                     <TextView
@@ -361,7 +393,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_last_connection"
+                        android:id="@+id/omnipod_overview_last_connection"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -392,7 +424,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/lastbolus_label"
+                        android:text="@string/omnipod_overview_last_bolus"
                         android:textSize="14sp" />
 
                     <TextView
@@ -406,7 +438,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_last_bolus"
+                        android:id="@+id/omnipod_overview_last_bolus"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -438,7 +470,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/basebasalrate_label"
+                        android:text="@string/omnipod_overview_base_basal_rate"
                         android:textSize="14sp" />
 
                     <TextView
@@ -452,7 +484,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_base_basal_rate"
+                        android:id="@+id/omnipod_overview_base_basal_rate"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -483,7 +515,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/tempbasal_label"
+                        android:text="@string/omnipod_overview_temp_basal_rate"
                         android:textSize="14sp" />
 
                     <TextView
@@ -497,7 +529,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_temp_basal"
+                        android:id="@+id/omnipod_overview_temp_basal"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -528,7 +560,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/reservoir_label"
+                        android:text="@string/omnipod_overview_reservoir"
                         android:textSize="14sp" />
 
                     <TextView
@@ -542,7 +574,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_reservoir"
+                        android:id="@+id/omnipod_overview_reservoir"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -573,7 +605,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/omnipod_total_delivered_label"
+                        android:text="@string/omnipod_overview_total_delivered"
                         android:textSize="14sp" />
 
                     <TextView
@@ -587,7 +619,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_total_delivered"
+                        android:id="@+id/omnipod_overview_total_delivered"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -618,7 +650,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/omnipod_errors"
+                        android:text="@string/omnipod_overview_errors"
                         android:textSize="14sp" />
 
                     <TextView
@@ -632,7 +664,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_errors"
+                        android:id="@+id/omnipod_overview_errors"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -663,7 +695,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/omnipod_pod_active_alerts"
+                        android:text="@string/omnipod_overview_pod_active_alerts"
                         android:textSize="14sp" />
 
                     <TextView
@@ -677,7 +709,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_pod_active_alerts"
+                        android:id="@+id/omnipod_overview_pod_active_alerts"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -703,7 +735,7 @@
         </ScrollView>
 
         <LinearLayout
-            android:id="@+id/omnipod_buttons"
+            android:id="@+id/omnipod_overview_buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
@@ -715,7 +747,7 @@
                 android:orientation="horizontal">
 
                 <Button
-                    android:id="@+id/omnipod_button_refresh_status"
+                    android:id="@+id/omnipod_overview_button_refresh_status"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -723,10 +755,10 @@
                     android:drawableTop="@drawable/ic_actions_refill"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/omnipod_refresh" />
+                    android:text="@string/omnipod_overview_button_refresh" />
 
                 <Button
-                    android:id="@+id/omnipod_button_pod_mgmt"
+                    android:id="@+id/omnipod_overview_button_pod_management"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -734,10 +766,10 @@
                     android:drawableTop="@drawable/ic_danarhistory"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/omnipod_pod_mgmt" />
+                    android:text="@string/omnipod_overview_button_pod_management" />
 
                 <Button
-                    android:id="@+id/omnipod_button_acknowledge_active_alerts"
+                    android:id="@+id/omnipod_overview_button_acknowledge_active_alerts"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -745,10 +777,10 @@
                     android:drawableTop="@drawable/ic_cp_aaps_offline"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/omnipod_acknowledge_active_alerts_short" />
+                    android:text="@string/omnipod_overview_button_acknowledge_active_alerts" />
 
                 <Button
-                    android:id="@+id/omnipod_button_rileylink_stats"
+                    android:id="@+id/omnipod_overview_button_rileylink_stats"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -756,10 +788,10 @@
                     android:drawableTop="@drawable/ic_danarstats"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/omnipod_rl_stats" />
+                    android:text="@string/omnipod_overview_button_riley_link_stats" />
 
                 <Button
-                    android:id="@+id/omnipod_button_pulse_log"
+                    android:id="@+id/omnipod_overview_button_pulse_log"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -767,23 +799,23 @@
                     android:drawableTop="@drawable/ic_cp_bolus_correction"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/omnipod_read_pulse_log_short"
+                    android:text="@string/omnipod_overview_button_read_pulse_log"
                     android:visibility="gone" />
 
                 <Button
-                    android:id="@+id/omnipod_button_suspend_delivery"
+                    android:id="@+id/omnipod_overview_button_set_time"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_loop_disabled"
+                    android:drawableTop="@drawable/ic_access_alarm"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/omnipod_suspend_delivery_short"
+                    android:text="@string/omnipod_overview_button_set_time"
                     android:visibility="gone" />
 
                 <Button
-                    android:id="@+id/omnipod_button_resume_delivery"
+                    android:id="@+id/omnipod_overview_button_resume_delivery"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -791,7 +823,19 @@
                     android:drawableTop="@drawable/ic_local_activate"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/omnipod_resume_delivery"
+                    android:text="@string/omnipod_overview_button_resume_delivery"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@+id/omnipod_overview_button_suspend_delivery"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_loop_disabled"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/omnipod_overview_button_suspend_delivery"
                     android:visibility="gone" />
 
             </LinearLayout>
diff --git a/omnipod/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml b/omnipod/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml
new file mode 100644
index 0000000000..afbc055b78
--- /dev/null
+++ b/omnipod/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="10dp">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/omnipod/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml b/omnipod/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml
new file mode 100644
index 0000000000..8104ed2ec4
--- /dev/null
+++ b/omnipod/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="10dp">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+
+        app:navGraph="@navigation/omnipod_pod_deactivation_wizard_navigation_graph" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/omnipod/src/main/res/layout/omnipod_pod_history_activity.xml b/omnipod/src/main/res/layout/omnipod_pod_history_activity.xml
index 7e4a7a2aa3..d2a91efbc7 100644
--- a/omnipod/src/main/res/layout/omnipod_pod_history_activity.xml
+++ b/omnipod/src/main/res/layout/omnipod_pod_history_activity.xml
@@ -34,7 +34,7 @@
             android:layout_weight="1"
             android:background="@drawable/pillborder"
             android:gravity="center_horizontal"
-            android:text="@string/omnipod_cmd_pod_history" />
+            android:text="@string/omnipod_history_title" />
 
     </LinearLayout>
 
diff --git a/omnipod/src/main/res/layout/omnipod_pod_history_item.xml b/omnipod/src/main/res/layout/omnipod_pod_history_item.xml
index 9d61d9cee6..0534481536 100644
--- a/omnipod/src/main/res/layout/omnipod_pod_history_item.xml
+++ b/omnipod/src/main/res/layout/omnipod_pod_history_item.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="40dp"
+    android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingStart="20dp">
+    android:paddingStart="20dp"
+    android:paddingTop="10dp"
+    android:paddingEnd="20dp">
 
     <TextView
         android:id="@+id/omnipod_history_time"
         android:layout_width="88dp"
         android:layout_height="match_parent"
-        android:gravity="center_vertical"
         android:text="@string/omnipod_history_item_date"
         android:textSize="12sp" />
 
@@ -17,7 +18,6 @@
         android:id="@+id/omnipod_history_source"
         android:layout_width="132dp"
         android:layout_height="match_parent"
-        android:gravity="center_vertical"
         android:text="@string/omnipod_history_item_source"
         android:textSize="12sp" />
 
@@ -25,7 +25,6 @@
         android:id="@+id/omnipod_history_description"
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
-        android:gravity="center_vertical"
         android:text="@string/omnipod_history_item_description"
         android:textSize="12sp" />
 
diff --git a/omnipod/src/main/res/layout/omnipod_pod_mgmt.xml b/omnipod/src/main/res/layout/omnipod_pod_management.xml
similarity index 60%
rename from omnipod/src/main/res/layout/omnipod_pod_mgmt.xml
rename to omnipod/src/main/res/layout/omnipod_pod_management.xml
index 6db1b7d19f..bc088db71f 100644
--- a/omnipod/src/main/res/layout/omnipod_pod_mgmt.xml
+++ b/omnipod/src/main/res/layout/omnipod_pod_management.xml
@@ -9,130 +9,100 @@
         android:layout_height="wrap_content">
 
         <LinearLayout
-            android:id="@+id/initpod_buttons_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
-                android:id="@+id/initpod_space0"
                 android:layout_width="match_parent"
-                android:layout_height="120dp"
+                android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="3dp"
+                android:layout_marginTop="20dp"
                 android:layout_marginRight="10dp"
-                android:layout_marginBottom="3dp"
                 android:layout_weight="0.5"
                 android:gravity="center"
-                android:text="@string/omnipod_pod_mgmt_title"
+                android:text="@string/omnipod_pod_management_title"
                 android:textAlignment="center"
                 android:textSize="12pt"
                 android:textStyle="bold" />
 
             <LinearLayout
-                android:id="@+id/initpod_waiting_for_rl_layout"
+                android:id="@+id/omnipod_pod_management_waiting_for_rl_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:visibility="gone">
 
                 <ProgressBar
-                    android:id="@+id/initpod_waiting_for_rl_progress_bar"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:layout_marginLeft="25dp"
+                    android:layout_marginTop="20dp"
                     android:layout_marginRight="25dp" />
 
                 <TextView
-                    android:id="@+id/initpod_waiting_for_rl_text"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginTop="3dp"
+                    android:layout_marginTop="10dp"
                     android:layout_marginRight="10dp"
-                    android:layout_marginBottom="3dp"
                     android:layout_weight="0.5"
                     android:gravity="center"
-                    android:text="@string/omnipod_waiting_for_rileylink_connection"
+                    android:text="@string/omnipod_pod_management_waiting_for_rileylink_connection"
                     android:textAlignment="center"
-                    android:textSize="8pt"/>
+                    android:textSize="8pt" />
             </LinearLayout>
 
             <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/initpod_init_pod"
+                android:id="@+id/omnipod_pod_management_button_activate_pod"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="40dp"
-                android:layout_marginTop="3dp"
+                android:layout_marginTop="20dp"
                 android:layout_marginRight="40dp"
-                android:layout_marginBottom="3dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_cp_pump_canula"
-                android:text="@string/omnipod_cmd_init_pod"
+                android:text="@string/omnipod_pod_management_button_activate_pod"
                 android:textAllCaps="false" />
 
-            <TextView
-                android:id="@+id/initpod_space1"
-                android:layout_width="match_parent"
-                android:layout_height="20dp"
-                android:layout_weight="0.5"
-                android:text="" />
-
             <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/initpod_remove_pod"
+                android:id="@+id/omnipod_pod_management_button_deactivate_pod"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="40dp"
-                android:layout_marginTop="3dp"
+                android:layout_marginTop="20dp"
                 android:layout_marginRight="40dp"
-                android:layout_marginBottom="3dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_actions_temptarget"
-                android:text="@string/omnipod_cmd_deactivate_pod"
+                android:text="@string/omnipod_pod_management_button_deactivate_pod"
                 android:textAllCaps="false" />
 
-            <TextView
-                android:id="@+id/initpod_space2"
-                android:layout_width="match_parent"
-                android:layout_height="20dp"
-                android:layout_weight="0.5"
-                android:text="" />
-
             <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/initpod_reset_pod"
+                android:id="@+id/omnipod_pod_management_button_discard_pod"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="40dp"
-                android:layout_marginTop="3dp"
+                android:layout_marginTop="20dp"
                 android:layout_marginRight="40dp"
-                android:layout_marginBottom="3dp"
                 android:layout_weight="0.5"
-                android:drawableTop="@drawable/ic_cp_pump_canula"
-                android:text="@string/omnipod_cmd_discard_pod"
+                android:drawableTop="@drawable/ic_toast_delete_confirm"
+                android:text="@string/omnipod_pod_management_button_discard_pod"
                 android:textAllCaps="false" />
 
-            <TextView
-                android:id="@+id/initpod_space3"
-                android:layout_width="match_parent"
-                android:layout_height="20dp"
-                android:layout_weight="0.5"
-                android:text="" />
-
             <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/initpod_pod_history"
+                android:id="@+id/omnipod_pod_management_button_pod_history"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="40dp"
-                android:layout_marginTop="3dp"
+                android:layout_marginTop="20dp"
                 android:layout_marginRight="40dp"
-                android:layout_marginBottom="3dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_danarhistory"
-                android:text="@string/omnipod_cmd_pod_history"
+                android:text="@string/omnipod_pod_management_button_pod_history"
                 android:textAllCaps="false" />
 
         </LinearLayout>
diff --git a/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml b/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
new file mode 100644
index 0000000000..6e300995b7
--- /dev/null
+++ b/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/omnipod_wizard_action_page_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/omnipod_wizard_vertical_spacing"
+        android:textAppearance="@style/OmnipodWizardText" />
+
+    <ProgressBar
+        android:id="@+id/omnipod_wizard_action_progress_indication"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="@dimen/omnipod_wizard_vertical_spacing"
+        android:layout_marginBottom="@dimen/omnipod_wizard_vertical_spacing"
+        android:indeterminate="true"
+        android:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/omnipod_wizard_action_success"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/omnipod_wizard_vertical_spacing"
+        android:layout_marginBottom="@dimen/omnipod_wizard_vertical_spacing"
+        android:src="@drawable/ic_toast_check"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/omnipod_wizard_action_error"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/omnipod_wizard_vertical_spacing"
+        android:layout_marginBottom="@dimen/omnipod_wizard_vertical_spacing"
+        android:paddingStart="50dp"
+        android:paddingEnd="50dp"
+        android:textAppearance="@style/OmnipodWizardError"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        android:orientation="horizontal"
+        android:paddingEnd="50dp">
+
+        <Button
+            android:id="@+id/omnipod_wizard_button_deactivate_pod"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:text="@string/omnipod_wizard_button_deactivate_pod"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/omnipod_wizard_button_discard_pod"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:text="@string/omnipod_wizard_button_discard_pod"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/omnipod_wizard_button_retry"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:text="@string/omnipod_wizard_button_retry"
+            android:visibility="gone" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/omnipod/src/main/res/layout/omnipod_wizard_base_fragment.xml b/omnipod/src/main/res/layout/omnipod_wizard_base_fragment.xml
new file mode 100644
index 0000000000..f0e9649066
--- /dev/null
+++ b/omnipod/src/main/res/layout/omnipod_wizard_base_fragment.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/omnipod_wizard_progress_indication" />
+
+    <TextView
+        android:id="@+id/omnipod_wizard_base_fragment_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:textAppearance="@style/OmnipodWizardTitle" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginBottom="@dimen/omnipod_wizard_vertical_spacing"
+        android:layout_weight="1">
+
+        <ViewStub
+            android:id="@+id/omnipod_wizard_base_fragment_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </ScrollView>
+
+    <include layout="@layout/omnipod_wizard_nav_buttons" />
+</LinearLayout>
\ No newline at end of file
diff --git a/omnipod/src/main/res/layout/omnipod_wizard_info_page_fragment.xml b/omnipod/src/main/res/layout/omnipod_wizard_info_page_fragment.xml
new file mode 100644
index 0000000000..9a6b30a397
--- /dev/null
+++ b/omnipod/src/main/res/layout/omnipod_wizard_info_page_fragment.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/omnipod_wizard_info_page_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/OmnipodWizardText" />
+</LinearLayout>
\ No newline at end of file
diff --git a/omnipod/src/main/res/layout/omnipod_wizard_nav_buttons.xml b/omnipod/src/main/res/layout/omnipod_wizard_nav_buttons.xml
new file mode 100644
index 0000000000..abf9a835e2
--- /dev/null
+++ b/omnipod/src/main/res/layout/omnipod_wizard_nav_buttons.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <Button
+        android:id="@+id/omnipod_wizard_button_cancel"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/omnipod_wizard_button_cancel" />
+
+    <Button
+        android:id="@+id/omnipod_wizard_button_next"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/omnipod_wizard_button_next" />
+</LinearLayout>
\ No newline at end of file
diff --git a/omnipod/src/main/res/layout/omnipod_wizard_progress_indication.xml b/omnipod/src/main/res/layout/omnipod_wizard_progress_indication.xml
new file mode 100644
index 0000000000..983a0bb4ea
--- /dev/null
+++ b/omnipod/src/main/res/layout/omnipod_wizard_progress_indication.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <ProgressBar
+        android:id="@+id/omnipod_wizard_progress_indication"
+        style="@android:style/Widget.ProgressBar.Horizontal"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:indeterminate="false"
+        android:progress="0"
+        android:progressTint="@color/omnipodWizardProgressBar"
+        android:scaleY=".5" />
+</LinearLayout>
\ No newline at end of file
diff --git a/omnipod/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml b/omnipod/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml
new file mode 100644
index 0000000000..b5ad757c49
--- /dev/null
+++ b/omnipod/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:startDestination="@id/fillPodInfoFragment">
+    <fragment
+        android:id="@+id/fillPodInfoFragment"
+        android:name="info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.FillPodInfoFragment"
+        android:label="FillPodInfoFragment">
+        <action
+            android:id="@+id/action_fillPodInfoFragment_to_initializePodActionFragment"
+            app:destination="@id/initializePodActionFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/initializePodActionFragment"
+        android:name="info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.InitializePodActionFragment"
+        android:label="initializePodActionFragment">
+        <action
+            android:id="@+id/action_initializePodActionFragment_to_attachPodInfoFragment"
+            app:destination="@id/attachPodInfoFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/attachPodInfoFragment"
+        android:name="info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.AttachPodInfoFragment"
+        android:label="AttachPodInfoFragment">
+        <action
+            android:id="@+id/action_attachPodInfoFragment_to_insertCannulaActionFragment"
+            app:destination="@id/insertCannulaActionFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/insertCannulaActionFragment"
+        android:name="info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.InsertCannulaActionFragment"
+        android:label="InsertCannulaActionFragment">
+        <action
+            android:id="@+id/action_insertCannulaActionFragment_to_PodActivatedInfoFragment"
+            app:destination="@id/PodActivatedInfoFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/PodActivatedInfoFragment"
+        android:name="info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment.PodActivatedInfoFragment"
+        android:label="PodActivatedInfoFragment" />
+</navigation>
\ No newline at end of file
diff --git a/omnipod/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml b/omnipod/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml
new file mode 100644
index 0000000000..d1c431652c
--- /dev/null
+++ b/omnipod/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:startDestination="@id/deactivatePodInfoFragment">
+    <fragment
+        android:id="@+id/deactivatePodInfoFragment"
+        android:name="info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.DeactivatePodInfoFragment"
+        android:label="DeactivatePodInfoFragment">
+        <action
+            android:id="@+id/action_deactivatePodInfoFragment_to_deactivatePodActionFragment"
+            app:destination="@id/deactivatePodActionFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/deactivatePodActionFragment"
+        android:name="info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.DeactivatePodActionFragment"
+        android:label="DeactivatePodActionFragment">
+        <action
+            android:id="@+id/action_deactivatePodActionFragment_to_podDeactivatedInfoFragment"
+            app:destination="@id/podDeactivatedInfoFragment" />
+        <action
+            android:id="@+id/action_deactivatePodActionFragment_to_podDiscardedInfoFragment"
+            app:destination="@id/podDiscardedInfoFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/podDeactivatedInfoFragment"
+        android:name="info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.PodDeactivatedInfoFragment"
+        android:label="PodDeactivatedInfoFragment" />
+    <fragment
+        android:id="@+id/podDiscardedInfoFragment"
+        android:name="info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.deactivation.fragment.PodDiscardedInfoFragment"
+        android:label="PodDiscardedInfoFragment" />
+</navigation>
\ No newline at end of file
diff --git a/omnipod/src/main/res/values-no-rNO/strings.xml b/omnipod/src/main/res/values-no-rNO/strings.xml
index 036e78a8a3..ca2895aa9d 100644
--- a/omnipod/src/main/res/values-no-rNO/strings.xml
+++ b/omnipod/src/main/res/values-no-rNO/strings.xml
@@ -2,10 +2,178 @@
 <resources>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Pumpe-integrering for Omnipod, krever RileyLink (med minst 2.0 firmware) enhet.</string>
     <!-- Omnipod Configuration -->
+    <string name="omnipod_config_bolus_beeps_enabled">Bolus pip aktivert</string>
+    <string name="omnipod_config_basal_beeps_enabled">Bolus pip aktivert</string>
+    <string name="omnipod_config_smb_beeps_enabled">SMB pip aktivert</string>
+    <string name="omnipod_config_tbr_beeps_enabled">TBR pip aktivert</string>
+    <string name="omnipod_config_suspend_delivery_button_enabled">Deaktiver insulin leveringknapp aktivert</string>
+    <string name="omnipod_config_pulse_log_button_enabled">Pulslogg knappen er aktivert</string>
+    <string name="omnipod_config_time_change_enabled">DST/Tidssone deteksjon aktivert</string>
+    <string name="omnipod_config_expiration_reminder_enabled">Utløpspåminnelse aktivert</string>
+    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Timer før nedstenging</string>
+    <string name="omnipod_config_low_reservoir_alert_enabled">Varsel om lavt reservoar aktivert</string>
+    <string name="omnipod_config_low_reservoir_alert_units">Antall enheter</string>
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_moments_ago">For litt siden</string>
+    <string name="omnipod_pod_mgmt">Pod håndtering</string>
+    <string name="omnipod_pod_status">Pod status</string>
+    <string name="omnipod_total_delivered_label">Totalt levert</string>
+    <string name="omnipod_total_delivered">%1$.2f E</string>
+    <string name="omnipod_reservoir_left">%1$.2f E igjen</string>
+    <string name="omnipod_reservoir_over50">Over 50 E</string>
+    <string name="omnipod_pod_address">Pod adresse</string>
+    <string name="omnipod_pod_expiry">Pod utløper</string>
+    <string name="omnipod_warning">Advarsel</string>
+    <string name="omnipod_pod_status_no_active_pod">Ingen aktiv Pod</string>
+    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Forberedelse av pod (venter på paring og priming)</string>
+    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Forberedelse av pod (venter på innskyting av kanyle)</string>
+    <string name="omnipod_pod_status_running">Kjører</string>
+    <string name="omnipod_pod_status_suspended">Satt på vent</string>
+    <string name="omnipod_pod_status_pod_fault">Pod feil</string>
+    <string name="omnipod_pod_status_activation_time_exceeded">Aktiveringstiden er overskredet</string>
+    <string name="omnipod_pod_status_inactive">Inaktiv</string>
+    <string name="omnipod_pod_status_pod_fault_description">Pod feil: %1$s %2$s</string>
+    <string name="omnipod_pod_active_alerts">Aktive Pod varsler</string>
+    <string name="omnipod_acknowledge_active_alerts_short">Ack varsler</string>
     <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_rileylink_address_invalid">RileyLink adressen er ugyldig.</string>
+    <string name="omnipod_error_operation_not_possible_no_configuration">Operasjon ikke mulig.\n\n Du må konfigurere Medtronic pumpen før du kan bruke denne funksjonen.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Operasjonen er ikke mulig.\n\n Du må vente noen minutter før AAPS prøver å sette basalprofilen for første gang.</string>
+    <string name="omnipod_error_illegal_init_action_type">Ulovlig PodInitActionType: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Ingen aktiv Pod</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Kommandobekreftelse mislyktes</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">En uventet feil oppstod. Vennligst rapporter (type: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Kommunikasjon mislyktes: ugyldige inndataparametere</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Kommunikasjon mislyktes: tidsavbrudd</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Kommunikasjon mislyktes: en uventet feil oppstod. Vennligst rapporter!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Kommunikasjon mislyktes: integritetsbekreftelse av meldinger mislyktes</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Kommunikasjon mislyktes: ugyldig melding fra Pod</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Kommunikasjonen mislyktes: Pod er i feil tilstand</string>
+    <string name="omnipod_driver_error_invalid_response">Kommunikasjon mislyktes: ugyldig svar fra Pod</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Kommunikasjon mislyktes: mottatt en melding med et ugyldig sekvensnummer fra Pod</string>
+    <string name="omnipod_driver_error_invalid_message_address">Kommunikasjon mislyktes: mottatt en melding med en ugyldig adresse fra Pod</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Kommunikasjon mislyktes: kan ikke dekode meldingen fra Pod</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Kommunikasjon mislyktes: nonce resync mislyktes</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Kommunikasjon mislyktes: nonce usynkron</string>
+    <string name="omnipod_driver_error_not_enough_data">Kommunikasjon mislyktes: ikke nok data mottatt fra Pod</string>
+    <string name="omnipod_driver_error_pod_fault">En Pod feil (%1$03d %2$s) ble oppdaget. Vennligst deaktiver Poden din og start en ny Pod</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Kommunikasjonen mislyktes: Poden returnerte et feil svar</string>
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Pod administrasjon</string>
+    <string name="omnipod_cmd_init_pod">Initsialiser Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Deaktiviser Pod</string>
+    <string name="omnipod_cmd_discard_pod">Forkast Pod</string>
+    <string name="omnipod_cmd_pod_history">Pod historikk</string>
+    <string name="omnipod_cmd_set_bolus">Sett bolus</string>
+    <string name="omnipod_cmd_cancel_bolus">Avbryt bolus</string>
+    <string name="omnipod_cmd_set_tbr">Sett midlertidig basal</string>
+    <string name="omnipod_cmd_cancel_tbr_by_driver">Avbryt midlertidig basal (internt av driver)</string>
+    <string name="omnipod_cmd_cancel_tbr">Avbryt midlertidig basal</string>
+    <string name="omnipod_cmd_set_basal_schedule">Sett basal program</string>
+    <string name="omnipod_cmd_get_pod_status">Hent Pod status</string>
+    <string name="omnipod_cmd_get_pod_info">Hent Pod info</string>
+    <string name="omnipod_cmd_set_time">Angi tid</string>
+    <string name="omnipod_cmd_configure_alerts">Konfigurer varsler</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Bekreft varsel</string>
+    <string name="omnipod_cmd_suspend_delivery">Stopp levering</string>
+    <string name="omnipod_cmd_resume_delivery">Gjenoppta levering</string>
+    <string name="omnipod_cmd_unknown_entry">Ukjent valg</string>
+    <string name="omnipod_cmd_bolus_value">%1$.2f E</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f E, KH=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Levering: %1$.2f E, varighet: %2$d min</string>
+    <string name="omnipod_cmd_discard_pod_desc">Hvis du trykker <b>OK</b>, Pod statusen bli tvangsmessig tilbakestilt, og du vil ikke lenger kunne kommunisere med Poden. Gjør dette bare hvis du ikke kan kommunisere med Poden lenger. Hvis du fortsatt kan kommunisere med Poden, kan du bruke <b>Deaktiver Pod</b> alternativet.\n\nHvis du ønsker å fortsette, må du fjerne Poden fra kroppen.</string>
+    <string name="omnipod_cmd_pod_history_na">Pod historikken er ikke tilgjengelig for øyeblikket.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Fyll Poden</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nFyll den nye stilen med nok insulin for 3 dager.\n\nLytt til to pip fra Poden under fyllingen. Disse indikerer at minste mengde 85U er satt inn. Pass på å tømme sprøyten helt, også etter å ha hørt de to pipene.\n\nEtter fylling av Poden, vennligst trykk <b>Neste</b>.\n\n<b>Merk:</b> Ikke fjern Poden\'s beskyttelseshette på dette tidspunktet.\n<b>Merk:</b> vennligst plasser RileyLinken i en stående posisjon og plasser Poden 5-10 cm unna.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Fylling av insulin i Poden helt ut i injeksjonsnålen</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Prøver å parre med den nye Poden og klargjøre den.\n\nNår alle trinn er merket, kan du trykke <b>Neste</b>.\n\n<b>Merk:</b> plasser RileyLink i en stående posisjon og plasser Poden ac 5-10 cm vekk fra den.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Fest poden</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nKlargjør infusjonsstedet. Fjern Podens beskyttelseshette og den heftende bakside og fest pumpen til infusjonsstedet.\n\nHvis kanylen stikker ut, trykk <b>Avbryt</b> og forkast tilpasningen.\n\nTrykk <b>Neste</b> for å sette inn kanyle og starte basallevering.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Kanyle blir satt inn</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Prøver å oppdatere første basalprofil og setter inn kanylen.\n\nNår alle punkter er avmerket, kan du trykke <b>Neste</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Informasjon om Pod</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod\'en er nå aktivt.\n\nDin basalprofil har blitt programmert og kanylen har blitt satt inn.\n\nVennligst kontroller at kanyle er satt inn riktig og erstatt pod\'en din hvis du føler at noe er feil.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Deaktiviser Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nTrykk <b>Neste</b> for å deaktivere Pod\'en.\n\n<b>Merk:</b> Dette vil stoppe all insulintilførsel og deaktivere Pod\'en.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Pod\'en deaktiviseres</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Deaktiverer Pod\'en.\n\nNår alle punkter er avmerket, kan du trykke <b>Neste</b>.\n\n<b>Merk:</b> Hvis deaktiveringen kontinuerlig svikter, trykk <b>Avbryt</b> og bruk <b>Forkast Pod</b> valget for å tvinge reset av Pod\'en.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod er deaktivert.\n\nVennligst fjern Pod\'en fra kroppen din og kast den.</string>
+    <string name="omnipod_init_pod_pair_pod">Par Pod</string>
+    <string name="omnipod_init_pod_prime_pod">Klargjør insulintilførsel i Pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Fyll kanyle</string>
+    <string name="omnipod_init_pod_set_basal_profile">Sett basalprofil</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Avbryt levering</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Deaktiver Pod</string>
     <!-- Omnipod - Base -->
+    <string name="omnipod_alert_finish_pairing_reminder">Fullfør paringspåminnelse</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Påminnelse om å sluttføre oppsett</string>
+    <string name="omnipod_alert_expiration">Pod utløper snart</string>
+    <string name="omnipod_alert_expiration_advisory">Pod utløper snart</string>
+    <string name="omnipod_alert_shutdown_imminent">Nedstenging er nært forestående</string>
+    <string name="omnipod_alert_low_reservoir">Lavt reservoar</string>
+    <string name="omnipod_alert_unknown_alert">Ukjent varsel</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Endring av basalprofil mislyktes. Insulinlevering kan bli sperret! Vennligst velg oppdater fra Omnipod fanen og velg gjenoppta levering hvis nødvendig.</string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Endring av basalprofil mislyktes. Insulinlevering kan bli sperret! Vennligst velg oppdater fra Omnipod fanen og velg gjenoppta levering hvis nødvendig.</string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Endring av basal profil mislyktes. Insulinlevering er sperret! Velg gjenoppta levering manuelt fra Omnipod-fanen.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Endring av midlertidig basal var mislykket. En tidligere midlertidig basal kan ha blitt kansellert. Oppdater statusen på Pod manuelt fra Omnipod fanen.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Endring av midlertidig basal kan ha vært mislykket. En tidligere midlertidig basal kan ha blitt kansellert. Oppdater statusen på Pod manuelt fra Omnipod fanen.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Innstilling av tid kan ha mislyktes. Insulinlevering kan være kansellert! Oppdater statusen manuelt fra fanen Omnipod og gjenoppta levering hvis nødvendig.</string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Endring av tid mislyktes. Insulinlevering er sperret! Velg gjenoppta levering manuelt fra Omnipod-fanen.</string>
+    <string name="omnipod_bolus_failed_uncertain">Kan ikke kontrollere om bolusdosen ble gitt. Kontroller at Pod\'en gir bolus ved å lytte etter klikkk. <b>Dersom du er sikker på at bolusen ikke var vellykket, bør du manuelt slette bolusoppføring fra behandlingene, selv om du klikker \'Avbryt bolus\' nå!</b></string>
+    <string name="omnipod_bolus_failed_uncertain_smb">Kan ikke bekrefte om SMB bolus (%1$.2f E) lyktes. <b>Hvis du er sikker på at Bolus ikke lyktes, bør du manuelt slette SMB-oppføringen fra behandlinger.</b></string>
+    <string name="omnipod_rl_stats">RL statistikk</string>
+    <string name="omnipod_read_pulse_log_short">Puls logg</string>
+    <string name="omnipod_pod_lot">LOT nummer</string>
+    <string name="omnipod_pod_tid">TID nummer</string>
+    <string name="omnipod_pod_firmware_version">Firmware Versjon</string>
+    <string name="omnipod_errors">Feil</string>
+    <string name="omnipod_cmd_basal_profile_not_set_is_same">Basalprofilen er den samme, så den blir ikke satt igjen.</string>
+    <string name="omnipod_custom_action_reset_rileylink">Tilbakestill RileyLink oppsett</string>
+    <string name="omnipod_time_or_timezone_change">Tids- og/eller tidssone endret på Pod</string>
+    <string name="omnipod_composite_time">%1$s og %2$s</string>
+    <string name="omnipod_time_ago">%1$s siden</string>
+    <string name="omnipod_waiting_for_rileylink_connection">Venter på RileyLink-tilkobling...</string>
+    <string name="omnipod_bolus_did_not_succeed">Bolus lyktes ikke</string>
+    <string name="omnipod_refresh">Oppdater</string>
+    <string name="omnipod_resume_delivery">Gjenoppta leveranse</string>
+    <string name="omnipod_error_pod_suspended">Pod suspendert</string>
+    <string name="omnipod_less_than_a_minute_ago">Mindre enn ett minutt siden</string>
+    <string name="omnipod_suspend_delivery_short">Suspender</string>
+    <string name="omnipod_cmd_pair_and_prime">Paring og klargjøring av insulintilførsel</string>
+    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Fyll kanyle og sett opp basalprofil</string>
+    <string name="omnipod_cmd_get_pulse_log">Hent pulslogg</string>
+    <string name="omnipod_uncertain_failure">Usikker feil</string>
+    <string name="omnipod_cancelled_old_tbr_failed_to_set_new">Annullerte gammel midlertidig basal, men klarte ikke å sette ny midlertidig basal</string>
+    <string name="omnipod_cmd_set_fake_suspended_tbr">Angi vilkårlig midlertidig basal fordi Pod er suspendert</string>
+    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Avbryt vilkårlig midlertidig basal som er opprettet fordi Pod var suspendert</string>
+    <string name="omnipod_uncertain">usikker</string>
+    <string name="omnipod_expiration_alerts_updated">Varselkonfigurasjon oppdatert i Pod</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Annen</string>
+    <string name="omnipod_preference_category_alerts">Varsler</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Bekreftelse pip</string>
+    <string name="omnipod_wizard_button_exit">Avslutt</string>
+    <string name="omnipod_wizard_button_previous">Foregående</string>
+    <string name="omnipod_wizard_button_next">Neste</string>
+    <string name="omnipod_wizard_button_finish">Fullfør</string>
+    <string name="omnipod_history_item_description">Beskrivelse</string>
+    <string name="omnipod_history_item_source">Kildekode</string>
+    <string name="omnipod_history_item_date">Dato</string>
+    <string name="omnipod_history_type">Type:</string>
+    <plurals name="omnipod_minutes">
+        <item quantity="one">%1$d minutt</item>
+        <item quantity="other">%1$d minutter</item>
+    </plurals>
+    <plurals name="omnipod_hours">
+        <item quantity="one">%1$d time</item>
+        <item quantity="other">%1$d timer</item>
+    </plurals>
+    <plurals name="omnipod_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dager</item>
+    </plurals>
 </resources>
diff --git a/omnipod/src/main/res/values-pl-rPL/strings.xml b/omnipod/src/main/res/values-pl-rPL/strings.xml
index 4a42a57b5f..ed20d6830e 100644
--- a/omnipod/src/main/res/values-pl-rPL/strings.xml
+++ b/omnipod/src/main/res/values-pl-rPL/strings.xml
@@ -5,17 +5,38 @@
     <string name="description_pump_omnipod">Integracja pompy Omnipod, wymaga RileyLink (z firmwarem 2.0 lub wyższym).</string>
     <!-- Omnipod Configuration -->
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_total_delivered">%1$.2f U</string>
     <string name="omnipod_reservoir_left">%1$.2f U zostało</string>
     <string name="omnipod_reservoir_over50">Ponad 50 U</string>
+    <string name="omnipod_warning">Ostrzeżenie</string>
+    <string name="omnipod_pod_status_running">W działaniu</string>
     <!-- Omnipod - Dialogs -->
     <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">To działanie nie jest możliwe.\n\n Musisz skonfigurować Omnipod przed uruchomieniem tego działania.</string>
     <string name="omnipod_error_illegal_init_action_type">Niedozwolone działanie PodInitActionType: %1$s</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Nieudana weryfikacja polecenia</string>
     <string name="omnipod_driver_error_unexpected_exception_type">Wystąpił nieoczekiwany błąd. Proszę zgłosić! (typ: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Komunikacja nie powiodła się: odebrano niepoprawne parametry wejściowe</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Komunikacja nie powiodła się: przekroczono limit czasu</string>
     <string name="omnipod_driver_error_communication_failed_unexpected_exception">Komunikacja nie powiodła się: wystąpił nieoczekiwany błąd. Proszę zgłosić!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Komunikacja nie powiodła się: weryfikacja integralności komunikatu nie powiodła się</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Komunikacja nie powiodła się: odebrano niepoprawny pakiet (komunikat) z Poda</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Komunikacja nie powiodła się: Pod jest w niewłaściwym stanie</string>
+    <string name="omnipod_driver_error_invalid_response">Komunikacja nie powiodła się: odebrano niepoprawną odpowiedź (pakiet) z Poda</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Komunikacja nie powiodła się: odebrano komunikat z niepoprawnym numerem kolejnym z Poda</string>
+    <string name="omnipod_driver_error_invalid_message_address">Komunikacja nie powiodła się: odebrano komunikat z niepoprawną adresacją z Poda</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Komunikacja nie powiodła się: nie powiodło się dekodowanie komunikatu z Poda</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Komunikacja nie powiodła się: synchronizacja unikalnej liczby nie powiodło się</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Komunikacja nie powiodła się: unikalna liczba nie jest zsynchronizowana</string>
+    <string name="omnipod_driver_error_not_enough_data">Komunikacja nie powiodła się: brak wystarczającej ilości danych odebranych z Poda</string>
+    <string name="omnipod_driver_error_pod_fault">Wykryto błąd Poda (%1$03d %2$s). Zdezaktywuj swój Pod i uruchom nowy</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Komunikacja nie powiodła się: Pod odpowiedział komunikatem o błędzie</string>
     <!-- Omnipod - Pod Mgmt -->
     <string name="omnipod_cmd_init_pod">Uruchom Pod</string>
     <string name="omnipod_cmd_deactivate_pod">Odłącz Pod</string>
+    <string name="omnipod_cmd_bolus_value">%1$.2f U</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f U, Węgl.=%2$.1f g</string>
     <string name="omnipod_cmd_pod_history_na">Historia Pod nie jest dostępna w tej chwili.</string>
     <string name="omnipod_init_pod_wizard_step1_title">Napełnij Pod</string>
     <string name="omnipod_init_pod_wizard_step2_title">Wypełnianie</string>
@@ -24,14 +45,47 @@
     <string name="omnipod_init_pod_wizard_step4_title">Wprowadzanie kaniuli</string>
     <string name="omnipod_init_pod_wizard_step4_action_header">Próba ustawienia początkowego planu bazowego i wprowadzeia kaniuli.\n\nKiedy wszystkie elementy są sprawdzane, można nacisnąć <b>Następny</b>.</string>
     <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod jest teraz aktywny.\n\nTwój plan dawki bazowej został zaprogramowany i wprowadzono kaniulę w miejsce wkłucia.\n\nSprawdź, czy kaniula została prawidłowo włożona i wymień swój Pod, jeśli czujesz, że nie.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Odłącz Pod</string>
     <string name="omnipod_remove_pod_wizard_step1_desc">\nNaciśnij <b>Następny</b> w celu odłączenia Poda.\n\n<b>Uwaga:</b> To spowoduje zawieszenie wszystkich dostaw insuliny i dezaktywację Poda.</string>
     <string name="omnipod_remove_pod_wizard_step2_title">Odłączanie Poda</string>
     <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod odłączony.\n\nProszę odkleić Pod od ciała i wyrzucić go.</string>
     <string name="omnipod_init_pod_pair_pod">Sparuj Pod</string>
     <string name="omnipod_init_pod_prime_pod">Wypełnij Pod</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Odłącz Pod</string>
     <!-- Omnipod - Base -->
+    <string name="omnipod_alert_finish_pairing_reminder">Przypomnienie o zakończeniu parowania</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Zakończ przypomnienie o konfiguracji</string>
+    <string name="omnipod_alert_expiration">Pod wkrótce straci ważność</string>
+    <string name="omnipod_alert_expiration_advisory">Pod wkrótce straci ważność</string>
     <string name="omnipod_alert_shutdown_imminent">Wyłączenie jest nieuchronne</string>
     <string name="omnipod_alert_low_reservoir">Niski poziom w zbiorniku</string>
     <string name="omnipod_alert_unknown_alert">Nieznany alarm</string>
+    <string name="omnipod_errors">Błędy</string>
+    <string name="omnipod_cmd_basal_profile_not_set_is_same">Profil bazy jest taki sam, więc nie zostanie ustawiony ponownie.</string>
+    <string name="omnipod_refresh">Odśwież</string>
+    <string name="omnipod_suspend_delivery_short">Wstrzymaj</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Inne</string>
+    <string name="omnipod_wizard_button_exit">Wyjście</string>
+    <string name="omnipod_wizard_button_next">Dalej</string>
+    <string name="omnipod_history_item_description">Opis</string>
+    <string name="omnipod_history_item_date">Data</string>
+    <plurals name="omnipod_minutes">
+        <item quantity="one">%1$d minuta</item>
+        <item quantity="few">%1$d minuty</item>
+        <item quantity="many">%1$d minut</item>
+        <item quantity="other">%1$d minut</item>
+    </plurals>
+    <plurals name="omnipod_hours">
+        <item quantity="one">%1$d godzina</item>
+        <item quantity="few">%1$d godziny</item>
+        <item quantity="many">%1$d godzin</item>
+        <item quantity="other">%1$d godzin</item>
+    </plurals>
+    <plurals name="omnipod_days">
+        <item quantity="one">%1$d dzień</item>
+        <item quantity="few">%1$d dni</item>
+        <item quantity="many">%1$d dni</item>
+        <item quantity="other">%1$d dni</item>
+    </plurals>
 </resources>
diff --git a/omnipod/src/main/res/values-pt-rPT/strings.xml b/omnipod/src/main/res/values-pt-rPT/strings.xml
index a697ec43c1..86bd8785b8 100644
--- a/omnipod/src/main/res/values-pt-rPT/strings.xml
+++ b/omnipod/src/main/res/values-pt-rPT/strings.xml
@@ -5,16 +5,28 @@
     <string name="description_pump_omnipod">Integração de bomba para Omnipod, requer RileyLink (com pelo menos firmware 2.0) dispositivo.</string>
     <!-- Omnipod Configuration -->
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Gestão Pod</string>
+    <string name="omnipod_pod_status">Estado do Pod</string>
+    <string name="omnipod_total_delivered_label">Total Administrado</string>
     <string name="omnipod_total_delivered">%1$.2f U</string>
     <string name="omnipod_reservoir_left">%1$.2f U restante</string>
     <string name="omnipod_reservoir_over50">Mais de 50 U</string>
+    <string name="omnipod_pod_address">Endereço do Pod</string>
+    <string name="omnipod_pod_expiry">Pod Expira</string>
     <string name="omnipod_warning">Aviso</string>
+    <string name="omnipod_pod_status_no_active_pod">Nenhum Pod Activo</string>
     <string name="omnipod_pod_status_running">A correr</string>
+    <string name="omnipod_pod_status_suspended">Suspenso</string>
+    <string name="omnipod_pod_status_pod_fault">Falha no Pod</string>
+    <string name="omnipod_pod_status_inactive">Inactivo</string>
+    <string name="omnipod_pod_status_pod_fault_description">Falha no Pod: %1$s %2$s</string>
+    <string name="omnipod_acknowledge_active_alerts_short">Reco Alertas</string>
     <!-- Omnipod - Dialogs -->
     <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <!-- Omnipod - Error -->
     <string name="omnipod_error_operation_not_possible_no_configuration">A operação não é possível.\n\nPrecisa configurar o Omnipod primeiro, antes de pode usar esta operação.</string>
     <string name="omnipod_error_illegal_init_action_type">PodInitActionType Ilegal: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Nenhum Pod Activo</string>
     <string name="omnipod_driver_error_setup_action_verification_failed">A verificação do comando falhou</string>
     <string name="omnipod_driver_error_unexpected_exception_type">Ocorreu um erro inesperado. Por favor reporte! (digite: %1$s).</string>
     <string name="omnipod_driver_error_invalid_parameters">Falha na comunicação: foram recebidos parâmetros de entrada inválidos</string>
@@ -33,8 +45,25 @@
     <string name="omnipod_driver_error_pod_fault">Uma falha de Pod (%1$03d %2$s) foi detectada. Por favor, desactive o Pod e inicie um novo</string>
     <string name="omnipod_driver_error_pod_returned_error_response">Falha na comunicação: o Pod devolveu uma resposta de erro</string>
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Gestão Pod</string>
     <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
     <string name="omnipod_cmd_deactivate_pod">Desactivar Pod</string>
+    <string name="omnipod_cmd_discard_pod">Descartar Pod</string>
+    <string name="omnipod_cmd_pod_history">Histórico do Pod</string>
+    <string name="omnipod_cmd_set_bolus">Definir Bólus</string>
+    <string name="omnipod_cmd_cancel_bolus">Cancelar Bólus</string>
+    <string name="omnipod_cmd_set_tbr">Definir Basal Temporária</string>
+    <string name="omnipod_cmd_cancel_tbr_by_driver">Cancelar Basal Temporária (intermanente pelo controlador)</string>
+    <string name="omnipod_cmd_cancel_tbr">Cancelar Basal Temporária</string>
+    <string name="omnipod_cmd_set_basal_schedule">Definir Programação Basal</string>
+    <string name="omnipod_cmd_get_pod_status">Obter Estado do Pod</string>
+    <string name="omnipod_cmd_get_pod_info">Obter Info do Pod</string>
+    <string name="omnipod_cmd_set_time">Definir hora</string>
+    <string name="omnipod_cmd_configure_alerts">Configurar Alertas</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Reconhecer Alertas</string>
+    <string name="omnipod_cmd_suspend_delivery">Suspender Administração</string>
+    <string name="omnipod_cmd_resume_delivery">Retomar Administração</string>
+    <string name="omnipod_cmd_unknown_entry">Entrada Desconhecida</string>
     <string name="omnipod_cmd_bolus_value">%1$.2f U</string>
     <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f U, HC=%2$.1f g</string>
     <string name="omnipod_cmd_pod_history_na">Histórico do Pod não disponível no momento.</string>
@@ -52,6 +81,9 @@
     <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod desactivado.\n\nPor favor, remova o Pod do seu corpo e descarte-o.</string>
     <string name="omnipod_init_pod_pair_pod">Emparelhar Pod</string>
     <string name="omnipod_init_pod_prime_pod">Purgar Pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Preencher Canula</string>
+    <string name="omnipod_init_pod_set_basal_profile">Definir Perfil Basal</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Cancelar Administração</string>
     <string name="omnipod_deactivate_pod_deactivate_pod">Desactivar Pod</string>
     <!-- Omnipod - Base -->
     <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
@@ -62,17 +94,27 @@
     <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
     <string name="omnipod_alert_unknown_alert">Alerta desconhecido</string>
     <string name="omnipod_rl_stats">Estatísticas RL</string>
+    <string name="omnipod_pod_firmware_version">Versão do Firmware</string>
     <string name="omnipod_errors">Erros</string>
     <string name="omnipod_cmd_basal_profile_not_set_is_same">Perfil Basal é o mesmo, então não será definido novamente.</string>
+    <string name="omnipod_composite_time">%1$s e %2$s</string>
+    <string name="omnipod_time_ago">%1$s atrás</string>
     <string name="omnipod_refresh">Actualizar</string>
+    <string name="omnipod_resume_delivery">Retomar Administração</string>
+    <string name="omnipod_error_pod_suspended">Pod suspenso</string>
     <string name="omnipod_suspend_delivery_short">Suspender</string>
+    <string name="omnipod_cmd_pair_and_prime">Emparelhar e Purgar</string>
+    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Preencher canula e definir perfil basal</string>
     <string name="omnipod_uncertain_failure">Falha incerta</string>
+    <string name="omnipod_uncertain">incerto</string>
     <string name="omnipod_preference_category_rileylink">RileyLink</string>
     <string name="omnipod_preference_category_other">Outro</string>
     <string name="omnipod_preference_category_alerts">Alertas</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Beeps de confirmação</string>
     <string name="omnipod_wizard_button_exit">Sair</string>
     <string name="omnipod_wizard_button_previous">Anterior</string>
     <string name="omnipod_wizard_button_next">Seguinte</string>
+    <string name="omnipod_wizard_button_finish">Terminar</string>
     <string name="omnipod_history_item_description">Descrição</string>
     <string name="omnipod_history_item_source">Fonte</string>
     <string name="omnipod_history_item_date">Data</string>
diff --git a/omnipod/src/main/res/values/colors.xml b/omnipod/src/main/res/values/colors.xml
index 456448446a..078411269a 100644
--- a/omnipod/src/main/res/values/colors.xml
+++ b/omnipod/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="black_overlay">#66000000</color>
-    <color name="ribbonWarning">#f4d700</color>
+    <color name="omnipodWizardProgressBar">#0099CC</color>
+    <color name="review_green">#ff669900</color>
 </resources>
\ No newline at end of file
diff --git a/omnipod/src/main/res/values/dimens.xml b/omnipod/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..fba59bf307
--- /dev/null
+++ b/omnipod/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="omnipod_wizard_vertical_spacing">10dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml
index 73b3871bae..62ab50b16c 100644
--- a/omnipod/src/main/res/values/strings.xml
+++ b/omnipod/src/main/res/values/strings.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- Omnipod -->
-
-    <!-- Omnipod - Base -->
-    <string name="omnipod_name" translatable="false">Omnipod</string>
-    <string name="omnipod_name_short" translatable="false">Pod</string>
-    <string name="description_pump_omnipod">Pump integration for Omnipod, requires RileyLink (with at least 2.0 firmware) device.</string>
-
-    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Keys -->
+    <string name="key_omnipod_pod_state" translatable="false">AAPS.Omnipod.pod_state</string>
+    <string name="key_omnipod_current_bolus" translatable="false">AAPS.Omnipod.current_bolus</string>
     <string name="key_omnipod_bolus_beeps_enabled" translatable="false">AAPS.Omnipod.bolus_beeps_enabled</string>
     <string name="key_omnipod_basal_beeps_enabled" translatable="false">AAPS.Omnipod.basal_beeps_enabled</string>
     <string name="key_omnipod_smb_beeps_enabled" translatable="false">AAPS.Omnipod.smb_beeps_enabled</string>
@@ -20,6 +15,22 @@
     <string name="key_omnipod_expiration_reminder_hours_before_shutdown" translatable="false">AAPS.Omnipod.expiration_reminder_hours_before_shutdown</string>
     <string name="key_omnipod_low_reservoir_alert_enabled" translatable="false">AAPS.Omnipod.low_reservoir_alert_enabled</string>
     <string name="key_omnipod_low_reservoir_alert_units" translatable="false">AAPS.Omnipod.low_reservoir_alert_units</string>
+    <string name="key_omnipod_tbrs_set" translatable="false">AAPS.Omnipod.tbrs_set</string>
+    <string name="key_omnipod_std_boluses_delivered" translatable="false">AAPS.Omnipod.std_boluses_delivered</string>
+    <string name="key_omnipod_smb_boluses_delivered" translatable="false">AAPS.Omnipod.smb_boluses_delivered</string>
+
+    <!-- Omnipod - Non translatable -->
+    <string name="omnipod_name" translatable="false">Omnipod</string>
+    <string name="omnipod_name_short" translatable="false">Pod</string>
+    <string name="omnipod_frequency" translatable="false">Omnipod (433.91 MHz)</string>
+    <string name="omnipod_lot" translatable="false">LOT</string>
+    <string name="omnipod_tid" translatable="false">TID</string>
+    <string name="omnipod_firmware_version_value" translatable="false">PM %1$s / PI %2$s</string>
+    <string name="omnipod_time_with_timezone" translatable="false">%1$s (%2$s)</string>
+    <string name="omnipod_two_strings_concatenated_by_colon" translatable="false">%1$s: %2$s</string>
+    <string name="omnipod_overview_last_bolus_value" translatable="false">%1$.2f %2$s (%3$s)</string>
+
+    <!-- Omnipod - Preferences -->
     <string name="omnipod_config_bolus_beeps_enabled">Bolus beeps enabled</string>
     <string name="omnipod_config_basal_beeps_enabled">Basal beeps enabled</string>
     <string name="omnipod_config_smb_beeps_enabled">SMB beeps enabled</string>
@@ -31,20 +42,14 @@
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Hours before shutdown</string>
     <string name="omnipod_config_low_reservoir_alert_enabled">Low reservoir alert enabled</string>
     <string name="omnipod_config_low_reservoir_alert_units">Number of units</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Other</string>
+    <string name="omnipod_preference_category_alerts">Alerts</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Confirmation beeps</string>
 
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_moments_ago">Moments ago</string>
-    <string name="omnipod_pod_mgmt">Pod mgmt</string>
-    <string name="omnipod_pod_status">Pod status</string>
-    <string name="omnipod_total_delivered_label">Total delivered</string>
-    <string name="omnipod_total_delivered">%1$.2f U</string>
-    <string name="omnipod_reservoir_left">%1$.2f U left</string>
-    <string name="omnipod_reservoir_over50">Over 50 U</string>
-    <string name="omnipod_pod_address">Pod address</string>
-    <string name="omnipod_pod_expiry">Pod expires</string>
-    <string name="omnipod_warning">Warning</string>
+    <!-- Omnipod - Pod Status -->
     <string name="omnipod_pod_status_no_active_pod">No active Pod</string>
-    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Setup in progress (waiting for pair and prime)</string>
+    <string name="omnipod_pod_status_waiting_for_activation">Setup in progress (waiting for Pod activation)</string>
     <string name="omnipod_pod_status_waiting_for_cannula_insertion">Setup in progress (waiting for cannula insertion)</string>
     <string name="omnipod_pod_status_running">Running</string>
     <string name="omnipod_pod_status_suspended">Suspended</string>
@@ -52,46 +57,86 @@
     <string name="omnipod_pod_status_activation_time_exceeded">Activation time exceeded</string>
     <string name="omnipod_pod_status_inactive">Inactive</string>
     <string name="omnipod_pod_status_pod_fault_description">Pod fault: %1$s %2$s</string>
-    <string name="omnipod_pod_active_alerts">Active Pod alerts</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Ack alerts</string>
-    <string name="omnipod_last_bolus" translatable="false">%1$.2f %2$s (%3$s)</string>
-    <string name="omnipod_temp_basal" translatable="false">%1$.2fU/h @%2$s (%3$d/%4$d minutes)</string>
 
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Finish pairing reminder</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Finish setup reminder</string>
+    <string name="omnipod_alert_expiration">Pod will expire soon</string>
+    <string name="omnipod_alert_expiration_advisory">Pod will expire soon</string>
+    <string name="omnipod_alert_shutdown_imminent">Shutdown is imminent</string>
+    <string name="omnipod_alert_low_reservoir">Low reservoir</string>
+    <string name="omnipod_alert_unknown_alert">Unknown alert</string>
 
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_title">Pod history</string>
+    <string name="omnipod_history_item_description">Description</string>
+    <string name="omnipod_history_item_source">Source</string>
+    <string name="omnipod_history_item_date">Date</string>
+    <string name="omnipod_history_type">Type:</string>
+    <string name="omnipod_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_history_bolus_value_with_carbs">%1$.2f U, CH=%2$.1f g</string>
+    <string name="omnipod_history_tbr_value">Rate: %1$.2f U, duration: %2$d minutes</string>
 
     <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Warning</string>
     <string name="omnipod_error_rileylink_address_invalid">RileyLink address invalid.</string>
     <string name="omnipod_error_operation_not_possible_no_configuration">Operation is not possible.\n\nYou need to configure Omnipod first, before you can use this operation.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Operation is not possible.\n\n You need to wait a few minutes, until AAPS tries to set basal profile for first time.</string>
-    <string name="omnipod_error_illegal_init_action_type">Illegal PodInitActionType: %1$s</string>
     <string name="omnipod_error_pod_not_attached">No active Pod</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Command verification failed</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">An unexpected error occurred. Please report! (type: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Communication failed: received invalid input parameters</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Communication failed: timeout</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Communication failed: an unexpected error occurred. Please report!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Communication failed: message integrity verification failed</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Communication failed: received an invalid packet from the Pod</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Communication failed: the Pod is in a wrong state</string>
-    <string name="omnipod_driver_error_invalid_response">Communication failed: received an invalid response from the Pod</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Communication failed: received a message with an invalid sequence number from the Pod</string>
-    <string name="omnipod_driver_error_invalid_message_address">Communication failed: received a message with an invalid address from the Pod</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Communication failed: failed to decode message from the Pod</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Communication failed: nonce resync failed</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Communication failed: nonce out of sync</string>
-    <string name="omnipod_driver_error_not_enough_data">Communication failed: not enough data received from the Pod</string>
-    <string name="omnipod_driver_error_pod_fault">A Pod fault (%1$03d %2$s) has been detected. Please deactivate your Pod and start a new one</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Communication failed: the Pod returned an error response</string>
+    <string name="omnipod_error_unexpected_exception">An unexpected error occurred. Please report! (%1$s: %2$s).</string>
+    <string name="omnipod_error_crc_mismatch">Communication failed: message integrity verification failed</string>
+    <string name="omnipod_error_invalid_packet_type">Communication failed: received an invalid packet from the Pod</string>
+    <string name="omnipod_error_invalid_progress_state">Communication failed: the Pod is in a wrong state</string>
+    <string name="omnipod_error_invalid_response">Communication failed: received an invalid response from the Pod</string>
+    <string name="omnipod_error_invalid_message_sequence_number">Communication failed: received a message with an invalid sequence number from the Pod</string>
+    <string name="omnipod_error_invalid_message_address">Communication failed: received a message with an invalid address from the Pod</string>
+    <string name="omnipod_error_message_decoding_failed">Communication failed: failed to decode message from the Pod</string>
+    <string name="omnipod_error_nonce_resync_failed">Communication failed: nonce resync failed</string>
+    <string name="omnipod_error_nonce_out_of_sync">Communication failed: nonce out of sync</string>
+    <string name="omnipod_error_not_enough_data">Communication failed: not enough data received from the Pod</string>
+    <string name="omnipod_error_pod_fault">A Pod fault (%1$03d %2$s) has been detected. Please deactivate your Pod and start a new one</string>
+    <string name="omnipod_error_pod_returned_error_response">Communication failed: the Pod returned an error response</string>
+    <string name="omnipod_error_communication_failed_no_response_from_riley_link">No response from RileyLink</string>
+    <string name="omnipod_error_communication_failed_riley_link_interrupted">RileyLink interrupted</string>
+    <string name="omnipod_error_communication_failed_no_response_from_pod">No response from Pod</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Setting basal profile failed. Delivery might be suspended! Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.</string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Setting basal profile might have failed. Delivery might be suspended! Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.</string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Setting basal profile failed. Delivery is suspended! Please manually resume delivery from the Omnipod tab.</string>
+    <string name="omnipod_error_set_basal_failed">Setting basal profile failed.</string>
+    <string name="omnipod_error_cancel_temp_basal_failed_uncertain">Cancelling temp basal might have failed. Please manually refresh the Pod status from the Omnipod tab.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Setting temp basal failed. If a temp basal was previously running, it might have been cancelled. Please manually refresh the Pod status from the Omnipod tab.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Setting temp might have basal failed. If a temp basal was previously running, it has been cancelled. Please manually refresh the Pod status from the Omnipod tab.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Setting time might have failed. Delivery might be suspended! Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.</string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Setting time failed. Delivery is suspended! Please manually resume delivery from the Omnipod tab.</string>
+    <string name="omnipod_error_failed_to_set_profile_empty_profile">Failed to set basal profile: received an empty profile. Make sure to activate your basal profile.</string>
+    <string name="omnipod_error_set_initial_basal_schedule_no_profile">No basal profile is active. Make sure to activate your basal profile.</string>
+    <string name="omnipod_error_unknown_custom_command">Unknown custom command: %1$s</string>
+    <string name="omnipod_error_failed_to_read_pulse_log">Failed to read Pulse Log</string>
+    <string name="omnipod_error_failed_to_refresh_status">Failed to refresh status</string>
+    <string name="omnipod_error_failed_to_acknowledge_alerts">Failed to acknowledge alerts</string>
+    <string name="omnipod_error_failed_to_suspend_delivery">Failed to suspend delivery</string>
+    <string name="omnipod_error_failed_to_set_time">Failed to set time</string>
+    <string name="omnipod_error_failed_to_resume_delivery">Failed to resume delivery</string>
+    <string name="omnipod_error_automatic_time_or_timezone_change_failed">Failed to automatically change time on the Pod. You should manually synchronise the time on the Omnipod tab.</string>
+    <string name="omnipod_error_bolus_failed_uncertain">Unable to verify whether the bolus succeeded. Please manually verify that your Pod is bolusing by listening to clicks. <b>If you are sure that the bolus didn\'t succeed, you should manually delete the bolus entry from Treatments, even if you click \'Cancel bolus\' now!</b></string>
+    <string name="omnipod_error_bolus_failed_uncertain_smb">Unable to verify whether SMB bolus (%1$.2f U) succeeded. <b>If you are sure that the Bolus didn\'t succeed, you should manually delete the SMB entry from Treatments.</b></string>
+    <string name="omnipod_error_bolus_did_not_succeed">Bolus did not succeed.</string>
+    <string name="omnipod_error_failed_to_initialize_pod">Failed to initialize the Pod</string>
+    <string name="omnipod_error_failed_to_insert_cannula">Failed to insert cannula</string>
+    <string name="omnipod_error_pod_fault_activation_time_exceeded">The Pod\'s activation time has been exceeded. This Pod can no longer be activated.</string>
 
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Pod management</string>
-    <string name="omnipod_cmd_init_pod">Init Pod</string>
+    <!-- Omnipod - Confirmation -->
+    <string name="omnipod_confirmation">Confirmation</string>
+    <string name="omnipod_confirmation_time_or_timezone_change">Time and/or time zone changed on the Pod.</string>
+    <string name="omnipod_confirmation_expiration_alerts_updated">Alert configuration has been updated in the Pod.</string>
+    <string name="omnipod_confirmation_time_on_pod_updated">The time on the Pod has been updated.</string>
+    <string name="omnipod_confirmation_suspended_delivery">All insulin delivery has been suspended.</string>
+    <string name="omnipod_confirmation_acknowledged_alerts">Active alerts have been acknowledged.</string>
+    <string name="omnipod_confirmation_delivery_resumed">Insulin delivery has been resumed.</string>
+    <string name="omnipod_confirmation_pod_suspended">Pod suspended</string>
+
+    <!-- Omnipod - Commands -->
     <string name="omnipod_cmd_deactivate_pod">Deactivate Pod</string>
     <string name="omnipod_cmd_discard_pod">Discard Pod</string>
-    <string name="omnipod_cmd_pod_history">Pod history</string>
     <string name="omnipod_cmd_set_bolus">Set bolus</string>
     <string name="omnipod_cmd_cancel_bolus">Cancel bolus</string>
     <string name="omnipod_cmd_set_tbr">Set temporary basal</string>
@@ -106,91 +151,99 @@
     <string name="omnipod_cmd_suspend_delivery">Suspend delivery</string>
     <string name="omnipod_cmd_resume_delivery">Resume delivery</string>
     <string name="omnipod_cmd_unknown_entry">Unknown entry</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f U, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Rate: %1$.2f U, duration: %2$d min</string>
-    <string name="omnipod_cmd_discard_pod_desc">If you press <b>OK</b>, the Pod state will be forcibly reset and you will not be able to communicate with the Pod anymore. Do this only if you can not communicate with the Pod anymore. If you can still communicate with the Pod, please use the <b>Deactivate Pod</b> option.\n\nIf you wish to proceed, please make sure to also remove the Pod from your body.</string>
-    <string name="omnipod_cmd_pod_history_na">Pod History not available at the moment.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Fill the Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nFill the new Pod with enough insulin for 3 days.\n\nListen for two beeps from the Pod during the filling process. These indicate that the minimum amount of 85U has been inserted. Be sure to completely empty the fill syringe, even after hearing the two beeps.\n\nAfter filling the Pod, please press <b>Next</b>.\n\n<b>Note:</b> do not remove the Pod\'s needle cap at this time.\n<b>Note:</b> please place the RileyLink in an upright position and place the Pod a few inches away.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Priming</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Trying to pair with the new Pod and prime it.\n\nWhen all items are checked, you can press <b>Next</b>.\n\n<b>Note:</b> please place the RileyLink in an upright position and place the Pod a few inches away it.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Attach the Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPrepare the infusion site. Remove the Pod\'s needle cap and adhesive backing and attach the Pod to the infusion site.\n\nIf the cannula sticks out, please press <b>Cancel</b> and discard your Pod.\n\nPress <b>Next</b> to insert the cannula and begin basal delivery.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Inserting cannula</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Trying to set initial basal schedule and insert the cannula.\n\nWhen all items are checked, you can press <b>Next</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Pod info</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nThe Pod is now active.\n\nYour basal schedule has been programmed and the cannula has been inserted.\n\nPlease verify that the cannula has been inserted correctly and replace your Pod if you feel hasn\'t.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Deactivate Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nPress <b>Next</b> to deactivate the Pod.\n\n<b>Note:</b> This will suspend all insulin delivery and deactivate the Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Deactivating the Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Deactivating the Pod.\n\nWhen all items are checked, you can press <b>Next</b>.\n\n<b>Note:</b> If deactivating continuously fails, please press <b>Cancel</b> and use the <b>Discard Pod</b> option to forcibly reset the Pod state.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deactivated.\n\nPlease remove the Pod from your body and discard it.</string>
-    <string name="omnipod_init_pod_pair_pod">Pair Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Prime Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Fill cannula</string>
-    <string name="omnipod_init_pod_set_basal_profile">Set basal profile</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Cancel delivery</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Deactivate Pod</string>
-
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Finish pairing reminder</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Finish setup reminder</string>
-    <string name="omnipod_alert_expiration">Pod will expire soon</string>
-    <string name="omnipod_alert_expiration_advisory">Pod will expire soon</string>
-    <string name="omnipod_alert_shutdown_imminent">Shutdown is imminent</string>
-    <string name="omnipod_alert_low_reservoir">Low reservoir</string>
-    <string name="omnipod_alert_unknown_alert">Unknown alert</string>
-    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Setting basal profile failed. Delivery might be suspended! Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.</string>
-    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Setting basal profile might have failed. Delivery might be suspended! Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.</string>
-    <string name="omnipod_error_set_basal_failed_delivery_suspended">Setting basal profile failed. Delivery is suspended! Please manually resume delivery from the Omnipod tab.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Setting temp basal failed. If a temp basal was previously running, it might have been cancelled. Please manually refresh the Pod status from the Omnipod tab.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Setting temp might have basal failed. If a temp basal was previously running, it has been cancelled. Please manually refresh the Pod status from the Omnipod tab.</string>
-    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Setting time might have failed. Delivery might be suspended! Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.</string>
-    <string name="omnipod_error_set_time_failed_delivery_suspended">Setting time failed. Delivery is suspended! Please manually resume delivery from the Omnipod tab.</string>
-    <string name="omnipod_bolus_failed_uncertain">Unable to verify whether the bolus succeeded. Please manually verify that your Pod is bolusing by listening to clicks. <b>If you are sure that the bolus didn\'t succeed, you should manually delete the bolus entry from Treatments, even if you click \'Cancel bolus\' now!</b></string>
-    <string name="omnipod_bolus_failed_uncertain_smb">Unable to verify whether SMB bolus (%1$.2f U) succeeded. <b>If you are sure that the Bolus didn\'t succeed, you should manually delete the SMB entry from Treatments.</b></string>
-    <string name="omnipod_rl_stats">RL stats</string>
-    <string name="omnipod_read_pulse_log_short">Pulse log</string>
-    <string name="omnipod_pod_lot">LOT</string>
-    <string name="omnipod_pod_tid">TID</string>
-    <string name="omnipod_pod_firmware_version">Firmware version</string>
-    <string name="omnipod_pod_firmware_version_value" translatable="false">PM %1$s / PI %2$s</string>
-    <string name="omnipod_errors">Errors</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Basal profile is the same, so it will not be set again.</string>
-    <string name="omnipod_custom_action_reset_rileylink">Reset RileyLink config</string>
-    <string name="omnipod_time_or_timezone_change">Time and/or time zone changed on the Pod</string>
-    <string name="omnipod_composite_time">%1$s and %2$s</string>
-    <string name="omnipod_time_ago">%1$s ago</string>
-    <string name="omnipod_waiting_for_rileylink_connection">Waiting for RileyLink connection...</string>
-    <string name="omnipod_bolus_did_not_succeed">Bolus did not succeed</string>
-    <string name="omnipod_refresh">Refresh</string>
-    <string name="omnipod_resume_delivery">Resume delivery</string>
-    <string name="omnipod_error_pod_suspended">Pod suspended</string>
-    <string name="omnipod_less_than_a_minute_ago">Less than a minute ago</string>
-    <string name="omnipod_suspend_delivery_short">Suspend</string>
-    <string name="omnipod_cmd_pair_and_prime">Pair and prime</string>
-    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Fill cannula and set basal profile</string>
-    <string name="omnipod_cmd_get_pulse_log">Get pulse log</string>
-    <string name="omnipod_uncertain_failure">Uncertain failure</string>
-    <string name="omnipod_cancelled_old_tbr_failed_to_set_new">Cancelled the old temporary basal, but failed to set new temporary basal</string>
+    <string name="omnipod_cmd_initialize_pod">Initialize Pod</string>
+    <string name="omnipod_cmd_insert_cannula">Insert cannula</string>
+    <string name="omnipod_cmd_read_pulse_log">Read pulse log</string>
     <string name="omnipod_cmd_set_fake_suspended_tbr">Set fake temporary basal because the Pod is suspended</string>
     <string name="omnipod_cmd_cancel_fake_suspended_tbr">Cancel fake temporary basal that was created because the Pod was suspended</string>
-    <string name="omnipod_uncertain">uncertain</string>
-    <string name="omnipod_expiration_alerts_updated">Alert configuration updated in Pod</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Other</string>
-    <string name="omnipod_preference_category_alerts">Alerts</string>
-    <string name="omnipod_preference_category_confirmation_beeps">Confirmation beeps</string>
-    <string name="omnipod_wizard_button_exit">Exit</string>
-    <string name="omnipod_wizard_button_previous">Previous</string>
-    <string name="omnipod_wizard_button_next">Next</string>
-    <string name="omnipod_wizard_button_finish">Finish</string>
-    <string name="omnipod_history_item_description">Description</string>
-    <string name="omnipod_history_item_source">Source</string>
-    <string name="omnipod_history_item_date">Date</string>
-    <string name="omnipod_history_type">Type:</string>
 
+    <!-- Omnipod - Pod Management -->
+    <string name="omnipod_pod_management_title">Pod management</string>
+    <string name="omnipod_pod_management_waiting_for_rileylink_connection">Waiting for RileyLink connection…</string>
+    <string name="omnipod_pod_management_button_activate_pod">Activate Pod</string>
+    <string name="omnipod_pod_management_button_deactivate_pod">Deactivate Pod</string>
+    <string name="omnipod_pod_management_button_discard_pod">Discard Pod</string>
+    <string name="omnipod_pod_management_button_pod_history">Pod history</string>
+    <string name="omnipod_pod_management_discard_pod_state_confirmation">If you discard the Pod, you will not be able to communicate with it anymore. You should only do this when all communication with the Pod persistently fails. If you can still communicate with the Pod, please use the <b>Deactivate Pod</b> option.\n\nIf you wish to proceed, please make sure to remove the Pod from your body!</string>
+
+    <!-- Omnipod - Wizard common -->
+    <string name="omnipod_wizard_button_cancel">Cancel</string>
+    <string name="omnipod_wizard_button_finish">Finish</string>
+    <string name="omnipod_wizard_button_next">Next</string>
+    <string name="omnipod_wizard_button_retry">Retry</string>
+    <string name="omnipod_wizard_button_deactivate_pod">Deactivate Pod</string>
+    <string name="omnipod_wizard_button_discard_pod">Discard Pod</string>
+    <string name="omnipod_wizard_exit_confirmation_text">You haven\'t completed all steps yet. Are you sure you want to exit?</string>
+    <string name="omnipod_wizard_exit_confirmation_title">Exit</string>
+
+    <!-- Omnipod - Pod activation Wizard -->
+    <string name="omnipod_pod_activation_wizard_fill_pod_title">Fill Pod</string>
+    <string name="omnipod_pod_activation_wizard_fill_pod_text">Fill a new Pod with enough insulin for 3 days.\n\nListen for two beeps from the Pod during the filling process. These indicate that the minimum amount of 85U has been inserted. Be sure to completely empty the fill syringe, even after hearing the two beeps.\n\nAfter filling the Pod, please press <b>Next</b>.\n\n<b>Note:</b> do not remove the Pod\'s needle cap at this time.\n<b>Note:</b> please place the RileyLink in an upright position and place the Pod a few inches away from it.</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_title">Initialize Pod</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_text">Trying to pair with the new Pod and prime it.\n\nWhen the initialization process has successfully been completed, you can press <b>Next</b>.\n\n<b>Note:</b> please place the RileyLink in an upright position and place the Pod a few inches away from it.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_title">Attach Pod</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_text">Prepare the infusion site. Remove the Pod\'s needle cap and adhesive backing and attach the Pod to the infusion site.\n\nIf the cannula sticks out, please press <b>Cancel</b> and discard your Pod.\n\nPress <b>Next</b> to insert the cannula and begin basal delivery.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">When you press <b>OK</b>, the cannula will be inserted. Make sure that you have attached the Pod to the infusion site.</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_title">Insert cannula</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_text">Trying to set initial basal schedule and insert the cannula.\n\nWhen the cannula has successfully been inserted, you can press <b>Next</b>.</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_title">Pod activated</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_text">The new Pod is now active.\n\nYour basal schedule has been programmed and the cannula has been inserted.\n\nPlease verify that the cannula has been inserted correctly and change your Pod if you think it has not.</string>
+
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_title">Deactivate Pod</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_text">Press <b>Next</b> to deactivate the Pod.\n\n<b>Note:</b> This will suspend all insulin delivery and deactivate the Pod.</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_title">Deactivating Pod</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_text">Deactivating the Pod.\n\nWhen deactivation has completed successfully, you can press <b>Next</b>.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_title">Pod deactivated</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_text">Your Pod has been deactivated.\n\nPlease remove the Pod from your body and recycle it.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_discarded_title">Pod discarded</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_discarded_text">The Pod state has been discarded. Insulin delivery has not been suspended because the Pod has not been properly deactivated!\n\nPlease remove the Pod from your body and recycle it.</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod_confirmation">If you discard the Pod, you will not be able to communicate with it anymore. You should only do this when all communication with the Pod persistently fails. Are you sure you want to discard the Pod?</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod">Discard Pod</string>
+
+    <!-- Omnipod - Overview -->
+    <string name="omnipod_overview_button_set_time">Set time</string>
+    <string name="omnipod_overview_button_suspend_delivery">Suspend</string>
+    <string name="omnipod_overview_button_riley_link_stats">RL stats</string>
+    <string name="omnipod_overview_button_read_pulse_log">Pulse log</string>
+    <string name="omnipod_overview_button_refresh">Refresh</string>
+    <string name="omnipod_overview_button_resume_delivery">Resume delivery</string>
+    <string name="omnipod_overview_button_pod_management">Pod mgmt</string>
+    <string name="omnipod_overview_button_acknowledge_active_alerts">Ack alerts</string>
+    <string name="omnipod_overview_pod_status">Pod status</string>
+    <string name="omnipod_overview_total_delivered">Total delivered</string>
+    <string name="omnipod_overview_total_delivered_value">%1$.2f U</string>
+    <string name="omnipod_overview_pod_address">Pod address</string>
+    <string name="omnipod_overview_pod_expiry_date">Pod expires</string>
+    <string name="omnipod_overview_last_connection">Last connection</string>
+    <string name="omnipod_overview_last_bolus">Last bolus</string>
+    <string name="omnipod_overview_temp_basal_rate">Temp basal rate</string>
+    <string name="omnipod_overview_base_basal_rate">Base basal rate</string>
+    <string name="omnipod_overview_reservoir">Reservoir</string>
+    <string name="omnipod_overview_pod_active_alerts">Active Pod alerts</string>
+    <string name="omnipod_overview_firmware_version">Firmware version</string>
+    <string name="omnipod_overview_time_on_pod">Time on Pod</string>
+    <string name="omnipod_overview_temp_basal_value">%1$.2fU/h @%2$s (%3$d/%4$d minutes)</string>
+    <string name="omnipod_overview_reservoir_value">%1$.2f U left</string>
+    <string name="omnipod_overview_reservoir_value_over50">Over 50 U left</string>
+    <string name="omnipod_overview_errors">Errors</string>
+
+    <!-- Omnipod - Other -->
+    <string name="omnipod_pump_description">Pump integration for Omnipod, requires RileyLink (with at least 2.0 firmware) device.</string>
+    <string name="omnipod_custom_action_reset_rileylink">Reset RileyLink config</string>
+    <string name="omnipod_uncertain">uncertain</string>
+    <string name="omnipod_pulse_log">Pulse log</string>
+    <string name="omnipod_pulse_log_value">Pulse Log (copied to clipboard)</string>
+    <string name="omnipod_yes">Yes</string>
+    <string name="omnipod_no">No</string>
+    <string name="omnipod_ok">OK</string>
+    <string name="omnipod_cancel">Cancel</string>
+
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">Moments ago</string>
+    <string name="omnipod_less_than_a_minute_ago">Less than a minute ago</string>
+    <string name="omnipod_composite_time">%1$s and %2$s</string>
+    <string name="omnipod_time_ago">%1$s ago</string>
     <plurals name="omnipod_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
@@ -203,4 +256,5 @@
         <item quantity="one">%1$d day</item>
         <item quantity="other">%1$d days</item>
     </plurals>
+
 </resources>
\ No newline at end of file
diff --git a/omnipod/src/main/res/values/styles.xml b/omnipod/src/main/res/values/styles.xml
index 99ceef6b8d..1e590c64d8 100644
--- a/omnipod/src/main/res/values/styles.xml
+++ b/omnipod/src/main/res/values/styles.xml
@@ -1,30 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="WizardPagePodContent">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">8dp</item>
-        <item name="android:paddingLeft">20dp</item>
-        <item name="android:paddingRight">20dp</item>
+
+    <style name="OmnipodWizardTitle">
+        <item name="android:textSize">30sp</item>
+        <item name="android:textColor">#0099CC</item>
+    </style>
+
+    <style name="OmnipodWizardText" parent="@android:style/TextAppearance">
         <item name="android:textSize">18sp</item>
     </style>
 
-    <style name="WizardPagePodListItem">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">20dp</item>
-        <item name="android:layout_marginTop">20dp</item>
-        <item name="android:paddingTop">20dp</item>
-        <item name="android:paddingBottom">20dp</item>
-        <item name="android:paddingLeft">60dp</item>
-        <item name="android:paddingRight">60dp</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="PodInfoListView" parent="@android:style/Widget.ListView">
-        <item name="android:background">@color/colorLightGray</item>
-        <item name="android:cacheColorHint">@android:color/transparent</item>
-        <item name="android:divider">@android:color/black</item>
-        <item name="android:dividerHeight">1dp</item>
+    <style name="OmnipodWizardError" parent="@style/OmnipodWizardText">
+        <item name="android:textColor">#FFE91E63</item>
+        <item name="android:textStyle">bold</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponseTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponseTest.java
index f3c8dca01c..e095a57953 100644
--- a/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponseTest.java
+++ b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/StatusResponseTest.java
@@ -55,7 +55,7 @@ public class StatusResponseTest {
     }
 
     @Test
-    public void testWithSampleCaptureWithReplacePodSoonAlert() {
+    public void testWithSampleCaptureWithChangePodSoonAlert() {
         byte[] bytes = ByteUtil.fromHexString("1d19061f6800044295e8"); // From https://github.com/openaps/openomni/wiki/Status-Response-1D-long-run-%28Lytrix%29
         StatusResponse statusResponse = new StatusResponse(bytes);
 
diff --git a/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java
index 30035a69f9..97b19ab1b8 100644
--- a/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java
+++ b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java
@@ -21,7 +21,7 @@ public class PodInfoActiveAlertsTest {
     }
 
     @Test
-    public void testReplacePodAfter3Days() {
+    public void testChangePodAfter3Days() {
         byte[] encodedMessage = ByteUtil.fromHexString("010000000000000000000000000000000010e1"); // from https://github.com/ps2/rileylink_ios/blob/omnipod-testing/OmniKitTests/PodInfoTests.swift
         PodInfoActiveAlerts podInfoActiveAlerts = new PodInfoActiveAlerts(encodedMessage);
 
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dagger/RileyLinkModule.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dagger/RileyLinkModule.kt
index 5e963f5485..40227b9269 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dagger/RileyLinkModule.kt
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dagger/RileyLinkModule.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.pump.common.dagger
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen
@@ -14,7 +13,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks
 @Module
 @Suppress("unused")
 abstract class RileyLinkModule {
-    @ContributesAndroidInjector abstract fun rileyLinkCommunicationManagerProvider(): RileyLinkCommunicationManager
     @ContributesAndroidInjector abstract fun serviceTaskProvider(): ServiceTask
     @ContributesAndroidInjector abstract fun pumpTaskProvider(): PumpTask
     @ContributesAndroidInjector abstract fun discoverGattServicesTaskProvider(): DiscoverGattServicesTask
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
index fc6a146d29..a7aae37175 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
@@ -30,8 +30,7 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
  * <p>
  * Created by andy on 5/10/18.
  */
-public abstract class RileyLinkCommunicationManager {
-
+public abstract class RileyLinkCommunicationManager<T extends RLMessage> {
     @Inject protected AAPSLogger aapsLogger;
     @Inject protected SP sp;
     @Inject protected RileyLinkServiceData rileyLinkServiceData;
@@ -51,23 +50,23 @@ public abstract class RileyLinkCommunicationManager {
 
 
     // All pump communications go through this function.
-    protected RLMessage sendAndListen(RLMessage msg, int timeout_ms)
+    protected T sendAndListen(T msg, int timeout_ms)
             throws RileyLinkCommunicationException {
         return sendAndListen(msg, timeout_ms, null);
     }
 
-    private RLMessage sendAndListen(RLMessage msg, int timeout_ms, Integer extendPreamble_ms)
+    private T sendAndListen(T msg, int timeout_ms, Integer extendPreamble_ms)
             throws RileyLinkCommunicationException {
         return sendAndListen(msg, timeout_ms, 0, extendPreamble_ms);
     }
 
     // For backward compatibility
-    private RLMessage sendAndListen(RLMessage msg, int timeout_ms, int repeatCount, Integer extendPreamble_ms)
+    private T sendAndListen(T msg, int timeout_ms, int repeatCount, Integer extendPreamble_ms)
             throws RileyLinkCommunicationException {
         return sendAndListen(msg, timeout_ms, repeatCount, 0, extendPreamble_ms);
     }
 
-    protected RLMessage sendAndListen(RLMessage msg, int timeout_ms, int repeatCount, int retryCount, Integer extendPreamble_ms)
+    protected T sendAndListen(T msg, int timeout_ms, int repeatCount, int retryCount, Integer extendPreamble_ms)
             throws RileyLinkCommunicationException {
 
         // internal flag
@@ -80,14 +79,14 @@ public abstract class RileyLinkCommunicationManager {
                 (byte) 0, (byte) repeatCount, (byte) 0, (byte) 0, timeout_ms, (byte) retryCount, extendPreamble_ms);
 
         RadioResponse radioResponse = rfSpyResponse.getRadioResponse(injector);
-        RLMessage response = createResponseMessage(radioResponse.getPayload());
+        T response = createResponseMessage(radioResponse.getPayload());
 
         if (response.isValid()) {
             // Mark this as the last time we heard from the pump.
             rememberLastGoodDeviceCommunicationTime();
         } else {
-            aapsLogger.warn(LTag.PUMPBTCOMM, "isDeviceReachable. Response is invalid ! [interrupted={}, timeout={}, unknownCommand={}, invalidParam={}]", rfSpyResponse.wasInterrupted(),
-                    rfSpyResponse.wasTimeout(), rfSpyResponse.isUnknownCommand(), rfSpyResponse.isInvalidParam());
+            aapsLogger.warn(LTag.PUMPBTCOMM, "isDeviceReachable. Response is invalid ! [noResponseFromRileyLink={}, interrupted={}, timeout={}, unknownCommand={}, invalidParam={}]",
+                    rfSpyResponse.wasNoResponseFromRileyLink(), rfSpyResponse.wasInterrupted(), rfSpyResponse.wasTimeout(), rfSpyResponse.isUnknownCommand(), rfSpyResponse.isInvalidParam());
 
             if (rfSpyResponse.wasTimeout()) {
                 if (rileyLinkServiceData.targetDevice.isTuneUpEnabled()) {
@@ -105,6 +104,8 @@ public abstract class RileyLinkCommunicationManager {
                 throw new RileyLinkCommunicationException(RileyLinkBLEError.Timeout);
             } else if (rfSpyResponse.wasInterrupted()) {
                 throw new RileyLinkCommunicationException(RileyLinkBLEError.Interrupted);
+            } else if (rfSpyResponse.wasNoResponseFromRileyLink()) {
+                throw new RileyLinkCommunicationException(RileyLinkBLEError.NoResponse);
             }
         }
 
@@ -116,7 +117,7 @@ public abstract class RileyLinkCommunicationManager {
     }
 
 
-    public abstract RLMessage createResponseMessage(byte[] payload);
+    public abstract T createResponseMessage(byte[] payload);
 
 
     public abstract void setPumpDeviceState(PumpDeviceState pumpDeviceState);
@@ -313,7 +314,7 @@ public abstract class RileyLinkCommunicationManager {
 
     private int tune_tryFrequency(double freqMHz) {
         rfspy.setBaseFrequency(freqMHz);
-        // RLMessage msg = makeRLMessage(RLMessageType.ReadSimpleData);
+        // T msg = makeRLMessage(RLMessageType.ReadSimpleData);
         byte[] pumpMsgContent = createPumpMessageContent(RLMessageType.ReadSimpleData);
         RadioPacket pkt = new RadioPacket(injector, pumpMsgContent);
         RFSpyResponse resp = rfspy.transmitThenReceive(pkt, (byte) 0, (byte) 0, (byte) 0, (byte) 0, SCAN_TIMEOUT, (byte) 0);
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
index 128152aa31..4c05c67c2d 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
@@ -8,13 +8,11 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.Reset;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.RileyLinkCommand;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetHardwareEncoding;
@@ -34,7 +32,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.ThreadUtil;
-
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -212,24 +209,22 @@ public class RFSpy {
         if (rawResponse == null) {
             aapsLogger.error(LTag.PUMPBTCOMM, "writeToData: No response from RileyLink");
             notConnectedCount++;
+        } else if (resp.wasInterrupted()) {
+            aapsLogger.error(LTag.PUMPBTCOMM, "writeToData: RileyLink was interrupted");
+        } else if (resp.wasTimeout()) {
+            aapsLogger.error(LTag.PUMPBTCOMM, "writeToData: RileyLink reports timeout");
+            notConnectedCount++;
+        } else if (resp.isOK()) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "writeToData: RileyLink reports OK");
+            resetNotConnectedCount();
         } else {
-            if (resp.wasInterrupted()) {
-                aapsLogger.error(LTag.PUMPBTCOMM, "writeToData: RileyLink was interrupted");
-            } else if (resp.wasTimeout()) {
-                aapsLogger.error(LTag.PUMPBTCOMM, "writeToData: RileyLink reports timeout");
-                notConnectedCount++;
-            } else if (resp.isOK()) {
-                aapsLogger.warn(LTag.PUMPBTCOMM, "writeToData: RileyLink reports OK");
+            if (resp.looksLikeRadioPacket()) {
+                // RadioResponse radioResp = resp.getRadioResponse();
+                // byte[] responsePayload = radioResp.getPayload();
+                aapsLogger.debug(LTag.PUMPBTCOMM, "writeToData: received radio response. Will decode at upper level");
                 resetNotConnectedCount();
-            } else {
-                if (resp.looksLikeRadioPacket()) {
-                    // RadioResponse radioResp = resp.getRadioResponse();
-                    // byte[] responsePayload = radioResp.getPayload();
-                    aapsLogger.debug(LTag.PUMPBTCOMM, "writeToData: received radio response. Will decode at upper level");
-                    resetNotConnectedCount();
-                }
-                // Log.i(TAG, "writeToData: raw response is " + ByteUtil.shortHexString(rawResponse));
             }
+            // Log.i(TAG, "writeToData: raw response is " + ByteUtil.shortHexString(rawResponse));
         }
         return resp;
     }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java
index a766e92266..4ef8658861 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java
@@ -21,34 +21,27 @@ public class RFSpyResponse {
     protected RadioResponse radioResponse;
     private RileyLinkCommand command;
 
-
     public RFSpyResponse() {
         init(new byte[0]);
     }
 
-
     public RFSpyResponse(byte[] bytes) {
         init(bytes);
     }
 
-
     public RFSpyResponse(RileyLinkCommand command, byte[] rawResponse) {
-
         this.command = command;
         init(rawResponse);
     }
 
-
     public void init(byte[] bytes) {
         if (bytes == null) {
             raw = new byte[0];
         } else {
             raw = bytes;
         }
-
     }
 
-
     public RadioResponse getRadioResponse(HasAndroidInjector injector) throws RileyLinkCommunicationException {
         if (looksLikeRadioPacket()) {
             radioResponse = new RadioResponse(injector, command);
@@ -59,76 +52,59 @@ public class RFSpyResponse {
         return radioResponse;
     }
 
+    public boolean wasNoResponseFromRileyLink() {
+        return raw.length == 0;
+    }
 
     public boolean wasTimeout() {
         if ((raw.length == 1) || (raw.length == 2)) {
-            if (raw[0] == (byte)0xaa) {
-                return true;
-            }
+            return raw[0] == (byte) 0xaa;
         }
         return false;
     }
 
-
     public boolean wasInterrupted() {
         if ((raw.length == 1) || (raw.length == 2)) {
-            if (raw[0] == (byte)0xbb) {
-                return true;
-            }
+            return raw[0] == (byte) 0xbb;
         }
         return false;
     }
 
-
     public boolean isInvalidParam() {
         if ((raw.length == 1) || (raw.length == 2)) {
-            if (raw[0] == (byte)0x11) {
-                return true;
-            }
+            return raw[0] == (byte) 0x11;
         }
         return false;
     }
 
-
     public boolean isUnknownCommand() {
         if ((raw.length == 1) || (raw.length == 2)) {
-            if (raw[0] == (byte)0x22) {
-                return true;
-            }
+            return raw[0] == (byte) 0x22;
         }
         return false;
     }
 
-
     public boolean isOK() {
         if ((raw.length == 1) || (raw.length == 2)) {
-            if (raw[0] == (byte)0x01 || raw[0] == (byte)0xDD) {
-                return true;
-            }
+            return raw[0] == (byte) 0x01 || raw[0] == (byte) 0xDD;
         }
         return false;
     }
 
-
     public boolean looksLikeRadioPacket() {
-        if (raw.length > 2) {
-            return true;
-        }
-        return false;
+        return raw.length > 2;
     }
 
-
     @Override
     public String toString() {
         if (raw.length > 2) {
             return "Radio packet";
         } else {
             RFSpyRLResponse r = RFSpyRLResponse.fromByte(raw[0]);
-            return r.toString();
+            return r == null ? "" : r.toString();
         }
     }
 
-
     public byte[] getRaw() {
         return raw;
     }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java
index 8d32445718..7da0995fe1 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java
@@ -8,17 +8,15 @@ public enum RileyLinkBLEError {
     CodingErrors("Coding Errors encountered during decode of RileyLink packet."), //
     Timeout("Timeout"), //
     Interrupted("Interrupted"),
+    NoResponse("No response from RileyLink"),
     TooShortOrNullResponse("Too short or null decoded response.");
 
     private String description;
 
-
     RileyLinkBLEError(String description) {
-
         this.description = description;
     }
 
-
     public String getDescription() {
         return description;
     }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
index c7e49f6cd8..271a769d46 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
@@ -65,7 +65,7 @@ public class InitializePumpManagerTask extends ServiceTask {
             lastGoodFrequency = rileyLinkServiceData.lastGoodFrequency;
         }
 
-        RileyLinkCommunicationManager rileyLinkCommunicationManager = ((RileyLinkPumpDevice) activePlugin.getActivePump()).getRileyLinkService().getDeviceCommunicationManager();
+        RileyLinkCommunicationManager<?> rileyLinkCommunicationManager = ((RileyLinkPumpDevice) activePlugin.getActivePump()).getRileyLinkService().getDeviceCommunicationManager();
 
         if (activePlugin.getActivePump().manufacturer() == ManufacturerType.Medtronic) {
 
diff --git a/rileylink/src/main/res/values-no-rNO/strings.xml b/rileylink/src/main/res/values-no-rNO/strings.xml
index eb781f84f2..9f08520eac 100644
--- a/rileylink/src/main/res/values-no-rNO/strings.xml
+++ b/rileylink/src/main/res/values-no-rNO/strings.xml
@@ -1,8 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SØK</string>
+    <string name="rileylink_scanner_scan_stop">STOPP</string>
+    <string name="rileylink_scanner_selected_device">Valgt</string>
+    <string name="rileylink_scanner_title">RileyLink Søk</string>
+    <string name="location_yes">Aktiver</string>
+    <string name="location_no">Nei</string>
+    <string name="rileylink_scanner_scanning">Søker</string>
+    <string name="rileylink_scanner_scanning_finished">Søk fullført</string>
+    <string name="rileylink_scanner_scanning_error">Søk feilet: %1$d</string>
+    <string name="common_never">Aldri</string>
     <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Innstillinger</string>
+    <string name="rileylink_settings_tab2">Historikk</string>
+    <string name="rileylink_status">RileyLink Status</string>
+    <string name="medtronic_pump_status">Pumpe Status</string>
+    <string name="title_activity_rileylink_settings">RileyLink Innstillinger</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Konfigurert adresse</string>
+    <string name="rileylink_connected_device">Tilkoblet enhet</string>
+    <string name="rileylink_connection_status">Tilkoblingsstatus</string>
+    <string name="rileylink_connection_error">Tilkoblings feil</string>
+    <string name="rileylink_device">Enhet</string>
+    <string name="rileylink_device_type">Enhets type</string>
+    <string name="rileylink_device_model">Enhets modell</string>
+    <string name="rileylink_last_used_frequency">Sist brukte frekvens</string>
+    <string name="rileylink_last_device_contact">Siste enhetstilkobling</string>
+    <string name="rileylink_firmware_version">RL firmware</string>
     <!-- RL State -->
+    <string name="rileylink_state_bt_init">Bluetooth initialiserer…</string>
+    <string name="rileylink_state_bt_error">Bluetooth feil</string>
+    <string name="rileylink_state_bt_ready">Bluetooth klar</string>
+    <string name="rileylink_state_not_started">Ikke startet</string>
+    <string name="rileylink_state_rl_init">RileyLink initialisering…</string>
+    <string name="rileylink_state_rl_error">RileyLink feil</string>
+    <string name="rileylink_state_pc_tune_up">Tuning av RileyLink og pumpe</string>
+    <string name="rileylink_state_pc_error">Problemer med tilkobling til pumpe</string>
+    <string name="rileylink_state_connected">Tilkoblet</string>
+    <string name="rileylink_state_rl_ready">RileyLink er klar</string>
     <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Enheten er ikke RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink utilgjengelig</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth deaktivert</string>
+    <string name="rileylink_error_no_bt_adapter">Ingen Bluetooth adapter</string>
+    <string name="rileylink_error_tuneup_failed">TuneUp mislyktes</string>
+    <string name="rileylink_error_pump_unreachable">Pumpe utilgjengelig</string>
+    <string name="rileylink_error_pod_unreachable">Pod utilgjengelig</string>
     <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Medtronic pumpe</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dager</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d time</item>
+        <item quantity="other">%1$d timer</item>
+    </plurals>
 </resources>
diff --git a/rileylink/src/main/res/values-pl-rPL/strings.xml b/rileylink/src/main/res/values-pl-rPL/strings.xml
index ce592e20a6..427f51496d 100644
--- a/rileylink/src/main/res/values-pl-rPL/strings.xml
+++ b/rileylink/src/main/res/values-pl-rPL/strings.xml
@@ -6,9 +6,11 @@
     <string name="rileylink_scanner_selected_device">Wybrany</string>
     <string name="rileylink_scanner_title">Skan RileyLink</string>
     <string name="location_yes">Uruchom</string>
+    <string name="location_no">Nie</string>
     <string name="rileylink_scanner_scanning">Skanowanie</string>
     <string name="rileylink_scanner_scanning_finished">Skanowanie zakończono</string>
     <string name="rileylink_scanner_scanning_error">Błąd skanowania: %1$d</string>
+    <string name="common_never">Nigdy</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Ustawienia</string>
     <string name="rileylink_settings_tab2">Historia</string>
@@ -35,14 +37,29 @@
     <string name="rileylink_state_rl_error">Błąd RileyLink</string>
     <string name="rileylink_state_pc_tune_up">Dostrojenie RileyLink i pompy</string>
     <string name="rileylink_state_pc_error">Problem z połączeniem z pompą</string>
+    <string name="rileylink_state_connected">Połączono</string>
+    <string name="rileylink_state_rl_ready">RileyLink gotowy</string>
     <!-- RL Errors -->
     <string name="rileylink_error_not_rl">Urządzenie to nie RileyLink</string>
     <string name="rileylink_error_unreachable">RileyLink nie osiągalny</string>
     <string name="rileylink_error_bt_disabled">Bluetooth wyłączony</string>
     <string name="rileylink_error_no_bt_adapter">Brak modułu Bluetooth</string>
     <string name="rileylink_error_tuneup_failed">Dostrojenie nie powiodło się</string>
+    <string name="rileylink_error_pump_unreachable">Pompa nieosiągalna</string>
     <string name="rileylink_error_pod_unreachable">Pod nieosiągalny</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Pompa Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dzień</item>
+        <item quantity="few">%1$d dni</item>
+        <item quantity="many">%1$d dni</item>
+        <item quantity="other">%1$d dni</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d godzina</item>
+        <item quantity="few">%1$d godziny</item>
+        <item quantity="many">%1$d godzin</item>
+        <item quantity="other">%1$d godzin</item>
+    </plurals>
 </resources>
diff --git a/wear/src/main/res/values-no-rNO/strings.xml b/wear/src/main/res/values-no-rNO/strings.xml
index 3ea04e700d..924ff44ff4 100644
--- a/wear/src/main/res/values-no-rNO/strings.xml
+++ b/wear/src/main/res/values-no-rNO/strings.xml
@@ -1,2 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">AAPS</string>
+    <string name="label_actions_activity">AAPS</string>
+    <string name="label_xdrip">AAPS</string>
+    <string name="label_xdrip_large">AAPS (Large)</string>
+    <string name="label_xdrip_big_chart">AAPS (BigChart)</string>
+    <string name="label_xdrip_no_chart">AAPS (NoChart)</string>
+    <string name="label_xdrip_circle">AAPS (Circle)</string>
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
+    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
+    <string name="label_warning_sync">Ingen data!</string>
+    <string name="label_warning_old">Gamle data!</string>
+    <string name="label_warning_since">Siden %1$s</string>
+    <string name="label_warning_sync_aaps">Synk med AAPS!</string>
+    <string name="msg_warning_sync">Ingen data mottatt siden %1$s. Sjekk om AAPS på telefonen sender data</string>
+    <string name="msg_warning_old">AAPS-data er %1$s gamle! Sjekk din sensor, xDrip+, NS, AAPS konfigurasjon eller annet!</string>
+    <string name="pref_on">På</string>
+    <string name="pref_off">Av</string>
+    <string name="pref_vibrate_on_bolus">Vibrer ved bolus</string>
+    <string name="pref_units_for_actions">Enheter for handlinger</string>
+    <string name="pref_show_date">Vis dato</string>
+    <string name="pref_show_iob">Vis IOB</string>
+    <string name="pref_show_cob">Vis COB</string>
+    <string name="pref_show_delta">Vis Delta</string>
+    <string name="pref_show_avgdelta">Vis Gj.snittDelta</string>
+    <string name="pref_show_phone_battery">Vis telefonbatteri</string>
+    <string name="pref_show_rig_battery">Vis riggens batteri</string>
+    <string name="pref_show_basal_rate">Vis basalrate</string>
+    <string name="pref_show_loop_status">Vis loop status</string>
+    <string name="pref_show_bg">Vis BS</string>
+    <string name="pref_show_direction_arrow">Vis retningspil</string>
+    <string name="pref_show_ago">Vis siden</string>
+    <string name="pref_dark" comment="Enables dark visual theme">Mørkt</string>
+    <string name="pref_highlight_basals">Marker basaler</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Matchende avdeler</string>
+    <string name="pref_chart_timeframe">Tidsspenn for diagram</string>
+    <string name="pref_1_hour">1 time</string>
+    <string name="pref_2_hours">2 timer</string>
+    <string name="pref_3_hours">3 timer</string>
+    <string name="pref_4_hours">4 timer</string>
+    <string name="pref_5_hours">5 timer</string>
+    <string name="pref_input_design">Innlesing design</string>
+    <string name="pref_default">Standard</string>
+    <string name="pref_quick_righty">Raskt høyre</string>
+    <string name="pref_quick_lefty">Raskt venstre</string>
+    <string name="pref_modern_sparse">Modern Sparse</string>
+    <string name="pref_delta_granularity">Delta granularitet (Steampunk)</string>
+    <string name="pref_low">Lav</string>
+    <string name="pref_medium">Middels</string>
+    <string name="pref_high">Høy</string>
+    <string name="pref_auto">Auto</string>
+    <string name="pref_big_numbers">Store sifre</string>
+    <string name="pref_ring_history">Ringe historikk</string>
+    <string name="pref_light_ring_history">Lys ringe historikk</string>
+    <string name="pref_animations">Animasjoner</string>
+    <string name="pref_wizard_in_menu">Veiviser i meny</string>
+    <string name="pref_prime_in_menu">Prime i menyen</string>
+    <string name="pref_single_target">Enkel måleverdi</string>
+    <string name="pref_wizard_percentage">Veiviser prosent</string>
+    <string name="pref_complication_tap_action">Komplikasjon trykk handling</string>
+    <string name="pref_unicode_in_complications">Unicode ikomplikasjoner</string>
+    <string name="pref_version">Versjon:</string>
+    <string name="menu_tempt">TempT</string>
+    <string name="menu_wizard">Veiviser</string>
+    <string name="menu_bolus">Bolus</string>
+    <string name="menu_ecarb">eKarbo</string>
+    <string name="menu_settings">Innstillinger</string>
+    <string name="menu_status">Status</string>
+    <string name="menu_prime_fill">Prime/fylling</string>
+    <string name="menu_none">Ingen</string>
+    <string name="menu_default">Standard</string>
+    <string name="menu_menu">Meny</string>
+    <string name="action_duration">varighet</string>
+    <string name="action_target" comment="In temp target menu, single target value">målverdi</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">lav</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">høy</string>
+    <string name="action_carbs">karbo</string>
+    <string name="action_percentage">prosent</string>
+    <string name="action_start_min">start [min]</string>
+    <string name="action_duration_h">varighet [h]</string>
+    <string name="action_insulin">insulin</string>
+    <string name="action_preset_1">Forhåndsinnstilling 1</string>
+    <string name="action_preset_2">Forhåndsinnstilling 2</string>
+    <string name="action_preset_3">Forhåndsinnstilling 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Valgfri mengde</string>
+    <string name="action_confirm">BEKREFT</string>
+    <string name="action_status_pump">STATUS PUMPE</string>
+    <string name="action_status_loop">STATUS LOOP</string>
+    <string name="action_timeshift">tidsforskyving</string>
+    <string name="action_tdd_weighted">TDD vektet</string>
+    <string name="action_bolus">bolus</string>
+    <string name="status_pump">Pumpe</string>
+    <string name="status_loop">Loop</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_carb">Karbo</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">ingen status</string>
+    <string name="unit_mg_dl">mg/dl</string>
+    <string name="unit_mmol_l">mmol/l</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">E</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">E/t</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">t</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">u</string>
+</resources>
diff --git a/wear/src/main/res/values-ru-rRU/strings.xml b/wear/src/main/res/values-ru-rRU/strings.xml
index 6e668dbb11..148558d866 100644
--- a/wear/src/main/res/values-ru-rRU/strings.xml
+++ b/wear/src/main/res/values-ru-rRU/strings.xml
@@ -15,7 +15,7 @@
     <string name="label_warning_since">Длится с: %1$s</string>
     <string name="label_warning_sync_aaps">Синхронизация с ААПС!</string>
     <string name="msg_warning_sync">Нет данных начиная с %1$s! Убедитесь, что AAPS на телефоне отправляет данные на часы</string>
-    <string name="msg_warning_old">Старые данные AAPS от %1$s! Проверьте сенсор, xDrip +, NS, конфигурацию AAPS, другое!</string>
+    <string name="msg_warning_old">Данные AAPS отстают на %1$s! Проверьте сенсор, xDrip+, NS, конфигурацию AAPS, другое!</string>
     <string name="pref_on">Вкл.</string>
     <string name="pref_off">Выкл.</string>
     <string name="pref_vibrate_on_bolus">Вибрировать при болюсе</string>