diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 66acf8e27e5..03c1a4dff82 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -127,7 +127,7 @@
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <option name="RIGHT_MARGIN" value="120" />
+      <option name="RIGHT_MARGIN" value="200" />
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="LINE_COMMENT_ADD_SPACE" value="true" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
diff --git a/app/build.gradle b/app/build.gradle
index 0ab6421024c..f21c4c94cd5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,7 +109,7 @@ android {
     defaultConfig {
         multiDexEnabled true
         versionCode 1500
-        version "2.8.2.5-dev"
+        version "3.0-beta6"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index 764a5727eb7..0db09d53485 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -34,16 +34,16 @@ import info.nightscout.androidaps.databinding.ActivityMainBinding
 import info.nightscout.androidaps.events.EventAppExit
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventRebuildTabs
-import info.nightscout.androidaps.activities.HistoryBrowseActivity
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.IconsProvider
 import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
 import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
@@ -62,6 +62,7 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import info.nightscout.androidaps.utils.tabs.TabPageAdapter
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import java.util.*
 import javax.inject.Inject
 import kotlin.system.exitProcess
@@ -72,7 +73,7 @@ class MainActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var androidPermission: AndroidPermission
     @Inject lateinit var sp: SP
     @Inject lateinit var versionCheckerUtils: VersionCheckerUtils
@@ -88,6 +89,7 @@ class MainActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var signatureVerifierPlugin: SignatureVerifierPlugin
     @Inject lateinit var config: Config
     @Inject lateinit var uel: UserEntryLogger
+    @Inject lateinit var profileFunction: ProfileFunction
 
     private lateinit var actionBarDrawerToggle: ActionBarDrawerToggle
     private var pluginPreferencesMenuItem: MenuItem? = null
@@ -111,7 +113,7 @@ class MainActivity : NoSplashAppCompatActivity() {
         }
 
         // initialize screen wake lock
-        processPreferenceChange(EventPreferenceChange(resourceHelper.gs(R.string.key_keep_screen_on)))
+        processPreferenceChange(EventPreferenceChange(rh.gs(R.string.key_keep_screen_on)))
         binding.mainPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
             override fun onPageScrollStateChanged(state: Int) {}
             override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
@@ -122,23 +124,21 @@ class MainActivity : NoSplashAppCompatActivity() {
         })
 
         //Check here if loop plugin is disabled. Else check via constraints
-        if (!loopPlugin.isEnabled(PluginType.LOOP)) versionCheckerUtils.triggerCheckVersion()
+        if (!loopPlugin.isEnabled()) versionCheckerUtils.triggerCheckVersion()
         setUserStats()
         setupViews()
-        disposable.add(rxBus
+        disposable += rxBus
             .toObservable(EventRebuildTabs::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({
-                if (it.recreate) recreate()
-                else setupViews()
-                setWakeLock()
-            }, fabricPrivacy::logException)
-        )
-        disposable.add(rxBus
+                           if (it.recreate) recreate()
+                           else setupViews()
+                           setWakeLock()
+                       }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({ processPreferenceChange(it) }, fabricPrivacy::logException)
-        )
         if (startWizard() && !isRunningRealPumpTest()) {
             protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, {
                 startActivity(Intent(this, SetupWizardActivity::class.java))
@@ -146,7 +146,7 @@ class MainActivity : NoSplashAppCompatActivity() {
         }
         androidPermission.notifyForStoragePermission(this)
         androidPermission.notifyForBatteryOptimizationPermission(this)
-        androidPermission.notifyForLocationPermissions(this)
+        if (!config.NSCLIENT) androidPermission.notifyForLocationPermissions(this)
         if (config.PUMPDRIVERS) {
             androidPermission.notifyForSMSPermissions(this, smsCommunicatorPlugin)
             androidPermission.notifyForSystemWindowPermissions(this)
@@ -157,7 +157,7 @@ class MainActivity : NoSplashAppCompatActivity() {
         if (viewPager.currentItem >= 0) pluginPreferencesMenuItem?.isEnabled = (viewPager.adapter as TabPageAdapter).getPluginAt(viewPager.currentItem).preferencesId != -1
     }
 
-    private fun startWizard() : Boolean =
+    private fun startWizard(): Boolean =
         !sp.getBoolean(R.string.key_setupwizard_processed, false)
 
     override fun onPostCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
@@ -173,8 +173,8 @@ class MainActivity : NoSplashAppCompatActivity() {
     override fun onResume() {
         super.onResume()
         protectionCheck.queryProtection(this, ProtectionCheck.Protection.APPLICATION, null,
-            UIRunnable { OKDialog.show(this, "", resourceHelper.gs(R.string.authorizationfailed)) { finish() } },
-            UIRunnable { OKDialog.show(this, "", resourceHelper.gs(R.string.authorizationfailed)) { finish() } }
+                                        UIRunnable { OKDialog.show(this, "", rh.gs(R.string.authorizationfailed)) { finish() } },
+                                        UIRunnable { OKDialog.show(this, "", rh.gs(R.string.authorizationfailed)) { finish() } }
         )
     }
 
@@ -184,8 +184,8 @@ class MainActivity : NoSplashAppCompatActivity() {
     }
 
     private fun processPreferenceChange(ev: EventPreferenceChange) {
-        if (ev.isChanged(resourceHelper, R.string.key_keep_screen_on)) setWakeLock()
-        if (ev.isChanged(resourceHelper, R.string.key_skin)) recreate()
+        if (ev.isChanged(rh, R.string.key_keep_screen_on)) setWakeLock()
+        if (ev.isChanged(rh, R.string.key_skin)) recreate()
     }
 
     private fun setupViews() {
@@ -229,8 +229,10 @@ class MainActivity : NoSplashAppCompatActivity() {
             binding.tabsCompact.visibility = View.GONE
             val typedValue = TypedValue()
             if (theme.resolveAttribute(R.attr.actionBarSize, typedValue, true)) {
-                binding.toolbar.layoutParams = LinearLayout.LayoutParams(Toolbar.LayoutParams.MATCH_PARENT,
-                    TypedValue.complexToDimensionPixelSize(typedValue.data, resources.displayMetrics))
+                binding.toolbar.layoutParams = LinearLayout.LayoutParams(
+                    Toolbar.LayoutParams.MATCH_PARENT,
+                    TypedValue.complexToDimensionPixelSize(typedValue.data, resources.displayMetrics)
+                )
             }
             TabLayoutMediator(binding.tabsNormal, binding.mainPager) { tab, position ->
                 tab.text = (binding.mainPager.adapter as TabPageAdapter).getPluginAt(position).name
@@ -257,10 +259,16 @@ class MainActivity : NoSplashAppCompatActivity() {
     private fun setPluginPreferenceMenuName() {
         if (binding.mainPager.currentItem >= 0) {
             val plugin = (binding.mainPager.adapter as TabPageAdapter).getPluginAt(binding.mainPager.currentItem)
-            this.menu?.findItem(R.id.nav_plugin_preferences)?.title = resourceHelper.gs(R.string.nav_preferences_plugin, plugin.name)
+            this.menu?.findItem(R.id.nav_plugin_preferences)?.title = rh.gs(R.string.nav_preferences_plugin, plugin.name)
         }
     }
 
+    override fun onMenuOpened(featureId: Int, menu: Menu): Boolean {
+        val result = super.onMenuOpened(featureId, menu)
+        menu.findItem(R.id.nav_treatments)?.isEnabled = profileFunction.getProfile() != null
+        return result
+    }
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         this.menu = menu
         menuInflater.inflate(R.menu.menu_main, menu)
@@ -272,7 +280,7 @@ class MainActivity : NoSplashAppCompatActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.nav_preferences -> {
+            R.id.nav_preferences        -> {
                 protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, {
                     val i = Intent(this, PreferencesActivity::class.java)
                     i.putExtra("id", -1)
@@ -281,38 +289,38 @@ class MainActivity : NoSplashAppCompatActivity() {
                 return true
             }
 
-            R.id.nav_historybrowser -> {
+            R.id.nav_historybrowser     -> {
                 startActivity(Intent(this, HistoryBrowseActivity::class.java))
                 return true
             }
 
-            R.id.nav_treatments -> {
+            R.id.nav_treatments         -> {
                 startActivity(Intent(this, TreatmentsActivity::class.java))
                 return true
             }
 
-            R.id.nav_setupwizard -> {
+            R.id.nav_setupwizard        -> {
                 protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, {
                     startActivity(Intent(this, SetupWizardActivity::class.java))
                 })
                 return true
             }
 
-            R.id.nav_about -> {
+            R.id.nav_about              -> {
                 var message = "Build: ${BuildConfig.BUILDVERSION}\n"
                 message += "Flavor: ${BuildConfig.FLAVOR}${BuildConfig.BUILD_TYPE}\n"
-                message += "${resourceHelper.gs(R.string.configbuilder_nightscoutversion_label)} ${nsSettingsStatus.getVersion()}"
-                if (buildHelper.isEngineeringMode()) message += "\n${resourceHelper.gs(R.string.engineering_mode_enabled)}"
-                if (!fabricPrivacy.fabricEnabled()) message += "\n${resourceHelper.gs(R.string.fabric_upload_disabled)}"
-                message += resourceHelper.gs(R.string.about_link_urls)
+                message += "${rh.gs(R.string.configbuilder_nightscoutversion_label)} ${nsSettingsStatus.getVersion()}"
+                if (buildHelper.isEngineeringMode()) message += "\n${rh.gs(R.string.engineering_mode_enabled)}"
+                if (!fabricPrivacy.fabricEnabled()) message += "\n${rh.gs(R.string.fabric_upload_disabled)}"
+                message += rh.gs(R.string.about_link_urls)
                 val messageSpanned = SpannableString(message)
                 Linkify.addLinks(messageSpanned, Linkify.WEB_URLS)
                 AlertDialog.Builder(this)
-                    .setTitle(resourceHelper.gs(R.string.app_name) + " " + BuildConfig.VERSION)
+                    .setTitle(rh.gs(R.string.app_name) + " " + BuildConfig.VERSION)
                     .setIcon(iconsProvider.getIcon())
                     .setMessage(messageSpanned)
-                    .setPositiveButton(resourceHelper.gs(R.string.ok), null)
-                    .setNeutralButton(resourceHelper.gs(R.string.cta_dont_kill_my_app_info)) { _, _ -> DokiActivity.start(context = this@MainActivity) }
+                    .setPositiveButton(rh.gs(R.string.ok), null)
+                    .setNeutralButton(rh.gs(R.string.cta_dont_kill_my_app_info)) { _, _ -> DokiActivity.start(context = this@MainActivity) }
                     .create().apply {
                         show()
                         findViewById<TextView>(android.R.id.message)?.movementMethod = LinkMovementMethod.getInstance()
@@ -320,7 +328,7 @@ class MainActivity : NoSplashAppCompatActivity() {
                 return true
             }
 
-            R.id.nav_exit -> {
+            R.id.nav_exit               -> {
                 aapsLogger.debug(LTag.CORE, "Exiting")
                 uel.log(Action.EXIT_AAPS, Sources.Aaps)
                 rxBus.send(EventAppExit())
@@ -344,12 +352,12 @@ class MainActivity : NoSplashAppCompatActivity() {
                 return true
             }
 */
-            R.id.nav_defaultprofile -> {
+            R.id.nav_defaultprofile     -> {
                 startActivity(Intent(this, ProfileHelperActivity::class.java))
                 return true
             }
 
-            R.id.nav_stats -> {
+            R.id.nav_stats              -> {
                 startActivity(Intent(this, StatsActivity::class.java))
                 return true
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
index f3a0f03ec42..eae9da8d403 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
@@ -6,6 +6,7 @@ import android.content.IntentFilter
 import android.net.ConnectivityManager
 import android.net.wifi.WifiManager
 import android.os.Build
+import com.uber.rxdogtag.RxDogTag
 import dagger.android.AndroidInjector
 import dagger.android.DaggerApplication
 import info.nightscout.androidaps.database.AppRepository
@@ -14,8 +15,8 @@ import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
 import info.nightscout.androidaps.database.transactions.VersionChangeTransaction
 import info.nightscout.androidaps.db.CompatDBHelper
-import info.nightscout.androidaps.di.StaticInjector
 import info.nightscout.androidaps.dependencyInjection.DaggerAppComponent
+import info.nightscout.androidaps.di.StaticInjector
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.ConfigBuilder
 import info.nightscout.androidaps.interfaces.PluginBase
@@ -29,14 +30,19 @@ import info.nightscout.androidaps.receivers.ChargingStateReceiver
 import info.nightscout.androidaps.receivers.KeepAliveReceiver.KeepAliveManager
 import info.nightscout.androidaps.receivers.NetworkChangeReceiver
 import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver
+import info.nightscout.androidaps.services.AlarmSoundServiceHelper
 import info.nightscout.androidaps.utils.ActivityMonitor
 import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.locale.LocaleHelper.update
+import info.nightscout.androidaps.utils.locale.LocaleHelper
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.exceptions.UndeliverableException
+import io.reactivex.plugins.RxJavaPlugins
 import io.reactivex.rxkotlin.plusAssign
 import net.danlew.android.joda.JodaTimeAndroid
+import java.io.IOException
+import java.net.SocketException
 import javax.inject.Inject
 
 class MainApp : DaggerApplication() {
@@ -58,11 +64,14 @@ class MainApp : DaggerApplication() {
     @Inject lateinit var staticInjector: StaticInjector// TODO avoid , here fake only to initialize
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var passwordCheck: PasswordCheck
+    @Inject lateinit var alarmSoundServiceHelper: AlarmSoundServiceHelper
 
     override fun onCreate() {
         super.onCreate()
         aapsLogger.debug("onCreate")
-        update(this)
+        RxDogTag.install()
+        setRxErrorHandler()
+        LocaleHelper.update(this)
 
         var gitRemote: String? = BuildConfig.REMOTE
         var commitHash: String? = BuildConfig.HEAD
@@ -71,7 +80,17 @@ class MainApp : DaggerApplication() {
             commitHash = null
         }
         disposable += repository.runTransaction(VersionChangeTransaction(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, gitRemote, commitHash)).subscribe()
-        disposable += repository.runTransaction(InsertIfNewByTimestampTherapyEventTransaction(timestamp = dateUtil.now(), type = TherapyEvent.Type.NOTE, note = getString(info.nightscout.androidaps.core.R.string.androidaps_start).toString() + " - " + Build.MANUFACTURER + " " + Build.MODEL, glucoseUnit = TherapyEvent.GlucoseUnit.MGDL)).subscribe()
+        if (sp.getBoolean(R.string.key_ns_logappstartedevent, config.APS))
+            disposable += repository
+                .runTransaction(
+                    InsertIfNewByTimestampTherapyEventTransaction(
+                        timestamp = dateUtil.now(),
+                        type = TherapyEvent.Type.NOTE,
+                        note = getString(info.nightscout.androidaps.core.R.string.androidaps_start) + " - " + Build.MANUFACTURER + " " + Build.MODEL,
+                        glucoseUnit = TherapyEvent.GlucoseUnit.MGDL
+                    )
+                )
+                .subscribe()
         disposable += compatDBHelper.dbChangeDisposable()
         registerActivityLifecycleCallbacks(activityMonitor)
         JodaTimeAndroid.init(this)
@@ -92,6 +111,34 @@ class MainApp : DaggerApplication() {
         passwordCheck.passwordResetCheck(this)
     }
 
+    private fun setRxErrorHandler() {
+        RxJavaPlugins.setErrorHandler { t: Throwable ->
+            var e = t
+            if (e is UndeliverableException) {
+                e = e.cause!!
+            }
+            if (e is IOException || e is SocketException) {
+                // fine, irrelevant network problem or API that throws on cancellation
+                return@setErrorHandler
+            }
+            if (e is InterruptedException) {
+                // fine, some blocking code was interrupted by a dispose call
+                return@setErrorHandler
+            }
+            if (e is NullPointerException || e is IllegalArgumentException) {
+                // that's likely a bug in the application
+                Thread.currentThread().uncaughtExceptionHandler?.uncaughtException(Thread.currentThread(), e)
+                return@setErrorHandler
+            }
+            if (e is IllegalStateException) {
+                // that's a bug in RxJava or in a custom operator
+                Thread.currentThread().uncaughtExceptionHandler?.uncaughtException(Thread.currentThread(), e)
+                return@setErrorHandler
+            }
+            aapsLogger.warn(LTag.CORE, "Undeliverable exception received, not sure what to do", e)
+        }
+    }
+
     private fun doMigrations() {
         // set values for different builds
         if (!sp.contains(R.string.key_ns_alarms)) sp.putBoolean(R.string.key_ns_alarms, config.NSCLIENT)
@@ -132,6 +179,7 @@ class MainApp : DaggerApplication() {
         aapsLogger.debug(LTag.CORE, "onTerminate")
         unregisterActivityLifecycleCallbacks(activityMonitor)
         keepAliveManager.cancelAlarm(this)
+        alarmSoundServiceHelper.stopService(this)
         super.onTerminate()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
index c0436142283..74d46d6b394 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
@@ -24,7 +24,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
 import info.nightscout.androidaps.plugins.general.overview.OverviewData
 import info.nightscout.androidaps.plugins.general.overview.OverviewMenus
@@ -50,7 +50,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
@@ -89,8 +89,8 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         setContentView(binding.root)
 
         // We don't want to use injected singletons but own instance working on top of different data
-        iobCobCalculator = IobCobCalculatorPlugin(injector, aapsLogger, aapsSchedulers, rxBus, sp, resourceHelper, profileFunction, activePlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy, dateUtil, repository)
-        overviewData = OverviewData(injector, aapsLogger, resourceHelper, dateUtil, sp, activePlugin, defaultValueHelper, profileFunction, config, loopPlugin, nsDeviceStatus, repository, overviewMenus, iobCobCalculator, translator)
+        iobCobCalculator = IobCobCalculatorPlugin(injector, aapsLogger, aapsSchedulers, rxBus, sp, rh, profileFunction, activePlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy, dateUtil, repository)
+        overviewData = OverviewData(injector, aapsLogger, rh, dateUtil, sp, activePlugin, defaultValueHelper, profileFunction, config, loopPlugin, nsDeviceStatus, repository, overviewMenus, iobCobCalculator, translator)
 
         binding.left.setOnClickListener {
             adjustTimeRange(overviewData.fromTime - T.hours(rangeToDisplay.toLong()).msecs())
@@ -158,7 +158,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
 
         axisWidth = if (dm.densityDpi <= 120) 3 else if (dm.densityDpi <= 160) 10 else if (dm.densityDpi <= 320) 35 else if (dm.densityDpi <= 420) 50 else if (dm.densityDpi <= 560) 70 else 80
-        binding.bgGraph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
+        binding.bgGraph.gridLabelRenderer?.gridColor = rh.gc(R.color.graphgrid)
         binding.bgGraph.gridLabelRenderer?.reloadStyles()
         binding.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth
 
@@ -185,36 +185,33 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        disposable.add(rxBus
-                .toObservable(EventAutosensCalculationFinished::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({
-                    // catch only events from iobCobCalculator
-                    if (it.cause is EventCustomCalculationFinished)
-                        refreshLoop("EventAutosensCalculationFinished")
-                }, fabricPrivacy::logException)
-        )
-        disposable.add(rxBus
-                .toObservable(EventIobCalculationProgress::class.java)
-                .observeOn(aapsSchedulers.main)
-                .subscribe({
-                    if (it.cause is EventCustomCalculationFinished)
-                        binding.overviewIobcalculationprogess.text = it.progress
-                }, fabricPrivacy::logException)
-        )
-        disposable.add(rxBus
-                .toObservable(EventRefreshOverview::class.java)
-                .observeOn(aapsSchedulers.main)
-                .subscribe({ updateGUI("EventRefreshOverview") }, fabricPrivacy::logException)
-        )
         disposable += rxBus
-                .toObservable(EventBucketedDataCreated::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({
-                    overviewData.prepareBucketedData("EventBucketedDataCreated")
-                    overviewData.prepareBgData("EventBucketedDataCreated")
-                    rxBus.send(EventRefreshOverview("EventBucketedDataCreated"))
-                }, fabricPrivacy::logException)
+            .toObservable(EventAutosensCalculationFinished::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({
+                           // catch only events from iobCobCalculator
+                           if (it.cause is EventCustomCalculationFinished)
+                               refreshLoop("EventAutosensCalculationFinished")
+                       }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventIobCalculationProgress::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({
+                           if (it.cause is EventCustomCalculationFinished)
+                               binding.overviewIobcalculationprogess.text = it.progress
+                       }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventRefreshOverview::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateGUI("EventRefreshOverview") }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventBucketedDataCreated::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({
+                           overviewData.prepareBucketedData("EventBucketedDataCreated")
+                           overviewData.prepareBgData("EventBucketedDataCreated")
+                           rxBus.send(EventRefreshOverview("EventBucketedDataCreated"))
+                       }, fabricPrivacy::logException)
 
         if (overviewData.fromTime == 0L) {
             // set start of current day
@@ -244,8 +241,8 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                 relativeLayout.layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
 
                 val graph = GraphView(this)
-                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(100)).also { it.setMargins(0, resourceHelper.dpToPx(15), 0, resourceHelper.dpToPx(10)) }
-                graph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
+                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, rh.dpToPx(100)).also { it.setMargins(0, rh.dpToPx(15), 0, rh.dpToPx(10)) }
+                graph.gridLabelRenderer?.gridColor = rh.gc(R.color.graphgrid)
                 graph.gridLabelRenderer?.reloadStyles()
                 graph.gridLabelRenderer?.isHorizontalLabelsVisible = false
                 graph.gridLabelRenderer?.labelVerticalWidth = axisWidth
@@ -254,7 +251,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                 relativeLayout.addView(graph)
 
                 val label = TextView(this)
-                val layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(resourceHelper.dpToPx(30), resourceHelper.dpToPx(25), 0, 0) }
+                val layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(rh.dpToPx(30), rh.dpToPx(25), 0, 0) }
                 layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP)
                 layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT)
                 label.layoutParams = layoutParams
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index eb74f7b8cff..b9cd7b9d0ab 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -24,7 +24,7 @@ import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
@@ -48,6 +48,7 @@ import info.nightscout.androidaps.plugins.source.EversensePlugin
 import info.nightscout.androidaps.plugins.source.GlimpPlugin
 import info.nightscout.androidaps.plugins.source.PoctechPlugin
 import info.nightscout.androidaps.plugins.source.TomatoPlugin
+import info.nightscout.androidaps.plugins.source.GlunovoPlugin
 import info.nightscout.androidaps.utils.SafeParse
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog.show
 import info.nightscout.androidaps.utils.protection.PasswordCheck
@@ -61,8 +62,8 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     private var pluginId = -1
     private var filter = ""
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var pluginStore: PluginStore
@@ -90,6 +91,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var glimpPlugin: GlimpPlugin
     @Inject lateinit var poctechPlugin: PoctechPlugin
     @Inject lateinit var tomatoPlugin: TomatoPlugin
+    @Inject lateinit var glunovoPlugin: GlunovoPlugin
     @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
     @Inject lateinit var statusLinePlugin: StatusLinePlugin
     @Inject lateinit var tidepoolPlugin: TidepoolPlugin
@@ -160,6 +162,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             addPreferencesFromResourceIfEnabled(eversensePlugin, rootKey)
             addPreferencesFromResourceIfEnabled(dexcomPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(tomatoPlugin, rootKey)
+            addPreferencesFromResourceIfEnabled(glunovoPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(poctechPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(glimpPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(loopPlugin, rootKey, config.APS)
@@ -197,21 +200,21 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
         rxBus.send(EventPreferenceChange(key))
-        if (key == resourceHelper.gs(R.string.key_language)) {
+        if (key == rh.gs(R.string.key_language)) {
             rxBus.send(EventRebuildTabs(true))
             //recreate() does not update language so better close settings
             activity?.finish()
         }
-        if (key == resourceHelper.gs(R.string.key_short_tabtitles)) {
+        if (key == rh.gs(R.string.key_short_tabtitles)) {
             rxBus.send(EventRebuildTabs())
         }
-        if (key == resourceHelper.gs(R.string.key_units)) {
+        if (key == rh.gs(R.string.key_units)) {
             activity?.recreate()
             return
         }
-        if (key == resourceHelper.gs(R.string.key_openapsama_useautosens) && sp.getBoolean(R.string.key_openapsama_useautosens, false)) {
+        if (key == rh.gs(R.string.key_openapsama_useautosens) && sp.getBoolean(R.string.key_openapsama_useautosens, false)) {
             activity?.let {
-                show(it, resourceHelper.gs(R.string.configbuilder_sensitivity), resourceHelper.gs(R.string.sensitivity_warning))
+                show(it, rh.gs(R.string.configbuilder_sensitivity), rh.gs(R.string.sensitivity_warning))
             }
         }
         checkForBiometricFallback(key)
@@ -228,15 +231,15 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
 
     private fun checkForBiometricFallback(key: String) {
         // Biometric protection activated without set master password
-        if ((resourceHelper.gs(R.string.key_settings_protection) == key ||
-                resourceHelper.gs(R.string.key_application_protection) == key ||
-                resourceHelper.gs(R.string.key_bolus_protection) == key) &&
+        if ((rh.gs(R.string.key_settings_protection) == key ||
+                rh.gs(R.string.key_application_protection) == key ||
+                rh.gs(R.string.key_bolus_protection) == key) &&
             sp.getString(R.string.key_master_password, "") == "" &&
             sp.getInt(key, ProtectionCheck.ProtectionType.NONE.ordinal) == ProtectionCheck.ProtectionType.BIOMETRIC.ordinal
         ) {
             activity?.let {
-                val title = resourceHelper.gs(R.string.unsecure_fallback_biometric)
-                val message = resourceHelper.gs(R.string.master_password_missing, resourceHelper.gs(R.string.configbuilder_general), resourceHelper.gs(R.string.protection))
+                val title = rh.gs(R.string.unsecure_fallback_biometric)
+                val message = rh.gs(R.string.master_password_missing, rh.gs(R.string.configbuilder_general), rh.gs(R.string.protection))
                 show(it, title = title, message = message)
             }
         }
@@ -245,10 +248,10 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
         val isBiometricActivated = sp.getInt(R.string.key_settings_protection, ProtectionCheck.ProtectionType.NONE.ordinal) == ProtectionCheck.ProtectionType.BIOMETRIC.ordinal ||
             sp.getInt(R.string.key_application_protection, ProtectionCheck.ProtectionType.NONE.ordinal) == ProtectionCheck.ProtectionType.BIOMETRIC.ordinal ||
             sp.getInt(R.string.key_bolus_protection, ProtectionCheck.ProtectionType.NONE.ordinal) == ProtectionCheck.ProtectionType.BIOMETRIC.ordinal
-        if (resourceHelper.gs(R.string.key_master_password) == key && sp.getString(key, "") == "" && isBiometricActivated) {
+        if (rh.gs(R.string.key_master_password) == key && sp.getString(key, "") == "" && isBiometricActivated) {
             activity?.let {
-                val title = resourceHelper.gs(R.string.unsecure_fallback_biometric)
-                val message = resourceHelper.gs(R.string.unsecure_fallback_descriotion_biometric)
+                val title = rh.gs(R.string.unsecure_fallback_biometric)
+                val message = rh.gs(R.string.unsecure_fallback_descriotion_biometric)
                 show(it, title = title, message = message)
             }
         }
@@ -278,11 +281,11 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
 
     private fun adjustUnitDependentPrefs(pref: Preference) { // convert preferences values to current units
         val unitDependent = arrayOf(
-            resourceHelper.gs(R.string.key_hypo_target),
-            resourceHelper.gs(R.string.key_activity_target),
-            resourceHelper.gs(R.string.key_eatingsoon_target),
-            resourceHelper.gs(R.string.key_high_mark),
-            resourceHelper.gs(R.string.key_low_mark)
+            rh.gs(R.string.key_hypo_target),
+            rh.gs(R.string.key_activity_target),
+            rh.gs(R.string.key_eatingsoon_target),
+            rh.gs(R.string.key_high_mark),
+            rh.gs(R.string.key_low_mark)
         )
         if (unitDependent.toList().contains(pref.key) && pref is EditTextPreference) {
             val converted = Profile.toCurrentUnits(profileFunction, SafeParse.stringToDouble(pref.text))
@@ -322,20 +325,20 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             pref.setSummary(pref.entry)
             // Preferences
             // Preferences
-            if (pref.getKey() == resourceHelper.gs(R.string.key_settings_protection)) {
-                val pass: Preference? = findPreference(resourceHelper.gs(R.string.key_settings_password))
+            if (pref.getKey() == rh.gs(R.string.key_settings_protection)) {
+                val pass: Preference? = findPreference(rh.gs(R.string.key_settings_password))
                 if (pass != null) pass.isEnabled = pref.value == ProtectionCheck.ProtectionType.CUSTOM_PASSWORD.ordinal.toString()
             }
             // Application
             // Application
-            if (pref.getKey() == resourceHelper.gs(R.string.key_application_protection)) {
-                val pass: Preference? = findPreference(resourceHelper.gs(R.string.key_application_password))
+            if (pref.getKey() == rh.gs(R.string.key_application_protection)) {
+                val pass: Preference? = findPreference(rh.gs(R.string.key_application_password))
                 if (pass != null) pass.isEnabled = pref.value == ProtectionCheck.ProtectionType.CUSTOM_PASSWORD.ordinal.toString()
             }
             // Bolus
             // Bolus
-            if (pref.getKey() == resourceHelper.gs(R.string.key_bolus_protection)) {
-                val pass: Preference? = findPreference(resourceHelper.gs(R.string.key_bolus_password))
+            if (pref.getKey() == rh.gs(R.string.key_bolus_protection)) {
+                val pass: Preference? = findPreference(rh.gs(R.string.key_bolus_password))
                 if (pass != null) pass.isEnabled = pref.value == ProtectionCheck.ProtectionType.CUSTOM_PASSWORD.ordinal.toString()
             }
         }
@@ -353,10 +356,10 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
         }
 
         val hmacPasswords = arrayOf(
-            resourceHelper.gs(R.string.key_bolus_password),
-            resourceHelper.gs(R.string.key_master_password),
-            resourceHelper.gs(R.string.key_application_password),
-            resourceHelper.gs(R.string.key_settings_password)
+            rh.gs(R.string.key_bolus_password),
+            rh.gs(R.string.key_master_password),
+            rh.gs(R.string.key_application_password),
+            rh.gs(R.string.key_settings_password)
         )
 
         if (pref is Preference) {
@@ -364,7 +367,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
                 if (sp.getString(pref.key, "").startsWith("hmac:")) {
                     pref.summary = "******"
                 } else {
-                    pref.summary = resourceHelper.gs(R.string.password_not_set)
+                    pref.summary = rh.gs(R.string.password_not_set)
                 }
             }
         }
@@ -393,26 +396,26 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     override fun onPreferenceTreeClick(preference: Preference?): Boolean {
         context?.let { context ->
             if (preference != null) {
-                if (preference.key == resourceHelper.gs(R.string.key_master_password)) {
+                if (preference.key == rh.gs(R.string.key_master_password)) {
                     passwordCheck.queryPassword(context, R.string.current_master_password, R.string.key_master_password, {
                         passwordCheck.setPassword(context, R.string.master_password, R.string.key_master_password)
                     })
                     return true
                 }
-                if (preference.key == resourceHelper.gs(R.string.key_settings_password)) {
+                if (preference.key == rh.gs(R.string.key_settings_password)) {
                     passwordCheck.setPassword(context, R.string.settings_password, R.string.key_settings_password)
                     return true
                 }
-                if (preference.key == resourceHelper.gs(R.string.key_bolus_password)) {
+                if (preference.key == rh.gs(R.string.key_bolus_password)) {
                     passwordCheck.setPassword(context, R.string.bolus_password, R.string.key_bolus_password)
                     return true
                 }
-                if (preference.key == resourceHelper.gs(R.string.key_application_password)) {
+                if (preference.key == rh.gs(R.string.key_application_password)) {
                     passwordCheck.setPassword(context, R.string.application_password, R.string.key_application_password)
                     return true
                 }
                 // NSClient copy settings
-                if (preference.key == resourceHelper.gs(R.string.key_statuslights_copy_ns)) {
+                if (preference.key == rh.gs(R.string.key_statuslights_copy_ns)) {
                     nsSettingStatus.copyStatusLightsNsSettings(context)
                     return true
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
index d209670b01f..edff5991226 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
@@ -31,7 +31,7 @@ class PreferencesActivity : NoSplashAppCompatActivity(), PreferenceFragmentCompa
             override fun afterTextChanged(s: Editable) {}
         })
 
-        title = resourceHelper.gs(R.string.nav_preferences)
+        title = rh.gs(R.string.nav_preferences)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
         myPreferenceFragment = MyPreferenceFragment()
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
index e89e11a7354..eb69d5658fe 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
@@ -9,8 +9,8 @@ import android.widget.PopupMenu
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.data.PureProfile
-import info.nightscout.androidaps.data.defaultProfile.DefaultProfile
-import info.nightscout.androidaps.data.defaultProfile.DefaultProfileDPV
+import info.nightscout.androidaps.utils.defaultProfile.DefaultProfile
+import info.nightscout.androidaps.utils.defaultProfile.DefaultProfileDPV
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch
 import info.nightscout.androidaps.databinding.ActivityProfilehelperBinding
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.profile.local.events.EventLocalProfileChanged
 import info.nightscout.androidaps.utils.DateUtil
@@ -38,7 +38,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var defaultProfile: DefaultProfile
     @Inject lateinit var defaultProfileDPV: DefaultProfileDPV
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var repository: AppRepository
@@ -140,7 +140,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
             val profile = if (typeSelected[tabSelected] == ProfileType.MOTOL_DEFAULT) defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
             else defaultProfileDPV.profile(age, tdd, pct / 100.0, profileFunction.getUnits())
             profile?.let {
-                OKDialog.showConfirmation(this, resourceHelper.gs(R.string.careportal_profileswitch), resourceHelper.gs(R.string.copytolocalprofile), Runnable {
+                OKDialog.showConfirmation(this, rh.gs(R.string.careportal_profileswitch), rh.gs(R.string.copytolocalprofile), Runnable {
                     localProfilePlugin.addProfile(localProfilePlugin.copyFrom(it, "DefaultProfile " +
                         dateUtil.dateAndTimeAndSecondsString(dateUtil.now())
                             .replace(".", "/")
@@ -168,7 +168,11 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
 
         binding.basalpctfromtdd.setParams(32.0, 32.0, 37.0, 1.0, DecimalFormat("0"), false, null)
 
-        binding.tdds.text = tddCalculator.stats()
+        binding.tdds.text = getString(R.string.tdd) + ": " + rh.gs(R.string.calculation_in_progress);
+        Thread {
+            val tdds = tddCalculator.stats()
+            runOnUiThread { binding.tdds.text = tdds }
+        }.start()
 
         // Current profile
         binding.currentProfileText.text = profileFunction.getProfileName()
@@ -242,8 +246,8 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
 
     private fun getProfileName(age: Double, tdd: Double, weight: Double, basalSumPct: Double, tab: Int): String =
         when (typeSelected[tab]) {
-            ProfileType.MOTOL_DEFAULT     -> if (tdd > 0) resourceHelper.gs(R.string.formatwithtdd, age, tdd) else resourceHelper.gs(R.string.formatwithweight, age, weight)
-            ProfileType.DPV_DEFAULT       -> resourceHelper.gs(R.string.formatwittddandpct, age, tdd, (basalSumPct * 100).toInt())
+            ProfileType.MOTOL_DEFAULT     -> if (tdd > 0) rh.gs(R.string.formatwithtdd, age, tdd) else rh.gs(R.string.formatwithweight, age, weight)
+            ProfileType.DPV_DEFAULT       -> rh.gs(R.string.formatwittddandpct, age, tdd, (basalSumPct * 100).toInt())
             ProfileType.CURRENT           -> profileFunction.getProfileName()
             ProfileType.AVAILABLE_PROFILE -> profileList[profileUsed[tab]].toString()
             ProfileType.PROFILE_SWITCH    -> profileSwitch[profileSwitchUsed[tab]].originalCustomizedName
@@ -263,16 +267,16 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
 
         tabSelected = tab
         typeSelected[tabSelected] = newContent
-        binding.profiletypeTitle.defaultHintTextColor = ColorStateList.valueOf(resourceHelper.gc(if (tab == 0) R.color.tabBgColorSelected else R.color.examinedProfile))
+        binding.profiletypeTitle.defaultHintTextColor = ColorStateList.valueOf(rh.gc(if (tab == 0) R.color.tabBgColorSelected else R.color.examinedProfile))
 
         // show new content
         binding.profiletype.setText(
             when (typeSelected[tabSelected]) {
-                ProfileType.MOTOL_DEFAULT     -> resourceHelper.gs(R.string.motoldefaultprofile)
-                ProfileType.DPV_DEFAULT       -> resourceHelper.gs(R.string.dpvdefaultprofile)
-                ProfileType.CURRENT           -> resourceHelper.gs(R.string.currentprofile)
-                ProfileType.AVAILABLE_PROFILE -> resourceHelper.gs(R.string.availableprofile)
-                ProfileType.PROFILE_SWITCH    -> resourceHelper.gs(R.string.careportal_profileswitch)
+                ProfileType.MOTOL_DEFAULT     -> rh.gs(R.string.motoldefaultprofile)
+                ProfileType.DPV_DEFAULT       -> rh.gs(R.string.dpvdefaultprofile)
+                ProfileType.CURRENT           -> rh.gs(R.string.currentprofile)
+                ProfileType.AVAILABLE_PROFILE -> rh.gs(R.string.availableprofile)
+                ProfileType.PROFILE_SWITCH    -> rh.gs(R.string.careportal_profileswitch)
             })
         binding.defaultProfile.visibility = (newContent == ProfileType.MOTOL_DEFAULT || newContent == ProfileType.DPV_DEFAULT).toVisibility()
         binding.currentProfile.visibility = (newContent == ProfileType.CURRENT).toVisibility()
@@ -293,7 +297,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
     }
 
     private fun setBackgroundColorOnSelected(tab: Int) {
-        binding.menu1.setBackgroundColor(resourceHelper.gc(if (tab == 1) R.color.defaultbackground else R.color.tempbasal))
-        binding.menu2.setBackgroundColor(resourceHelper.gc(if (tab == 0) R.color.defaultbackground else R.color.examinedProfile))
+        binding.menu1.setBackgroundColor(rh.gc(if (tab == 1) R.color.defaultbackground else R.color.tempbasal))
+        binding.menu2.setBackgroundColor(rh.gc(if (tab == 0) R.color.defaultbackground else R.color.examinedProfile))
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
index 82912e3da31..1ad4bb826f2 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
@@ -9,6 +9,7 @@ import info.nightscout.androidaps.databinding.ActivityStatsBinding
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ActivityMonitor
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.stats.TddCalculator
 import info.nightscout.androidaps.utils.stats.TirCalculator
 import javax.inject.Inject
@@ -28,9 +29,9 @@ class StatsActivity : NoSplashAppCompatActivity() {
         binding = ActivityStatsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        binding.tdds.text = getString(R.string.tdd) + ": " + getString(R.string.calculation_in_progress)
-        binding.tir.text = getString(R.string.tir) + ": " + getString(R.string.calculation_in_progress)
-        binding.activity.text = getString(R.string.activitymonitor) + ": " + getString(R.string.calculation_in_progress)
+        binding.tdds.text = getString(R.string.tdd) + ": " + rh.gs(R.string.calculation_in_progress)
+        binding.tir.text = getString(R.string.tir) + ": " + rh.gs(R.string.calculation_in_progress)
+        binding.activity.text = rh.gs(R.string.activitymonitor) + ": " + rh.gs(R.string.calculation_in_progress)
 
         Thread {
             val tdds = tddCalculator.stats()
@@ -47,7 +48,7 @@ class StatsActivity : NoSplashAppCompatActivity() {
 
         binding.ok.setOnClickListener { finish() }
         binding.reset.setOnClickListener {
-            OKDialog.showConfirmation(this, resourceHelper.gs(R.string.doyouwantresetstats)) {
+            OKDialog.showConfirmation(this, rh.gs(R.string.doyouwantresetstats)) {
                 uel.log(Action.STAT_RESET, Sources.Stats)
                 activityMonitor.reset()
                 recreate()
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
index b7af9b81547..72f728c8694 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
@@ -5,7 +5,7 @@ import android.widget.ArrayAdapter
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.database.FirebaseDatabase
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.defaultProfile.DefaultProfile
+import info.nightscout.androidaps.utils.defaultProfile.DefaultProfile
 import info.nightscout.androidaps.databinding.ActivitySurveyBinding
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.interfaces.ActivePlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/TreatmentsActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/TreatmentsActivity.kt
index 4cd4ab559a5..9a68aeaf5ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/TreatmentsActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/TreatmentsActivity.kt
@@ -24,8 +24,8 @@ class TreatmentsActivity : NoSplashAppCompatActivity() {
         binding = TreatmentsFragmentBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        binding.tempBasals.visibility = buildHelper.isEngineeringMode().toVisibility()
-        binding.extendedBoluses.visibility = (buildHelper.isEngineeringMode() && !activePlugin.activePump.isFakingTempsByExtendedBoluses).toVisibility()
+        //binding.tempBasals.visibility = buildHelper.isEngineeringMode().toVisibility()
+        //binding.extendedBoluses.visibility = (buildHelper.isEngineeringMode() && !activePlugin.activePump.isFakingTempsByExtendedBoluses).toVisibility()
 
         binding.treatments.setOnClickListener {
             setFragment(TreatmentsBolusCarbsFragment())
@@ -67,14 +67,14 @@ class TreatmentsActivity : NoSplashAppCompatActivity() {
     }
 
     private fun setBackgroundColorOnSelected(selected: View) {
-        binding.treatments.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        binding.extendedBoluses.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        binding.tempBasals.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        binding.tempTargets.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        binding.profileSwitches.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        binding.careportal.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        binding.userentry.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        selected.setBackgroundColor(resourceHelper.gc(R.color.tabBgColorSelected))
+        binding.treatments.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        binding.extendedBoluses.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        binding.tempBasals.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        binding.tempTargets.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        binding.profileSwitches.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        binding.careportal.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        binding.userentry.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        selected.setBackgroundColor(rh.gc(R.color.tabBgColorSelected))
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt
index 051c6ba2127..b6a1af7745f 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.activities.fragments
 
+import android.annotation.SuppressLint
 import android.graphics.Paint
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -24,22 +25,22 @@ import info.nightscout.androidaps.databinding.TreatmentsBolusCarbsItemBinding
 import info.nightscout.androidaps.dialogs.WizardInfoDialog
 import info.nightscout.androidaps.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.events.EventTreatmentChange
+import info.nightscout.androidaps.events.EventTreatmentUpdateGui
+import info.nightscout.androidaps.extensions.iobCalc
+import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
-import info.nightscout.androidaps.events.EventTreatmentUpdateGui
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
-import info.nightscout.androidaps.extensions.iobCalc
-import info.nightscout.androidaps.extensions.toVisibility
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -49,13 +50,14 @@ import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.rxkotlin.subscribeBy
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
+import kotlin.math.abs
 
 class TreatmentsBolusCarbsFragment : DaggerFragment() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var dateUtil: DateUtil
@@ -84,6 +86,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
         TreatmentsBolusCarbsFragmentBinding.inflate(inflater, container, false).also { _binding = it }.root
 
+    @SuppressLint("CheckResult")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.recyclerview.setHasFixedSize(true)
@@ -91,7 +94,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
 
         binding.refreshFromNightscout.setOnClickListener {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.refresheventsfromnightscout) + "?") {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.refresheventsfromnightscout) + "?") {
                     uel.log(Action.TREATMENTS_NS_REFRESH, Sources.Treatments)
                     disposable +=
                         Completable.fromAction {
@@ -114,7 +117,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
         }
         binding.deleteFutureTreatments.setOnClickListener {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.overview_treatment_label), resourceHelper.gs(R.string.deletefuturetreatments) + "?", Runnable {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.overview_treatment_label), rh.gs(R.string.deletefuturetreatments) + "?", Runnable {
                     uel.log(Action.DELETE_FUTURE_TREATMENTS, Sources.Treatments)
                     repository
                         .getBolusesDataFromTime(dateUtil.now(), false)
@@ -276,28 +279,36 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
             holder.binding.bolusLayout.visibility = (ml.bolus != null && (ml.bolus.isValid || binding.showInvalidated.isChecked)).toVisibility()
             ml.bolus?.let { bolus ->
                 holder.binding.bolusDate.text = dateUtil.timeString(bolus.timestamp)
-                holder.binding.insulin.text = resourceHelper.gs(R.string.formatinsulinunits, bolus.amount)
+                holder.binding.insulin.text = rh.gs(R.string.formatinsulinunits, bolus.amount)
                 holder.binding.bolusNs.visibility = (bolus.interfaceIDs.nightscoutId != null).toVisibility()
                 holder.binding.bolusPump.visibility = (bolus.interfaceIDs.pumpId != null).toVisibility()
                 holder.binding.bolusInvalid.visibility = bolus.isValid.not().toVisibility()
                 val iob = bolus.iobCalc(activePlugin, System.currentTimeMillis(), profile.dia)
-                holder.binding.iob.text = resourceHelper.gs(R.string.formatinsulinunits, iob.iobContrib)
-                holder.binding.iobLabel.visibility = (iob.iobContrib != 0.0).toVisibility()
-                holder.binding.iob.visibility = (iob.iobContrib != 0.0).toVisibility()
-                if (bolus.timestamp > dateUtil.now()) holder.binding.date.setTextColor(resourceHelper.gc(R.color.colorScheduled)) else holder.binding.date.setTextColor(holder.binding.carbs.currentTextColor)
+                if (iob.iobContrib > 0.01) {
+                    holder.binding.iob.setTextColor(rh.gc(R.color.colorActive))
+                    holder.binding.iob.text = rh.gs(R.string.formatinsulinunits, iob.iobContrib)
+                    holder.binding.iobLabel.visibility = View.VISIBLE
+                    holder.binding.iob.visibility = View.VISIBLE
+                } else {
+                    holder.binding.iob.text = rh.gs(R.string.formatinsulinunits, 0.0)
+                    holder.binding.iob.setTextColor(holder.binding.insulin.currentTextColor)
+                    holder.binding.iobLabel.visibility = View.GONE
+                    holder.binding.iob.visibility = View.GONE
+                }
+                if (bolus.timestamp > dateUtil.now()) holder.binding.date.setTextColor(rh.gc(R.color.colorScheduled)) else holder.binding.date.setTextColor(holder.binding.carbs.currentTextColor)
                 holder.binding.mealOrCorrection.text =
                     when (ml.bolus.type) {
                         Bolus.Type.SMB     -> "SMB"
-                        Bolus.Type.NORMAL  -> resourceHelper.gs(R.string.mealbolus)
-                        Bolus.Type.PRIMING -> resourceHelper.gs(R.string.prime)
+                        Bolus.Type.NORMAL  -> rh.gs(R.string.mealbolus)
+                        Bolus.Type.PRIMING -> rh.gs(R.string.prime)
                     }
             }
             // Carbs
             holder.binding.carbsLayout.visibility = (ml.carbs != null && (ml.carbs.isValid || binding.showInvalidated.isChecked)).toVisibility()
             ml.carbs?.let { carbs ->
                 holder.binding.carbsDate.text = dateUtil.timeString(carbs.timestamp)
-                holder.binding.carbs.text = resourceHelper.gs(R.string.format_carbs, carbs.amount.toInt())
-                holder.binding.carbsDuration.text = if (carbs.duration > 0) resourceHelper.gs(R.string.format_mins, T.msecs(carbs.duration).mins().toInt()) else ""
+                holder.binding.carbs.text = rh.gs(R.string.format_carbs, carbs.amount.toInt())
+                holder.binding.carbsDuration.text = if (carbs.duration > 0) rh.gs(R.string.format_mins, T.msecs(carbs.duration).mins().toInt()) else ""
                 holder.binding.carbsNs.visibility = (carbs.interfaceIDs.nightscoutId != null).toVisibility()
                 holder.binding.carbsPump.visibility = (carbs.interfaceIDs.pumpId != null).toVisibility()
                 holder.binding.carbsInvalid.visibility = carbs.isValid.not().toVisibility()
@@ -320,7 +331,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
 
             init {
                 binding.calculation.setOnClickListener {
-                    val mealLinkLoaded = it.tag as MealLink
+                    val mealLinkLoaded = it.tag as MealLink? ?: return@setOnClickListener
                     mealLinkLoaded.bolusCalculatorResult?.let { bolusCalculatorResult ->
                         WizardInfoDialog().also { wizardDialog ->
                             wizardDialog.setData(bolusCalculatorResult)
@@ -332,10 +343,10 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
                 binding.bolusRemove.setOnClickListener { ml ->
                     val bolus = (ml.tag as MealLink?)?.bolus ?: return@setOnClickListener
                     activity?.let { activity ->
-                        val text = resourceHelper.gs(R.string.configbuilder_insulin) + ": " +
-                            resourceHelper.gs(R.string.formatinsulinunits, bolus.amount) + "\n" +
-                            resourceHelper.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(bolus.timestamp)
-                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
+                        val text = rh.gs(R.string.configbuilder_insulin) + ": " +
+                            rh.gs(R.string.formatinsulinunits, bolus.amount) + "\n" +
+                            rh.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(bolus.timestamp)
+                        OKDialog.showConfirmation(activity, rh.gs(R.string.removerecord), text, Runnable {
                             uel.log(
                                 Action.BOLUS_REMOVED, Sources.Treatments,
                                 ValueWithUnit.Timestamp(bolus.timestamp),
@@ -354,14 +365,15 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
                 binding.carbsRemove.setOnClickListener { ml ->
                     val carb = (ml.tag as MealLink?)?.carbs ?: return@setOnClickListener
                     activity?.let { activity ->
-                        val text = resourceHelper.gs(R.string.carbs) + ": " +
-                            resourceHelper.gs(R.string.carbs) + ": " + resourceHelper.gs(R.string.format_carbs, carb.amount.toInt()) + "\n" +
-                            resourceHelper.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(carb.timestamp)
-                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
+                        val text = rh.gs(R.string.carbs) + ": " +
+                            rh.gs(R.string.carbs) + ": " + rh.gs(R.string.format_carbs, carb.amount.toInt()) + "\n" +
+                            rh.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(carb.timestamp)
+                        OKDialog.showConfirmation(activity, rh.gs(R.string.removerecord), text, Runnable {
                             uel.log(
                                 Action.CARBS_REMOVED, Sources.Treatments,
                                 ValueWithUnit.Timestamp(carb.timestamp),
-                                ValueWithUnit.Gram(carb.amount.toInt()))
+                                ValueWithUnit.Gram(carb.amount.toInt())
+                            )
                             disposable += repository.runTransactionForResult(InvalidateCarbsTransaction(carb.id))
                                 .subscribe(
                                     { result -> result.invalidated.forEach { aapsLogger.debug(LTag.DATABASE, "Invalidated carbs $it") } },
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt
index e7c9fc480cb..9c6b08ddf39 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.events.EventTherapyEventChange
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.events.EventTreatmentUpdateGui
 import info.nightscout.androidaps.activities.fragments.TreatmentsCareportalFragment.RecyclerViewAdapter.TherapyEventsViewHolder
@@ -46,9 +46,9 @@ import javax.inject.Inject
 class TreatmentsCareportalFragment : DaggerFragment() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var translator: Translator
     @Inject lateinit var dateUtil: DateUtil
@@ -76,11 +76,10 @@ class TreatmentsCareportalFragment : DaggerFragment() {
         binding.recyclerview.layoutManager = LinearLayoutManager(view.context)
         binding.refreshFromNightscout.setOnClickListener {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal), resourceHelper.gs(R.string.refresheventsfromnightscout) + " ?", Runnable {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.careportal), rh.gs(R.string.refresheventsfromnightscout) + " ?", Runnable {
                     uel.log(Action.CAREPORTAL_NS_REFRESH, Sources.Treatments)
                     disposable += Completable.fromAction { repository.deleteAllTherapyEventsEntries() }
                         .subscribeOn(aapsSchedulers.io)
-                        .observeOn(aapsSchedulers.main)
                         .subscribeBy(
                             onError = { aapsLogger.error("Error removing entries", it) },
                             onComplete = { rxBus.send(EventTherapyEventChange()) }
@@ -91,9 +90,9 @@ class TreatmentsCareportalFragment : DaggerFragment() {
         }
         binding.removeAndroidapsStartedEvents.setOnClickListener {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal), resourceHelper.gs(R.string.careportal_removestartedevents), Runnable {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.careportal), rh.gs(R.string.careportal_removestartedevents), Runnable {
                     uel.log(Action.RESTART_EVENTS_REMOVED, Sources.Treatments)
-                    repository.runTransactionForResult(InvalidateAAPSStartedTherapyEventTransaction(resourceHelper.gs(R.string.androidaps_start)))
+                    repository.runTransactionForResult(InvalidateAAPSStartedTherapyEventTransaction(rh.gs(R.string.androidaps_start)))
                         .subscribe(
                             { result -> result.invalidated.forEach { aapsLogger.debug(LTag.DATABASE, "Invalidated therapy event $it") } },
                             { aapsLogger.error(LTag.DATABASE, "Error while invalidating therapy event", it) }
@@ -165,7 +164,7 @@ class TreatmentsCareportalFragment : DaggerFragment() {
             holder.binding.ns.visibility = (therapyEvent.interfaceIDs.nightscoutId != null).toVisibility()
             holder.binding.invalid.visibility = therapyEvent.isValid.not().toVisibility()
             holder.binding.date.text = dateUtil.dateAndTimeString(therapyEvent.timestamp)
-            holder.binding.duration.text = if (therapyEvent.duration == 0L) "" else dateUtil.niceTimeScalar(therapyEvent.duration, resourceHelper)
+            holder.binding.duration.text = if (therapyEvent.duration == 0L) "" else dateUtil.niceTimeScalar(therapyEvent.duration, rh)
             holder.binding.note.text = therapyEvent.note
             holder.binding.type.text = translator.translate(therapyEvent.type)
             holder.binding.remove.tag = therapyEvent
@@ -183,11 +182,11 @@ class TreatmentsCareportalFragment : DaggerFragment() {
                 binding.remove.setOnClickListener { v: View ->
                     val therapyEvent = v.tag as TherapyEvent
                     activity?.let { activity ->
-                        val text = resourceHelper.gs(R.string.eventtype) + ": " + translator.translate(therapyEvent.type) + "\n" +
-                            resourceHelper.gs(R.string.notes_label) + ": " + (therapyEvent.note
+                        val text = rh.gs(R.string.eventtype) + ": " + translator.translate(therapyEvent.type) + "\n" +
+                            rh.gs(R.string.notes_label) + ": " + (therapyEvent.note
                             ?: "") + "\n" +
-                            resourceHelper.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(therapyEvent.timestamp)
-                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
+                            rh.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(therapyEvent.timestamp)
+                        OKDialog.showConfirmation(activity, rh.gs(R.string.removerecord), text, Runnable {
                             uel.log(Action.CAREPORTAL_REMOVED, Sources.Treatments, therapyEvent.note ,
                                 ValueWithUnit.Timestamp(therapyEvent.timestamp),
                                 ValueWithUnit.TherapyEventType(therapyEvent.type))
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt
index d5dfec5f6cb..af72a3087c0 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt
@@ -29,7 +29,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.activities.fragments.TreatmentsExtendedBolusesFragment.RecyclerViewAdapter.ExtendedBolusesViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -49,8 +49,8 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
     private val millsToThePast = T.days(30).msecs()
 
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var profileFunction: ProfileFunction
@@ -128,18 +128,18 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
             @SuppressLint("SetTextI18n")
             if (extendedBolus.isInProgress(dateUtil)) {
                 holder.binding.date.text = dateUtil.dateAndTimeString(extendedBolus.timestamp)
-                holder.binding.date.setTextColor(resourceHelper.gc(R.color.colorActive))
+                holder.binding.date.setTextColor(rh.gc(R.color.colorActive))
             } else {
                 holder.binding.date.text = dateUtil.dateAndTimeString(extendedBolus.timestamp) + " - " + dateUtil.timeString(extendedBolus.end)
                 holder.binding.date.setTextColor(holder.binding.insulin.currentTextColor)
             }
             val profile = profileFunction.getProfile(extendedBolus.timestamp) ?: return
-            holder.binding.duration.text = resourceHelper.gs(R.string.format_mins, T.msecs(extendedBolus.duration).mins())
-            holder.binding.insulin.text = resourceHelper.gs(R.string.formatinsulinunits, extendedBolus.amount)
+            holder.binding.duration.text = rh.gs(R.string.format_mins, T.msecs(extendedBolus.duration).mins())
+            holder.binding.insulin.text = rh.gs(R.string.formatinsulinunits, extendedBolus.amount)
             val iob = extendedBolus.iobCalc(System.currentTimeMillis(), profile, activePlugin.activeInsulin)
-            holder.binding.iob.text = resourceHelper.gs(R.string.formatinsulinunits, iob.iob)
-            holder.binding.ratio.text = resourceHelper.gs(R.string.pump_basebasalrate, extendedBolus.rate)
-            if (iob.iob != 0.0) holder.binding.iob.setTextColor(resourceHelper.gc(R.color.colorActive)) else holder.binding.iob.setTextColor(holder.binding.insulin.currentTextColor)
+            holder.binding.iob.text = rh.gs(R.string.formatinsulinunits, iob.iob)
+            holder.binding.ratio.text = rh.gs(R.string.pump_basebasalrate, extendedBolus.rate)
+            if (iob.iob != 0.0) holder.binding.iob.setTextColor(rh.gc(R.color.colorActive)) else holder.binding.iob.setTextColor(holder.binding.insulin.currentTextColor)
             holder.binding.remove.tag = extendedBolus
         }
 
@@ -153,10 +153,10 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
                 binding.remove.setOnClickListener { v: View ->
                     val extendedBolus = v.tag as ExtendedBolus
                     context?.let { context ->
-                        OKDialog.showConfirmation(context, resourceHelper.gs(R.string.removerecord),
+                        OKDialog.showConfirmation(context, rh.gs(R.string.removerecord),
                             """
-                ${resourceHelper.gs(R.string.extended_bolus)}
-                ${resourceHelper.gs(R.string.date)}: ${dateUtil.dateAndTimeString(extendedBolus.timestamp)}
+                ${rh.gs(R.string.extended_bolus)}
+                ${rh.gs(R.string.date)}: ${dateUtil.dateAndTimeString(extendedBolus.timestamp)}
                 """.trimIndent(), { _: DialogInterface, _: Int ->
                             uel.log(Action.EXTENDED_BOLUS_REMOVED, Sources.Treatments,
                                 ValueWithUnit.Timestamp(extendedBolus.timestamp),
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt
index 846fa50ec6d..266cf3d12c7 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt
@@ -24,13 +24,14 @@ import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.profile.local.events.EventLocalProfileChanged
 import info.nightscout.androidaps.events.EventTreatmentUpdateGui
 import info.nightscout.androidaps.activities.fragments.TreatmentsProfileSwitchFragment.RecyclerProfileViewAdapter.ProfileSwitchViewHolder
+import info.nightscout.androidaps.events.EventEffectiveProfileSwitchChanged
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
@@ -47,11 +48,11 @@ import javax.inject.Inject
 
 class TreatmentsProfileSwitchFragment : DaggerFragment() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var buildHelper: BuildHelper
@@ -79,7 +80,7 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
 
         binding.refreshFromNightscout.setOnClickListener {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.refresheventsfromnightscout) + "?") {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.refresheventsfromnightscout) + "?") {
                     uel.log(Action.TREATMENTS_NS_REFRESH, Sources.Treatments)
                     disposable +=
                         Completable.fromAction {
@@ -92,6 +93,7 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
                                 onError = { aapsLogger.error("Error removing entries", it) },
                                 onComplete = {
                                     rxBus.send(EventProfileSwitchChanged())
+                                    rxBus.send(EventEffectiveProfileSwitchChanged(0L))
                                     rxBus.send(EventNewHistoryData(0, false))
                                 }
                             )
@@ -147,11 +149,14 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
     override fun onResume() {
         super.onResume()
         swapAdapter()
-        disposable.add(rxBus
+        disposable += rxBus
             .toObservable(EventProfileSwitchChanged::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({ swapAdapter() }, fabricPrivacy::logException)
-        )
+        disposable += rxBus
+            .toObservable(EventEffectiveProfileSwitchChanged::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ swapAdapter() }, fabricPrivacy::logException)
     }
 
     @Synchronized
@@ -177,9 +182,9 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
             holder.binding.ph.visibility = (profileSwitch is ProfileSealed.EPS).toVisibility()
             holder.binding.ns.visibility = (profileSwitch.interfaceIDs_backing?.nightscoutId != null).toVisibility()
             holder.binding.date.text = dateUtil.dateAndTimeString(profileSwitch.timestamp)
-            holder.binding.duration.text = resourceHelper.gs(R.string.format_mins, T.msecs(profileSwitch.duration ?: 0L).mins())
+            holder.binding.duration.text = rh.gs(R.string.format_mins, T.msecs(profileSwitch.duration ?: 0L).mins())
             holder.binding.name.text = if (profileSwitch is ProfileSealed.PS) profileSwitch.value.getCustomizedName() else if (profileSwitch is ProfileSealed.EPS) profileSwitch.value.originalCustomizedName else ""
-            if (profileSwitch.isInProgress(dateUtil)) holder.binding.date.setTextColor(resourceHelper.gc(R.color.colorActive))
+            if (profileSwitch.isInProgress(dateUtil)) holder.binding.date.setTextColor(rh.gc(R.color.colorActive))
             else holder.binding.date.setTextColor(holder.binding.duration.currentTextColor)
             holder.binding.remove.tag = profileSwitch
             holder.binding.clone.tag = profileSwitch
@@ -190,7 +195,7 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
             holder.binding.remove.visibility = (profileSwitch is ProfileSealed.PS).toVisibility()
             holder.binding.clone.visibility = (profileSwitch is ProfileSealed.PS).toVisibility()
             holder.binding.spacer.visibility = (profileSwitch is ProfileSealed.PS).toVisibility()
-            holder.binding.root.setBackgroundColor(resourceHelper.gc(if (profileSwitch is ProfileSealed.PS) R.color.defaultbackground else R.color.list_delimiter))
+            holder.binding.root.setBackgroundColor(rh.gc(if (profileSwitch is ProfileSealed.PS) R.color.defaultbackground else R.color.list_delimiter))
         }
 
         override fun getItemCount(): Int {
@@ -205,9 +210,9 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
                 binding.remove.setOnClickListener { view ->
                     val profileSwitch = view.tag as ProfileSealed.PS
                     activity?.let { activity ->
-                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord),
-                            resourceHelper.gs(R.string.careportal_profileswitch) + ": " + profileSwitch.profileName +
-                                "\n" + resourceHelper.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(profileSwitch.timestamp), Runnable {
+                        OKDialog.showConfirmation(activity, rh.gs(R.string.removerecord),
+                            rh.gs(R.string.careportal_profileswitch) + ": " + profileSwitch.profileName +
+                                "\n" + rh.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(profileSwitch.timestamp), Runnable {
                             uel.log(Action.PROFILE_SWITCH_REMOVED, Sources.Treatments, profileSwitch.profileName,
                                 ValueWithUnit.Timestamp(profileSwitch.timestamp))
                             disposable += repository.runTransactionForResult(InvalidateProfileSwitchTransaction(profileSwitch.id))
@@ -222,7 +227,7 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
                     activity?.let { activity ->
                         val profileSwitch = (it.tag as ProfileSealed.PS).value
                         val profileSealed = it.tag as ProfileSealed
-                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), resourceHelper.gs(R.string.copytolocalprofile) + "\n" + profileSwitch.getCustomizedName() + "\n" + dateUtil.dateAndTimeString(profileSwitch.timestamp), Runnable {
+                        OKDialog.showConfirmation(activity, rh.gs(R.string.careportal_profileswitch), rh.gs(R.string.copytolocalprofile) + "\n" + profileSwitch.getCustomizedName() + "\n" + dateUtil.dateAndTimeString(profileSwitch.timestamp), Runnable {
                             uel.log(Action.PROFILE_SWITCH_CLONED, Sources.Treatments,
                                 profileSwitch.getCustomizedName() + " " + dateUtil.dateAndTimeString(profileSwitch.timestamp).replace(".", "_"),
                                 ValueWithUnit.Timestamp(profileSwitch.timestamp),
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt
index ea872749144..067b3490490 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt
@@ -26,7 +26,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.events.EventTreatmentUpdateGui
 import info.nightscout.androidaps.activities.fragments.TreatmentsTempTargetFragment.RecyclerViewAdapter.TempTargetsViewHolder
@@ -53,10 +53,10 @@ import javax.inject.Inject
 class TreatmentsTempTargetFragment : DaggerFragment() {
 
     @Inject lateinit var sp: SP
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var translator: Translator
     @Inject lateinit var dateUtil: DateUtil
@@ -83,7 +83,7 @@ class TreatmentsTempTargetFragment : DaggerFragment() {
         binding.recyclerview.layoutManager = LinearLayoutManager(view.context)
         binding.refreshFromNightscout.setOnClickListener {
             context?.let { context ->
-                OKDialog.showConfirmation(context, resourceHelper.gs(R.string.refresheventsfromnightscout) + " ?", {
+                OKDialog.showConfirmation(context, rh.gs(R.string.refresheventsfromnightscout) + " ?", {
                     uel.log(Action.TT_NS_REFRESH, Sources.Treatments)
                     disposable += Completable.fromAction { repository.deleteAllTempTargetEntries() }
                         .subscribeOn(aapsSchedulers.io)
@@ -165,14 +165,14 @@ class TreatmentsTempTargetFragment : DaggerFragment() {
             holder.binding.invalid.visibility = tempTarget.isValid.not().toVisibility()
             holder.binding.remove.visibility = tempTarget.isValid.toVisibility()
             holder.binding.date.text = dateUtil.dateAndTimeString(tempTarget.timestamp) + " - " + dateUtil.timeString(tempTarget.end)
-            holder.binding.duration.text = resourceHelper.gs(R.string.format_mins, T.msecs(tempTarget.duration).mins())
+            holder.binding.duration.text = rh.gs(R.string.format_mins, T.msecs(tempTarget.duration).mins())
             holder.binding.low.text = tempTarget.lowValueToUnitsToString(units)
             holder.binding.high.text = tempTarget.highValueToUnitsToString(units)
             holder.binding.reason.text = translator.translate(tempTarget.reason)
             holder.binding.date.setTextColor(
                 when {
-                    tempTarget.id == currentlyActiveTarget?.id -> resourceHelper.gc(R.color.colorActive)
-                    tempTarget.timestamp > dateUtil.now()      -> resourceHelper.gc(R.color.colorScheduled)
+                    tempTarget.id == currentlyActiveTarget?.id -> rh.gc(R.color.colorActive)
+                    tempTarget.timestamp > dateUtil.now()      -> rh.gc(R.color.colorScheduled)
                     else                                       -> holder.binding.reasonColon.currentTextColor
                 })
             holder.binding.remove.tag = tempTarget
@@ -188,9 +188,9 @@ class TreatmentsTempTargetFragment : DaggerFragment() {
                 binding.remove.setOnClickListener { v: View ->
                     val tempTarget = v.tag as TemporaryTarget
                     context?.let { context ->
-                        OKDialog.showConfirmation(context, resourceHelper.gs(R.string.removerecord),
+                        OKDialog.showConfirmation(context, rh.gs(R.string.removerecord),
                             """
-                        ${resourceHelper.gs(R.string.careportal_temporarytarget)}: ${tempTarget.friendlyDescription(profileFunction.getUnits(), resourceHelper)}
+                        ${rh.gs(R.string.careportal_temporarytarget)}: ${tempTarget.friendlyDescription(profileFunction.getUnits(), rh)}
                         ${dateUtil.dateAndTimeString(tempTarget.timestamp)}
                         """.trimIndent(),
                             { _: DialogInterface?, _: Int ->
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
index c856386cb64..bf922a55db9 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
@@ -35,7 +35,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.activities.fragments.TreatmentsTemporaryBasalsFragment.RecyclerViewAdapter.TempBasalsViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -54,8 +54,8 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
     private val disposable = CompositeDisposable()
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var profileFunction: ProfileFunction
@@ -167,24 +167,24 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
             holder.binding.ph.visibility = (tempBasal.interfaceIDs.pumpId != null).toVisibility()
             if (tempBasal.isInProgress) {
                 holder.binding.date.text = dateUtil.dateAndTimeString(tempBasal.timestamp)
-                holder.binding.date.setTextColor(resourceHelper.gc(R.color.colorActive))
+                holder.binding.date.setTextColor(rh.gc(R.color.colorActive))
             } else {
                 holder.binding.date.text = dateUtil.dateAndTimeRangeString(tempBasal.timestamp, tempBasal.end)
                 holder.binding.date.setTextColor(holder.binding.duration.currentTextColor)
             }
-            holder.binding.duration.text = resourceHelper.gs(R.string.format_mins, T.msecs(tempBasal.duration).mins())
-            if (tempBasal.isAbsolute) holder.binding.rate.text = resourceHelper.gs(R.string.pump_basebasalrate, tempBasal.rate)
-            else holder.binding.rate.text = resourceHelper.gs(R.string.format_percent, tempBasal.rate.toInt())
+            holder.binding.duration.text = rh.gs(R.string.format_mins, T.msecs(tempBasal.duration).mins())
+            if (tempBasal.isAbsolute) holder.binding.rate.text = rh.gs(R.string.pump_basebasalrate, tempBasal.rate)
+            else holder.binding.rate.text = rh.gs(R.string.format_percent, tempBasal.rate.toInt())
             val now = dateUtil.now()
             var iob = IobTotal(now)
             val profile = profileFunction.getProfile(now)
             if (profile != null) iob = tempBasal.iobCalc(now, profile, activePlugin.activeInsulin)
-            holder.binding.iob.text = resourceHelper.gs(R.string.formatinsulinunits, iob.basaliob)
+            holder.binding.iob.text = rh.gs(R.string.formatinsulinunits, iob.basaliob)
             holder.binding.extendedFlag.visibility = (tempBasal.type == TemporaryBasal.Type.FAKE_EXTENDED).toVisibility()
             holder.binding.suspendFlag.visibility = (tempBasal.type == TemporaryBasal.Type.PUMP_SUSPEND).toVisibility()
             holder.binding.emulatedSuspendFlag.visibility = (tempBasal.type == TemporaryBasal.Type.EMULATED_PUMP_SUSPEND).toVisibility()
             holder.binding.superBolusFlag.visibility = (tempBasal.type == TemporaryBasal.Type.SUPERBOLUS).toVisibility()
-            if (abs(iob.basaliob) > 0.01) holder.binding.iob.setTextColor(resourceHelper.gc(R.color.colorActive)) else holder.binding.iob.setTextColor(holder.binding.duration.currentTextColor)
+            if (abs(iob.basaliob) > 0.01) holder.binding.iob.setTextColor(rh.gc(R.color.colorActive)) else holder.binding.iob.setTextColor(holder.binding.duration.currentTextColor)
             holder.binding.remove.tag = tempBasal
         }
 
@@ -206,10 +206,10 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
                     val profile = profileFunction.getProfile(dateUtil.now())
                         ?: return@setOnClickListener
                     context?.let {
-                        OKDialog.showConfirmation(it, resourceHelper.gs(R.string.removerecord),
+                        OKDialog.showConfirmation(it, rh.gs(R.string.removerecord),
                             """
-                ${if (isFakeExtended) resourceHelper.gs(R.string.extended_bolus) else resourceHelper.gs(R.string.tempbasal_label)}: ${tempBasal.toStringFull(profile, dateUtil)}
-                ${resourceHelper.gs(R.string.date)}: ${dateUtil.dateAndTimeString(tempBasal.timestamp)}
+                ${if (isFakeExtended) rh.gs(R.string.extended_bolus) else rh.gs(R.string.tempbasal_label)}: ${tempBasal.toStringFull(profile, dateUtil)}
+                ${rh.gs(R.string.date)}: ${dateUtil.dateAndTimeString(tempBasal.timestamp)}
                 """.trimIndent(),
                             { _: DialogInterface?, _: Int ->
                                 if (isFakeExtended && extendedBolus != null) {
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt
index a0b5d1b1697..8cb5681995d 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt
@@ -18,7 +18,7 @@ import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.ImportExportPrefs
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.events.EventTreatmentUpdateGui
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -36,11 +36,11 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
 
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var translator: Translator
     @Inject lateinit var importExportPrefs: ImportExportPrefs
     @Inject lateinit var uel: UserEntryLogger
@@ -66,9 +66,9 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
         binding.recyclerview.layoutManager = LinearLayoutManager(view.context)
         binding.ueExportToXml.setOnClickListener {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.ue_export_to_csv) + "?") {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.ue_export_to_csv) + "?") {
                     uel.log(Action.EXPORT_CSV, Sources.Treatments)
-                    importExportPrefs.exportUserEntriesCsv(activity, repository.getAllUserEntries())
+                    importExportPrefs.exportUserEntriesCsv(activity)
                 }
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt b/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt
index 1f238d014ad..ca170443a36 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt
+++ b/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt
@@ -2,12 +2,10 @@ package info.nightscout.androidaps.db
 
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.*
-import info.nightscout.androidaps.database.entities.ExtendedBolus
-import info.nightscout.androidaps.database.entities.TemporaryBasal
 import info.nightscout.androidaps.events.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
 import io.reactivex.disposables.Disposable
 import javax.inject.Inject
@@ -17,7 +15,7 @@ import javax.inject.Singleton
 class CompatDBHelper @Inject constructor(
     val aapsLogger: AAPSLogger,
     val repository: AppRepository,
-    val rxBus: RxBusWrapper
+    val rxBus: RxBus
 ) {
 
     fun dbChangeDisposable(): Disposable = repository
@@ -34,56 +32,56 @@ class CompatDBHelper @Inject constructor(
              */
             var newestGlucoseValue: GlucoseValue? = null
             it.filterIsInstance<GlucoseValue>().lastOrNull()?.let { gv ->
-                aapsLogger.debug(LTag.DATABASE, "Firing EventNewBg")
+                aapsLogger.debug(LTag.DATABASE, "Firing EventNewBg $gv")
                 rxBus.send(EventNewBG(gv))
                 newestGlucoseValue = gv
             }
             it.filterIsInstance<GlucoseValue>().map { gv -> gv.timestamp }.minOrNull()?.let { timestamp ->
-                aapsLogger.debug(LTag.DATABASE, "Firing EventNewHistoryData")
+                aapsLogger.debug(LTag.DATABASE, "Firing EventNewHistoryData $newestGlucoseValue")
                 rxBus.send(EventNewHistoryData(timestamp, true, newestGlucoseValue))
             }
             it.filterIsInstance<Carbs>().map { t -> t.timestamp }.minOrNull()?.let { timestamp ->
-                aapsLogger.debug(LTag.DATABASE, "Firing EventTreatmentChange")
+                aapsLogger.debug(LTag.DATABASE, "Firing EventTreatmentChange $timestamp")
                 rxBus.send(EventTreatmentChange())
                 rxBus.send(EventNewHistoryData(timestamp, false))
             }
             it.filterIsInstance<Bolus>().map { t -> t.timestamp }.minOrNull()?.let { timestamp ->
-                aapsLogger.debug(LTag.DATABASE, "Firing EventTreatmentChange")
+                aapsLogger.debug(LTag.DATABASE, "Firing EventTreatmentChange $timestamp")
                 rxBus.send(EventTreatmentChange())
                 rxBus.send(EventNewHistoryData(timestamp, false))
             }
             it.filterIsInstance<TemporaryBasal>().map { t -> t.timestamp }.minOrNull()?.let { timestamp ->
-                aapsLogger.debug(LTag.DATABASE, "Firing EventTempBasalChange")
+                aapsLogger.debug(LTag.DATABASE, "Firing EventTempBasalChange $timestamp")
                 rxBus.send(EventTempBasalChange())
                 rxBus.send(EventNewHistoryData(timestamp, false))
             }
             it.filterIsInstance<ExtendedBolus>().map { t -> t.timestamp }.minOrNull()?.let { timestamp ->
-                aapsLogger.debug(LTag.DATABASE, "Firing EventExtendedBolusChange")
+                aapsLogger.debug(LTag.DATABASE, "Firing EventExtendedBolusChange $timestamp")
                 rxBus.send(EventExtendedBolusChange())
                 rxBus.send(EventNewHistoryData(timestamp, false))
             }
-            it.filterIsInstance<TemporaryTarget>().firstOrNull()?.let {
-                aapsLogger.debug(LTag.DATABASE, "Firing EventTempTargetChange")
+            it.filterIsInstance<TemporaryTarget>().firstOrNull()?.let { tt ->
+                aapsLogger.debug(LTag.DATABASE, "Firing EventTempTargetChange $tt")
                 rxBus.send(EventTempTargetChange())
             }
-            it.filterIsInstance<TherapyEvent>().firstOrNull()?.let {
-                aapsLogger.debug(LTag.DATABASE, "Firing EventTherapyEventChange")
+            it.filterIsInstance<TherapyEvent>().firstOrNull()?.let { te ->
+                aapsLogger.debug(LTag.DATABASE, "Firing EventTherapyEventChange $te")
                 rxBus.send(EventTherapyEventChange())
             }
-            it.filterIsInstance<Food>().firstOrNull()?.let {
-                aapsLogger.debug(LTag.DATABASE, "Firing EventFoodDatabaseChanged")
+            it.filterIsInstance<Food>().firstOrNull()?.let { food ->
+                aapsLogger.debug(LTag.DATABASE, "Firing EventFoodDatabaseChanged $food")
                 rxBus.send(EventFoodDatabaseChanged())
             }
-            it.filterIsInstance<ProfileSwitch>().firstOrNull()?.let {
-                aapsLogger.debug(LTag.DATABASE, "Firing EventProfileSwitchChanged")
+            it.filterIsInstance<ProfileSwitch>().firstOrNull()?.let { ps ->
+                aapsLogger.debug(LTag.DATABASE, "Firing EventProfileSwitchChanged $ps")
                 rxBus.send(EventProfileSwitchChanged())
             }
-            it.filterIsInstance<EffectiveProfileSwitch>().firstOrNull()?.let {
-                aapsLogger.debug(LTag.DATABASE, "Firing EventProfileSwitchChanged")
-                rxBus.send(EventProfileSwitchChanged())
+            it.filterIsInstance<EffectiveProfileSwitch>().firstOrNull()?.let { eps ->
+                aapsLogger.debug(LTag.DATABASE, "Firing EventEffectiveProfileSwitchChanged $eps")
+                rxBus.send(EventEffectiveProfileSwitchChanged(eps))
             }
-            it.filterIsInstance<OfflineEvent>().firstOrNull()?.let {
-                aapsLogger.debug(LTag.DATABASE, "Firing EventOfflineChange")
+            it.filterIsInstance<OfflineEvent>().firstOrNull()?.let { oe ->
+                aapsLogger.debug(LTag.DATABASE, "Firing EventOfflineChange $oe")
                 rxBus.send(EventOfflineChange())
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index d31c51f8e47..95f18111f89 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -11,18 +11,20 @@ import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImplementation
 import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefsImpl
 import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
 import info.nightscout.androidaps.plugins.general.nsclient.DataSyncSelectorImplementation
+import info.nightscout.androidaps.plugins.general.nsclient.data.DeviceStatusData
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.PumpSyncImplementation
-import info.nightscout.androidaps.queue.CommandQueue
+import info.nightscout.androidaps.queue.CommandQueueImplementation
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.androidNotification.NotificationHolderImpl
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
@@ -72,13 +74,14 @@ open class AppModule {
     @Provides
     @Singleton
     fun provideProfileFunction(
-        aapsLogger: AAPSLogger, sp: SP, rxBus: RxBusWrapper, resourceHelper:
+        aapsLogger: AAPSLogger, sp: SP, rxBus: RxBus, rh:
         ResourceHelper, activePlugin:
-        ActivePlugin, repository: AppRepository, dateUtil: DateUtil, config: Config, hardLimits: HardLimits
+        ActivePlugin, repository: AppRepository, dateUtil: DateUtil, config: Config, hardLimits: HardLimits,
+        aapsSchedulers: AapsSchedulers, fabricPrivacy: FabricPrivacy, deviceStatusData: DeviceStatusData
     ): ProfileFunction =
         ProfileFunctionImplementation(
-            aapsLogger, sp, rxBus, resourceHelper, activePlugin, repository, dateUtil,
-            config, hardLimits
+            aapsLogger, sp, rxBus, rh, activePlugin, repository, dateUtil,
+            config, hardLimits, aapsSchedulers, fabricPrivacy, deviceStatusData
         )
 
     @Module
@@ -86,8 +89,8 @@ open class AppModule {
 
         @Binds fun bindContext(mainApp: MainApp): Context
         @Binds fun bindInjector(mainApp: MainApp): HasAndroidInjector
-        @Binds fun bindActivePluginProvider(pluginStore: PluginStore): ActivePlugin
-        @Binds fun bindCommandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
+        @Binds fun bindActivePlugin(pluginStore: PluginStore): ActivePlugin
+        @Binds fun bindCommandQueue(commandQueue: CommandQueueImplementation): CommandQueue
         @Binds fun bindConfigInterface(config: ConfigImpl): Config
 
         @Binds fun bindConfigBuilderInterface(configBuilderPlugin: ConfigBuilderPlugin): ConfigBuilder
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 014a8de8e3c..56bc21dc498 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt
@@ -2,14 +2,14 @@ package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.queue.CommandQueue
+import info.nightscout.androidaps.queue.CommandQueueImplementation
 import info.nightscout.androidaps.queue.commands.*
 
 @Module
 @Suppress("unused")
 abstract class CommandQueueModule {
 
-    @ContributesAndroidInjector abstract fun commandQueueInjector(): CommandQueue
+    @ContributesAndroidInjector abstract fun commandQueueInjector(): CommandQueueImplementation
     @ContributesAndroidInjector abstract fun commandBolusInjector(): CommandBolus
     @ContributesAndroidInjector abstract fun commandCancelExtendedBolusInjector(): CommandCancelExtendedBolus
     @ContributesAndroidInjector abstract fun commandCancelTempBasalInjector(): CommandCancelTempBasal
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 f758398d629..b5266e4d3f2 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -12,11 +12,6 @@ import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragm
 import info.nightscout.androidaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
 import info.nightscout.androidaps.plugins.general.actions.ActionsFragment
 import info.nightscout.androidaps.plugins.general.automation.AutomationFragment
-import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseActionDialog
-import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseTriggerDialog
-import info.nightscout.androidaps.plugins.general.automation.dialogs.EditActionDialog
-import info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog
-import info.nightscout.androidaps.plugins.general.automation.dialogs.EditTriggerDialog
 import info.nightscout.androidaps.plugins.general.food.FoodFragment
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenanceFragment
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientFragment
@@ -30,6 +25,7 @@ import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment
 import info.nightscout.androidaps.plugins.source.BGSourceFragment
 import info.nightscout.androidaps.activities.fragments.*
+import info.nightscout.androidaps.plugins.general.automation.dialogs.*
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 
 @Module
@@ -81,6 +77,7 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesFillDialog(): FillDialog
     @ContributesAndroidInjector abstract fun contributesChooseActionDialog(): ChooseActionDialog
     @ContributesAndroidInjector abstract fun contributesChooseTriggerDialog(): ChooseTriggerDialog
+    @ContributesAndroidInjector abstract fun contributesChooseOperationDialog(): ChooseOperationDialog
     @ContributesAndroidInjector abstract fun contributesInsulinDialog(): InsulinDialog
     @ContributesAndroidInjector abstract fun contributesLoopDialog(): LoopDialog
     @ContributesAndroidInjector abstract fun contributesObjectivesExamDialog(): ObjectivesExamDialog
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 f861de7b078..6d58752f2bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -15,6 +15,7 @@ import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
 import info.nightscout.androidaps.plugins.constraints.dstHelper.DstHelperPlugin
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
@@ -43,6 +44,7 @@ import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.OmnipodDashPumpPlugin
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
@@ -161,6 +163,12 @@ abstract class PluginsModule {
     @IntKey(156)
     abstract fun bindOmnipodDashPumpPlugin(plugin: OmnipodDashPumpPlugin): PluginBase
 
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(135)
+    abstract fun bindOmnipodErosPumpPlugin(plugin: OmnipodErosPumpPlugin): PluginBase
+
     @Binds
     @PumpDriver
     @IntoMap
@@ -287,6 +295,12 @@ abstract class PluginsModule {
     @IntKey(380)
     abstract fun bindDstHelperPlugin(plugin: DstHelperPlugin): PluginBase
 
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(381)
+    abstract fun bindBgQualityCheckPlugin(plugin: BgQualityCheckPlugin): PluginBase
+
     @Binds
     @AllConfigs
     @IntoMap
@@ -339,6 +353,12 @@ abstract class PluginsModule {
     @AllConfigs
     @IntoMap
     @IntKey(470)
+    abstract fun bindGlunovoPlugin(plugin: GlunovoPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(475)
     abstract fun bindRandomBgPlugin(plugin: RandomBgPlugin): PluginBase
 
     // @Binds
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PreferencesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PreferencesModule.kt
index 738f53872a8..69023fe821f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PreferencesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PreferencesModule.kt
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.dependencyInjection
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
-import info.nightscout.androidaps.plugins.general.maintenance.formats.ClassicPrefsFormat
 import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat
 import info.nightscout.androidaps.utils.CryptoUtil
 
@@ -13,6 +12,5 @@ abstract class PreferencesModule {
 
     @ContributesAndroidInjector abstract fun cryptoUtilInjector(): CryptoUtil
     @ContributesAndroidInjector abstract fun encryptedPrefsFormatInjector(): EncryptedPrefsFormat
-    @ContributesAndroidInjector abstract fun classicPrefsFormatInjector(): ClassicPrefsFormat
     @ContributesAndroidInjector abstract fun prefImportListProviderInjector(): PrefFileListProvider
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt
index 1405b8867f0..9a9217bc56f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt
@@ -14,6 +14,7 @@ abstract class WizardModule {
     @ContributesAndroidInjector abstract fun swButtonInjector(): SWButton
     @ContributesAndroidInjector abstract fun swEditNumberWithUnitsInjector(): SWEditNumberWithUnits
     @ContributesAndroidInjector abstract fun swEditNumberInjector(): SWEditNumber
+    @ContributesAndroidInjector abstract fun swEditIntNumberInjector(): SWEditIntNumber
     @ContributesAndroidInjector abstract fun swEditStringInjector(): SWEditString
     @ContributesAndroidInjector abstract fun swEditEncryptedPasswordInjector(): SWEditEncryptedPassword
     @ContributesAndroidInjector abstract fun swEditUrlInjector(): SWEditUrl
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WorkersModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WorkersModule.kt
index 2e7bb25b43b..a4ef80ab811 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WorkersModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WorkersModule.kt
@@ -3,10 +3,10 @@ package info.nightscout.androidaps.dependencyInjection
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.plugins.general.food.FoodPlugin
+import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefsImpl
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientAddAckWorker
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientAddUpdateWorker
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientMbgWorker
-import info.nightscout.androidaps.plugins.general.nsclient.NSClientRemoveWorker
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientUpdateRemoveAckWorker
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
@@ -29,7 +29,7 @@ abstract class WorkersModule {
     @ContributesAndroidInjector abstract fun contributesNSClientWorker(): NSClientAddUpdateWorker
     @ContributesAndroidInjector abstract fun contributesNSClientAddAckWorker(): NSClientAddAckWorker
     @ContributesAndroidInjector abstract fun contributesNSClientUpdateRemoveAckWorker(): NSClientUpdateRemoveAckWorker
-    @ContributesAndroidInjector abstract fun contributesNSClientRemoveWorker(): NSClientRemoveWorker
     @ContributesAndroidInjector abstract fun contributesNSClientMbgWorker(): NSClientMbgWorker
     @ContributesAndroidInjector abstract fun contributesFoodWorker(): FoodPlugin.FoodWorker
+    @ContributesAndroidInjector abstract fun contributesCsvExportWorker(): ImportExportPrefsImpl.CsvExportWorker
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
index 5b4c6978142..8489ce49df5 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
@@ -27,7 +27,7 @@ import javax.inject.Inject
 class CalibrationDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var injector: HasAndroidInjector
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var xdripCalibrations: XdripCalibrations
     @Inject lateinit var uel: UserEntryLogger
@@ -63,7 +63,7 @@ class CalibrationDialog : DialogFragmentWithDate() {
         else
             binding.bg.setParams(savedInstanceState?.getDouble("bg")
                 ?: bg, 36.0, 500.0, 1.0, DecimalFormat("0"), false, binding.okcancel.ok)
-        binding.units.text = if (units == GlucoseUnit.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
+        binding.units.text = if (units == GlucoseUnit.MMOL) rh.gs(R.string.mmol) else rh.gs(R.string.mgdl)
     }
 
     override fun onDestroyView() {
@@ -74,20 +74,20 @@ class CalibrationDialog : DialogFragmentWithDate() {
     override fun submit(): Boolean {
         if (_binding == null) return false
         val units = profileFunction.getUnits()
-        val unitLabel = if (units == GlucoseUnit.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
+        val unitLabel = if (units == GlucoseUnit.MMOL) rh.gs(R.string.mmol) else rh.gs(R.string.mgdl)
         val actions: LinkedList<String?> = LinkedList()
         val bg = binding.bg.value ?: return false
-        actions.add(resourceHelper.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(profileFunction, bg) + " " + unitLabel)
+        actions.add(rh.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(profileFunction, bg) + " " + unitLabel)
         if (bg > 0) {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.overview_calibration), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.overview_calibration), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                     uel.log(Action.CALIBRATION, Sources.CalibrationDialog, ValueWithUnit.fromGlucoseUnit(bg, units.asText))
                     xdripCalibrations.sendIntent(bg)
                 })
             }
         } else
             activity?.let { activity ->
-                OKDialog.show(activity, resourceHelper.gs(R.string.overview_calibration), resourceHelper.gs(R.string.no_action_selected))
+                OKDialog.show(activity, rh.gs(R.string.overview_calibration), rh.gs(R.string.no_action_selected))
             }
         return true
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
index 3bfa076da95..7a5e116933c 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
@@ -11,7 +11,6 @@ import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.UserEntry.Action
@@ -20,15 +19,12 @@ import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.databinding.DialogCarbsBinding
 import info.nightscout.androidaps.extensions.formatColor
-import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.queue.Callback
-import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -43,13 +39,15 @@ import kotlin.math.max
 class CarbsDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var ctx: Context
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var iobCobCalculator: IobCobCalculator
+    @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var carbTimer: CarbTimer
+    @Inject lateinit var bolusTimer: BolusTimer
     @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var repository: AppRepository
 
@@ -76,15 +74,15 @@ class CarbsDialog : DialogFragmentWithDate() {
         val time = binding.time.value.toInt()
         if (time > 12 * 60 || time < -12 * 60) {
             binding.time.value = 0.0
-            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.constraintapllied))
+            ToastUtils.showToastInUiThread(ctx, rh.gs(R.string.constraintapllied))
         }
         if (binding.duration.value > 10) {
             binding.duration.value = 0.0
-            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.constraintapllied))
+            ToastUtils.showToastInUiThread(ctx, rh.gs(R.string.constraintapllied))
         }
         if (binding.carbs.value.toInt() > maxCarbs) {
             binding.carbs.value = 0.0
-            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.carbsconstraintapplied))
+            ToastUtils.showToastInUiThread(ctx, rh.gs(R.string.carbsconstraintapplied))
         }
     }
 
@@ -101,8 +99,10 @@ class CarbsDialog : DialogFragmentWithDate() {
         savedInstanceState.putDouble("carbs", binding.carbs.value)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View {
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
         onCreateViewGeneral()
         _binding = DialogCarbsBinding.inflate(inflater, container, false)
         return binding.root
@@ -110,35 +110,52 @@ class CarbsDialog : DialogFragmentWithDate() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
+        if (sp.getBoolean(R.string.key_usebolusreminder, false)) {
+            glucoseStatusProvider.glucoseStatusData?.let { glucoseStatus ->
+                if (glucoseStatus.glucose + 3 * glucoseStatus.delta < 70.0)
+                    binding.bolusReminder.visibility = View.VISIBLE
+            }
+        }
         val maxCarbs = constraintChecker.getMaxCarbsAllowed().value().toDouble()
-        binding.time.setParams(savedInstanceState?.getDouble("time")
-            ?: 0.0, -12 * 60.0, 12 * 60.0, 5.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher)
+        binding.time.setParams(
+            savedInstanceState?.getDouble("time")
+                ?: 0.0, -12 * 60.0, 12 * 60.0, 5.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher
+        )
 
-        binding.duration.setParams(savedInstanceState?.getDouble("duration")
-            ?: 0.0, 0.0, 10.0, 1.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher)
+        binding.duration.setParams(
+            savedInstanceState?.getDouble("duration")
+                ?: 0.0, 0.0, 10.0, 1.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher
+        )
 
-        binding.carbs.setParams(savedInstanceState?.getDouble("carbs")
-            ?: 0.0, 0.0, maxCarbs, 1.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher)
+        binding.carbs.setParams(
+            savedInstanceState?.getDouble("carbs")
+                ?: 0.0, 0.0, maxCarbs, 1.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher
+        )
 
         binding.plus1.text = toSignedString(sp.getInt(R.string.key_carbs_button_increment_1, FAV1_DEFAULT))
         binding.plus1.setOnClickListener {
-            binding.carbs.value = max(0.0, binding.carbs.value
-                + sp.getInt(R.string.key_carbs_button_increment_1, FAV1_DEFAULT))
+            binding.carbs.value = max(
+                0.0, binding.carbs.value
+                    + sp.getInt(R.string.key_carbs_button_increment_1, FAV1_DEFAULT)
+            )
             validateInputs()
         }
 
         binding.plus2.text = toSignedString(sp.getInt(R.string.key_carbs_button_increment_2, FAV2_DEFAULT))
         binding.plus2.setOnClickListener {
-            binding.carbs.value = max(0.0, binding.carbs.value
-                + sp.getInt(R.string.key_carbs_button_increment_2, FAV2_DEFAULT))
+            binding.carbs.value = max(
+                0.0, binding.carbs.value
+                    + sp.getInt(R.string.key_carbs_button_increment_2, FAV2_DEFAULT)
+            )
             validateInputs()
         }
 
         binding.plus3.text = toSignedString(sp.getInt(R.string.key_carbs_button_increment_3, FAV3_DEFAULT))
         binding.plus3.setOnClickListener {
-            binding.carbs.value = max(0.0, binding.carbs.value
-                + sp.getInt(R.string.key_carbs_button_increment_3, FAV3_DEFAULT))
+            binding.carbs.value = max(
+                0.0, binding.carbs.value
+                    + sp.getInt(R.string.key_carbs_button_increment_3, FAV3_DEFAULT)
+            )
             validateInputs()
         }
 
@@ -182,100 +199,128 @@ class CarbsDialog : DialogFragmentWithDate() {
         val hypoTTDuration = defaultValueHelper.determineHypoTTDuration()
         val hypoTT = defaultValueHelper.determineHypoTT()
         val actions: LinkedList<String?> = LinkedList()
-        val unitLabel = if (units == GlucoseUnit.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
+        val unitLabel = if (units == GlucoseUnit.MMOL) rh.gs(R.string.mmol) else rh.gs(R.string.mgdl)
         val useAlarm = binding.alarmCheckBox.isChecked
+        val remindBolus = binding.bolusReminderCheckBox.isChecked
 
         val activitySelected = binding.activityTt.isChecked
         if (activitySelected)
-            actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + resourceHelper.gs(R.string.format_mins, activityTTDuration) + ")").formatColor(resourceHelper, R.color.tempTargetConfirmation))
+            actions.add(
+                rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + rh.gs(R.string.format_mins, activityTTDuration) + ")").formatColor(
+                    rh,
+                    R.color.tempTargetConfirmation
+                )
+            )
         val eatingSoonSelected = binding.eatingSoonTt.isChecked
         if (eatingSoonSelected)
-            actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + resourceHelper.gs(R.string.format_mins, eatingSoonTTDuration) + ")").formatColor(resourceHelper, R.color.tempTargetConfirmation))
+            actions.add(
+                rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + rh.gs(
+                    R.string.format_mins,
+                    eatingSoonTTDuration
+                ) + ")").formatColor(rh, R.color.tempTargetConfirmation)
+            )
         val hypoSelected = binding.hypoTt.isChecked
         if (hypoSelected)
-            actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(hypoTT) + " " + unitLabel + " (" + resourceHelper.gs(R.string.format_mins, hypoTTDuration) + ")").formatColor(resourceHelper, R.color.tempTargetConfirmation))
+            actions.add(
+                rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(hypoTT) + " " + unitLabel + " (" + rh.gs(R.string.format_mins, hypoTTDuration) + ")").formatColor(
+                    rh,
+                    R.color.tempTargetConfirmation
+                )
+            )
 
         val timeOffset = binding.time.value.toInt()
         eventTime -= eventTime % 1000
         val time = eventTime + timeOffset * 1000 * 60
         if (timeOffset != 0)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(time))
+            actions.add(rh.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(time))
         if (useAlarm && carbs > 0 && timeOffset > 0)
-            actions.add(resourceHelper.gs(R.string.alarminxmin, timeOffset).formatColor(resourceHelper, R.color.info))
+            actions.add(rh.gs(R.string.alarminxmin, timeOffset).formatColor(rh, R.color.info))
         val duration = binding.duration.value.toInt()
         if (duration > 0)
-            actions.add(resourceHelper.gs(R.string.duration) + ": " + duration + resourceHelper.gs(R.string.shorthour))
+            actions.add(rh.gs(R.string.duration) + ": " + duration + rh.gs(R.string.shorthour))
         if (carbsAfterConstraints > 0) {
-            actions.add(resourceHelper.gs(R.string.carbs) + ": " + "<font color='" + resourceHelper.gc(R.color.carbs) + "'>" + resourceHelper.gs(R.string.format_carbs, carbsAfterConstraints) + "</font>")
+            actions.add(rh.gs(R.string.carbs) + ": " + "<font color='" + rh.gc(R.color.carbs) + "'>" + rh.gs(R.string.format_carbs, carbsAfterConstraints) + "</font>")
             if (carbsAfterConstraints != carbs)
-                actions.add("<font color='" + resourceHelper.gc(R.color.warning) + "'>" + resourceHelper.gs(R.string.carbsconstraintapplied) + "</font>")
+                actions.add("<font color='" + rh.gc(R.color.warning) + "'>" + rh.gs(R.string.carbsconstraintapplied) + "</font>")
         }
         val notes = binding.notesLayout.notes.text.toString()
         if (notes.isNotEmpty())
-            actions.add(resourceHelper.gs(R.string.notes_label) + ": " + notes)
+            actions.add(rh.gs(R.string.notes_label) + ": " + notes)
 
         if (eventTimeChanged)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
+            actions.add(rh.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
         if (carbsAfterConstraints > 0 || activitySelected || eatingSoonSelected || hypoSelected) {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.carbs), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.carbs), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                     when {
-                        activitySelected   -> {
-                            uel.log(Action.TT, Sources.CarbDialog,
+                        activitySelected -> {
+                            uel.log(
+                                Action.TT, Sources.CarbDialog,
                                 ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.ACTIVITY),
                                 ValueWithUnit.fromGlucoseUnit(activityTT, units.asText),
-                                ValueWithUnit.Minute(activityTTDuration))
-                            disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(
-                                timestamp = System.currentTimeMillis(),
-                                duration = TimeUnit.MINUTES.toMillis(activityTTDuration.toLong()),
-                                reason = TemporaryTarget.Reason.ACTIVITY,
-                                lowTarget = Profile.toMgdl(activityTT, profileFunction.getUnits()),
-                                highTarget = Profile.toMgdl(activityTT, profileFunction.getUnits())
-                            )).subscribe({ result ->
-                                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
-                                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
-                            }, {
-                                aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
-                            })
+                                ValueWithUnit.Minute(activityTTDuration)
+                            )
+                            disposable += repository.runTransactionForResult(
+                                InsertAndCancelCurrentTemporaryTargetTransaction(
+                                    timestamp = System.currentTimeMillis(),
+                                    duration = TimeUnit.MINUTES.toMillis(activityTTDuration.toLong()),
+                                    reason = TemporaryTarget.Reason.ACTIVITY,
+                                    lowTarget = Profile.toMgdl(activityTT, profileFunction.getUnits()),
+                                    highTarget = Profile.toMgdl(activityTT, profileFunction.getUnits())
+                                )
+                            ).subscribe({ result ->
+                                            result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
+                                            result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
+                                        }, {
+                                            aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
+                                        })
                         }
 
                         eatingSoonSelected -> {
-                            uel.log(Action.TT, Sources.CarbDialog,
+                            uel.log(
+                                Action.TT, Sources.CarbDialog,
                                 ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.EATING_SOON),
                                 ValueWithUnit.fromGlucoseUnit(eatingSoonTT, units.asText),
-                                ValueWithUnit.Minute(eatingSoonTTDuration))
-                            disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(
-                                timestamp = System.currentTimeMillis(),
-                                duration = TimeUnit.MINUTES.toMillis(eatingSoonTTDuration.toLong()),
-                                reason = TemporaryTarget.Reason.EATING_SOON,
-                                lowTarget = Profile.toMgdl(eatingSoonTT, profileFunction.getUnits()),
-                                highTarget = Profile.toMgdl(eatingSoonTT, profileFunction.getUnits())
-                            )).subscribe({ result ->
-                                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
-                                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
-                            }, {
-                                aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
-                            })
+                                ValueWithUnit.Minute(eatingSoonTTDuration)
+                            )
+                            disposable += repository.runTransactionForResult(
+                                InsertAndCancelCurrentTemporaryTargetTransaction(
+                                    timestamp = System.currentTimeMillis(),
+                                    duration = TimeUnit.MINUTES.toMillis(eatingSoonTTDuration.toLong()),
+                                    reason = TemporaryTarget.Reason.EATING_SOON,
+                                    lowTarget = Profile.toMgdl(eatingSoonTT, profileFunction.getUnits()),
+                                    highTarget = Profile.toMgdl(eatingSoonTT, profileFunction.getUnits())
+                                )
+                            ).subscribe({ result ->
+                                            result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
+                                            result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
+                                        }, {
+                                            aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
+                                        })
                         }
 
-                        hypoSelected       -> {
-                            uel.log(Action.TT, Sources.CarbDialog,
+                        hypoSelected -> {
+                            uel.log(
+                                Action.TT, Sources.CarbDialog,
                                 ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.HYPOGLYCEMIA),
                                 ValueWithUnit.fromGlucoseUnit(hypoTT, units.asText),
-                                ValueWithUnit.Minute(hypoTTDuration))
-                            disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(
-                                timestamp = System.currentTimeMillis(),
-                                duration = TimeUnit.MINUTES.toMillis(hypoTTDuration.toLong()),
-                                reason = TemporaryTarget.Reason.HYPOGLYCEMIA,
-                                lowTarget = Profile.toMgdl(hypoTT, profileFunction.getUnits()),
-                                highTarget = Profile.toMgdl(hypoTT, profileFunction.getUnits())
-                            )).subscribe({ result ->
-                                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
-                                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
-                            }, {
-                                aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
-                            })
+                                ValueWithUnit.Minute(hypoTTDuration)
+                            )
+                            disposable += repository.runTransactionForResult(
+                                InsertAndCancelCurrentTemporaryTargetTransaction(
+                                    timestamp = System.currentTimeMillis(),
+                                    duration = TimeUnit.MINUTES.toMillis(hypoTTDuration.toLong()),
+                                    reason = TemporaryTarget.Reason.HYPOGLYCEMIA,
+                                    lowTarget = Profile.toMgdl(hypoTT, profileFunction.getUnits()),
+                                    highTarget = Profile.toMgdl(hypoTT, profileFunction.getUnits())
+                                )
+                            ).subscribe({ result ->
+                                            result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
+                                            result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
+                                        }, {
+                                            aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
+                                        })
                         }
                     }
                     if (carbsAfterConstraints > 0) {
@@ -287,16 +332,18 @@ class CarbsDialog : DialogFragmentWithDate() {
                         detailedBolusInfo.carbsDuration = T.hours(duration.toLong()).msecs()
                         detailedBolusInfo.carbsTimestamp = time
                         uel.log(if (duration == 0) Action.CARBS else Action.EXTENDED_CARBS, Sources.CarbDialog,
-                            notes,
-                            ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
-                            ValueWithUnit.Gram(carbsAfterConstraints),
-                            ValueWithUnit.Minute(timeOffset).takeIf { timeOffset != 0 },
-                            ValueWithUnit.Hour(duration).takeIf { duration != 0 })
+                                notes,
+                                ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
+                                ValueWithUnit.Gram(carbsAfterConstraints),
+                                ValueWithUnit.Minute(timeOffset).takeIf { timeOffset != 0 },
+                                ValueWithUnit.Hour(duration).takeIf { duration != 0 })
                         commandQueue.bolus(detailedBolusInfo, object : Callback() {
                             override fun run() {
+                                carbTimer.removeEatReminder()
                                 if (!result.success) {
-                                    ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
-                                }
+                                    ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
+                                } else if (sp.getBoolean(R.string.key_usebolusreminder, false) && remindBolus)
+                                    bolusTimer.scheduleBolusReminder()
                             }
                         })
                     }
@@ -307,7 +354,7 @@ class CarbsDialog : DialogFragmentWithDate() {
             }
         } else
             activity?.let { activity ->
-                OKDialog.show(activity, resourceHelper.gs(R.string.carbs), resourceHelper.gs(R.string.no_action_selected))
+                OKDialog.show(activity, rh.gs(R.string.carbs), rh.gs(R.string.no_action_selected))
             }
         return true
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index 15883aaf9e9..3c4b6905ac5 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -41,7 +41,7 @@ class CareDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var ctx: Context
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var translator: Translator
     @Inject lateinit var uel: UserEntryLogger
@@ -111,7 +111,7 @@ class CareDialog : DialogFragmentWithDate() {
             EventType.QUESTION       -> R.drawable.ic_cp_question
             EventType.ANNOUNCEMENT   -> R.drawable.ic_cp_announcement
         })
-        binding.title.text = resourceHelper.gs(when (options) {
+        binding.title.text = rh.gs(when (options) {
             EventType.BGCHECK        -> R.string.careportal_bgcheck
             EventType.SENSOR_INSERT  -> R.string.careportal_cgmsensorinsert
             EventType.BATTERY_CHANGE -> R.string.careportal_pumpbatterychange
@@ -153,11 +153,11 @@ class CareDialog : DialogFragmentWithDate() {
         }
 
         if (profileFunction.getUnits() == GlucoseUnit.MMOL) {
-            binding.bgunits.text = resourceHelper.gs(R.string.mmol)
+            binding.bgunits.text = rh.gs(R.string.mmol)
             binding.bg.setParams(savedInstanceState?.getDouble("bg")
                 ?: bg, 2.0, 30.0, 0.1, DecimalFormat("0.0"), false, binding.okcancel.ok, bgTextWatcher)
         } else {
-            binding.bgunits.text = resourceHelper.gs(R.string.mgdl)
+            binding.bgunits.text = rh.gs(R.string.mgdl)
             binding.bg.setParams(savedInstanceState?.getDouble("bg")
                 ?: bg, 36.0, 500.0, 1.0, DecimalFormat("0"), false, binding.okcancel.ok, bgTextWatcher)
         }
@@ -200,25 +200,25 @@ class CareDialog : DialogFragmentWithDate() {
                     binding.sensor.isChecked -> TherapyEvent.MeterType.SENSOR
                     else                     -> TherapyEvent.MeterType.MANUAL
                 }
-            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_glucosetype) + ": " + translator.translate(meterType))
-            actions.add(resourceHelper.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(profileFunction, binding.bg.value) + " " + resourceHelper.gs(unitResId))
+            actions.add(rh.gs(R.string.careportal_newnstreatment_glucosetype) + ": " + translator.translate(meterType))
+            actions.add(rh.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(profileFunction, binding.bg.value) + " " + rh.gs(unitResId))
             therapyEvent.glucoseType = meterType
             therapyEvent.glucose = binding.bg.value
             valuesWithUnit.add(ValueWithUnit.fromGlucoseUnit(binding.bg.value.toDouble(), profileFunction.getUnits().asText))
             valuesWithUnit.add(ValueWithUnit.TherapyEventMeterType(meterType))
         }
         if (options == EventType.NOTE || options == EventType.EXERCISE) {
-            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_duration_label) + ": " + resourceHelper.gs(R.string.format_mins, binding.duration.value.toInt()))
+            actions.add(rh.gs(R.string.careportal_newnstreatment_duration_label) + ": " + rh.gs(R.string.format_mins, binding.duration.value.toInt()))
             therapyEvent.duration = T.mins(binding.duration.value.toLong()).msecs()
             valuesWithUnit.add(ValueWithUnit.Minute(binding.duration.value.toInt()).takeIf { !binding.duration.value.equals(0.0) } )
         }
         val notes = binding.notesLayout.notes.text.toString()
         if (notes.isNotEmpty()) {
-            actions.add(resourceHelper.gs(R.string.notes_label) + ": " + notes)
+            actions.add(rh.gs(R.string.notes_label) + ": " + notes)
             therapyEvent.note = notes
         }
 
-        if (eventTimeChanged) actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
+        if (eventTimeChanged) actions.add(rh.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
         therapyEvent.enteredBy = enteredBy
 
@@ -233,7 +233,7 @@ class CareDialog : DialogFragmentWithDate() {
         }
 
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, resourceHelper.gs(event), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
+            OKDialog.showConfirmation(activity, rh.gs(event), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                 disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction(therapyEvent))
                     .subscribe(
                         { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted therapy event $it") } },
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
index e3ed95451cc..ac86d3b9826 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.DialogExtendedbolusBinding
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
@@ -31,9 +31,9 @@ import kotlin.math.abs
 class ExtendedBolusDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var ctx: Context
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var constraintChecker: ConstraintChecker
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var uel: UserEntryLogger
 
@@ -83,20 +83,20 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
         val durationInMinutes = binding.duration.value.toInt()
         val actions: LinkedList<String> = LinkedList()
         val insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
-        actions.add(resourceHelper.gs(R.string.formatinsulinunits, insulinAfterConstraint))
-        actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, durationInMinutes))
+        actions.add(rh.gs(R.string.formatinsulinunits, insulinAfterConstraint))
+        actions.add(rh.gs(R.string.duration) + ": " + rh.gs(R.string.format_mins, durationInMinutes))
         if (abs(insulinAfterConstraint - insulin) > 0.01)
-            actions.add(resourceHelper.gs(R.string.constraintapllied).formatColor(resourceHelper, R.color.warning))
+            actions.add(rh.gs(R.string.constraintapllied).formatColor(rh, R.color.warning))
 
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.extended_bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
+            OKDialog.showConfirmation(activity, rh.gs(R.string.extended_bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                 uel.log(Action.EXTENDED_BOLUS, Sources.ExtendedBolusDialog,
                     ValueWithUnit.Insulin(insulinAfterConstraint),
                     ValueWithUnit.Minute(durationInMinutes))
                 commandQueue.extendedBolus(insulinAfterConstraint, durationInMinutes, object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
+                            ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                         }
                     }
                 })
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
index 398eca586f3..ad35ffe6121 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
@@ -17,7 +17,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
 import info.nightscout.androidaps.databinding.DialogFillBinding
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -38,9 +38,9 @@ import kotlin.math.abs
 class FillDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var constraintChecker: ConstraintChecker
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var ctx: Context
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var repository: AppRepository
@@ -111,29 +111,29 @@ class FillDialog : DialogFragmentWithDate() {
 
         val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value()
         if (insulinAfterConstraints > 0) {
-            actions.add(resourceHelper.gs(R.string.fillwarning))
+            actions.add(rh.gs(R.string.fillwarning))
             actions.add("")
-            actions.add(resourceHelper.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, resourceHelper).formatColor(resourceHelper, R.color.colorInsulinButton))
+            actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(rh, R.color.colorInsulinButton))
             if (abs(insulinAfterConstraints - insulin) > 0.01)
-                actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(resourceHelper, R.color.warning))
+                actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(rh, R.color.warning))
         }
         val siteChange = binding.fillCatheterChange.isChecked
         if (siteChange)
-            actions.add(resourceHelper.gs(R.string.record_pump_site_change).formatColor(resourceHelper, R.color.actionsConfirm))
+            actions.add(rh.gs(R.string.record_pump_site_change).formatColor(rh, R.color.actionsConfirm))
         val insulinChange = binding.fillCartridgeChange.isChecked
         if (insulinChange)
-            actions.add(resourceHelper.gs(R.string.record_insulin_cartridge_change).formatColor(resourceHelper, R.color.actionsConfirm))
+            actions.add(rh.gs(R.string.record_insulin_cartridge_change).formatColor(rh, R.color.actionsConfirm))
         val notes: String = binding.notesLayout.notes.text.toString()
         if (notes.isNotEmpty())
-            actions.add(resourceHelper.gs(R.string.notes_label) + ": " + notes)
+            actions.add(rh.gs(R.string.notes_label) + ": " + notes)
         eventTime -= eventTime % 1000
 
         if (eventTimeChanged)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
+            actions.add(rh.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
         if (insulinAfterConstraints > 0 || binding.fillCatheterChange.isChecked || binding.fillCartridgeChange.isChecked) {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.primefill), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.primefill), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                     if (insulinAfterConstraints > 0) {
                         uel.log(Action.PRIME_BOLUS, Sources.FillDialog,
                             notes,
@@ -175,7 +175,7 @@ class FillDialog : DialogFragmentWithDate() {
             }
         } else {
             activity?.let { activity ->
-                OKDialog.show(activity, resourceHelper.gs(R.string.primefill), resourceHelper.gs(R.string.no_action_selected))
+                OKDialog.show(activity, rh.gs(R.string.primefill), rh.gs(R.string.no_action_selected))
             }
         }
         dismiss()
@@ -191,7 +191,7 @@ class FillDialog : DialogFragmentWithDate() {
         commandQueue.bolus(detailedBolusInfo, object : Callback() {
             override fun run() {
                 if (!result.success) {
-                    ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
+                    ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                 }
             }
         })
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
index 12d14ef2653..99bdfacd9ab 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
@@ -41,14 +41,15 @@ import kotlin.math.max
 class InsulinDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var constraintChecker: ConstraintChecker
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var ctx: Context
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var config: Config
+    @Inject lateinit var bolusTimer: BolusTimer
     @Inject lateinit var uel: UserEntryLogger
 
     companion object {
@@ -79,11 +80,11 @@ class InsulinDialog : DialogFragmentWithDate() {
         val maxInsulin = constraintChecker.getMaxBolusAllowed().value()
         if (abs(binding.time.value.toInt()) > 12 * 60) {
             binding.time.value = 0.0
-            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.constraintapllied))
+            ToastUtils.showToastInUiThread(context, rh.gs(R.string.constraintapllied))
         }
         if (binding.amount.value > maxInsulin) {
             binding.amount.value = 0.0
-            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.bolusconstraintapplied))
+            ToastUtils.showToastInUiThread(context, rh.gs(R.string.bolusconstraintapplied))
         }
     }
 
@@ -114,22 +115,22 @@ class InsulinDialog : DialogFragmentWithDate() {
         binding.amount.setParams(savedInstanceState?.getDouble("amount")
             ?: 0.0, 0.0, maxInsulin, activePlugin.activePump.pumpDescription.bolusStep, DecimalFormatter.pumpSupportedBolusFormat(activePlugin.activePump), false, binding.okcancel.ok, textWatcher)
 
-        binding.plus05.text = sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_1), PLUS1_DEFAULT).toSignedString(activePlugin.activePump)
+        binding.plus05.text = sp.getDouble(rh.gs(R.string.key_insulin_button_increment_1), PLUS1_DEFAULT).toSignedString(activePlugin.activePump)
         binding.plus05.setOnClickListener {
             binding.amount.value = max(0.0, binding.amount.value
-                + sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_1), PLUS1_DEFAULT))
+                + sp.getDouble(rh.gs(R.string.key_insulin_button_increment_1), PLUS1_DEFAULT))
             validateInputs()
         }
-        binding.plus10.text = sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_2), PLUS2_DEFAULT).toSignedString(activePlugin.activePump)
+        binding.plus10.text = sp.getDouble(rh.gs(R.string.key_insulin_button_increment_2), PLUS2_DEFAULT).toSignedString(activePlugin.activePump)
         binding.plus10.setOnClickListener {
             binding.amount.value = max(0.0, binding.amount.value
-                + sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_2), PLUS2_DEFAULT))
+                + sp.getDouble(rh.gs(R.string.key_insulin_button_increment_2), PLUS2_DEFAULT))
             validateInputs()
         }
-        binding.plus20.text = sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_3), PLUS3_DEFAULT).toSignedString(activePlugin.activePump)
+        binding.plus20.text = sp.getDouble(rh.gs(R.string.key_insulin_button_increment_3), PLUS3_DEFAULT).toSignedString(activePlugin.activePump)
         binding.plus20.setOnClickListener {
             binding.amount.value = max(0.0, binding.amount.value
-                + sp.getDouble(resourceHelper.gs(R.string.key_insulin_button_increment_3), PLUS3_DEFAULT))
+                + sp.getDouble(rh.gs(R.string.key_insulin_button_increment_3), PLUS3_DEFAULT))
             validateInputs()
         }
 
@@ -152,34 +153,34 @@ class InsulinDialog : DialogFragmentWithDate() {
         val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value()
         val actions: LinkedList<String?> = LinkedList()
         val units = profileFunction.getUnits()
-        val unitLabel = if (units == GlucoseUnit.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
+        val unitLabel = if (units == GlucoseUnit.MMOL) rh.gs(R.string.mmol) else rh.gs(R.string.mgdl)
         val recordOnlyChecked = binding.recordOnly.isChecked
         val eatingSoonChecked = binding.startEatingSoonTt.isChecked
 
         if (insulinAfterConstraints > 0) {
-            actions.add(resourceHelper.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, resourceHelper).formatColor(resourceHelper, R.color.bolus))
+            actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(rh, R.color.bolus))
             if (recordOnlyChecked)
-                actions.add(resourceHelper.gs(R.string.bolusrecordedonly).formatColor(resourceHelper, R.color.warning))
+                actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(rh, R.color.warning))
             if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
-                actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(resourceHelper, R.color.warning))
+                actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(rh, R.color.warning))
         }
         val eatingSoonTTDuration = defaultValueHelper.determineEatingSoonTTDuration()
         val eatingSoonTT = defaultValueHelper.determineEatingSoonTT()
         if (eatingSoonChecked)
-            actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + resourceHelper.gs(R.string.format_mins, eatingSoonTTDuration) + ")").formatColor(resourceHelper, R.color.tempTargetConfirmation))
+            actions.add(rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + rh.gs(R.string.format_mins, eatingSoonTTDuration) + ")").formatColor(rh, R.color.tempTargetConfirmation))
 
         val timeOffset = binding.time.value.toInt()
         val time = dateUtil.now() + T.mins(timeOffset.toLong()).msecs()
         if (timeOffset != 0)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(time))
+            actions.add(rh.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(time))
 
         val notes = binding.notesLayout.notes.text.toString()
         if (notes.isNotEmpty())
-            actions.add(resourceHelper.gs(R.string.notes_label) + ": " + notes)
+            actions.add(rh.gs(R.string.notes_label) + ": " + notes)
 
         if (insulinAfterConstraints > 0 || eatingSoonChecked) {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                     if (eatingSoonChecked) {
                         uel.log(Action.TT, Sources.InsulinDialog,
                             notes,
@@ -208,8 +209,8 @@ class InsulinDialog : DialogFragmentWithDate() {
                         detailedBolusInfo.timestamp = time
                         if (recordOnlyChecked) {
                             uel.log(Action.BOLUS, Sources.InsulinDialog,
-                                resourceHelper.gs(R.string.record) + if (notes.isNotEmpty()) ": " + notes else "",
-                                ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.record)),
+                                rh.gs(R.string.record) + if (notes.isNotEmpty()) ": " + notes else "",
+                                ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.record)),
                                 ValueWithUnit.Insulin(insulinAfterConstraints),
                                 ValueWithUnit.Minute(timeOffset).takeIf { timeOffset!= 0 })
                             disposable += repository.runTransactionForResult(detailedBolusInfo.insertBolusTransaction())
@@ -217,6 +218,8 @@ class InsulinDialog : DialogFragmentWithDate() {
                                     { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted bolus $it") } },
                                     { aapsLogger.error(LTag.DATABASE, "Error while saving bolus", it) }
                                 )
+                            if (timeOffset == 0)
+                                bolusTimer.removeBolusReminder()
                         } else {
                             uel.log(Action.BOLUS, Sources.InsulinDialog,
                                 notes,
@@ -224,7 +227,9 @@ class InsulinDialog : DialogFragmentWithDate() {
                             commandQueue.bolus(detailedBolusInfo, object : Callback() {
                                 override fun run() {
                                     if (!result.success) {
-                                        ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
+                                        ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
+                                    } else {
+                                        bolusTimer.removeBolusReminder()
                                     }
                                 }
                             })
@@ -234,7 +239,7 @@ class InsulinDialog : DialogFragmentWithDate() {
             }
         } else
             activity?.let { activity ->
-                OKDialog.show(activity, resourceHelper.gs(R.string.bolus), resourceHelper.gs(R.string.no_action_selected))
+                OKDialog.show(activity, rh.gs(R.string.bolus), rh.gs(R.string.no_action_selected))
             }
         return true
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
index 7833a836cde..12b04b97f66 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
@@ -27,7 +27,7 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -49,14 +49,14 @@ class LoopDialog : DaggerDialogFragment() {
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var ctx: Context
     @Inject lateinit var sp: SP
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var loopPlugin: LoopPlugin
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var constraintChecker: ConstraintChecker
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var configBuilder: ConfigBuilder
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var dateUtil: DateUtil
@@ -185,12 +185,12 @@ class LoopDialog : DaggerDialogFragment() {
                 binding.overviewLoop.visibility = View.GONE
                 binding.overviewSuspend.visibility = View.GONE
                 binding.overviewPump.visibility = View.VISIBLE
-                binding.overviewPumpHeader.text = resourceHelper.gs(R.string.reconnect)
+                binding.overviewPumpHeader.text = rh.gs(R.string.reconnect)
                 binding.overviewDisconnectButtons.visibility = View.VISIBLE
                 binding.overviewReconnect.visibility = View.VISIBLE
             }
 
-            !loopPlugin.isEnabled(PluginType.LOOP)                  -> {
+            !loopPlugin.isEnabled()                  -> {
                 binding.overviewLoop.visibility = View.VISIBLE
                 binding.overviewEnable.visibility = View.VISIBLE
                 binding.overviewDisable.visibility = View.GONE
@@ -202,7 +202,7 @@ class LoopDialog : DaggerDialogFragment() {
             loopPlugin.isSuspended                                 -> {
                 binding.overviewLoop.visibility = View.GONE
                 binding.overviewSuspend.visibility = View.VISIBLE
-                binding.overviewSuspendHeader.text = resourceHelper.gs(R.string.resumeloop)
+                binding.overviewSuspendHeader.text = rh.gs(R.string.resumeloop)
                 binding.overviewSuspendButtons.visibility = View.VISIBLE
                 binding.overviewResume.visibility = View.VISIBLE
                 binding.overviewPump.visibility = View.GONE
@@ -238,12 +238,12 @@ class LoopDialog : DaggerDialogFragment() {
                     }
                 }
                 binding.overviewSuspend.visibility = View.VISIBLE
-                binding.overviewSuspendHeader.text = resourceHelper.gs(R.string.suspendloop)
+                binding.overviewSuspendHeader.text = rh.gs(R.string.suspendloop)
                 binding.overviewSuspendButtons.visibility = View.VISIBLE
                 binding.overviewResume.visibility = View.GONE
 
                 binding.overviewPump.visibility = View.VISIBLE
-                binding.overviewPumpHeader.text = resourceHelper.gs(R.string.disconnectpump)
+                binding.overviewPumpHeader.text = rh.gs(R.string.disconnectpump)
                 binding.overviewDisconnectButtons.visibility = View.VISIBLE
                 binding.overviewReconnect.visibility = View.GONE
 
@@ -254,25 +254,25 @@ class LoopDialog : DaggerDialogFragment() {
     private fun onClickOkCancelEnabled(v: View): Boolean {
         var description = ""
         when (v.id) {
-            R.id.overview_closeloop      -> description = resourceHelper.gs(R.string.closedloop)
-            R.id.overview_lgsloop        -> description = resourceHelper.gs(R.string.lowglucosesuspend)
-            R.id.overview_openloop       -> description = resourceHelper.gs(R.string.openloop)
-            R.id.overview_disable        -> description = resourceHelper.gs(R.string.disableloop)
-            R.id.overview_enable         -> description = resourceHelper.gs(R.string.enableloop)
-            R.id.overview_resume         -> description = resourceHelper.gs(R.string.resume)
-            R.id.overview_reconnect      -> description = resourceHelper.gs(R.string.reconnect)
-            R.id.overview_suspend_1h     -> description = resourceHelper.gs(R.string.suspendloopfor1h)
-            R.id.overview_suspend_2h     -> description = resourceHelper.gs(R.string.suspendloopfor2h)
-            R.id.overview_suspend_3h     -> description = resourceHelper.gs(R.string.suspendloopfor3h)
-            R.id.overview_suspend_10h    -> description = resourceHelper.gs(R.string.suspendloopfor10h)
-            R.id.overview_disconnect_15m -> description = resourceHelper.gs(R.string.disconnectpumpfor15m)
-            R.id.overview_disconnect_30m -> description = resourceHelper.gs(R.string.disconnectpumpfor30m)
-            R.id.overview_disconnect_1h  -> description = resourceHelper.gs(R.string.disconnectpumpfor1h)
-            R.id.overview_disconnect_2h  -> description = resourceHelper.gs(R.string.disconnectpumpfor2h)
-            R.id.overview_disconnect_3h  -> description = resourceHelper.gs(R.string.disconnectpumpfor3h)
+            R.id.overview_closeloop      -> description = rh.gs(R.string.closedloop)
+            R.id.overview_lgsloop        -> description = rh.gs(R.string.lowglucosesuspend)
+            R.id.overview_openloop       -> description = rh.gs(R.string.openloop)
+            R.id.overview_disable        -> description = rh.gs(R.string.disableloop)
+            R.id.overview_enable         -> description = rh.gs(R.string.enableloop)
+            R.id.overview_resume         -> description = rh.gs(R.string.resume)
+            R.id.overview_reconnect      -> description = rh.gs(R.string.reconnect)
+            R.id.overview_suspend_1h     -> description = rh.gs(R.string.suspendloopfor1h)
+            R.id.overview_suspend_2h     -> description = rh.gs(R.string.suspendloopfor2h)
+            R.id.overview_suspend_3h     -> description = rh.gs(R.string.suspendloopfor3h)
+            R.id.overview_suspend_10h    -> description = rh.gs(R.string.suspendloopfor10h)
+            R.id.overview_disconnect_15m -> description = rh.gs(R.string.disconnectpumpfor15m)
+            R.id.overview_disconnect_30m -> description = rh.gs(R.string.disconnectpumpfor30m)
+            R.id.overview_disconnect_1h  -> description = rh.gs(R.string.disconnectpumpfor1h)
+            R.id.overview_disconnect_2h  -> description = rh.gs(R.string.disconnectpumpfor2h)
+            R.id.overview_disconnect_3h  -> description = rh.gs(R.string.disconnectpumpfor3h)
         }
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.confirm), description, Runnable {
+            OKDialog.showConfirmation(activity, rh.gs(R.string.confirm), description, Runnable {
                 onClick(v)
             })
         }
@@ -284,21 +284,21 @@ class LoopDialog : DaggerDialogFragment() {
             R.id.overview_closeloop                       -> {
                 uel.log(Action.CLOSED_LOOP_MODE, Sources.LoopDialog)
                 sp.putString(R.string.key_aps_mode, "closed")
-                rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.closedloop)))
+                rxBus.send(EventPreferenceChange(rh.gs(R.string.closedloop)))
                 return true
             }
 
             R.id.overview_lgsloop                         -> {
                 uel.log(Action.LGS_LOOP_MODE, Sources.LoopDialog)
                 sp.putString(R.string.key_aps_mode, "lgs")
-                rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.lowglucosesuspend)))
+                rxBus.send(EventPreferenceChange(rh.gs(R.string.lowglucosesuspend)))
                 return true
             }
 
             R.id.overview_openloop                        -> {
                 uel.log(Action.OPEN_LOOP_MODE, Sources.LoopDialog)
                 sp.putString(R.string.key_aps_mode, "open")
-                rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.lowglucosesuspend)))
+                rxBus.send(EventPreferenceChange(rh.gs(R.string.lowglucosesuspend)))
                 return true
             }
 
@@ -311,7 +311,7 @@ class LoopDialog : DaggerDialogFragment() {
                 commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.tempbasaldeliveryerror))
+                            ToastUtils.showToastInUiThread(ctx, rh.gs(R.string.tempbasaldeliveryerror))
                         }
                     }
                 })
@@ -352,7 +352,7 @@ class LoopDialog : DaggerDialogFragment() {
                 commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
+                            ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                         }
                     }
                 })
@@ -412,6 +412,7 @@ class LoopDialog : DaggerDialogFragment() {
                     loopPlugin.goToZeroTemp(T.hours(1).mins().toInt(), profile, OfflineEvent.Reason.DISCONNECT_PUMP)
                     rxBus.send(EventRefreshOverview("suspend_menu"))
                 }
+                sp.putBoolean(R.string.key_objectiveusedisconnect, true)
                 return true
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
index 65bd45444cf..9d3a9e20da7 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
@@ -25,10 +25,11 @@ import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.HtmlHelper
+import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.disposables.CompositeDisposable
@@ -37,17 +38,18 @@ import java.text.DecimalFormat
 import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
+import kotlin.collections.ArrayList
 
 class ProfileSwitchDialog : DialogFragmentWithDate() {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var config: Config
     @Inject lateinit var hardLimits: HardLimits
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
 
     private var profileIndex: Int? = null
@@ -78,8 +80,10 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
         savedInstanceState.putDouble("timeshift", binding.timeshift.value)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View {
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
         onCreateViewGeneral()
         arguments?.let { bundle ->
             profileIndex = bundle.getInt("profileIndex", 0)
@@ -91,20 +95,36 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.duration.setParams(savedInstanceState?.getDouble("duration")
-            ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, binding.okcancel.ok,
-                                   textWatcher)
-        binding.percentage.setParams(savedInstanceState?.getDouble("percentage")
-            ?: 100.0, Constants.CPP_MIN_PERCENTAGE.toDouble(), Constants.CPP_MAX_PERCENTAGE.toDouble(), 5.0,
-                                     DecimalFormat("0"), false, binding.okcancel.ok, textWatcher)
-        binding.timeshift.setParams(savedInstanceState?.getDouble("timeshift")
-            ?: 0.0, Constants.CPP_MIN_TIMESHIFT.toDouble(), Constants.CPP_MAX_TIMESHIFT.toDouble(), 1.0, DecimalFormat("0"), false, binding.okcancel.ok)
+        binding.duration.setParams(
+            savedInstanceState?.getDouble("duration")
+                ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, binding.okcancel.ok,
+            textWatcher
+        )
+        binding.percentage.setParams(
+            savedInstanceState?.getDouble("percentage")
+                ?: 100.0, Constants.CPP_MIN_PERCENTAGE.toDouble(), Constants.CPP_MAX_PERCENTAGE.toDouble(), 5.0,
+            DecimalFormat("0"), false, binding.okcancel.ok, textWatcher
+        )
+        binding.timeshift.setParams(
+            savedInstanceState?.getDouble("timeshift")
+                ?: 0.0, Constants.CPP_MIN_TIMESHIFT.toDouble(), Constants.CPP_MAX_TIMESHIFT.toDouble(), 1.0, DecimalFormat("0"), false, binding.okcancel.ok
+        )
 
         // profile
         context?.let { context ->
             val profileStore = activePlugin.activeProfileSource.profile
                 ?: return
-            val profileList = profileStore.getProfileList()
+            val profileListToCheck = profileStore.getProfileList()
+            val profileList = ArrayList<CharSequence>()
+            for (profileName in profileListToCheck) {
+                val profileToCheck = activePlugin.activeProfileSource.profile?.getSpecificProfile(profileName.toString())
+                if (profileToCheck != null && ProfileSealed.Pure(profileToCheck).isValid("ProfileSwitch", activePlugin.activePump, config, rh, rxBus, hardLimits, false).isValid)
+                    profileList.add(profileName)
+            }
+            if (profileList.isEmpty()) {
+                dismiss()
+                return
+            }
             val adapter = ArrayAdapter(context, R.layout.spinner_centered, profileList)
             binding.profile.adapter = adapter
             // set selected to actual profile
@@ -114,19 +134,18 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
                 for (p in profileList.indices)
                     if (profileList[p] == profileFunction.getOriginalProfileName())
                         binding.profile.setSelection(p)
-        } ?: return
+        }
 
         profileFunction.getProfile()?.let { profile ->
-            if (profile.percentage != 100 || profile.timeshift != 0) {
-                binding.reuselayout.visibility = View.VISIBLE
-                binding.reusebutton.text = resourceHelper.gs(R.string.reuse_profile_pct_hours, profile.percentage, profile.timeshift)
-                binding.reusebutton.setOnClickListener {
-                    binding.percentage.value = profile.percentage.toDouble()
-                    binding.timeshift.value = profile.timeshift.toDouble()
+            if (profile is ProfileSealed.EPS)
+                if (profile.value.originalPercentage != 100 || profile.value.originalTimeshift != 0L) {
+                    binding.reuselayout.visibility = View.VISIBLE
+                    binding.reusebutton.text = rh.gs(R.string.reuse_profile_pct_hours, profile.value.originalPercentage, T.msecs(profile.value.originalTimeshift).hours().toInt())
+                    binding.reusebutton.setOnClickListener {
+                        binding.percentage.value = profile.value.originalPercentage.toDouble()
+                        binding.timeshift.value = profile.value.originalTimeshift.toDouble()
+                    }
                 }
-            } else {
-                binding.reuselayout.visibility = View.GONE
-            }
         }
         binding.ttLayout.visibility = View.GONE
     }
@@ -145,69 +164,77 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
         val actions: LinkedList<String> = LinkedList()
         val duration = binding.duration.value?.toInt() ?: return false
         if (duration > 0L)
-            actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, duration))
+            actions.add(rh.gs(R.string.duration) + ": " + rh.gs(R.string.format_mins, duration))
         val profileName = binding.profile.selectedItem.toString()
-        actions.add(resourceHelper.gs(R.string.profile) + ": " + profileName)
+        actions.add(rh.gs(R.string.profile) + ": " + profileName)
         val percent = binding.percentage.value.toInt()
         if (percent != 100)
-            actions.add(resourceHelper.gs(R.string.percent) + ": " + percent + "%")
+            actions.add(rh.gs(R.string.percent) + ": " + percent + "%")
         val timeShift = binding.timeshift.value.toInt()
         if (timeShift != 0)
-            actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_timeshift_label) + ": " + resourceHelper.gs(R.string.format_hours, timeShift.toDouble()))
+            actions.add(rh.gs(R.string.careportal_newnstreatment_timeshift_label) + ": " + rh.gs(R.string.format_hours, timeShift.toDouble()))
         val notes = binding.notesLayout.notes.text.toString()
         if (notes.isNotEmpty())
-            actions.add(resourceHelper.gs(R.string.notes_label) + ": " + notes)
+            actions.add(rh.gs(R.string.notes_label) + ": " + notes)
         if (eventTimeChanged)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
+            actions.add(rh.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
         val isTT = binding.duration.value > 0 && binding.percentage.value < 100 && binding.tt.isChecked
         val target = defaultValueHelper.determineActivityTT()
         val units = profileFunction.getUnits()
         if (isTT)
-            actions.add(resourceHelper.gs(R.string.careportal_temporarytarget) + ": " + resourceHelper.gs(R.string.activity))
+            actions.add(rh.gs(R.string.careportal_temporarytarget) + ": " + rh.gs(R.string.activity))
 
         activity?.let { activity ->
-            val ps = profileFunction.buildProfileSwitch(profileStore, profileName, duration, percent, timeShift, eventTime)
-            val validity = ProfileSealed.PS(ps).isValid(resourceHelper.gs(R.string.careportal_profileswitch), activePlugin.activePump, config, resourceHelper, rxBus, hardLimits)
+            val ps = profileFunction.buildProfileSwitch(profileStore, profileName, duration, percent, timeShift, eventTime) ?: return@let
+            val validity = ProfileSealed.PS(ps).isValid(rh.gs(R.string.careportal_profileswitch), activePlugin.activePump, config, rh, rxBus, hardLimits, false)
             if (validity.isValid)
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
-                    profileFunction.createProfileSwitch(profileStore,
-                        profileName = profileName,
-                        durationInMinutes = duration,
-                        percentage = percent,
-                        timeShiftInHours = timeShift,
-                        timestamp = eventTime)
-                    uel.log(Action.PROFILE_SWITCH,
-                        Sources.ProfileSwitchDialog,
-                        notes,
-                        ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
-                        ValueWithUnit.SimpleString(profileName),
-                        ValueWithUnit.Percent(percent),
-                        ValueWithUnit.Hour(timeShift).takeIf { timeShift != 0 },
-                        ValueWithUnit.Minute(duration).takeIf { duration != 0 })
-                    if (isTT) {
-                        disposable += repository.runTransactionForResult(
-                            InsertAndCancelCurrentTemporaryTargetTransaction(
-                                timestamp = eventTime,
-                                duration = TimeUnit.MINUTES.toMillis(duration.toLong()),
-                                reason =  TemporaryTarget.Reason.ACTIVITY,
-                                lowTarget = Profile.toMgdl(target, profileFunction.getUnits()),
-                                highTarget = Profile.toMgdl(target, profileFunction.getUnits())
+                OKDialog.showConfirmation(activity, rh.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
+                    if (profileFunction.createProfileSwitch(
+                            profileStore,
+                            profileName = profileName,
+                            durationInMinutes = duration,
+                            percentage = percent,
+                            timeShiftInHours = timeShift,
+                            timestamp = eventTime
                         )
-                        ).subscribe({ result ->
-                                         result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
-                                         result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
-                                     }, {
-                                         aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
-                                     })
-                        uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(
-                            TemporaryTarget.Reason.ACTIVITY), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
+                    ) {
+                        uel.log(Action.PROFILE_SWITCH,
+                                Sources.ProfileSwitchDialog,
+                                notes,
+                                ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
+                                ValueWithUnit.SimpleString(profileName),
+                                ValueWithUnit.Percent(percent),
+                                ValueWithUnit.Hour(timeShift).takeIf { timeShift != 0 },
+                                ValueWithUnit.Minute(duration).takeIf { duration != 0 })
+                        if (percent == 90 && duration == 10) sp.putBoolean(R.string.key_objectiveuseprofileswitch, true)
+                        if (isTT) {
+                            disposable += repository.runTransactionForResult(
+                                InsertAndCancelCurrentTemporaryTargetTransaction(
+                                    timestamp = eventTime,
+                                    duration = TimeUnit.MINUTES.toMillis(duration.toLong()),
+                                    reason = TemporaryTarget.Reason.ACTIVITY,
+                                    lowTarget = Profile.toMgdl(target, profileFunction.getUnits()),
+                                    highTarget = Profile.toMgdl(target, profileFunction.getUnits())
+                                )
+                            ).subscribe({ result ->
+                                            result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
+                                            result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
+                                        }, {
+                                            aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
+                                        })
+                            uel.log(
+                                Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(
+                                    TemporaryTarget.Reason.ACTIVITY
+                                ), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration)
+                            )
+                        }
                     }
                 })
             else {
                 OKDialog.show(
                     activity,
-                    resourceHelper.gs(R.string.careportal_profileswitch),
+                    rh.gs(R.string.careportal_profileswitch),
                     HtmlHelper.fromHtml(Joiner.on("<br/>").join(validity.reasons))
                 )
                 return false
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
index f5c02a69d4a..1b6676f8b3d 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
@@ -29,10 +29,10 @@ import kotlin.math.abs
 class TempBasalDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var constraintChecker: ConstraintChecker
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var ctx: Context
     @Inject lateinit var uel: UserEntryLogger
 
@@ -103,23 +103,23 @@ class TempBasalDialog : DialogFragmentWithDate() {
         if (isPercentPump) {
             val basalPercentInput = SafeParse.stringToInt(binding.basalpercentinput.text)
             percent = constraintChecker.applyBasalPercentConstraints(Constraint(basalPercentInput), profile).value()
-            actions.add(resourceHelper.gs(R.string.tempbasal_label) + ": $percent%")
-            actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, durationInMinutes))
-            if (percent != basalPercentInput) actions.add(resourceHelper.gs(R.string.constraintapllied))
+            actions.add(rh.gs(R.string.tempbasal_label) + ": $percent%")
+            actions.add(rh.gs(R.string.duration) + ": " + rh.gs(R.string.format_mins, durationInMinutes))
+            if (percent != basalPercentInput) actions.add(rh.gs(R.string.constraintapllied))
         } else {
             val basalAbsoluteInput = SafeParse.stringToDouble(binding.basalabsoluteinput.text)
             absolute = constraintChecker.applyBasalConstraints(Constraint(basalAbsoluteInput), profile).value()
-            actions.add(resourceHelper.gs(R.string.tempbasal_label) + ": " + resourceHelper.gs(R.string.pump_basebasalrate, absolute))
-            actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, durationInMinutes))
+            actions.add(rh.gs(R.string.tempbasal_label) + ": " + rh.gs(R.string.pump_basebasalrate, absolute))
+            actions.add(rh.gs(R.string.duration) + ": " + rh.gs(R.string.format_mins, durationInMinutes))
             if (abs(absolute - basalAbsoluteInput) > 0.01)
-                actions.add(resourceHelper.gs(R.string.constraintapllied).formatColor(resourceHelper, R.color.warning))
+                actions.add(rh.gs(R.string.constraintapllied).formatColor(rh, R.color.warning))
         }
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.tempbasal_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
+            OKDialog.showConfirmation(activity, rh.gs(R.string.tempbasal_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                 val callback: Callback = object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
+                            ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                         }
                     }
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
index 36c157df722..5e423fa892f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@@ -38,7 +38,7 @@ import javax.inject.Inject
 class TempTargetDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var constraintChecker: ConstraintChecker
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var uel: UserEntryLogger
@@ -85,7 +85,7 @@ class TempTargetDialog : DialogFragmentWithDate() {
                 Constants.MIN_TT_MGDL, Constants.MAX_TT_MGDL, 1.0, DecimalFormat("0"), false, binding.okcancel.ok)
 
         val units = profileFunction.getUnits()
-        binding.units.text = if (units == GlucoseUnit.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
+        binding.units.text = if (units == GlucoseUnit.MMOL) rh.gs(R.string.mmol) else rh.gs(R.string.mgdl)
 
         // temp target
         context?.let { context ->
@@ -95,10 +95,10 @@ class TempTargetDialog : DialogFragmentWithDate() {
                 binding.targetCancel.visibility = View.GONE
 
             reasonList = Lists.newArrayList(
-                resourceHelper.gs(R.string.manual),
-                resourceHelper.gs(R.string.eatingsoon),
-                resourceHelper.gs(R.string.activity),
-                resourceHelper.gs(R.string.hypo)
+                rh.gs(R.string.manual),
+                rh.gs(R.string.eatingsoon),
+                rh.gs(R.string.activity),
+                rh.gs(R.string.hypo)
             )
             val adapterReason = ArrayAdapter(context, R.layout.spinner_centered, reasonList)
             binding.reason.adapter = adapterReason
@@ -133,19 +133,19 @@ class TempTargetDialog : DialogFragmentWithDate() {
             R.id.eating_soon -> {
                 binding.temptarget.value = defaultValueHelper.determineEatingSoonTT()
                 binding.duration.value = defaultValueHelper.determineEatingSoonTTDuration().toDouble()
-                binding.reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.eatingsoon)))
+                binding.reason.setSelection(reasonList.indexOf(rh.gs(R.string.eatingsoon)))
             }
 
             R.id.activity    -> {
                 binding.temptarget.value = defaultValueHelper.determineActivityTT()
                 binding.duration.value = defaultValueHelper.determineActivityTTDuration().toDouble()
-                binding.reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.activity)))
+                binding.reason.setSelection(reasonList.indexOf(rh.gs(R.string.activity)))
             }
 
             R.id.hypo        -> {
                 binding.temptarget.value = defaultValueHelper.determineHypoTT()
                 binding.duration.value = defaultValueHelper.determineHypoTTDuration().toDouble()
-                binding.reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.hypo)))
+                binding.reason.setSelection(reasonList.indexOf(rh.gs(R.string.hypo)))
             }
 
             R.id.cancel      -> {
@@ -168,25 +168,25 @@ class TempTargetDialog : DialogFragmentWithDate() {
         val target = binding.temptarget.value
         val duration = binding.duration.value.toInt()
         if (target != 0.0 && duration != 0) {
-            actions.add(resourceHelper.gs(R.string.reason) + ": " + reason)
-            actions.add(resourceHelper.gs(R.string.target_label) + ": " + Profile.toCurrentUnitsString(profileFunction, target) + " " + resourceHelper.gs(unitResId))
-            actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, duration))
+            actions.add(rh.gs(R.string.reason) + ": " + reason)
+            actions.add(rh.gs(R.string.target_label) + ": " + Profile.toCurrentUnitsString(profileFunction, target) + " " + rh.gs(unitResId))
+            actions.add(rh.gs(R.string.duration) + ": " + rh.gs(R.string.format_mins, duration))
         } else {
-            actions.add(resourceHelper.gs(R.string.stoptemptarget))
-            reason = resourceHelper.gs(R.string.stoptemptarget)
+            actions.add(rh.gs(R.string.stoptemptarget))
+            reason = rh.gs(R.string.stoptemptarget)
         }
         if (eventTimeChanged)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
+            actions.add(rh.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_temporarytarget), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
+            OKDialog.showConfirmation(activity, rh.gs(R.string.careportal_temporarytarget), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                 val units = profileFunction.getUnits()
                 when(reason) {
-                    resourceHelper.gs(R.string.eatingsoon)      -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.EATING_SOON), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
-                    resourceHelper.gs(R.string.activity)        -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.ACTIVITY), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
-                    resourceHelper.gs(R.string.hypo)            -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.HYPOGLYCEMIA), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
-                    resourceHelper.gs(R.string.manual)          -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.CUSTOM), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
-                    resourceHelper.gs(R.string.stoptemptarget) -> uel.log(Action.CANCEL_TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged })
+                    rh.gs(R.string.eatingsoon)      -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.EATING_SOON), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
+                    rh.gs(R.string.activity)        -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.ACTIVITY), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
+                    rh.gs(R.string.hypo)            -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.HYPOGLYCEMIA), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
+                    rh.gs(R.string.manual)          -> uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.CUSTOM), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
+                    rh.gs(R.string.stoptemptarget) -> uel.log(Action.CANCEL_TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged })
                 }
                 if (target == 0.0 || duration == 0) {
                     disposable += repository.runTransactionForResult(CancelCurrentTemporaryTargetIfAnyTransaction(eventTime))
@@ -200,9 +200,9 @@ class TempTargetDialog : DialogFragmentWithDate() {
                         timestamp = eventTime,
                         duration = TimeUnit.MINUTES.toMillis(duration.toLong()),
                         reason = when (reason) {
-                            resourceHelper.gs(R.string.eatingsoon) -> TemporaryTarget.Reason.EATING_SOON
-                            resourceHelper.gs(R.string.activity)   -> TemporaryTarget.Reason.ACTIVITY
-                            resourceHelper.gs(R.string.hypo)       -> TemporaryTarget.Reason.HYPOGLYCEMIA
+                            rh.gs(R.string.eatingsoon) -> TemporaryTarget.Reason.EATING_SOON
+                            rh.gs(R.string.activity)   -> TemporaryTarget.Reason.ACTIVITY
+                            rh.gs(R.string.hypo)       -> TemporaryTarget.Reason.HYPOGLYCEMIA
                             else                            -> TemporaryTarget.Reason.CUSTOM
                         },
                         lowTarget = Profile.toMgdl(target, profileFunction.getUnits()),
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
index 060eaff1326..2bf693c1e88 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
@@ -18,7 +18,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.DialogTreatmentBinding
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -41,9 +41,9 @@ import kotlin.math.abs
 class TreatmentDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var constraintChecker: ConstraintChecker
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var ctx: Context
     @Inject lateinit var config: Config
     @Inject lateinit var uel: UserEntryLogger
@@ -64,11 +64,11 @@ class TreatmentDialog : DialogFragmentWithDate() {
         val maxInsulin = constraintChecker.getMaxBolusAllowed().value()
         if (SafeParse.stringToInt(binding.carbs.text) > maxCarbs) {
             binding.carbs.value = 0.0
-            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.carbsconstraintapplied))
+            ToastUtils.showToastInUiThread(context, rh.gs(R.string.carbsconstraintapplied))
         }
         if (SafeParse.stringToDouble(binding.insulin.text) > maxInsulin) {
             binding.insulin.value = 0.0
-            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.bolusconstraintapplied))
+            ToastUtils.showToastInUiThread(context, rh.gs(R.string.bolusconstraintapplied))
         }
     }
 
@@ -123,20 +123,20 @@ class TreatmentDialog : DialogFragmentWithDate() {
         val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
 
         if (insulinAfterConstraints > 0) {
-            actions.add(resourceHelper.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, resourceHelper).formatColor(resourceHelper, R.color.bolus))
+            actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(rh, R.color.bolus))
             if (recordOnlyChecked)
-                actions.add(resourceHelper.gs(R.string.bolusrecordedonly).formatColor(resourceHelper, R.color.warning))
+                actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(rh, R.color.warning))
             if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
-                actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(resourceHelper, R.color.warning))
+                actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(rh, R.color.warning))
         }
         if (carbsAfterConstraints > 0) {
-            actions.add(resourceHelper.gs(R.string.carbs) + ": " + resourceHelper.gs(R.string.format_carbs, carbsAfterConstraints).formatColor(resourceHelper, R.color.carbs))
+            actions.add(rh.gs(R.string.carbs) + ": " + rh.gs(R.string.format_carbs, carbsAfterConstraints).formatColor(rh, R.color.carbs))
             if (carbsAfterConstraints != carbs)
-                actions.add(resourceHelper.gs(R.string.carbsconstraintapplied).formatColor(resourceHelper, R.color.warning))
+                actions.add(rh.gs(R.string.carbsconstraintapplied).formatColor(rh, R.color.warning))
         }
         if (insulinAfterConstraints > 0 || carbsAfterConstraints > 0) {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.overview_treatment_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.overview_treatment_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                     val action = when {
                         insulinAfterConstraints.equals(0.0) -> Action.CARBS
                         carbsAfterConstraints.equals(0)     -> Action.BOLUS
@@ -149,9 +149,9 @@ class TreatmentDialog : DialogFragmentWithDate() {
                     detailedBolusInfo.carbs = carbsAfterConstraints.toDouble()
                     detailedBolusInfo.context = context
                     if (recordOnlyChecked) {
-                        uel.log(action, Sources.TreatmentDialog, if (insulinAfterConstraints != 0.0) resourceHelper.gs(R.string.record) else "",
+                        uel.log(action, Sources.TreatmentDialog, if (insulinAfterConstraints != 0.0) rh.gs(R.string.record) else "",
                             ValueWithUnit.Timestamp(detailedBolusInfo.timestamp).takeIf { eventTimeChanged },
-                            ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.record)).takeIf { insulinAfterConstraints != 0.0 },
+                            ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.record)).takeIf { insulinAfterConstraints != 0.0 },
                             ValueWithUnit.Insulin(insulinAfterConstraints).takeIf { insulinAfterConstraints != 0.0 },
                             ValueWithUnit.Gram(carbsAfterConstraints).takeIf { carbsAfterConstraints != 0 })
                         if (detailedBolusInfo.insulin > 0)
@@ -174,7 +174,7 @@ class TreatmentDialog : DialogFragmentWithDate() {
                             commandQueue.bolus(detailedBolusInfo, object : Callback() {
                                 override fun run() {
                                     if (!result.success) {
-                                        ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
+                                        ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                                     }
                                 }
                             })
@@ -186,7 +186,7 @@ class TreatmentDialog : DialogFragmentWithDate() {
             }
         } else
             activity?.let { activity ->
-                OKDialog.show(activity, resourceHelper.gs(R.string.overview_treatment_label), resourceHelper.gs(R.string.no_action_selected))
+                OKDialog.show(activity, rh.gs(R.string.overview_treatment_label), rh.gs(R.string.no_action_selected))
             }
         return true
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
index 14833591628..82c3a07da1f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
@@ -25,7 +25,7 @@ import info.nightscout.androidaps.databinding.DialogWizardBinding
 import info.nightscout.androidaps.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
@@ -53,9 +53,9 @@ class WizardDialog : DaggerDialogFragment() {
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var ctx: Context
     @Inject lateinit var sp: SP
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var iobCobCalculator: IobCobCalculator
@@ -140,7 +140,7 @@ class WizardDialog : DaggerDialogFragment() {
             ?: 0.0, -60.0, 60.0, 5.0, DecimalFormat("0"), false, binding.ok, timeTextWatcher)
         initDialog()
 
-        binding.percentUsed.text = resourceHelper.gs(R.string.format_percent, sp.getInt(R.string.key_boluswizard_percentage, 100))
+        binding.percentUsed.text = rh.gs(R.string.format_percent, sp.getInt(R.string.key_boluswizard_percentage, 100))
         // ok button
         binding.ok.setOnClickListener {
             if (okClicked) {
@@ -171,7 +171,7 @@ class WizardDialog : DaggerDialogFragment() {
         binding.calculationcheckbox.isChecked = showCalc
         binding.calculationcheckbox.setOnCheckedChangeListener { _, isChecked ->
             run {
-                sp.putBoolean(resourceHelper.gs(R.string.key_wizard_calculation_visible), isChecked)
+                sp.putBoolean(rh.gs(R.string.key_wizard_calculation_visible), isChecked)
                 binding.delimiter.visibility = isChecked.toVisibility()
                 binding.resulttable.visibility = isChecked.toVisibility()
             }
@@ -179,7 +179,7 @@ class WizardDialog : DaggerDialogFragment() {
         // profile spinner
         binding.profile.onItemSelectedListener = object : OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
-                ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.noprofileselected))
+                ToastUtils.showToastInUiThread(ctx, rh.gs(R.string.noprofileset))
                 binding.ok.visibility = View.GONE
             }
 
@@ -244,13 +244,13 @@ class WizardDialog : DaggerDialogFragment() {
         val profileStore = activePlugin.activeProfileSource.profile
 
         if (profile == null || profileStore == null) {
-            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.noprofile))
+            ToastUtils.showToastInUiThread(ctx, rh.gs(R.string.noprofile))
             dismiss()
             return
         }
 
         val profileList: ArrayList<CharSequence> = profileStore.getProfileList()
-        profileList.add(0, resourceHelper.gs(R.string.active))
+        profileList.add(0, rh.gs(R.string.active))
         context?.let { context ->
             val adapter = ArrayAdapter(context, R.layout.spinner_centered, profileList)
             binding.profile.adapter = adapter
@@ -271,8 +271,8 @@ class WizardDialog : DaggerDialogFragment() {
         val bolusIob = iobCobCalculator.calculateIobFromBolus().round()
         val basalIob = iobCobCalculator.calculateIobFromTempBasalsIncludingConvertedExtended().round()
 
-        binding.bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, -bolusIob.iob)
-        binding.basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, -basalIob.basaliob)
+        binding.bolusiobinsulin.text = rh.gs(R.string.formatinsulinunits, -bolusIob.iob)
+        binding.basaliobinsulin.text = rh.gs(R.string.formatinsulinunits, -basalIob.basaliob)
 
         calculateInsulin()
 
@@ -285,7 +285,7 @@ class WizardDialog : DaggerDialogFragment() {
             return  // not initialized yet
         var profileName = binding.profile.selectedItem.toString()
         val specificProfile: Profile?
-        if (profileName == resourceHelper.gs(R.string.active)) {
+        if (profileName == rh.gs(R.string.active)) {
             specificProfile = profileFunction.getProfile()
             profileName = profileFunction.getProfileName()
         } else
@@ -300,7 +300,7 @@ class WizardDialog : DaggerDialogFragment() {
         val carbsAfterConstraint = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
         if (abs(carbs - carbsAfterConstraint) > 0.01) {
             binding.carbsInput.value = 0.0
-            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.carbsconstraintapplied))
+            ToastUtils.showToastInUiThread(ctx, rh.gs(R.string.carbsconstraintapplied))
             return
         }
 
@@ -330,20 +330,20 @@ class WizardDialog : DaggerDialogFragment() {
             binding.notes.text.toString(), carbTime)
 
         wizard?.let { wizard ->
-            binding.bg.text = String.format(resourceHelper.gs(R.string.format_bg_isf), valueToUnitsToString(Profile.toMgdl(bg, profileFunction.getUnits()), profileFunction.getUnits().asText), wizard.sens)
-            binding.bginsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBG)
+            binding.bg.text = String.format(rh.gs(R.string.format_bg_isf), valueToUnitsToString(Profile.toMgdl(bg, profileFunction.getUnits()), profileFunction.getUnits().asText), wizard.sens)
+            binding.bginsulin.text = rh.gs(R.string.formatinsulinunits, wizard.insulinFromBG)
 
-            binding.carbs.text = String.format(resourceHelper.gs(R.string.format_carbs_ic), carbs.toDouble(), wizard.ic)
-            binding.carbsinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCarbs)
+            binding.carbs.text = String.format(rh.gs(R.string.format_carbs_ic), carbs.toDouble(), wizard.ic)
+            binding.carbsinsulin.text = rh.gs(R.string.formatinsulinunits, wizard.insulinFromCarbs)
 
-            binding.bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBolusIOB)
-            binding.basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromBasalIOB)
+            binding.bolusiobinsulin.text = rh.gs(R.string.formatinsulinunits, wizard.insulinFromBolusIOB)
+            binding.basaliobinsulin.text = rh.gs(R.string.formatinsulinunits, wizard.insulinFromBasalIOB)
 
-            binding.correctioninsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCorrection)
+            binding.correctioninsulin.text = rh.gs(R.string.formatinsulinunits, wizard.insulinFromCorrection)
 
             // Superbolus
-            binding.sb.text = if (binding.sbcheckbox.isChecked) resourceHelper.gs(R.string.twohours) else ""
-            binding.sbinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromSuperBolus)
+            binding.sb.text = if (binding.sbcheckbox.isChecked) rh.gs(R.string.twohours) else ""
+            binding.sbinsulin.text = rh.gs(R.string.formatinsulinunits, wizard.insulinFromSuperBolus)
 
             // Trend
             if (binding.bgtrendcheckbox.isChecked && wizard.glucoseStatus != null) {
@@ -353,24 +353,24 @@ class WizardDialog : DaggerDialogFragment() {
             } else {
                 binding.bgtrend.text = ""
             }
-            binding.bgtrendinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromTrend)
+            binding.bgtrendinsulin.text = rh.gs(R.string.formatinsulinunits, wizard.insulinFromTrend)
 
             // COB
             if (binding.cobcheckbox.isChecked) {
-                binding.cob.text = String.format(resourceHelper.gs(R.string.format_cob_ic), cob, wizard.ic)
-                binding.cobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, wizard.insulinFromCOB)
+                binding.cob.text = String.format(rh.gs(R.string.format_cob_ic), cob, wizard.ic)
+                binding.cobinsulin.text = rh.gs(R.string.formatinsulinunits, wizard.insulinFromCOB)
             } else {
                 binding.cob.text = ""
                 binding.cobinsulin.text = ""
             }
 
             if (wizard.calculatedTotalInsulin > 0.0 || carbsAfterConstraint > 0.0) {
-                val insulinText = if (wizard.calculatedTotalInsulin > 0.0) resourceHelper.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin) else ""
-                val carbsText = if (carbsAfterConstraint > 0.0) resourceHelper.gs(R.string.format_carbs, carbsAfterConstraint) else ""
-                binding.total.text = resourceHelper.gs(R.string.result_insulin_carbs, insulinText, carbsText)
+                val insulinText = if (wizard.calculatedTotalInsulin > 0.0) rh.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin) else ""
+                val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(R.string.format_carbs, carbsAfterConstraint) else ""
+                binding.total.text = rh.gs(R.string.result_insulin_carbs, insulinText, carbsText)
                 binding.ok.visibility = View.VISIBLE
             } else {
-                binding.total.text = resourceHelper.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt())
+                binding.total.text = rh.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt())
                 binding.ok.visibility = View.INVISIBLE
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardInfoDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardInfoDialog.kt
index 1ae378454ec..d5ec4736bfb 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardInfoDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardInfoDialog.kt
@@ -19,7 +19,7 @@ import javax.inject.Inject
 
 class WizardInfoDialog : DaggerDialogFragment() {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
 
     private lateinit var data: BolusCalculatorResult
@@ -51,40 +51,40 @@ class WizardInfoDialog : DaggerDialogFragment() {
         val units = profileFunction.getUnits()
         val bgString = Profile.toUnitsString(data.glucoseValue, data.glucoseValue * Constants.MGDL_TO_MMOLL, units)
         // BG
-        binding.bg.text = resourceHelper.gs(R.string.format_bg_isf, bgString, data.isf)
-        binding.bginsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.glucoseInsulin)
+        binding.bg.text = rh.gs(R.string.format_bg_isf, bgString, data.isf)
+        binding.bginsulin.text = rh.gs(R.string.formatinsulinunits, data.glucoseInsulin)
         binding.bgcheckbox.isChecked = data.wasGlucoseUsed
         binding.ttcheckbox.isChecked = data.wasTempTargetUsed
         // Trend
         binding.bgtrend.text = DecimalFormatter.to1Decimal(data.glucoseTrend)
-        binding.bgtrendinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.trendInsulin)
+        binding.bgtrendinsulin.text = rh.gs(R.string.formatinsulinunits, data.trendInsulin)
         binding.bgtrendcheckbox.isChecked = data.wasTrendUsed
         // COB
-        binding.cob.text = resourceHelper.gs(R.string.format_cob_ic, data.cob, data.ic)
-        binding.cobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.cobInsulin)
+        binding.cob.text = rh.gs(R.string.format_cob_ic, data.cob, data.ic)
+        binding.cobinsulin.text = rh.gs(R.string.formatinsulinunits, data.cobInsulin)
         binding.cobcheckbox.isChecked = data.wasCOBUsed
         // Bolus IOB
-        binding.bolusiobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.bolusIOB)
+        binding.bolusiobinsulin.text = rh.gs(R.string.formatinsulinunits, data.bolusIOB)
         binding.bolusiobcheckbox.isChecked = data.wasBolusIOBUsed
         // Basal IOB
-        binding.basaliobinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.basalIOB)
+        binding.basaliobinsulin.text = rh.gs(R.string.formatinsulinunits, data.basalIOB)
         binding.basaliobcheckbox.isChecked = data.wasBasalIOBUsed
         // Superbolus
-        binding.sbinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.superbolusInsulin)
+        binding.sbinsulin.text = rh.gs(R.string.formatinsulinunits, data.superbolusInsulin)
         binding.sbcheckbox.isChecked = data.wasSuperbolusUsed
         // Carbs
-        binding.carbs.text = resourceHelper.gs(R.string.format_carbs_ic, data.carbs, data.ic)
-        binding.carbsinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.carbsInsulin)
+        binding.carbs.text = rh.gs(R.string.format_carbs_ic, data.carbs, data.ic)
+        binding.carbsinsulin.text = rh.gs(R.string.formatinsulinunits, data.carbsInsulin)
         // Correction
-        binding.correctioninsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.otherCorrection)
+        binding.correctioninsulin.text = rh.gs(R.string.formatinsulinunits, data.otherCorrection)
         // Profile
         binding.profile.text = data.profileName
         // Notes
         binding.notes.text = data.note
         // Percentage
-        binding.percentUsed.text = resourceHelper.gs(R.string.format_percent, data.percentageCorrection)
+        binding.percentUsed.text = rh.gs(R.string.format_percent, data.percentageCorrection)
         // Total
-        binding.totalinsulin.text = resourceHelper.gs(R.string.formatinsulinunits, data.totalInsulin)
+        binding.totalinsulin.text = rh.gs(R.string.formatinsulinunits, data.totalInsulin)
     }
 
     override fun onStart() {
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventNewBasalProfile.kt b/app/src/main/java/info/nightscout/androidaps/events/EventNewBasalProfile.kt
deleted file mode 100644
index 2ffa5a97244..00000000000
--- a/app/src/main/java/info/nightscout/androidaps/events/EventNewBasalProfile.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package info.nightscout.androidaps.events
-
-class EventNewBasalProfile : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
index 0c0b592a305..4b6a632913d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.HtmlHelper
@@ -26,9 +26,9 @@ class LoopFragment : DaggerFragment() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var loopPlugin: LoopPlugin
     @Inject lateinit var dateUtil: DateUtil
@@ -51,7 +51,7 @@ class LoopFragment : DaggerFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         binding.run.setOnClickListener {
-            binding.lastrun.text = resourceHelper.gs(R.string.executing)
+            binding.lastrun.text = rh.gs(R.string.executing)
             Thread { loopPlugin.invoke("Loop button", true) }.start()
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
index 5ee8e69839d..827b8e81b90 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
@@ -36,7 +36,7 @@ import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui
 import info.nightscout.androidaps.plugins.aps.loop.events.EventNewOpenLoopNotification
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
@@ -71,14 +71,14 @@ class LoopPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     private val aapsSchedulers: AapsSchedulers,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val sp: SP,
     config: Config,
     private val constraintChecker: ConstraintChecker,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val context: Context,
-    private val commandQueue: CommandQueueProvider,
+    private val commandQueue: CommandQueue,
     private val activePlugin: ActivePlugin,
     private val virtualPumpPlugin: VirtualPumpPlugin,
     private val iobCobCalculator: IobCobCalculator,
@@ -97,7 +97,7 @@ class LoopPlugin @Inject constructor(
     .preferencesId(R.xml.pref_loop)
     .enableByDefault(config.APS)
     .description(R.string.description_loop),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), Loop {
 
     private val disposable = CompositeDisposable()
@@ -230,7 +230,7 @@ class LoopPlugin @Inject constructor(
             val loopEnabled = constraintChecker.isLoopInvocationAllowed()
             if (!loopEnabled.value()) {
                 val message = """
-                    ${resourceHelper.gs(R.string.loopdisabled)}
+                    ${rh.gs(R.string.loopdisabled)}
                     ${loopEnabled.getReasons(aapsLogger)}
                     """.trimIndent()
                 aapsLogger.debug(LTag.APS, message)
@@ -242,28 +242,28 @@ class LoopPlugin @Inject constructor(
             if (!isEnabled(PluginType.LOOP)) return
             val profile = profileFunction.getProfile()
             if (profile == null || !profileFunction.isProfileValid("Loop")) {
-                aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.noprofileselected))
-                rxBus.send(EventLoopSetLastRunGui(resourceHelper.gs(R.string.noprofileselected)))
+                aapsLogger.debug(LTag.APS, rh.gs(R.string.noprofileset))
+                rxBus.send(EventLoopSetLastRunGui(rh.gs(R.string.noprofileset)))
                 return
             }
 
             // Check if pump info is loaded
             if (pump.baseBasalRate < 0.01) return
             val usedAPS = activePlugin.activeAPS
-            if ((usedAPS as PluginBase).isEnabled(PluginType.APS)) {
+            if ((usedAPS as PluginBase).isEnabled()) {
                 usedAPS.invoke(initiator, tempBasalFallback)
                 apsResult = usedAPS.lastAPSResult
             }
 
             // Check if we have any result
             if (apsResult == null) {
-                rxBus.send(EventLoopSetLastRunGui(resourceHelper.gs(R.string.noapsselected)))
+                rxBus.send(EventLoopSetLastRunGui(rh.gs(R.string.noapsselected)))
                 return
             } else rxBus.send(EventLoopInvoked())
 
             if (!isEmptyQueue()) {
-                aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.pumpbusy))
-                rxBus.send(EventLoopSetLastRunGui(resourceHelper.gs(R.string.pumpbusy)))
+                aapsLogger.debug(LTag.APS, rh.gs(R.string.pumpbusy))
+                rxBus.send(EventLoopSetLastRunGui(rh.gs(R.string.pumpbusy)))
                 return
             }
 
@@ -307,13 +307,13 @@ class LoopPlugin @Inject constructor(
                 }
 
                 if (isSuspended) {
-                    aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.loopsuspended))
-                    rxBus.send(EventLoopSetLastRunGui(resourceHelper.gs(R.string.loopsuspended)))
+                    aapsLogger.debug(LTag.APS, rh.gs(R.string.loopsuspended))
+                    rxBus.send(EventLoopSetLastRunGui(rh.gs(R.string.loopsuspended)))
                     return
                 }
                 if (pump.isSuspended()) {
-                    aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.pumpsuspended))
-                    rxBus.send(EventLoopSetLastRunGui(resourceHelper.gs(R.string.pumpsuspended)))
+                    aapsLogger.debug(LTag.APS, rh.gs(R.string.pumpsuspended))
+                    rxBus.send(EventLoopSetLastRunGui(rh.gs(R.string.pumpsuspended)))
                     return
                 }
                 val closedLoopEnabled = constraintChecker.isClosedLoopAllowed()
@@ -332,18 +332,18 @@ class LoopPlugin @Inject constructor(
                                 val intentAction5m = Intent(context, CarbSuggestionReceiver::class.java)
                                 intentAction5m.putExtra("ignoreDuration", 5)
                                 val pendingIntent5m = PendingIntent.getBroadcast(context, 1, intentAction5m, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
-                                val actionIgnore5m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore5m, "Ignore 5m"), pendingIntent5m)
+                                val actionIgnore5m = NotificationCompat.Action(R.drawable.ic_notif_aaps, rh.gs(R.string.ignore5m, "Ignore 5m"), pendingIntent5m)
                                 val intentAction15m = Intent(context, CarbSuggestionReceiver::class.java)
                                 intentAction15m.putExtra("ignoreDuration", 15)
                                 val pendingIntent15m = PendingIntent.getBroadcast(context, 1, intentAction15m, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
-                                val actionIgnore15m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore15m, "Ignore 15m"), pendingIntent15m)
+                                val actionIgnore15m = NotificationCompat.Action(R.drawable.ic_notif_aaps, rh.gs(R.string.ignore15m, "Ignore 15m"), pendingIntent15m)
                                 val intentAction30m = Intent(context, CarbSuggestionReceiver::class.java)
                                 intentAction30m.putExtra("ignoreDuration", 30)
                                 val pendingIntent30m = PendingIntent.getBroadcast(context, 1, intentAction30m, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
-                                val actionIgnore30m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore30m, "Ignore 30m"), pendingIntent30m)
+                                val actionIgnore30m = NotificationCompat.Action(R.drawable.ic_notif_aaps, rh.gs(R.string.ignore30m, "Ignore 30m"), pendingIntent30m)
                                 val builder = NotificationCompat.Builder(context, CHANNEL_ID)
                                 builder.setSmallIcon(R.drawable.notif_icon)
-                                    .setContentTitle(resourceHelper.gs(R.string.carbssuggestion))
+                                    .setContentTitle(rh.gs(R.string.carbssuggestion))
                                     .setContentText(resultAfterConstraints.carbsRequiredText)
                                     .setAutoCancel(true)
                                     .setPriority(Notification.IMPORTANCE_HIGH)
@@ -357,9 +357,9 @@ class LoopPlugin @Inject constructor(
 
                                 // mId allows you to update the notification later on.
                                 mNotificationManager.notify(Constants.notificationID, builder.build())
-                                uel.log(Action.CAREPORTAL, Sources.Loop, resourceHelper.gs(R.string.carbsreq, resultAfterConstraints.carbsReq, resultAfterConstraints.carbsReqWithin),
-                                    ValueWithUnit.Gram(resultAfterConstraints.carbsReq),
-                                    ValueWithUnit.Minute(resultAfterConstraints.carbsReqWithin))
+                                uel.log(Action.CAREPORTAL, Sources.Loop, rh.gs(R.string.carbsreq, resultAfterConstraints.carbsReq, resultAfterConstraints.carbsReqWithin),
+                                        ValueWithUnit.Gram(resultAfterConstraints.carbsReq),
+                                        ValueWithUnit.Minute(resultAfterConstraints.carbsReqWithin))
                                 rxBus.send(EventNewOpenLoopNotification())
 
                                 //only send to wear if Native notifications are turned off
@@ -422,7 +422,7 @@ class LoopPlugin @Inject constructor(
                     if (resultAfterConstraints.isChangeRequested && allowNotification) {
                         val builder = NotificationCompat.Builder(context, CHANNEL_ID)
                         builder.setSmallIcon(R.drawable.notif_icon)
-                            .setContentTitle(resourceHelper.gs(R.string.openloop_newsuggestion))
+                            .setContentTitle(rh.gs(R.string.openloop_newsuggestion))
                             .setContentText(resultAfterConstraints.toString())
                             .setAutoCancel(true)
                             .setPriority(Notification.IMPORTANCE_HIGH)
@@ -516,12 +516,12 @@ class LoopPlugin @Inject constructor(
         }
         val pump = activePlugin.activePump
         if (!pump.isInitialized()) {
-            aapsLogger.debug(LTag.APS, "applyAPSRequest: " + resourceHelper.gs(R.string.pumpNotInitialized))
+            aapsLogger.debug(LTag.APS, "applyAPSRequest: " + rh.gs(R.string.pumpNotInitialized))
             callback?.result(PumpEnactResult(injector).comment(R.string.pumpNotInitialized).enacted(false).success(false))?.run()
             return
         }
         if (pump.isSuspended()) {
-            aapsLogger.debug(LTag.APS, "applyAPSRequest: " + resourceHelper.gs(R.string.pumpsuspended))
+            aapsLogger.debug(LTag.APS, "applyAPSRequest: " + rh.gs(R.string.pumpsuspended))
             callback?.result(PumpEnactResult(injector).comment(R.string.pumpsuspended).enacted(false).success(false))?.run()
             return
         }
@@ -591,12 +591,12 @@ class LoopPlugin @Inject constructor(
             return
         }
         if (!pump.isInitialized()) {
-            aapsLogger.debug(LTag.APS, "applySMBRequest: " + resourceHelper.gs(R.string.pumpNotInitialized))
+            aapsLogger.debug(LTag.APS, "applySMBRequest: " + rh.gs(R.string.pumpNotInitialized))
             callback?.result(PumpEnactResult(injector).comment(R.string.pumpNotInitialized).enacted(false).success(false))?.run()
             return
         }
         if (pump.isSuspended()) {
-            aapsLogger.debug(LTag.APS, "applySMBRequest: " + resourceHelper.gs(R.string.pumpsuspended))
+            aapsLogger.debug(LTag.APS, "applySMBRequest: " + rh.gs(R.string.pumpsuspended))
             callback?.result(PumpEnactResult(injector).comment(R.string.pumpsuspended).enacted(false).success(false))?.run()
             return
         }
@@ -616,7 +616,7 @@ class LoopPlugin @Inject constructor(
     }
 
     private fun allowPercentage(): Boolean {
-        return virtualPumpPlugin.isEnabled(PluginType.PUMP)
+        return virtualPumpPlugin.isEnabled()
     }
 
     override fun goToZeroTemp(durationInMinutes: Int, profile: Profile, reason: OfflineEvent.Reason) {
@@ -632,7 +632,7 @@ class LoopPlugin @Inject constructor(
             commandQueue.tempBasalAbsolute(0.0, durationInMinutes, true, profile, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
+                        ErrorHelperActivity.runAlarm(context, result.comment, rh.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                     }
                 }
             })
@@ -640,7 +640,7 @@ class LoopPlugin @Inject constructor(
             commandQueue.tempBasalPercent(0, durationInMinutes, true, profile, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
+                        ErrorHelperActivity.runAlarm(context, result.comment, rh.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                     }
                 }
             })
@@ -649,7 +649,7 @@ class LoopPlugin @Inject constructor(
             commandQueue.cancelExtended(object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.extendedbolusdeliveryerror), R.raw.boluserror)
+                        ErrorHelperActivity.runAlarm(context, result.comment, rh.gs(R.string.extendedbolusdeliveryerror), R.raw.boluserror)
                     }
                 }
             })
@@ -667,7 +667,7 @@ class LoopPlugin @Inject constructor(
         commandQueue.cancelTempBasal(true, object : Callback() {
             override fun run() {
                 if (!result.success) {
-                    ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
+                    ErrorHelperActivity.runAlarm(context, result.comment, rh.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                 }
             }
         })
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
index acbbf1191bb..4d41682fd91 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
@@ -12,7 +12,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.JSONFormatter
@@ -30,8 +30,8 @@ class OpenAPSAMAFragment : DaggerFragment() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
     @Inject lateinit var dateUtil: DateUtil
@@ -101,7 +101,7 @@ class OpenAPSAMAFragment : DaggerFragment() {
             binding.currenttemp.text = jsonFormatter.format(determineBasalAdapterAMAJS.currentTempParam)
             try {
                 val iobArray = JSONArray(determineBasalAdapterAMAJS.iobDataParam)
-                binding.iobdata.text = TextUtils.concat(resourceHelper.gs(R.string.array_of_elements, iobArray.length()) + "\n", jsonFormatter.format(iobArray.getString(0)))
+                binding.iobdata.text = TextUtils.concat(rh.gs(R.string.array_of_elements, iobArray.length()) + "\n", jsonFormatter.format(iobArray.getString(0)))
             } catch (e: JSONException) {
                 aapsLogger.error(LTag.APS, "Unhandled exception", e)
                 @Suppress("SetTextI18n")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
index 479acd4da07..c08479d48d6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
@@ -33,9 +33,9 @@ import javax.inject.Singleton
 class OpenAPSAMAPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val constraintChecker: ConstraintChecker,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val context: Context,
     private val activePlugin: ActivePlugin,
@@ -54,7 +54,7 @@ class OpenAPSAMAPlugin @Inject constructor(
     .shortName(R.string.oaps_shortname)
     .preferencesId(R.xml.pref_openapsama)
     .description(R.string.description_ama),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), APS {
 
     // last values
@@ -86,18 +86,18 @@ class OpenAPSAMAPlugin @Inject constructor(
         val profile = profileFunction.getProfile()
         val pump = activePlugin.activePump
         if (profile == null) {
-            rxBus.send(EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.noprofileselected)))
-            aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.noprofileselected))
+            rxBus.send(EventOpenAPSUpdateResultGui(rh.gs(R.string.noprofileset)))
+            aapsLogger.debug(LTag.APS, rh.gs(R.string.noprofileset))
             return
         }
         if (!isEnabled(PluginType.APS)) {
-            rxBus.send(EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openapsma_disabled)))
-            aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.openapsma_disabled))
+            rxBus.send(EventOpenAPSUpdateResultGui(rh.gs(R.string.openapsma_disabled)))
+            aapsLogger.debug(LTag.APS, rh.gs(R.string.openapsma_disabled))
             return
         }
         if (glucoseStatus == null) {
-            rxBus.send(EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openapsma_noglucosedata)))
-            aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.openapsma_noglucosedata))
+            rxBus.send(EventOpenAPSUpdateResultGui(rh.gs(R.string.openapsma_noglucosedata)))
+            aapsLogger.debug(LTag.APS, rh.gs(R.string.openapsma_noglucosedata))
             return
         }
         val inputConstraints = Constraint(0.0) // fake. only for collecting all results
@@ -114,9 +114,9 @@ class OpenAPSAMAPlugin @Inject constructor(
         val maxIob = constraintChecker.getMaxIOBAllowed().also { maxIOBAllowedConstraint ->
             inputConstraints.copyReasons(maxIOBAllowedConstraint)
         }.value()
-        var minBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetLowMgdl(), 0.1), R.string.profile_low_target, HardLimits.VERY_HARD_LIMIT_MIN_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MIN_BG[1].toDouble())
-        var maxBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetHighMgdl(), 0.1), R.string.profile_high_target, HardLimits.VERY_HARD_LIMIT_MAX_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MAX_BG[1].toDouble())
-        var targetBg = hardLimits.verifyHardLimits(profile.getTargetMgdl(), R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble())
+        var minBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetLowMgdl(), 0.1), R.string.profile_low_target, HardLimits.VERY_HARD_LIMIT_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_MIN_BG[1])
+        var maxBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetHighMgdl(), 0.1), R.string.profile_high_target, HardLimits.VERY_HARD_LIMIT_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_MAX_BG[1])
+        var targetBg = hardLimits.verifyHardLimits(profile.getTargetMgdl(), R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TARGET_BG[1])
         var isTempTarget = false
         val tempTarget = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet()
         if (tempTarget is ValueWrapper.Existing) {
@@ -134,7 +134,7 @@ class OpenAPSAMAPlugin @Inject constructor(
         if (constraintChecker.isAutosensModeEnabled().value()) {
             val autosensData = iobCobCalculator.getLastAutosensDataWithWaitForCalculationFinish("OpenAPSPlugin")
             if (autosensData == null) {
-                rxBus.send(EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openaps_noasdata)))
+                rxBus.send(EventOpenAPSUpdateResultGui(rh.gs(R.string.openaps_noasdata)))
                 return
             }
             lastAutosensResult = autosensData.autosensResult
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
index bdb1039bd23..6e3a2fb43a4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
@@ -36,7 +36,7 @@ class DetermineBasalAdapterSMBJS internal constructor(private val scriptReader:
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var sp: SP
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var iobCobCalculator: IobCobCalculator
     @Inject lateinit var activePlugin: ActivePlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
index 61e52b08210..0e43d905515 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.JSONFormatter
@@ -31,8 +31,8 @@ class OpenAPSSMBFragment : DaggerFragment() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
     @Inject lateinit var dateUtil: DateUtil
@@ -101,7 +101,7 @@ class OpenAPSSMBFragment : DaggerFragment() {
             binding.currenttemp.text = jsonFormatter.format(determineBasalAdapterSMBJS.currentTempParam)
             try {
                 val iobArray = JSONArray(determineBasalAdapterSMBJS.iobDataParam)
-                binding.iobdata.text = TextUtils.concat(resourceHelper.gs(R.string.array_of_elements, iobArray.length()) + "\n", jsonFormatter.format(iobArray.getString(0)))
+                binding.iobdata.text = TextUtils.concat(rh.gs(R.string.array_of_elements, iobArray.length()) + "\n", jsonFormatter.format(iobArray.getString(0)))
             } catch (e: JSONException) {
                 aapsLogger.error(LTag.APS, "Unhandled exception", e)
                 @SuppressLint("SetTextI18n")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
index e658f2d04cc..d6118999693 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
@@ -33,9 +33,9 @@ import javax.inject.Singleton
 class OpenAPSSMBPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val constraintChecker: ConstraintChecker,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val context: Context,
     private val activePlugin: ActivePlugin,
@@ -55,7 +55,7 @@ class OpenAPSSMBPlugin @Inject constructor(
     .preferencesId(R.xml.pref_openapssmb)
     .description(R.string.description_smb)
     .setDefault(),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), APS, Constraints {
 
     // last values
@@ -81,9 +81,9 @@ class OpenAPSSMBPlugin @Inject constructor(
     override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
         super.preprocessPreferences(preferenceFragment)
         val smbAlwaysEnabled = sp.getBoolean(R.string.key_enableSMB_always, false)
-        preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_enableSMB_with_COB))?.isVisible = !smbAlwaysEnabled
-        preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_enableSMB_with_temptarget))?.isVisible = !smbAlwaysEnabled
-        preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_enableSMB_after_carbs))?.isVisible = !smbAlwaysEnabled
+        preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_enableSMB_with_COB))?.isVisible = !smbAlwaysEnabled
+        preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_enableSMB_with_temptarget))?.isVisible = !smbAlwaysEnabled
+        preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_enableSMB_after_carbs))?.isVisible = !smbAlwaysEnabled
     }
 
     override fun invoke(initiator: String, tempBasalFallback: Boolean) {
@@ -93,18 +93,18 @@ class OpenAPSSMBPlugin @Inject constructor(
         val profile = profileFunction.getProfile()
         val pump = activePlugin.activePump
         if (profile == null) {
-            rxBus.send(EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.noprofileselected)))
-            aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.noprofileselected))
+            rxBus.send(EventOpenAPSUpdateResultGui(rh.gs(R.string.noprofileset)))
+            aapsLogger.debug(LTag.APS, rh.gs(R.string.noprofileset))
             return
         }
         if (!isEnabled(PluginType.APS)) {
-            rxBus.send(EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openapsma_disabled)))
-            aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.openapsma_disabled))
+            rxBus.send(EventOpenAPSUpdateResultGui(rh.gs(R.string.openapsma_disabled)))
+            aapsLogger.debug(LTag.APS, rh.gs(R.string.openapsma_disabled))
             return
         }
         if (glucoseStatus == null) {
-            rxBus.send(EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openapsma_noglucosedata)))
-            aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.openapsma_noglucosedata))
+            rxBus.send(EventOpenAPSUpdateResultGui(rh.gs(R.string.openapsma_noglucosedata)))
+            aapsLogger.debug(LTag.APS, rh.gs(R.string.openapsma_noglucosedata))
             return
         }
 
@@ -119,9 +119,9 @@ class OpenAPSSMBPlugin @Inject constructor(
             inputConstraints.copyReasons(maxIOBAllowedConstraint)
         }.value()
 
-        var minBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetLowMgdl(), 0.1), R.string.profile_low_target, HardLimits.VERY_HARD_LIMIT_MIN_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MIN_BG[1].toDouble())
-        var maxBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetHighMgdl(), 0.1), R.string.profile_high_target, HardLimits.VERY_HARD_LIMIT_MAX_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_MAX_BG[1].toDouble())
-        var targetBg = hardLimits.verifyHardLimits(profile.getTargetMgdl(), R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble())
+        var minBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetLowMgdl(), 0.1), R.string.profile_low_target, HardLimits.VERY_HARD_LIMIT_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_MIN_BG[1])
+        var maxBg = hardLimits.verifyHardLimits(Round.roundTo(profile.getTargetHighMgdl(), 0.1), R.string.profile_high_target, HardLimits.VERY_HARD_LIMIT_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_MAX_BG[1])
+        var targetBg = hardLimits.verifyHardLimits(profile.getTargetMgdl(), R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TARGET_BG[1])
         var isTempTarget = false
         val tempTarget = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet()
         if (tempTarget is ValueWrapper.Existing) {
@@ -139,7 +139,7 @@ class OpenAPSSMBPlugin @Inject constructor(
         if (constraintChecker.isAutosensModeEnabled().value()) {
             val autosensData = iobCobCalculator.getLastAutosensDataWithWaitForCalculationFinish("OpenAPSPlugin")
             if (autosensData == null) {
-                rxBus.send(EventOpenAPSUpdateResultGui(resourceHelper.gs(R.string.openaps_noasdata)))
+                rxBus.send(EventOpenAPSUpdateResultGui(rh.gs(R.string.openaps_noasdata)))
                 return
             }
             lastAutosensResult = autosensData.autosensResult
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
index 862a8c918a0..ab93562d4a7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.configBuilder
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -15,11 +16,12 @@ import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.databinding.ConfigbuilderFragmentBinding
 import info.nightscout.androidaps.events.EventRebuildTabs
 import info.nightscout.androidaps.interfaces.*
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
 import info.nightscout.androidaps.utils.FabricPrivacy
 import io.reactivex.rxkotlin.plusAssign
 import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
@@ -30,13 +32,15 @@ import javax.inject.Inject
 class ConfigBuilderFragment : DaggerFragment() {
 
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var protectionCheck: ProtectionCheck
     @Inject lateinit var config: Config
+    @Inject lateinit var buildHelper: BuildHelper
+    @Inject lateinit var ctx: Context
 
     private var disposable: CompositeDisposable = CompositeDisposable()
     private val pluginViewHolders = ArrayList<PluginViewHolder>()
@@ -103,12 +107,14 @@ class ConfigBuilderFragment : DaggerFragment() {
         if (!config.NSCLIENT) {
             createViewsForPlugins(R.string.configbuilder_profile, R.string.configbuilder_profile_description, PluginType.PROFILE, activePlugin.getSpecificPluginsVisibleInList(PluginType.PROFILE))
         }
-        createViewsForPlugins(R.string.configbuilder_insulin, R.string.configbuilder_insulin_description, PluginType.INSULIN, activePlugin.getSpecificPluginsVisibleInList(PluginType.INSULIN))
+        if (config.APS || config.PUMPCONTROL || buildHelper.isEngineeringMode())
+            createViewsForPlugins(R.string.configbuilder_insulin, R.string.configbuilder_insulin_description, PluginType.INSULIN, activePlugin.getSpecificPluginsVisibleInList(PluginType.INSULIN))
         if (!config.NSCLIENT) {
             createViewsForPlugins(R.string.configbuilder_bgsource, R.string.configbuilder_bgsource_description, PluginType.BGSOURCE, activePlugin.getSpecificPluginsVisibleInList(PluginType.BGSOURCE))
             createViewsForPlugins(R.string.configbuilder_pump, R.string.configbuilder_pump_description, PluginType.PUMP, activePlugin.getSpecificPluginsVisibleInList(PluginType.PUMP))
         }
-        createViewsForPlugins(R.string.configbuilder_sensitivity, R.string.configbuilder_sensitivity_description, PluginType.SENSITIVITY, activePlugin.getSpecificPluginsVisibleInList(PluginType.SENSITIVITY))
+        if (config.APS || config.PUMPCONTROL || buildHelper.isEngineeringMode())
+            createViewsForPlugins(R.string.configbuilder_sensitivity, R.string.configbuilder_sensitivity_description, PluginType.SENSITIVITY, activePlugin.getSpecificPluginsVisibleInList(PluginType.SENSITIVITY))
         if (config.APS) {
             createViewsForPlugins(R.string.configbuilder_aps, R.string.configbuilder_aps_description, PluginType.APS, activePlugin.getSpecificPluginsVisibleInList(PluginType.APS))
             createViewsForPlugins(R.string.configbuilder_loop, R.string.configbuilder_loop_description, PluginType.LOOP, activePlugin.getSpecificPluginsVisibleInList(PluginType.LOOP))
@@ -121,8 +127,8 @@ class ConfigBuilderFragment : DaggerFragment() {
         if (plugins.isEmpty()) return
         @Suppress("InflateParams")
         val parent = layoutInflater.inflate(R.layout.configbuilder_single_category, null) as LinearLayout
-        (parent.findViewById<View>(R.id.category_title) as TextView).text = resourceHelper.gs(title)
-        (parent.findViewById<View>(R.id.category_description) as TextView).text = resourceHelper.gs(description)
+        (parent.findViewById<View>(R.id.category_title) as TextView).text = rh.gs(title)
+        (parent.findViewById<View>(R.id.category_description) as TextView).text = rh.gs(description)
         val pluginContainer = parent.findViewById<LinearLayout>(R.id.category_plugins)
         for (plugin in plugins) {
             val pluginViewHolder = PluginViewHolder(this, pluginType, plugin)
@@ -166,7 +172,7 @@ class ConfigBuilderFragment : DaggerFragment() {
             pluginPreferences.setOnClickListener {
                 fragment.activity?.let { activity ->
                     protectionCheck.queryProtection(activity, ProtectionCheck.Protection.PREFERENCES, {
-                        val i = Intent(fragment.context, PreferencesActivity::class.java)
+                        val i = Intent(ctx, PreferencesActivity::class.java)
                         i.putExtra("id", plugin.preferencesId)
                         fragment.startActivity(i)
                     }, null)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
index dce8c552065..cf9a78194c9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -26,9 +26,9 @@ import javax.inject.Singleton
 class ConfigBuilderPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val sp: SP,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val activePlugin: ActivePlugin,
     private val uel: UserEntryLogger,
     private val pumpSync: PumpSync
@@ -42,7 +42,7 @@ class ConfigBuilderPlugin @Inject constructor(
     .pluginName(R.string.configbuilder)
     .shortName(R.string.configbuilder_shortname)
     .description(R.string.description_config_builder),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), ConfigBuilder {
 
     override fun initialize() {
@@ -134,7 +134,7 @@ class ConfigBuilderPlugin @Inject constructor(
 
     // Ask when switching to physical pump plugin
     fun switchAllowed(changedPlugin: PluginBase, newState: Boolean, activity: FragmentActivity?, type: PluginType) {
-        if (changedPlugin.getType() == PluginType.PUMP && changedPlugin.name != resourceHelper.gs(R.string.virtualpump))
+        if (changedPlugin.getType() == PluginType.PUMP && changedPlugin.name != rh.gs(R.string.virtualpump))
             confirmPumpPluginActivation(changedPlugin, newState, activity, type)
         else if (changedPlugin.getType() == PluginType.PUMP) {
             performPluginSwitch(changedPlugin, newState, type)
@@ -148,12 +148,12 @@ class ConfigBuilderPlugin @Inject constructor(
             performPluginSwitch(changedPlugin, newState, type)
             pumpSync.connectNewPump()
         } else {
-            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.allow_hardware_pump_text), {
+            OKDialog.showConfirmation(activity, rh.gs(R.string.allow_hardware_pump_text), {
                 performPluginSwitch(changedPlugin, newState, type)
                 pumpSync.connectNewPump()
                 sp.putBoolean("allow_hardware_pump", true)
-                uel.log(Action.HW_PUMP_ALLOWED, Sources.ConfigBuilder, resourceHelper.gs(changedPlugin.pluginDescription.pluginName),
-                    ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
+                uel.log(Action.HW_PUMP_ALLOWED, Sources.ConfigBuilder, rh.gs(changedPlugin.pluginDescription.pluginName),
+                        ValueWithUnit.SimpleString(rh.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
                 aapsLogger.debug(LTag.PUMP, "First time HW pump allowed!")
             }, {
                 rxBus.send(EventConfigBuilderUpdateGui())
@@ -164,12 +164,12 @@ class ConfigBuilderPlugin @Inject constructor(
 
     override fun performPluginSwitch(changedPlugin: PluginBase, enabled: Boolean, type: PluginType) {
         if(enabled && !changedPlugin.isEnabled()) {
-            uel.log(Action.PLUGIN_ENABLED, Sources.ConfigBuilder, resourceHelper.gs(changedPlugin.pluginDescription.pluginName),
-                ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
+            uel.log(Action.PLUGIN_ENABLED, Sources.ConfigBuilder, rh.gs(changedPlugin.pluginDescription.pluginName),
+                    ValueWithUnit.SimpleString(rh.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
         }
         else if(!enabled) {
-            uel.log(Action.PLUGIN_DISABLED, Sources.ConfigBuilder, resourceHelper.gs(changedPlugin.pluginDescription.pluginName),
-                ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
+            uel.log(Action.PLUGIN_DISABLED, Sources.ConfigBuilder, rh.gs(changedPlugin.pluginDescription.pluginName),
+                    ValueWithUnit.SimpleString(rh.gsNotLocalised(changedPlugin.pluginDescription.pluginName)))
         }
         changedPlugin.setPluginEnabled(type, enabled)
         changedPlugin.setFragmentVisible(type, enabled)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
index 83b8185da4a..05afc2fd869 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
@@ -8,15 +8,19 @@ import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.database.entities.ProfileSwitch
 import info.nightscout.androidaps.database.transactions.InsertOrUpdateProfileSwitch
+import info.nightscout.androidaps.events.EventEffectiveProfileSwitchChanged
 import info.nightscout.androidaps.extensions.fromConstant
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.general.nsclient.data.DeviceStatusData
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
@@ -28,19 +32,42 @@ import javax.inject.Singleton
 class ProfileFunctionImplementation @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val sp: SP,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
+    private val rxBus: RxBus,
+    private val rh: ResourceHelper,
     private val activePlugin: ActivePlugin,
     private val repository: AppRepository,
     private val dateUtil: DateUtil,
     private val config: Config,
-    private val hardLimits: HardLimits
+    private val hardLimits: HardLimits,
+    aapsSchedulers: AapsSchedulers,
+    private val fabricPrivacy: FabricPrivacy,
+    private val deviceStatusData: DeviceStatusData
 ) : ProfileFunction {
 
     val cache = LongSparseArray<Profile>()
 
     private val disposable = CompositeDisposable()
 
+    init {
+        disposable += rxBus
+            .toObservable(EventEffectiveProfileSwitchChanged::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe(
+                {
+                    synchronized(cache) {
+                        for (index in cache.size() - 1 downTo 0) {
+                            if (cache.keyAt(index) > it.startDate) {
+                                aapsLogger.debug(LTag.AUTOSENS, "Removing from profileCache: " + dateUtil.dateAndTimeAndSecondsString(cache.keyAt(index)))
+                                cache.removeAt(index)
+                            } else {
+                                break
+                            }
+                        }
+                    }
+                }, fabricPrivacy::logException
+            )
+    }
+
     override fun getProfileName(): String =
         getProfileName(System.currentTimeMillis(), customized = true, showRemainingTime = false)
 
@@ -51,13 +78,13 @@ class ProfileFunctionImplementation @Inject constructor(
         getProfileName(System.currentTimeMillis(), customized = true, showRemainingTime = true)
 
     fun getProfileName(time: Long, customized: Boolean, showRemainingTime: Boolean): String {
-        var profileName = resourceHelper.gs(R.string.noprofileselected)
+        var profileName = rh.gs(R.string.noprofileset)
 
         val profileSwitch = repository.getEffectiveProfileSwitchActiveAt(time).blockingGet()
         if (profileSwitch is ValueWrapper.Existing) {
             profileName = if (customized) profileSwitch.value.originalCustomizedName else profileSwitch.value.originalProfileName
             if (showRemainingTime && profileSwitch.value.originalDuration != 0L) {
-                profileName += dateUtil.untilString(profileSwitch.value.originalEnd, resourceHelper)
+                profileName += dateUtil.untilString(profileSwitch.value.originalEnd, rh)
             }
         }
         return profileName
@@ -68,21 +95,43 @@ class ProfileFunctionImplementation @Inject constructor(
     override fun getProfile(): Profile? =
         getProfile(dateUtil.now())
 
-    @Synchronized
     override fun getProfile(time: Long): Profile? {
         val rounded = time - time % 1000
-        val cached = cache[rounded]
-        if (cached != null) {
-//            aapsLogger.debug("HIT getProfile for $time $rounded")
-            return cached
+        // Clear cache after longer use
+        synchronized(cache) {
+            if (cache.size() > 30000) {
+                cache.clear()
+                aapsLogger.debug("Profile cache cleared")
+            }
+            val cached = cache[rounded]
+            if (cached != null) return cached
         }
 //        aapsLogger.debug("getProfile called for $time")
         val ps = repository.getEffectiveProfileSwitchActiveAt(time).blockingGet()
         if (ps is ValueWrapper.Existing) {
             val sealed = ProfileSealed.EPS(ps.value)
-            cache.put(rounded, sealed)
+            synchronized(cache) {
+                cache.put(rounded, sealed)
+            }
             return sealed
         }
+        // In NSClient mode effective profile may not be received if older than 2 days
+        // Try to get it from device status
+        // Remove this code after switch to api v3
+        if (config.NSCLIENT && ps is ValueWrapper.Absent) {
+            deviceStatusData.pumpData?.activeProfileName?.let { activeProfile ->
+                activePlugin.activeProfileSource.profile?.getSpecificProfile(activeProfile)?.let { ap ->
+                    val sealed = ProfileSealed.Pure(ap)
+                    synchronized(cache) {
+                        cache.put(rounded, sealed)
+                    }
+                    return sealed
+                }
+
+            }
+        }
+
+
         return null
     }
 
@@ -92,9 +141,8 @@ class ProfileFunctionImplementation @Inject constructor(
         if (sp.getString(R.string.key_units, Constants.MGDL) == Constants.MGDL) GlucoseUnit.MGDL
         else GlucoseUnit.MMOL
 
-    override fun buildProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long) : ProfileSwitch {
-        val pureProfile = profileStore.getSpecificProfile(profileName)
-            ?: throw InvalidParameterSpecException(profileName)
+    override fun buildProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long): ProfileSwitch? {
+        val pureProfile = profileStore.getSpecificProfile(profileName) ?: return null
         return ProfileSwitch(
             timestamp = timestamp,
             basalBlocks = pureProfile.basalBlocks,
@@ -112,8 +160,8 @@ class ProfileFunctionImplementation @Inject constructor(
         )
     }
 
-    override fun createProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long) {
-        val ps = buildProfileSwitch(profileStore, profileName, durationInMinutes, percentage, timeShiftInHours, timestamp)
+    override fun createProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long): Boolean {
+        val ps = buildProfileSwitch(profileStore, profileName, durationInMinutes, percentage, timeShiftInHours, timestamp)  ?: return false
         disposable += repository.runTransactionForResult(InsertOrUpdateProfileSwitch(ps))
             .subscribe({ result ->
                            result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted ProfileSwitch $it") }
@@ -121,20 +169,21 @@ class ProfileFunctionImplementation @Inject constructor(
                        }, {
                            aapsLogger.error(LTag.DATABASE, "Error while saving ProfileSwitch", it)
                        })
+        return true
     }
 
     override fun createProfileSwitch(durationInMinutes: Int, percentage: Int, timeShiftInHours: Int): Boolean {
-        val profile = repository.getPermanentProfileSwitch(dateUtil.now())
-            ?: throw InvalidParameterSpecException("No active ProfileSwitch")
+        val profile = repository.getPermanentProfileSwitch(dateUtil.now()) ?: return false
         val profileStore = activePlugin.activeProfileSource.profile ?: return false
-        val ps = buildProfileSwitch(profileStore, profile.profileName, durationInMinutes, percentage, 0, dateUtil.now())
+        val ps = buildProfileSwitch(profileStore, profile.profileName, durationInMinutes, percentage, 0, dateUtil.now()) ?: return false
         val validity = ProfileSealed.PS(ps).isValid(
-            resourceHelper.gs(info.nightscout.androidaps.automation.R.string.careportal_profileswitch),
+            rh.gs(info.nightscout.androidaps.automation.R.string.careportal_profileswitch),
             activePlugin.activePump,
             config,
-            resourceHelper,
+            rh,
             rxBus,
-            hardLimits
+            hardLimits,
+            false
         )
         var returnValue = true
         if (validity.isValid) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
new file mode 100644
index 00000000000..c20e5f3864c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
@@ -0,0 +1,102 @@
+package info.nightscout.androidaps.plugins.constraints.bgQualityCheck
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventBucketedDataCreated
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.math.abs
+
+@Singleton
+class BgQualityCheckPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    rh: ResourceHelper,
+    private val rxBus: RxBus,
+    private val iobCobCalculator: IobCobCalculator,
+    private val aapsSchedulers: AapsSchedulers,
+    private val fabricPrivacy: FabricPrivacy
+) : PluginBase(
+    PluginDescription()
+        .mainType(PluginType.CONSTRAINTS)
+        .neverVisible(true)
+        .alwaysEnabled(true)
+        .showInList(false)
+        .pluginName(R.string.dst_plugin_name),
+    aapsLogger, rh, injector
+), Constraints {
+
+    private var disposable: CompositeDisposable = CompositeDisposable()
+
+    enum class State {
+        UNKNOWN,
+        FIVE_MIN_DATA,
+        RECALCULATED,
+        DOUBLED
+    }
+
+    override fun onStart() {
+        super.onStart()
+        disposable += rxBus
+            .toObservable(EventBucketedDataCreated::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ processBgData() }, fabricPrivacy::logException)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        disposable.clear()
+    }
+
+    var state: State = State.UNKNOWN
+    var message: String = ""
+
+    // Return false if BG values are doubled
+    @Suppress("ReplaceGetOrSet")
+    override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
+        if (state == State.DOUBLED)
+            value.set(aapsLogger, false, "Doubled values in BGSource", this)
+        return value
+    }
+
+    fun processBgData() {
+        val readings = iobCobCalculator.ads.getBgReadingsDataTableCopy()
+        for (i in readings.indices)
+            if (i < readings.size - 2)
+                if (abs(readings[i].timestamp - readings[i + 1].timestamp) <= T.secs(20).msecs()) {
+                    state = State.DOUBLED
+                    aapsLogger.debug(LTag.CORE, "BG similar. Turning on red state.\n${readings[i]}\n${readings[i+1]}")
+                    message = rh.gs(R.string.bg_too_close, readings[i].toString(), readings[i+1].toString())
+                    return
+                }
+        if (iobCobCalculator.ads.lastUsed5minCalculation == true) {
+            state = State.FIVE_MIN_DATA
+            message = "Data is clean"
+        } else if (iobCobCalculator.ads.lastUsed5minCalculation == false) {
+            state = State.RECALCULATED
+            message = rh.gs(R.string.recalculated_data_used)
+        } else {
+            state = State.UNKNOWN
+            message = ""
+        }
+    }
+
+    fun icon(): Int =
+        when (state) {
+            State.UNKNOWN       -> 0
+            State.FIVE_MIN_DATA -> 0
+            State.RECALCULATED  -> R.drawable.ic_baseline_warning_24_yellow
+            State.DOUBLED       -> R.drawable.ic_baseline_warning_24_red
+        }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.kt
index 42ff9ea765d..3fbc8e009d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPlugin.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
@@ -21,18 +21,18 @@ import javax.inject.Singleton
 class DstHelperPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    private var rxBus: RxBusWrapper,
-    resourceHelper: ResourceHelper,
-    private var sp: SP,
-    private var activePlugin: ActivePlugin,
-    private var loopPlugin: LoopPlugin
+    private val rxBus: RxBus,
+    rh: ResourceHelper,
+    private val sp: SP,
+    private val activePlugin: ActivePlugin,
+    private val loopPlugin: LoopPlugin
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.CONSTRAINTS)
     .neverVisible(true)
     .alwaysEnabled(true)
     .showInList(false)
     .pluginName(R.string.dst_plugin_name),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), Constraints {
 
     companion object {
@@ -41,6 +41,7 @@ class DstHelperPlugin @Inject constructor(
     }
 
     //Return false if time to DST change happened in the last 3 hours.
+    @Suppress("ReplaceGetOrSet")
     override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         val pump = activePlugin.activePump
         if (pump.canHandleDST()) {
@@ -51,10 +52,10 @@ class DstHelperPlugin @Inject constructor(
         if (willBeDST(cal)) {
             val snoozedTo: Long = sp.getLong(R.string.key_snooze_dst_in24h, 0L)
             if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
-                val notification = NotificationWithAction(injector, Notification.DST_IN_24H, resourceHelper.gs(R.string.dst_in_24h_warning), Notification.LOW)
-                notification.action(R.string.snooze, Runnable {
+                val notification = NotificationWithAction(injector, Notification.DST_IN_24H, rh.gs(R.string.dst_in_24h_warning), Notification.LOW)
+                notification.action(R.string.snooze) {
                     sp.putLong(R.string.key_snooze_dst_in24h, System.currentTimeMillis() + T.hours(24).msecs())
-                })
+                }
                 rxBus.send(EventNewNotification(notification))
             }
         }
@@ -66,10 +67,10 @@ class DstHelperPlugin @Inject constructor(
             if (!loopPlugin.isSuspended) {
                 val snoozedTo: Long = sp.getLong(R.string.key_snooze_loopdisabled, 0L)
                 if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
-                    val notification = NotificationWithAction(injector, Notification.DST_LOOP_DISABLED, resourceHelper.gs(R.string.dst_loop_disabled_warning), Notification.LOW)
-                    notification.action(R.string.snooze, Runnable {
+                    val notification = NotificationWithAction(injector, Notification.DST_LOOP_DISABLED, rh.gs(R.string.dst_loop_disabled_warning), Notification.LOW)
+                    notification.action(R.string.snooze) {
                         sp.putLong(R.string.key_snooze_loopdisabled, System.currentTimeMillis() + T.hours(24).msecs())
-                    })
+                    }
                     rxBus.send(EventNewNotification(notification))
                 }
             } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
index 8f161e6ae21..1054e76d0b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
@@ -26,7 +26,7 @@ import info.nightscout.androidaps.dialogs.NtpProgressDialog
 import info.nightscout.androidaps.events.EventNtpStatus
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
 import info.nightscout.androidaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective.ExamTask
@@ -46,11 +46,11 @@ import javax.inject.Inject
 
 class ObjectivesFragment : DaggerFragment() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var sp: SP
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var objectivesPlugin: ObjectivesPlugin
     @Inject lateinit var receiverStatusStore: ReceiverStatusStore
@@ -155,15 +155,15 @@ class ObjectivesFragment : DaggerFragment() {
 
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
             val objective = objectivesPlugin.objectives[position]
-            holder.binding.title.text = resourceHelper.gs(R.string.nth_objective, position + 1)
+            holder.binding.title.text = rh.gs(R.string.nth_objective, position + 1)
             if (objective.objective != 0) {
                 holder.binding.objective.visibility = View.VISIBLE
-                holder.binding.objective.text = resourceHelper.gs(objective.objective)
+                holder.binding.objective.text = rh.gs(objective.objective)
             } else
                 holder.binding.objective.visibility = View.GONE
             if (objective.gate != 0) {
                 holder.binding.gate.visibility = View.VISIBLE
-                holder.binding.gate.text = resourceHelper.gs(objective.gate)
+                holder.binding.gate.text = rh.gs(objective.gate)
             } else
                 holder.binding.gate.visibility = View.GONE
             if (!objective.isStarted) {
@@ -199,7 +199,7 @@ class ObjectivesFragment : DaggerFragment() {
                     if (task.shouldBeIgnored()) continue
                     // name
                     val name = TextView(holder.binding.progress.context)
-                    name.text = "${resourceHelper.gs(task.task)}:"
+                    name.text = "${rh.gs(task.task)}:"
                     name.setTextColor(-0x1)
                     holder.binding.progress.addView(name, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
                     // hint
@@ -232,7 +232,7 @@ class ObjectivesFragment : DaggerFragment() {
                     holder.binding.progress.addView(separator, LinearLayout.LayoutParams.MATCH_PARENT, 2)
                 }
             }
-            holder.binding.accomplished.text = resourceHelper.gs(R.string.accomplished, dateUtil.dateAndTimeString(objective.accomplishedOn))
+            holder.binding.accomplished.text = rh.gs(R.string.accomplished, dateUtil.dateAndTimeString(objective.accomplishedOn))
             holder.binding.accomplished.setTextColor(-0x3e3e3f)
             holder.binding.verify.setOnClickListener {
                 receiverStatusStore.updateNetworkStatus()
@@ -246,27 +246,27 @@ class ObjectivesFragment : DaggerFragment() {
                     // move out of UI thread
                     Thread {
                         NtpProgressDialog().show((context as AppCompatActivity).supportFragmentManager, "NtpCheck")
-                        rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.timedetection), 0))
+                        rxBus.send(EventNtpStatus(rh.gs(R.string.timedetection), 0))
                         sntpClient.ntpTime(object : SntpClient.Callback() {
                             override fun run() {
                                 aapsLogger.debug("NTP time: $time System time: ${dateUtil.now()}")
                                 SystemClock.sleep(300)
                                 if (!networkConnected) {
-                                    rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.notconnected), 99))
+                                    rxBus.send(EventNtpStatus(rh.gs(R.string.notconnected), 99))
                                 } else if (success) {
                                     if (objective.isCompleted(time)) {
                                         objective.accomplishedOn = time
-                                        rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.success), 100))
+                                        rxBus.send(EventNtpStatus(rh.gs(R.string.success), 100))
                                         SystemClock.sleep(1000)
                                         rxBus.send(EventObjectivesUpdateGui())
                                         rxBus.send(EventSWUpdate(false))
                                         SystemClock.sleep(100)
                                         scrollToCurrentObjective()
                                     } else {
-                                        rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.requirementnotmet), 99))
+                                        rxBus.send(EventNtpStatus(rh.gs(R.string.requirementnotmet), 99))
                                     }
                                 } else {
-                                    rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.failedretrievetime), 99))
+                                    rxBus.send(EventNtpStatus(rh.gs(R.string.failedretrievetime), 99))
                                 }
                             }
                         }, receiverStatusStore.isConnected)
@@ -285,23 +285,23 @@ class ObjectivesFragment : DaggerFragment() {
                 // move out of UI thread
                     Thread {
                         NtpProgressDialog().show((context as AppCompatActivity).supportFragmentManager, "NtpCheck")
-                        rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.timedetection), 0))
+                        rxBus.send(EventNtpStatus(rh.gs(R.string.timedetection), 0))
                         sntpClient.ntpTime(object : SntpClient.Callback() {
                             override fun run() {
                                 aapsLogger.debug("NTP time: $time System time: ${dateUtil.now()}")
                                 SystemClock.sleep(300)
                                 if (!networkConnected) {
-                                    rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.notconnected), 99))
+                                    rxBus.send(EventNtpStatus(rh.gs(R.string.notconnected), 99))
                                 } else if (success) {
                                     objective.startedOn = time
-                                    rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.success), 100))
+                                    rxBus.send(EventNtpStatus(rh.gs(R.string.success), 100))
                                     SystemClock.sleep(1000)
                                     rxBus.send(EventObjectivesUpdateGui())
                                     rxBus.send(EventSWUpdate(false))
                                     SystemClock.sleep(100)
                                     scrollToCurrentObjective()
                                 } else {
-                                    rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.failedretrievetime), 99))
+                                    rxBus.send(EventNtpStatus(rh.gs(R.string.failedretrievetime), 99))
                                 }
                             }
                         }, receiverStatusStore.isConnected)
@@ -309,7 +309,7 @@ class ObjectivesFragment : DaggerFragment() {
             }
             holder.binding.unstart.setOnClickListener {
                 activity?.let { activity ->
-                    OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.objectives), resourceHelper.gs(R.string.doyouwantresetstart), Runnable {
+                    OKDialog.showConfirmation(activity, rh.gs(R.string.objectives), rh.gs(R.string.doyouwantresetstart), Runnable {
                         uel.log(Action.OBJECTIVE_UNSTARTED, Sources.Objectives,
                             ValueWithUnit.SimpleInt(position + 1))
                         objective.startedOn = 0
@@ -329,7 +329,7 @@ class ObjectivesFragment : DaggerFragment() {
                 // generate random request code if none exists
                 val request = sp.getString(R.string.key_objectives_request_code, String.format("%1$05d", (Math.random() * 99999).toInt()))
                 sp.putString(R.string.key_objectives_request_code, request)
-                holder.binding.requestcode.text = resourceHelper.gs(R.string.requestcode, request)
+                holder.binding.requestcode.text = rh.gs(R.string.requestcode, request)
                 holder.binding.requestcode.visibility = View.VISIBLE
                 holder.binding.enterbutton.visibility = View.VISIBLE
                 holder.binding.input.visibility = View.VISIBLE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
index 224a89a888f..fb143540446 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
@@ -24,7 +24,7 @@ import javax.inject.Singleton
 class ObjectivesPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val activePlugin: ActivePlugin,
     private val sp: SP,
     config: Config,
@@ -39,7 +39,7 @@ class ObjectivesPlugin @Inject constructor(
     .pluginName(R.string.objectives)
     .shortName(R.string.objectives_shortname)
     .description(R.string.description_objectives),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), Constraints {
 
     var objectives: MutableList<Objective> = ArrayList()
@@ -119,10 +119,10 @@ class ObjectivesPlugin @Inject constructor(
             sp.putLong("Objectives_" + "auto" + "_started", dateUtil.now())
             sp.putLong("Objectives_" + "auto" + "_accomplished", dateUtil.now())
             setupObjectives()
-            OKDialog.show(activity, resourceHelper.gs(R.string.objectives), resourceHelper.gs(R.string.codeaccepted))
+            OKDialog.show(activity, rh.gs(R.string.objectives), rh.gs(R.string.codeaccepted))
             uel.log(Action.OBJECTIVES_SKIPPED, Sources.Objectives)
         } else {
-            OKDialog.show(activity, resourceHelper.gs(R.string.objectives), resourceHelper.gs(R.string.codeinvalid))
+            OKDialog.show(activity, rh.gs(R.string.objectives), rh.gs(R.string.codeinvalid))
         }
     }
 
@@ -139,43 +139,43 @@ class ObjectivesPlugin @Inject constructor(
      */
     override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[FIRST_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, FIRST_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, FIRST_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isLgsAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[MAXBASAL_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, MAXBASAL_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, MAXBASAL_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[MAXIOB_ZERO_CL_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[AUTOSENS_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, AUTOSENS_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, AUTOSENS_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[SMB_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, SMB_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, SMB_OBJECTIVE + 1), this)
         return value
     }
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
         if (objectives[MAXIOB_ZERO_CL_OBJECTIVE].isStarted && !objectives[MAXIOB_ZERO_CL_OBJECTIVE].isAccomplished)
-            maxIob.set(aapsLogger, 0.0, resourceHelper.gs(R.string.objectivenotfinished, MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
+            maxIob.set(aapsLogger, 0.0, rh.gs(R.string.objectivenotfinished, MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
         return maxIob
     }
 
     override fun isAutomationEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[AUTO_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, AUTO_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, AUTO_OBJECTIVE + 1), this)
         return value
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
index 50c91dd6b91..d04210f2dfa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.ObjectivesExamFragmentBinding
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective.ExamTask
@@ -20,8 +20,8 @@ import javax.inject.Inject
 
 class ObjectivesExamDialog : DaggerDialogFragment() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var dateUtil: DateUtil
 
     companion object {
@@ -96,7 +96,7 @@ class ObjectivesExamDialog : DaggerDialogFragment() {
                 context?.let { binding.examHints.addView(h.generate(it)) }
             }
             // Disabled to
-            binding.examDisabledto.text = resourceHelper.gs(R.string.answerdisabledto, dateUtil.timeString(task.disabledTo))
+            binding.examDisabledto.text = rh.gs(R.string.answerdisabledto, dateUtil.timeString(task.disabledTo))
             binding.examDisabledto.visibility = if (task.isEnabledAnswer()) View.GONE else View.VISIBLE
             // Buttons
             binding.examVerify.isEnabled = !task.answered && task.isEnabledAnswer()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.kt
index 71f258781dc..2c5731bef43 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.kt
@@ -20,7 +20,7 @@ import kotlin.math.floor
 abstract class Objective(injector: HasAndroidInjector, spName: String, @StringRes objective: Int, @StringRes gate: Int) {
 
     @Inject lateinit var sp: SP
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var dateUtil: DateUtil
 
     private val spName: String
@@ -86,10 +86,10 @@ abstract class Objective(injector: HasAndroidInjector, spName: String, @StringRe
 
         abstract fun isCompleted(): Boolean
 
-        open fun isCompleted(trueTime: Long): Boolean = isCompleted
+        open fun isCompleted(trueTime: Long): Boolean = isCompleted()
 
         open val progress: String
-            get() = resourceHelper.gs(if (isCompleted) R.string.completed_well_done else R.string.not_completed_yet)
+            get() = rh.gs(if (isCompleted()) R.string.completed_well_done else R.string.not_completed_yet)
 
         fun hint(hint: Hint): Task {
             hints.add(hint)
@@ -117,9 +117,9 @@ abstract class Objective(injector: HasAndroidInjector, spName: String, @StringRe
             val hours = floor(duration.toDouble() / T.hours(1).msecs()).toInt()
             val minutes = floor(duration.toDouble() / T.mins(1).msecs()).toInt()
             return when {
-                days > 0  -> resourceHelper.gq(R.plurals.days, days, days)
-                hours > 0 -> resourceHelper.gq(R.plurals.hours, hours, hours)
-                else      -> resourceHelper.gq(R.plurals.minutes, minutes, minutes)
+                days > 0  -> rh.gq(R.plurals.days, days, days)
+                hours > 0 -> rh.gq(R.plurals.hours, hours, hours)
+                else      -> rh.gq(R.plurals.minutes, minutes, minutes)
             }
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.kt
index c58e0cb3551..abb56ccf0f7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.kt
@@ -39,7 +39,7 @@ class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R
             }
 
             override fun shouldBeIgnored(): Boolean {
-                return !virtualPumpPlugin.isEnabled(PluginType.PUMP)
+                return !virtualPumpPlugin.isEnabled()
             }
         })
         tasks.add(object : Task(this, R.string.objectives_pumpstatusavailableinns) {
@@ -54,13 +54,13 @@ class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R
         })
         tasks.add(object : Task(this, R.string.loopenabled) {
             override fun isCompleted(): Boolean {
-                return loopPlugin.isEnabled(PluginType.LOOP)
+                return loopPlugin.isEnabled()
             }
         })
         tasks.add(object : Task(this, R.string.apsselected) {
             override fun isCompleted(): Boolean {
                 val usedAPS = activePlugin.activeAPS
-                return (usedAPS as PluginBase).isEnabled(PluginType.APS)
+                return (usedAPS as PluginBase).isEnabled()
             }
         })
         tasks.add(object : Task(this, R.string.activate_profile) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.kt
index 91fb901033d..936065ee0f0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.kt
@@ -33,7 +33,7 @@ class Objective1 @Inject constructor(injector: HasAndroidInjector) : Objective(i
         }.hint(Hint(R.string.usetemptarget_hint)))
         tasks.add(object : Task(this, R.string.objectives_useactions) {
             override fun isCompleted(): Boolean {
-                return sp.getBoolean(R.string.key_objectiveuseactions, false) && actionsPlugin.isEnabled(PluginType.GENERAL) && actionsPlugin.isFragmentVisible()
+                return sp.getBoolean(R.string.key_objectiveuseactions, false) && actionsPlugin.isEnabled() && actionsPlugin.isFragmentVisible()
             }
         }.hint(Hint(R.string.useaction_hint)))
         tasks.add(object : Task(this, R.string.objectives_useloop) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.kt
index 2ccd96f3b36..1808666fada 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.kt
@@ -22,7 +22,7 @@ class Objective3 @Inject constructor(injector: HasAndroidInjector) : Objective(i
             }
 
             override val progress: String
-                get() = if (sp.getInt(R.string.key_ObjectivesmanualEnacts, 0) >= MANUAL_ENACTS_NEEDED) resourceHelper.gs(R.string.completed_well_done) else sp.getInt(R.string.key_ObjectivesmanualEnacts, 0).toString() + " / " + MANUAL_ENACTS_NEEDED
+                get() = if (sp.getInt(R.string.key_ObjectivesmanualEnacts, 0) >= MANUAL_ENACTS_NEEDED) rh.gs(R.string.completed_well_done) else sp.getInt(R.string.key_ObjectivesmanualEnacts, 0).toString() + " / " + MANUAL_ENACTS_NEEDED
         })
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt
index 19dcb7d9fd4..8c275cae1fb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt
@@ -18,7 +18,7 @@ import javax.inject.Singleton
 class PhoneCheckerPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val context: Context
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.CONSTRAINTS)
@@ -26,7 +26,7 @@ class PhoneCheckerPlugin @Inject constructor(
     .alwaysEnabled(true)
     .showInList(false)
     .pluginName(R.string.phonechecker),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), Constraints {
 
     var phoneRooted: Boolean = false
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt
index 6c8523b482a..8e55ff8de9f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
@@ -30,9 +30,9 @@ import kotlin.math.floor
 class SafetyPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val sp: SP,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val constraintChecker: ConstraintChecker,
     private val openAPSAMAPlugin: OpenAPSAMAPlugin,
     private val openAPSSMBPlugin: OpenAPSSMBPlugin,
@@ -50,86 +50,86 @@ class SafetyPlugin @Inject constructor(
     .showInList(false)
     .pluginName(R.string.safety)
     .preferencesId(R.xml.pref_safety),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), Constraints, Safety {
 
     /**
      * Constraints interface
      */
     override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
-        if (!activePlugin.activePump.pumpDescription.isTempBasalCapable) value[aapsLogger, false, resourceHelper.gs(R.string.pumpisnottempbasalcapable)] = this
+        if (!activePlugin.activePump.pumpDescription.isTempBasalCapable) value[aapsLogger, false, rh.gs(R.string.pumpisnottempbasalcapable)] = this
         return value
     }
 
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         val mode = sp.getString(R.string.key_aps_mode, "open")
-        if (mode == "open") value[aapsLogger, false, resourceHelper.gs(R.string.closedmodedisabledinpreferences)] = this
+        if (mode == "open") value[aapsLogger, false, rh.gs(R.string.closedmodedisabledinpreferences)] = this
         if (!buildHelper.isEngineeringModeOrRelease()) {
             if (value.value()) {
-                val n = Notification(Notification.TOAST_ALARM, resourceHelper.gs(R.string.closed_loop_disabled_on_dev_branch), Notification.NORMAL)
+                val n = Notification(Notification.TOAST_ALARM, rh.gs(R.string.closed_loop_disabled_on_dev_branch), Notification.NORMAL)
                 rxBus.send(EventNewNotification(n))
             }
-            value[aapsLogger, false, resourceHelper.gs(R.string.closed_loop_disabled_on_dev_branch)] = this
+            value[aapsLogger, false, rh.gs(R.string.closed_loop_disabled_on_dev_branch)] = this
         }
         val pump = activePlugin.activePump
         if (!pump.isFakingTempsByExtendedBoluses && iobCobCalculator.getExtendedBolus(dateUtil.now()) != null) {
-            value[aapsLogger, false, resourceHelper.gs(R.string.closed_loop_disabled_with_eb)] = this
+            value[aapsLogger, false, rh.gs(R.string.closed_loop_disabled_with_eb)] = this
         }
         return value
     }
 
     override fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         val enabled = sp.getBoolean(R.string.key_openapsama_useautosens, false)
-        if (!enabled) value[aapsLogger, false, resourceHelper.gs(R.string.autosensdisabledinpreferences)] = this
+        if (!enabled) value[aapsLogger, false, rh.gs(R.string.autosensdisabledinpreferences)] = this
         return value
     }
 
     override fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         val enabled = sp.getBoolean(R.string.key_use_smb, false)
-        if (!enabled) value[aapsLogger, false, resourceHelper.gs(R.string.smbdisabledinpreferences)] = this
+        if (!enabled) value[aapsLogger, false, rh.gs(R.string.smbdisabledinpreferences)] = this
         val closedLoop = constraintChecker.isClosedLoopAllowed()
-        if (!closedLoop.value()) value[aapsLogger, false, resourceHelper.gs(R.string.smbnotallowedinopenloopmode)] = this
+        if (!closedLoop.value()) value[aapsLogger, false, rh.gs(R.string.smbnotallowedinopenloopmode)] = this
         return value
     }
 
     override fun isUAMEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         val enabled = sp.getBoolean(R.string.key_use_uam, false)
-        if (!enabled) value[aapsLogger, false, resourceHelper.gs(R.string.uamdisabledinpreferences)] = this
-        val oref1Enabled = sensitivityOref1Plugin.isEnabled(PluginType.SENSITIVITY)
-        if (!oref1Enabled) value[aapsLogger, false, resourceHelper.gs(R.string.uamdisabledoref1notselected)] = this
+        if (!enabled) value[aapsLogger, false, rh.gs(R.string.uamdisabledinpreferences)] = this
+        val oref1Enabled = sensitivityOref1Plugin.isEnabled()
+        if (!oref1Enabled) value[aapsLogger, false, rh.gs(R.string.uamdisabledoref1notselected)] = this
         return value
     }
 
     override fun isAdvancedFilteringEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         val bgSource = activePlugin.activeBgSource
-        if (!bgSource.advancedFilteringSupported()) value[aapsLogger, false, resourceHelper.gs(R.string.smbalwaysdisabled)] = this
+        if (!bgSource.advancedFilteringSupported()) value[aapsLogger, false, rh.gs(R.string.smbalwaysdisabled)] = this
         return value
     }
 
     override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
-        absoluteRate.setIfGreater(aapsLogger, 0.0, String.format(resourceHelper.gs(R.string.limitingbasalratio), 0.0, resourceHelper.gs(R.string.itmustbepositivevalue)), this)
+        absoluteRate.setIfGreater(aapsLogger, 0.0, String.format(rh.gs(R.string.limitingbasalratio), 0.0, rh.gs(R.string.itmustbepositivevalue)), this)
         if (config.APS) {
             var maxBasal = sp.getDouble(R.string.key_openapsma_max_basal, 1.0)
             if (maxBasal < profile.getMaxDailyBasal()) {
                 maxBasal = profile.getMaxDailyBasal()
-                absoluteRate.addReason(resourceHelper.gs(R.string.increasingmaxbasal), this)
+                absoluteRate.addReason(rh.gs(R.string.increasingmaxbasal), this)
             }
-            absoluteRate.setIfSmaller(aapsLogger, maxBasal, String.format(resourceHelper.gs(R.string.limitingbasalratio), maxBasal, resourceHelper.gs(R.string.maxvalueinpreferences)), this)
+            absoluteRate.setIfSmaller(aapsLogger, maxBasal, String.format(rh.gs(R.string.limitingbasalratio), maxBasal, rh.gs(R.string.maxvalueinpreferences)), this)
 
             // Check percentRate but absolute rate too, because we know real current basal in pump
             val maxBasalMultiplier = sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0)
             val maxFromBasalMultiplier = floor(maxBasalMultiplier * profile.getBasal() * 100) / 100
-            absoluteRate.setIfSmaller(aapsLogger, maxFromBasalMultiplier, String.format(resourceHelper.gs(R.string.limitingbasalratio), maxFromBasalMultiplier, resourceHelper.gs(R.string.maxbasalmultiplier)), this)
+            absoluteRate.setIfSmaller(aapsLogger, maxFromBasalMultiplier, String.format(rh.gs(R.string.limitingbasalratio), maxFromBasalMultiplier, rh.gs(R.string.maxbasalmultiplier)), this)
             val maxBasalFromDaily = sp.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3.0)
             val maxFromDaily = floor(profile.getMaxDailyBasal() * maxBasalFromDaily * 100) / 100
-            absoluteRate.setIfSmaller(aapsLogger, maxFromDaily, String.format(resourceHelper.gs(R.string.limitingbasalratio), maxFromDaily, resourceHelper.gs(R.string.maxdailybasalmultiplier)), this)
+            absoluteRate.setIfSmaller(aapsLogger, maxFromDaily, String.format(rh.gs(R.string.limitingbasalratio), maxFromDaily, rh.gs(R.string.maxdailybasalmultiplier)), this)
         }
-        absoluteRate.setIfSmaller(aapsLogger, hardLimits.maxBasal(), String.format(resourceHelper.gs(R.string.limitingbasalratio), hardLimits.maxBasal(), resourceHelper.gs(R.string.hardlimit)), this)
+        absoluteRate.setIfSmaller(aapsLogger, hardLimits.maxBasal(), String.format(rh.gs(R.string.limitingbasalratio), hardLimits.maxBasal(), rh.gs(R.string.hardlimit)), this)
         val pump = activePlugin.activePump
         // check for pump max
         if (pump.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) {
             val pumpLimit = pump.pumpDescription.pumpType.tbrSettings?.maxDose ?: 0.0
-            absoluteRate.setIfSmaller(aapsLogger, pumpLimit, String.format(resourceHelper.gs(R.string.limitingbasalratio), pumpLimit, resourceHelper.gs(R.string.pumplimit)), this)
+            absoluteRate.setIfSmaller(aapsLogger, pumpLimit, String.format(rh.gs(R.string.limitingbasalratio), pumpLimit, rh.gs(R.string.pumplimit)), this)
         }
 
         // do rounding
@@ -149,62 +149,62 @@ class SafetyPlugin @Inject constructor(
         val pump = activePlugin.activePump
         var percentRateAfterConst = java.lang.Double.valueOf(absoluteConstraint.value() / currentBasal * 100).toInt()
         percentRateAfterConst = if (percentRateAfterConst < 100) Round.ceilTo(percentRateAfterConst.toDouble(), pump.pumpDescription.tempPercentStep.toDouble()).toInt() else Round.floorTo(percentRateAfterConst.toDouble(), pump.pumpDescription.tempPercentStep.toDouble()).toInt()
-        percentRate[aapsLogger, percentRateAfterConst, String.format(resourceHelper.gs(R.string.limitingpercentrate), percentRateAfterConst, resourceHelper.gs(R.string.pumplimit))] = this
+        percentRate[aapsLogger, percentRateAfterConst, String.format(rh.gs(R.string.limitingpercentrate), percentRateAfterConst, rh.gs(R.string.pumplimit))] = this
         if (pump.pumpDescription.tempBasalStyle == PumpDescription.PERCENT) {
             val pumpLimit = pump.pumpDescription.pumpType.tbrSettings?.maxDose ?: 0.0
-            percentRate.setIfSmaller(aapsLogger, pumpLimit.toInt(), String.format(resourceHelper.gs(R.string.limitingbasalratio), pumpLimit, resourceHelper.gs(R.string.pumplimit)), this)
+            percentRate.setIfSmaller(aapsLogger, pumpLimit.toInt(), String.format(rh.gs(R.string.limitingbasalratio), pumpLimit, rh.gs(R.string.pumplimit)), this)
         }
         return percentRate
     }
 
     override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
-        insulin.setIfGreater(aapsLogger, 0.0, String.format(resourceHelper.gs(R.string.limitingbolus), 0.0, resourceHelper.gs(R.string.itmustbepositivevalue)), this)
+        insulin.setIfGreater(aapsLogger, 0.0, String.format(rh.gs(R.string.limitingbolus), 0.0, rh.gs(R.string.itmustbepositivevalue)), this)
         val maxBolus = sp.getDouble(R.string.key_treatmentssafety_maxbolus, 3.0)
-        insulin.setIfSmaller(aapsLogger, maxBolus, String.format(resourceHelper.gs(R.string.limitingbolus), maxBolus, resourceHelper.gs(R.string.maxvalueinpreferences)), this)
-        insulin.setIfSmaller(aapsLogger, hardLimits.maxBolus(), String.format(resourceHelper.gs(R.string.limitingbolus), hardLimits.maxBolus(), resourceHelper.gs(R.string.hardlimit)), this)
+        insulin.setIfSmaller(aapsLogger, maxBolus, String.format(rh.gs(R.string.limitingbolus), maxBolus, rh.gs(R.string.maxvalueinpreferences)), this)
+        insulin.setIfSmaller(aapsLogger, hardLimits.maxBolus(), String.format(rh.gs(R.string.limitingbolus), hardLimits.maxBolus(), rh.gs(R.string.hardlimit)), this)
         val pump = activePlugin.activePump
         val rounded = pump.pumpDescription.pumpType.determineCorrectBolusSize(insulin.value())
-        insulin.setIfDifferent(aapsLogger, rounded, resourceHelper.gs(R.string.pumplimit), this)
+        insulin.setIfDifferent(aapsLogger, rounded, rh.gs(R.string.pumplimit), this)
         return insulin
     }
 
     override fun applyExtendedBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
-        insulin.setIfGreater(aapsLogger, 0.0, String.format(resourceHelper.gs(R.string.limitingextendedbolus), 0.0, resourceHelper.gs(R.string.itmustbepositivevalue)), this)
+        insulin.setIfGreater(aapsLogger, 0.0, String.format(rh.gs(R.string.limitingextendedbolus), 0.0, rh.gs(R.string.itmustbepositivevalue)), this)
         val maxBolus = sp.getDouble(R.string.key_treatmentssafety_maxbolus, 3.0)
-        insulin.setIfSmaller(aapsLogger, maxBolus, String.format(resourceHelper.gs(R.string.limitingextendedbolus), maxBolus, resourceHelper.gs(R.string.maxvalueinpreferences)), this)
-        insulin.setIfSmaller(aapsLogger, hardLimits.maxBolus(), String.format(resourceHelper.gs(R.string.limitingextendedbolus), hardLimits.maxBolus(), resourceHelper.gs(R.string.hardlimit)), this)
+        insulin.setIfSmaller(aapsLogger, maxBolus, String.format(rh.gs(R.string.limitingextendedbolus), maxBolus, rh.gs(R.string.maxvalueinpreferences)), this)
+        insulin.setIfSmaller(aapsLogger, hardLimits.maxBolus(), String.format(rh.gs(R.string.limitingextendedbolus), hardLimits.maxBolus(), rh.gs(R.string.hardlimit)), this)
         val pump = activePlugin.activePump
         val rounded = pump.pumpDescription.pumpType.determineCorrectExtendedBolusSize(insulin.value())
-        insulin.setIfDifferent(aapsLogger, rounded, resourceHelper.gs(R.string.pumplimit), this)
+        insulin.setIfDifferent(aapsLogger, rounded, rh.gs(R.string.pumplimit), this)
         return insulin
     }
 
     override fun applyCarbsConstraints(carbs: Constraint<Int>): Constraint<Int> {
-        carbs.setIfGreater(aapsLogger, 0, String.format(resourceHelper.gs(R.string.limitingcarbs), 0, resourceHelper.gs(R.string.itmustbepositivevalue)), this)
+        carbs.setIfGreater(aapsLogger, 0, String.format(rh.gs(R.string.limitingcarbs), 0, rh.gs(R.string.itmustbepositivevalue)), this)
         val maxCarbs = sp.getInt(R.string.key_treatmentssafety_maxcarbs, 48)
-        carbs.setIfSmaller(aapsLogger, maxCarbs, String.format(resourceHelper.gs(R.string.limitingcarbs), maxCarbs, resourceHelper.gs(R.string.maxvalueinpreferences)), this)
+        carbs.setIfSmaller(aapsLogger, maxCarbs, String.format(rh.gs(R.string.limitingcarbs), maxCarbs, rh.gs(R.string.maxvalueinpreferences)), this)
         return carbs
     }
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
         val apsMode = sp.getString(R.string.key_aps_mode, "open")
         val maxIobPref: Double = if (openAPSSMBPlugin.isEnabled()) sp.getDouble(R.string.key_openapssmb_max_iob, 3.0) else sp.getDouble(R.string.key_openapsma_max_iob, 1.5)
-        maxIob.setIfSmaller(aapsLogger, maxIobPref, String.format(resourceHelper.gs(R.string.limitingiob), maxIobPref, resourceHelper.gs(R.string.maxvalueinpreferences)), this)
-        if (openAPSAMAPlugin.isEnabled()) maxIob.setIfSmaller(aapsLogger, hardLimits.maxIobAMA(), String.format(resourceHelper.gs(R.string.limitingiob), hardLimits.maxIobAMA(), resourceHelper.gs(R.string.hardlimit)), this)
-        if (openAPSSMBPlugin.isEnabled()) maxIob.setIfSmaller(aapsLogger, hardLimits.maxIobSMB(), String.format(resourceHelper.gs(R.string.limitingiob), hardLimits.maxIobSMB(), resourceHelper.gs(R.string.hardlimit)), this)
-        if (apsMode == "lgs") maxIob.setIfSmaller(aapsLogger, HardLimits.MAX_IOB_LGS, String.format(resourceHelper.gs(R.string.limitingiob), HardLimits.MAX_IOB_LGS, resourceHelper.gs(R.string.lowglucosesuspend)), this)
+        maxIob.setIfSmaller(aapsLogger, maxIobPref, String.format(rh.gs(R.string.limitingiob), maxIobPref, rh.gs(R.string.maxvalueinpreferences)), this)
+        if (openAPSAMAPlugin.isEnabled()) maxIob.setIfSmaller(aapsLogger, hardLimits.maxIobAMA(), String.format(rh.gs(R.string.limitingiob), hardLimits.maxIobAMA(), rh.gs(R.string.hardlimit)), this)
+        if (openAPSSMBPlugin.isEnabled()) maxIob.setIfSmaller(aapsLogger, hardLimits.maxIobSMB(), String.format(rh.gs(R.string.limitingiob), hardLimits.maxIobSMB(), rh.gs(R.string.hardlimit)), this)
+        if (apsMode == "lgs") maxIob.setIfSmaller(aapsLogger, HardLimits.MAX_IOB_LGS, String.format(rh.gs(R.string.limitingiob), HardLimits.MAX_IOB_LGS, rh.gs(R.string.lowglucosesuspend)), this)
         return maxIob
     }
 
     override fun configuration(): JSONObject =
         JSONObject()
-            .putString(R.string.key_age, sp, resourceHelper)
-            .putDouble(R.string.key_treatmentssafety_maxbolus, sp, resourceHelper)
-            .putDouble(R.string.key_treatmentssafety_maxcarbs, sp, resourceHelper)
+            .putString(R.string.key_age, sp, rh)
+            .putDouble(R.string.key_treatmentssafety_maxbolus, sp, rh)
+            .putInt(R.string.key_treatmentssafety_maxcarbs, sp, rh)
 
     override fun applyConfiguration(configuration: JSONObject) {
-        configuration.storeString(R.string.key_age, sp, resourceHelper)
-        configuration.storeDouble(R.string.key_treatmentssafety_maxbolus, sp, resourceHelper)
-        configuration.storeDouble(R.string.key_treatmentssafety_maxcarbs, sp, resourceHelper)
+        configuration.storeString(R.string.key_age, sp, rh)
+        configuration.storeDouble(R.string.key_treatmentssafety_maxbolus, sp, rh)
+        configuration.storeInt(R.string.key_treatmentssafety_maxcarbs, sp, rh)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
index d4a7a73dca5..2fedf66fd5e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -35,9 +35,9 @@ import javax.inject.Singleton
 class SignatureVerifierPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val sp: SP,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val context: Context
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.CONSTRAINTS)
@@ -45,7 +45,7 @@ class SignatureVerifierPlugin @Inject constructor(
     .alwaysEnabled(true)
     .showInList(false)
     .pluginName(R.string.signature_verifier),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), Constraints {
 
     private val REVOKED_CERTS_URL = "https://raw.githubusercontent.com/nightscout/AndroidAPS/master/app/src/main/assets/revoked_certs.txt"
@@ -88,7 +88,7 @@ class SignatureVerifierPlugin @Inject constructor(
     }
 
     private fun showNotification() {
-        val notification = Notification(Notification.INVALID_VERSION, resourceHelper.gs(R.string.running_invalid_version), Notification.URGENT)
+        val notification = Notification(Notification.INVALID_VERSION, rh.gs(R.string.running_invalid_version), Notification.URGENT)
         rxBus.send(EventNewNotification(notification))
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt
index 9fb916690bc..cb78c7882e8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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
@@ -26,23 +26,25 @@ import javax.inject.Singleton
 class StorageConstraintPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
-    private val rxBus: RxBusWrapper
-) : PluginBase(PluginDescription()
-    .mainType(PluginType.CONSTRAINTS)
-    .neverVisible(true)
-    .alwaysEnabled(true)
-    .showInList(false)
-    .pluginName(R.string.storage),
-    aapsLogger, resourceHelper, injector
+    rh: ResourceHelper,
+    private val rxBus: RxBus
+) : PluginBase(
+    PluginDescription()
+        .mainType(PluginType.CONSTRAINTS)
+        .neverVisible(true)
+        .alwaysEnabled(true)
+        .showInList(false)
+        .pluginName(R.string.storage),
+    aapsLogger, rh, injector
 ), Constraints {
 
+    @Suppress("ReplaceGetOrSet")
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         val diskFree = availableInternalMemorySize()
-        aapsLogger.debug(LTag.CONSTRAINTS, "Internal storage free (Mb):$diskFree")
         if (diskFree < Constants.MINIMUM_FREE_SPACE) {
-            value[aapsLogger, false, resourceHelper.gs(R.string.diskfull, Constants.MINIMUM_FREE_SPACE)] = this
-            val notification = Notification(Notification.DISK_FULL, resourceHelper.gs(R.string.diskfull, Constants.MINIMUM_FREE_SPACE), Notification.NORMAL)
+            aapsLogger.debug(LTag.CONSTRAINTS, "Internal storage free (Mb):$diskFree")
+            value.set(aapsLogger, false, rh.gs(R.string.diskfull, Constants.MINIMUM_FREE_SPACE), this)
+            val notification = Notification(Notification.DISK_FULL, rh.gs(R.string.diskfull, Constants.MINIMUM_FREE_SPACE), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.DISK_FULL))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt
index 19e92e5015e..d3834719f87 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt
@@ -3,15 +3,12 @@ package info.nightscout.androidaps.plugins.constraints.versionChecker
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.PluginDescription
-import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.extensions.daysToMillis
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -24,17 +21,20 @@ import kotlin.math.roundToInt
 class VersionCheckerPlugin @Inject constructor(
     injector: HasAndroidInjector,
     private val sp: SP,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val versionCheckerUtils: VersionCheckerUtils,
-    val rxBus: RxBusWrapper,
-    aapsLogger: AAPSLogger
-) : PluginBase(PluginDescription()
-    .mainType(PluginType.CONSTRAINTS)
-    .neverVisible(true)
-    .alwaysEnabled(true)
-    .showInList(false)
-    .pluginName(R.string.versionChecker),
-    aapsLogger, resourceHelper, injector
+    val rxBus: RxBus,
+    aapsLogger: AAPSLogger,
+    private val config: Config,
+    private val dateUtil: DateUtil
+) : PluginBase(
+    PluginDescription()
+        .mainType(PluginType.CONSTRAINTS)
+        .neverVisible(true)
+        .alwaysEnabled(true)
+        .showInList(false)
+        .pluginName(R.string.versionChecker),
+    aapsLogger, rh, injector
 ), Constraints {
 
     enum class GracePeriod(val warning: Long, val old: Long, val veryOld: Long) {
@@ -50,6 +50,7 @@ class VersionCheckerPlugin @Inject constructor(
         }
 
     companion object {
+
         private val WARN_EVERY: Long
             get() = TimeUnit.DAYS.toMillis(1)
     }
@@ -57,10 +58,12 @@ class VersionCheckerPlugin @Inject constructor(
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         checkWarning()
         versionCheckerUtils.triggerCheckVersion()
-        return if (isOldVersion(gracePeriod.veryOld.daysToMillis()))
-            value.set(aapsLogger,false, resourceHelper.gs(R.string.very_old_version), this)
-        else
-            value
+        if (isOldVersion(gracePeriod.veryOld.daysToMillis()))
+            value[aapsLogger, false, rh.gs(R.string.very_old_version)] = this
+        val endDate = sp.getLong(rh.gs(info.nightscout.androidaps.core.R.string.key_app_expiration) + "_" + config.VERSION_NAME, 0)
+        if (endDate != 0L && dateUtil.now() > endDate)
+            value[aapsLogger, false, rh.gs(R.string.application_expired)] = this
+        return value
     }
 
     private fun checkWarning() {
@@ -77,7 +80,8 @@ class VersionCheckerPlugin @Inject constructor(
             sp.putLong(R.string.key_last_versionchecker_plugin_warning, now)
 
             //notify
-            val message = resourceHelper.gs(R.string.new_version_warning,
+            val message = rh.gs(
+                R.string.new_version_warning,
                 ((now - sp.getLong(R.string.key_last_time_this_version_detected, now)) / 1L.daysToMillis().toDouble()).roundToInt(),
                 gracePeriod.old,
                 gracePeriod.veryOld
@@ -85,6 +89,16 @@ class VersionCheckerPlugin @Inject constructor(
             val notification = Notification(Notification.OLD_VERSION, message, Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
         }
+
+        val endDate = sp.getLong(rh.gs(info.nightscout.androidaps.core.R.string.key_app_expiration) + "_" + config.VERSION_NAME, 0)
+        if (endDate != 0L && dateUtil.now() > endDate && shouldWarnAgain(now)) {
+            // store last notification time
+            sp.putLong(R.string.key_last_versionchecker_plugin_warning, now)
+
+            //notify
+            val notification = Notification(Notification.VERSION_EXPIRE, rh.gs(R.string.application_expired), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+        }
     }
 
     private fun shouldWarnAgain(now: Long) =
@@ -92,7 +106,7 @@ class VersionCheckerPlugin @Inject constructor(
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> =
         if (isOldVersion(gracePeriod.old.daysToMillis()))
-            maxIob.set(aapsLogger, 0.0, resourceHelper.gs(R.string.old_version), this)
+            maxIob.set(aapsLogger, 0.0, rh.gs(R.string.old_version), this)
         else
             maxIob
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index 3688f1a55f8..182b041aed2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -31,13 +31,13 @@ import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.activities.HistoryBrowseActivity
 import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
 import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
@@ -62,17 +62,17 @@ class ActionsFragment : DaggerFragment() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var ctx: Context
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var statusLightHandler: StatusLightHandler
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var iobCobCalculator: IobCobCalculator
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var buildHelper: BuildHelper
     @Inject lateinit var protectionCheck: ProtectionCheck
     @Inject lateinit var skinProvider: SkinProvider
@@ -164,7 +164,7 @@ class ActionsFragment : DaggerFragment() {
         extendedBolus?.setOnClickListener {
             activity?.let { activity ->
                 protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable {
-                    OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.extended_bolus), resourceHelper.gs(R.string.ebstopsloop),
+                    OKDialog.showConfirmation(activity, rh.gs(R.string.extended_bolus), rh.gs(R.string.ebstopsloop),
                         Runnable {
                             ExtendedBolusDialog().show(childFragmentManager, "Actions")
                         }, null)
@@ -177,7 +177,7 @@ class ActionsFragment : DaggerFragment() {
                 commandQueue.cancelExtended(object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.extendedbolusdeliveryerror), R.raw.boluserror)
+                            ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.extendedbolusdeliveryerror), R.raw.boluserror)
                         }
                     }
                 })
@@ -192,7 +192,7 @@ class ActionsFragment : DaggerFragment() {
                 commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
+                            ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                         }
                     }
                 })
@@ -274,7 +274,7 @@ class ActionsFragment : DaggerFragment() {
                 pump.isInitialized() &&
                 !pump.isSuspended()).toVisibility()
 
-        if (!pump.pumpDescription.isExtendedBolusCapable || !pump.isInitialized() || pump.isSuspended() || pump.isFakingTempsByExtendedBoluses) {
+        if (!pump.pumpDescription.isExtendedBolusCapable || !pump.isInitialized() || pump.isSuspended() || pump.isFakingTempsByExtendedBoluses || config.NSCLIENT) {
             extendedBolus?.visibility = View.GONE
             extendedBolusCancel?.visibility = View.GONE
         } else {
@@ -283,14 +283,14 @@ class ActionsFragment : DaggerFragment() {
                 extendedBolus?.visibility = View.GONE
                 extendedBolusCancel?.visibility = View.VISIBLE
                 @Suppress("SetTextI18n")
-                extendedBolusCancel?.text = resourceHelper.gs(R.string.cancel) + " " + activeExtendedBolus.value.toStringMedium(dateUtil)
+                extendedBolusCancel?.text = rh.gs(R.string.cancel) + " " + activeExtendedBolus.value.toStringMedium(dateUtil)
             } else {
                 extendedBolus?.visibility = View.VISIBLE
                 extendedBolusCancel?.visibility = View.GONE
             }
         }
 
-        if (!pump.pumpDescription.isTempBasalCapable || !pump.isInitialized() || pump.isSuspended()) {
+        if (!pump.pumpDescription.isTempBasalCapable || !pump.isInitialized() || pump.isSuspended() || config.NSCLIENT) {
             setTempBasal?.visibility = View.GONE
             cancelTempBasal?.visibility = View.GONE
         } else {
@@ -299,7 +299,7 @@ class ActionsFragment : DaggerFragment() {
                 setTempBasal?.visibility = View.GONE
                 cancelTempBasal?.visibility = View.VISIBLE
                 @Suppress("SetTextI18n")
-                cancelTempBasal?.text = resourceHelper.gs(R.string.cancel) + " " + activeTemp.toStringShort()
+                cancelTempBasal?.text = rh.gs(R.string.cancel) + " " + activeTemp.toStringShort()
             } else {
                 setTempBasal?.visibility = View.VISIBLE
                 cancelTempBasal?.visibility = View.GONE
@@ -318,7 +318,7 @@ class ActionsFragment : DaggerFragment() {
 
         if (!config.NSCLIENT) {
             statusLightHandler.updateStatusLights(cannulaAge, insulinAge, reservoirLevel, sensorAge, sensorLevel, pbAge, batteryLevel)
-            sensorLevelLabel?.text = if (activeBgSource.sensorBatteryLevel == -1) "" else resourceHelper.gs(R.string.careportal_level_label)
+            sensorLevelLabel?.text = if (activeBgSource.sensorBatteryLevel == -1) "" else rh.gs(R.string.careportal_level_label)
         } else {
             statusLightHandler.updateStatusLights(cannulaAge, insulinAge, null, sensorAge, null, pbAge, null)
             sensorLevelLabel?.text = ""
@@ -339,7 +339,7 @@ class ActionsFragment : DaggerFragment() {
             if (!customAction.isEnabled) continue
 
             val btn = SingleClickButton(currentContext, null, android.R.attr.buttonStyle)
-            btn.text = resourceHelper.gs(customAction.name)
+            btn.text = rh.gs(customAction.name)
 
             val layoutParams = LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 0.5f)
@@ -357,7 +357,7 @@ class ActionsFragment : DaggerFragment() {
 
             buttonsLayout?.addView(btn)
 
-            this.pumpCustomActions[resourceHelper.gs(customAction.name)] = customAction
+            this.pumpCustomActions[rh.gs(customAction.name)] = customAction
             this.pumpCustomButtons.add(btn)
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt
index 3fadf5be53f..dff25d3ead6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt
@@ -15,7 +15,7 @@ import javax.inject.Singleton
 class ActionsPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     config: Config
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
@@ -26,5 +26,5 @@ class ActionsPlugin @Inject constructor(
     .pluginName(R.string.actions)
     .shortName(R.string.actions_shortname)
     .description(R.string.description_actions),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 )
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
index 3b5b11c37d0..e4299709a77 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
@@ -5,15 +5,17 @@ import android.content.Intent
 import android.content.pm.ResolveInfo
 import android.os.Bundle
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.*
+import info.nightscout.androidaps.extensions.durationInMinutes
+import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.general.nsclient.data.DeviceStatusData
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
@@ -22,8 +24,6 @@ import info.nightscout.androidaps.services.Intents
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.extensions.durationInMinutes
-import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.disposables.CompositeDisposable
@@ -34,16 +34,17 @@ import javax.inject.Singleton
 class DataBroadcastPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val aapsSchedulers: AapsSchedulers,
     private val context: Context,
     private val dateUtil: DateUtil,
     private val fabricPrivacy: FabricPrivacy,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val iobCobCalculator: IobCobCalculator,
     private val profileFunction: ProfileFunction,
     private val defaultValueHelper: DefaultValueHelper,
     private val nsDeviceStatus: NSDeviceStatus,
+    private val deviceStatusData: DeviceStatusData,
     private val loopPlugin: LoopPlugin,
     private val activePlugin: ActivePlugin,
     private var receiverStatusStore: ReceiverStatusStore,
@@ -56,7 +57,7 @@ class DataBroadcastPlugin @Inject constructor(
     .alwaysEnabled(true)
     .neverVisible(true)
     .showInList(false),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ) {
 
     private val disposable = CompositeDisposable()
@@ -79,7 +80,7 @@ class DataBroadcastPlugin @Inject constructor(
             .observeOn(aapsSchedulers.io)
             .subscribe({ sendData(it) }, fabricPrivacy::logException))
         disposable.add(rxBus
-            .toObservable(EventNewBasalProfile::class.java)
+            .toObservable(EventEffectiveProfileSwitchChanged::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ sendData(it) }, fabricPrivacy::logException))
         disposable.add(rxBus
@@ -159,7 +160,7 @@ class DataBroadcastPlugin @Inject constructor(
                 bundle.putString("enacted", loopPlugin.lastRun?.request?.json().toString())
             }
         } else { //NSClient or remote
-            val data = nsDeviceStatus.deviceStatusOpenAPSData
+            val data = deviceStatusData.openAPSData
             if (data.clockSuggested != 0L && data.suggested != null) {
                 bundle.putLong("suggestedTimeStamp", data.clockSuggested)
                 bundle.putString("suggested", data.suggested.toString())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
index 97f780e842b..7c33102f428 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
@@ -26,7 +26,7 @@ import info.nightscout.androidaps.events.EventFoodDatabaseChanged
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
@@ -45,9 +45,9 @@ import kotlin.collections.ArrayList
 class FoodFragment : DaggerFragment() {
 
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var uel: UserEntryLogger
@@ -75,9 +75,9 @@ class FoodFragment : DaggerFragment() {
 
         binding.refreshFromNightscout.setOnClickListener {
             context?.let { context ->
-                OKDialog.showConfirmation(context, resourceHelper.gs(R.string.refresheventsfromnightscout) + " ?", {
-                    uel.log(Action.FOOD, Sources.Food, resourceHelper.gs(R.string.refresheventsfromnightscout),
-                        ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.refresheventsfromnightscout)))
+                OKDialog.showConfirmation(context, rh.gs(R.string.refresheventsfromnightscout) + " ?", {
+                    uel.log(Action.FOOD, Sources.Food, rh.gs(R.string.refresheventsfromnightscout),
+                        ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.refresheventsfromnightscout)))
                     disposable += Completable.fromAction { repository.deleteAllFoods() }
                         .subscribeOn(aapsSchedulers.io)
                         .observeOn(aapsSchedulers.main)
@@ -172,7 +172,7 @@ class FoodFragment : DaggerFragment() {
         }
         // make it unique
         val categories = ArrayList(catSet)
-        categories.add(0, resourceHelper.gs(R.string.none))
+        categories.add(0, rh.gs(R.string.none))
         context?.let { context ->
             val adapterCategories = ArrayAdapter(context, R.layout.spinner_centered, categories)
             binding.category.adapter = adapterCategories
@@ -182,7 +182,7 @@ class FoodFragment : DaggerFragment() {
     private fun fillSubcategories() {
         val categoryFilter = binding.category.selectedItem.toString()
         val subCatSet: MutableSet<CharSequence> = HashSet()
-        if (categoryFilter != resourceHelper.gs(R.string.none)) {
+        if (categoryFilter != rh.gs(R.string.none)) {
             for (f in unfiltered) {
                 if (f.category != null && f.category == categoryFilter) {
                     val subCategory = f.subCategory
@@ -192,7 +192,7 @@ class FoodFragment : DaggerFragment() {
         }
         // make it unique
         val subcategories = ArrayList(subCatSet)
-        subcategories.add(0, resourceHelper.gs(R.string.none))
+        subcategories.add(0, rh.gs(R.string.none))
         context?.let { context ->
             val adapterSubcategories = ArrayAdapter(context, R.layout.spinner_centered, subcategories)
             binding.subcategory.adapter = adapterSubcategories
@@ -202,14 +202,14 @@ class FoodFragment : DaggerFragment() {
     private fun filterData() {
         val textFilter = binding.filter.text.toString()
         val categoryFilter = binding.category.selectedItem?.toString()
-            ?: resourceHelper.gs(R.string.none)
+            ?: rh.gs(R.string.none)
         val subcategoryFilter = binding.subcategory.selectedItem?.toString()
-            ?: resourceHelper.gs(R.string.none)
+            ?: rh.gs(R.string.none)
         val newFiltered = ArrayList<Food>()
         for (f in unfiltered) {
             if (f.category == null || f.subCategory == null) continue
-            if (subcategoryFilter != resourceHelper.gs(R.string.none) && f.subCategory != subcategoryFilter) continue
-            if (categoryFilter != resourceHelper.gs(R.string.none) && f.category != categoryFilter) continue
+            if (subcategoryFilter != rh.gs(R.string.none) && f.subCategory != subcategoryFilter) continue
+            if (categoryFilter != rh.gs(R.string.none) && f.category != categoryFilter) continue
             if (textFilter != "" && !f.name.lowercase(Locale.getDefault()).contains(textFilter.lowercase(Locale.getDefault()))) continue
             newFiltered.add(f)
         }
@@ -232,12 +232,12 @@ class FoodFragment : DaggerFragment() {
             holder.binding.nsSign.visibility = (food.interfaceIDs.nightscoutId != null).toVisibility()
             holder.binding.name.text = food.name
             holder.binding.portion.text = food.portion.toString() + food.unit
-            holder.binding.carbs.text = food.carbs.toString() + resourceHelper.gs(R.string.shortgramm)
-            holder.binding.fat.text = resourceHelper.gs(R.string.shortfat) + ": " + food.fat + resourceHelper.gs(R.string.shortgramm)
+            holder.binding.carbs.text = food.carbs.toString() + rh.gs(R.string.shortgramm)
+            holder.binding.fat.text = rh.gs(R.string.shortfat) + ": " + food.fat + rh.gs(R.string.shortgramm)
             holder.binding.fat.visibility = food.fat.isNotZero().toVisibility()
-            holder.binding.protein.text = resourceHelper.gs(R.string.shortprotein) + ": " + food.protein + resourceHelper.gs(R.string.shortgramm)
+            holder.binding.protein.text = rh.gs(R.string.shortprotein) + ": " + food.protein + rh.gs(R.string.shortgramm)
             holder.binding.protein.visibility = food.protein.isNotZero().toVisibility()
-            holder.binding.energy.text = resourceHelper.gs(R.string.shortenergy) + ": " + food.energy + resourceHelper.gs(R.string.shortkilojoul)
+            holder.binding.energy.text = rh.gs(R.string.shortenergy) + ": " + food.energy + rh.gs(R.string.shortkilojoul)
             holder.binding.energy.visibility = food.energy.isNotZero().toVisibility()
             holder.binding.remove.tag = food
         }
@@ -252,7 +252,7 @@ class FoodFragment : DaggerFragment() {
                 binding.remove.setOnClickListener { v: View ->
                     val food = v.tag as Food
                     activity?.let { activity ->
-                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord) + "\n" + food.name, {
+                        OKDialog.showConfirmation(activity, rh.gs(R.string.removerecord) + "\n" + food.name, {
                             uel.log(Action.FOOD_REMOVED, Sources.Food, food.name)
                             disposable += repository.runTransactionForResult(InvalidateFoodTransaction(food.id))
                                 .subscribe(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt
index 7b9de286808..79eeb7dab7d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt
@@ -27,7 +27,7 @@ import javax.inject.Singleton
 class FoodPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper
+    rh: ResourceHelper
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
     .fragmentClass(FoodFragment::class.java.name)
@@ -35,7 +35,7 @@ class FoodPlugin @Inject constructor(
     .pluginName(R.string.food)
     .shortName(R.string.food_short)
     .description(R.string.description_food),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ) {
 
     // cannot be inner class because of needed injection
@@ -75,7 +75,7 @@ class FoodPlugin @Inject constructor(
                             isValid = false
                         ).also { it.interfaceIDs.nightscoutId = JsonHelper.safeGetString(jsonFood, "_id") }
 
-                        repository.runTransactionForResult(SyncNsFoodTransaction(delFood, true))
+                        repository.runTransactionForResult(SyncNsFoodTransaction(delFood))
                             .doOnError {
                                 aapsLogger.error(LTag.DATABASE, "Error while removing food", it)
                                 ret = Result.failure(workDataOf("Error" to it.toString()))
@@ -89,7 +89,7 @@ class FoodPlugin @Inject constructor(
                     else     -> {
                         val food = foodFromJson(jsonFood)
                         if (food != null) {
-                            repository.runTransactionForResult(SyncNsFoodTransaction(food, false))
+                            repository.runTransactionForResult(SyncNsFoodTransaction(food))
                                 .doOnError {
                                     aapsLogger.error(LTag.DATABASE, "Error while adding/updating food", it)
                                     ret = Result.failure(workDataOf("Error" to it.toString()))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
index 908d8011372..be4eba7ac2e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
@@ -11,10 +11,13 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import androidx.work.*
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.DaggerAppCompatActivityWithResult
 import info.nightscout.androidaps.activities.PreferencesActivity
+import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
@@ -24,10 +27,12 @@ import info.nightscout.androidaps.interfaces.ImportExportPrefs
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.maintenance.formats.*
 import info.nightscout.androidaps.utils.AndroidPermission
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.MidnightTime
+import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.alertDialogs.PrefImportSummaryDialog
@@ -37,7 +42,8 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
-import io.reactivex.Single
+import info.nightscout.androidaps.utils.storage.Storage
+import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -52,14 +58,13 @@ import kotlin.system.exitProcess
 @Singleton
 class ImportExportPrefsImpl @Inject constructor(
     private var log: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val sp: SP,
     private val buildHelper: BuildHelper,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val passwordCheck: PasswordCheck,
     private val config: Config,
     private val androidPermission: AndroidPermission,
-    private val classicPrefsFormat: ClassicPrefsFormat,
     private val encryptedPrefsFormat: EncryptedPrefsFormat,
     private val prefFileList: PrefFileListProvider,
     private val uel: UserEntryLogger,
@@ -99,12 +104,7 @@ class ImportExportPrefsImpl @Inject constructor(
         metadata[PrefsMetadataKey.AAPS_VERSION] = PrefMetadata(BuildConfig.VERSION_NAME, PrefsStatus.OK)
         metadata[PrefsMetadataKey.AAPS_FLAVOUR] = PrefMetadata(BuildConfig.FLAVOR, PrefsStatus.OK)
         metadata[PrefsMetadataKey.DEVICE_MODEL] = PrefMetadata(config.currentDeviceModelString, PrefsStatus.OK)
-
-        if (prefsEncryptionIsDisabled()) {
-            metadata[PrefsMetadataKey.ENCRYPTION] = PrefMetadata("Disabled", PrefsStatus.DISABLED)
-        } else {
-            metadata[PrefsMetadataKey.ENCRYPTION] = PrefMetadata("Enabled", PrefsStatus.OK)
-        }
+        metadata[PrefsMetadataKey.ENCRYPTION] = PrefMetadata("Enabled", PrefsStatus.OK)
 
         return metadata
     }
@@ -121,21 +121,18 @@ class ImportExportPrefsImpl @Inject constructor(
 
         // name provided (hopefully) by user
         val patientName = sp.getString(R.string.key_patient_name, "")
-        val defaultPatientName = resourceHelper.gs(R.string.patient_name_default)
+        val defaultPatientName = rh.gs(R.string.patient_name_default)
 
         // name we detect from OS
         val systemName = n1 ?: n2 ?: n3 ?: n4 ?: n5 ?: n6 ?: defaultPatientName
         return if (patientName.isNotEmpty() && patientName != defaultPatientName) patientName else systemName
     }
 
-    private fun prefsEncryptionIsDisabled() =
-        buildHelper.isEngineeringMode() && !sp.getBoolean(R.string.key_maintenance_encrypt_exported_prefs, true)
-
     private fun askForMasterPass(activity: FragmentActivity, @StringRes canceledMsg: Int, then: ((password: String) -> Unit)) {
         passwordCheck.queryPassword(activity, R.string.master_password, R.string.key_master_password, { password ->
             then(password)
         }, {
-            ToastUtils.warnToast(activity, resourceHelper.gs(canceledMsg))
+            ToastUtils.warnToast(activity, rh.gs(canceledMsg))
         })
     }
 
@@ -145,24 +142,20 @@ class ImportExportPrefsImpl @Inject constructor(
         passwordCheck.queryAnyPassword(activity, passwordName, R.string.key_master_password, passwordExplanation, passwordWarning, { password ->
             then(password)
         }, {
-            ToastUtils.warnToast(activity, resourceHelper.gs(canceledMsg))
+            ToastUtils.warnToast(activity, rh.gs(canceledMsg))
         })
     }
 
     @Suppress("SameParameterValue")
     private fun askForMasterPassIfNeeded(activity: FragmentActivity, @StringRes canceledMsg: Int, then: ((password: String) -> Unit)) {
-        if (prefsEncryptionIsDisabled()) {
-            then("")
-        } else {
             askForMasterPass(activity, canceledMsg, then)
-        }
     }
 
     private fun assureMasterPasswordSet(activity: FragmentActivity, @StringRes wrongPwdTitle: Int): Boolean {
         if (!sp.contains(R.string.key_master_password) || (sp.getString(R.string.key_master_password, "") == "")) {
             WarningDialog.showWarning(activity,
-                resourceHelper.gs(wrongPwdTitle),
-                resourceHelper.gs(R.string.master_password_missing, resourceHelper.gs(R.string.configbuilder_general), resourceHelper.gs(R.string.protection)),
+                rh.gs(wrongPwdTitle),
+                rh.gs(R.string.master_password_missing, rh.gs(R.string.configbuilder_general), rh.gs(R.string.protection)),
                 R.string.nav_preferences, {
                 val intent = Intent(activity, PreferencesActivity::class.java).apply {
                     putExtra("id", R.xml.pref_general)
@@ -175,30 +168,22 @@ class ImportExportPrefsImpl @Inject constructor(
     }
 
     private fun askToConfirmExport(activity: FragmentActivity, fileToExport: File, then: ((password: String) -> Unit)) {
-        if (!prefsEncryptionIsDisabled() && !assureMasterPasswordSet(activity, R.string.nav_export)) return
+        if (!assureMasterPasswordSet(activity, R.string.nav_export)) return
 
-        TwoMessagesAlertDialog.showAlert(activity, resourceHelper.gs(R.string.nav_export),
-            resourceHelper.gs(R.string.export_to) + " " + fileToExport.name + " ?",
-            resourceHelper.gs(R.string.password_preferences_encrypt_prompt), {
+        TwoMessagesAlertDialog.showAlert(activity, rh.gs(R.string.nav_export),
+            rh.gs(R.string.export_to) + " " + fileToExport.name + " ?",
+            rh.gs(R.string.password_preferences_encrypt_prompt), {
             askForMasterPassIfNeeded(activity, R.string.preferences_export_canceled, then)
         }, null, R.drawable.ic_header_export)
     }
 
     private fun askToConfirmImport(activity: FragmentActivity, fileToImport: PrefsFile, then: ((password: String) -> Unit)) {
-
-        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.name + " ?",
-                resourceHelper.gs(R.string.password_preferences_decrypt_prompt), {
-                askForMasterPass(activity, R.string.preferences_import_canceled, then)
-            }, null, R.drawable.ic_header_import)
-
-        } else {
-            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.nav_import),
-                resourceHelper.gs(R.string.import_from) + " " + fileToImport.file + " ?",
-                Runnable { then("") })
-        }
+        if (!assureMasterPasswordSet(activity, R.string.nav_import)) return
+        TwoMessagesAlertDialog.showAlert(activity, rh.gs(R.string.nav_import),
+            rh.gs(R.string.import_from) + " " + fileToImport.name + " ?",
+            rh.gs(R.string.password_preferences_decrypt_prompt), {
+            askForMasterPass(activity, R.string.preferences_import_canceled, then)
+        }, null, R.drawable.ic_header_import)
     }
 
     private fun promptForDecryptionPasswordIfNeeded(activity: FragmentActivity, prefs: Prefs, importOk: Boolean,
@@ -226,7 +211,6 @@ class ImportExportPrefsImpl @Inject constructor(
     private fun exportSharedPreferences(activity: FragmentActivity) {
 
         prefFileList.ensureExportDirExists()
-        val legacyFile = prefFileList.legacyFile()
         val newFile = prefFileList.newExportFile()
 
         askToConfirmExport(activity, newFile) { password ->
@@ -238,27 +222,24 @@ class ImportExportPrefsImpl @Inject constructor(
 
                 val prefs = Prefs(entries, prepareMetadata(activity))
 
-                if (BuildConfig.DEBUG && buildHelper.isEngineeringMode()) {
-                    classicPrefsFormat.savePreferences(legacyFile, prefs)
-                }
                 encryptedPrefsFormat.savePreferences(newFile, prefs, password)
 
-                ToastUtils.okToast(activity, resourceHelper.gs(R.string.exported))
+                ToastUtils.okToast(activity, rh.gs(R.string.exported))
             } catch (e: FileNotFoundException) {
-                ToastUtils.errorToast(activity, resourceHelper.gs(R.string.filenotfound) + " " + newFile)
+                ToastUtils.errorToast(activity, rh.gs(R.string.filenotfound) + " " + newFile)
                 log.error(LTag.CORE, "Unhandled exception", e)
             } catch (e: IOException) {
                 ToastUtils.errorToast(activity, e.message)
                 log.error(LTag.CORE, "Unhandled exception", e)
             } catch (e: PrefFileNotFoundError) {
-                ToastUtils.Long.errorToast(activity, resourceHelper.gs(R.string.preferences_export_canceled)
-                    + "\n\n" + resourceHelper.gs(R.string.filenotfound)
+                ToastUtils.Long.errorToast(activity, rh.gs(R.string.preferences_export_canceled)
+                    + "\n\n" + rh.gs(R.string.filenotfound)
                     + ": " + e.message
-                    + "\n\n" + resourceHelper.gs(R.string.needstoragepermission))
+                    + "\n\n" + rh.gs(R.string.needstoragepermission))
                 log.error(LTag.CORE, "File system exception", e)
             } catch (e: PrefIOError) {
-                ToastUtils.Long.errorToast(activity, resourceHelper.gs(R.string.preferences_export_canceled)
-                    + "\n\n" + resourceHelper.gs(R.string.needstoragepermission)
+                ToastUtils.Long.errorToast(activity, rh.gs(R.string.preferences_export_canceled)
+                    + "\n\n" + rh.gs(R.string.needstoragepermission)
                     + ": " + e.message)
                 log.error(LTag.CORE, "File system exception", e)
             }
@@ -279,7 +260,7 @@ class ImportExportPrefsImpl @Inject constructor(
         } catch (e: IllegalArgumentException) {
             // this exception happens on some early implementations of ActivityResult contracts
             // when registered and called for the second time
-            ToastUtils.errorToast(activity, resourceHelper.gs(R.string.goto_main_try_again))
+            ToastUtils.errorToast(activity, rh.gs(R.string.goto_main_try_again))
             log.error(LTag.CORE, "Internal android framework exception", e)
         }
     }
@@ -288,10 +269,7 @@ class ImportExportPrefsImpl @Inject constructor(
 
         askToConfirmImport(activity, importFile) { password ->
 
-            val format: PrefsFormat = when (importFile.handler) {
-                PrefsFormatsHandler.CLASSIC -> classicPrefsFormat
-                PrefsFormatsHandler.ENCRYPTED -> encryptedPrefsFormat
-            }
+            val format: PrefsFormat =  encryptedPrefsFormat
 
             try {
 
@@ -320,14 +298,14 @@ class ImportExportPrefsImpl @Inject constructor(
                             restartAppAfterImport(activity)
                         } else {
                             // for impossible imports it should not be called
-                            ToastUtils.errorToast(activity, resourceHelper.gs(R.string.preferences_import_impossible))
+                            ToastUtils.errorToast(activity, rh.gs(R.string.preferences_import_impossible))
                         }
                     })
 
                 }
 
             } catch (e: PrefFileNotFoundError) {
-                ToastUtils.errorToast(activity, resourceHelper.gs(R.string.filenotfound) + " " + importFile)
+                ToastUtils.errorToast(activity, rh.gs(R.string.filenotfound) + " " + importFile)
                 log.error(LTag.CORE, "Unhandled exception", e)
             } catch (e: PrefIOError) {
                 log.error(LTag.CORE, "Unhandled exception", e)
@@ -348,7 +326,7 @@ class ImportExportPrefsImpl @Inject constructor(
 
     private fun restartAppAfterImport(context: Context) {
         sp.putBoolean(R.string.key_setupwizard_processed, true)
-        OKDialog.show(context, resourceHelper.gs(R.string.setting_imported), resourceHelper.gs(R.string.restartingapp)) {
+        OKDialog.show(context, rh.gs(R.string.setting_imported), rh.gs(R.string.restartingapp)) {
             uel.log(Action.IMPORT_SETTINGS, Sources.Maintenance)
             log.debug(LTag.CORE, "Exiting")
             rxBus.send(EventAppExit())
@@ -360,20 +338,62 @@ class ImportExportPrefsImpl @Inject constructor(
         }
     }
 
-    override fun exportUserEntriesCsv(activity: FragmentActivity, singleEntries: Single<List<UserEntry>>) {
-        val entries = singleEntries.blockingGet()
-        prefFileList.ensureExportDirExists()
-        val newFile = prefFileList.newExportCsvFile()
+    override fun exportUserEntriesCsv(activity: FragmentActivity) {
+        WorkManager.getInstance(activity).enqueueUniqueWork(
+            "export",
+            ExistingWorkPolicy.APPEND_OR_REPLACE,
+            OneTimeWorkRequest.Builder(CsvExportWorker::class.java).build()
+        )
+    }
 
-        try {
-            classicPrefsFormat.saveCsv(newFile, entries)
-            ToastUtils.okToast(activity, resourceHelper.gs(R.string.ue_exported))
-        } catch (e: FileNotFoundException) {
-            ToastUtils.errorToast(activity, resourceHelper.gs(R.string.filenotfound) + " " + newFile)
-            log.error(LTag.CORE, "Unhandled exception", e)
-        } catch (e: IOException) {
-            ToastUtils.errorToast(activity, e.message)
-            log.error(LTag.CORE, "Unhandled exception", e)
+    class CsvExportWorker(
+        context: Context,
+        params: WorkerParameters
+    ) : Worker(context, params) {
+
+        @Inject lateinit var injector: HasAndroidInjector
+        @Inject lateinit var aapsLogger: AAPSLogger
+        @Inject lateinit var repository: AppRepository
+        @Inject lateinit var rh: ResourceHelper
+        @Inject lateinit var prefFileList: PrefFileListProvider
+        @Inject lateinit var context: Context
+        @Inject lateinit var userEntryPresentationHelper: UserEntryPresentationHelper
+        @Inject lateinit var storage: Storage
+
+        init {
+            (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
+        }
+
+        override fun doWork(): Result {
+            val entries = repository.getUserEntryFilteredDataFromTime(MidnightTime.calc() - T.days(90).msecs()).blockingGet()
+            prefFileList.ensureExportDirExists()
+            val newFile = prefFileList.newExportCsvFile()
+            var ret = Result.success()
+            try {
+                saveCsv(newFile, entries)
+                ToastUtils.okToast(context, rh.gs(R.string.ue_exported))
+            } catch (e: FileNotFoundException) {
+                ToastUtils.errorToast(context, rh.gs(R.string.filenotfound) + " " + newFile)
+                aapsLogger.error(LTag.CORE, "Unhandled exception", e)
+                ret = Result.failure(workDataOf("Error" to "Error FileNotFoundException"))
+            } catch (e: IOException) {
+                ToastUtils.errorToast(context, e.message)
+                aapsLogger.error(LTag.CORE, "Unhandled exception", e)
+                ret = Result.failure(workDataOf("Error" to "Error IOException"))
+            }
+            return ret
         }
+
+        private fun saveCsv(file: File, userEntries: List<UserEntry>) {
+            try {
+                val contents = userEntryPresentationHelper.userEntriesToCsv(userEntries)
+                storage.putFileContents(file, contents)
+            } catch (e: FileNotFoundException) {
+                throw PrefFileNotFoundError(file.absolutePath)
+            } catch (e: IOException) {
+                throw PrefIOError(file.absolutePath)
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
index a78575151c1..ab892688e85 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
@@ -12,7 +12,8 @@ import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.MaintenanceFragmentBinding
-import info.nightscout.androidaps.events.EventNewBG
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase
+import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.insight.database.InsightDatabase
 import info.nightscout.androidaps.interfaces.DataSyncSelector
 import info.nightscout.androidaps.interfaces.ImportExportPrefs
@@ -20,10 +21,11 @@ import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
 import info.nightscout.androidaps.plugins.general.overview.OverviewData
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.DashHistoryDatabase
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryDatabase
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
@@ -36,13 +38,16 @@ class MaintenanceFragment : DaggerFragment() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var maintenancePlugin: MaintenancePlugin
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var importExportPrefs: ImportExportPrefs
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var danaHistoryDatabase: DanaHistoryDatabase
     @Inject lateinit var insightDatabase: InsightDatabase
+    @Inject lateinit var diaconnDatabase: DiaconnHistoryDatabase
+    @Inject lateinit var erosDatabase: ErosHistoryDatabase
+    @Inject lateinit var dashDatabase: DashHistoryDatabase
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var dataSyncSelector: DataSyncSelector
     @Inject lateinit var pumpSync: PumpSync
@@ -73,12 +78,15 @@ class MaintenanceFragment : DaggerFragment() {
         }
         binding.navResetdb.setOnClickListener {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.maintenance), resourceHelper.gs(R.string.reset_db_confirm), Runnable {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.maintenance), rh.gs(R.string.reset_db_confirm), Runnable {
                     compositeDisposable.add(
                         fromAction {
                             repository.clearDatabases()
                             danaHistoryDatabase.clearAllTables()
                             insightDatabase.clearAllTables()
+                            diaconnDatabase.clearAllTables()
+                            erosDatabase.clearAllTables()
+                            dashDatabase.clearAllTables()
                             dataSyncSelector.resetToNextFullSync()
                             pumpSync.connectNewPump()
                             overviewData.reset()
@@ -86,12 +94,10 @@ class MaintenanceFragment : DaggerFragment() {
                             iobCobCalculator.clearCache()
                         }
                             .subscribeOn(aapsSchedulers.io)
-                            .observeOn(aapsSchedulers.main)
                             .subscribeBy(
                                 onError = { aapsLogger.error("Error clearing databases", it) },
                                 onComplete = {
-                                    rxBus.send(EventNewBG(null))
-                                    rxBus.send(EventNewHistoryData(0, true))
+                                    rxBus.send(EventPreferenceChange(rh, R.string.key_units))
                                 }
                             )
                     )
@@ -116,9 +122,9 @@ class MaintenanceFragment : DaggerFragment() {
         binding.navLogsettings.setOnClickListener { startActivity(Intent(activity, LogSettingActivity::class.java)) }
         binding.exportCsv.setOnClickListener {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.ue_export_to_csv) + "?") {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.ue_export_to_csv) + "?") {
                     uel.log(Action.EXPORT_CSV, Sources.Maintenance)
-                    importExportPrefs.exportUserEntriesCsv(activity, repository.getAllUserEntries())
+                    importExportPrefs.exportUserEntriesCsv(activity)
                 }
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
index 73395d4e96e..2437ff645a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
@@ -4,8 +4,6 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import androidx.core.content.FileProvider
-import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
@@ -29,7 +27,7 @@ import javax.inject.Singleton
 class MaintenancePlugin @Inject constructor(
     injector: HasAndroidInjector,
     private val context: Context,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val sp: SP,
     private val nsSettingsStatus: NSSettingsStatus,
     aapsLogger: AAPSLogger,
@@ -48,7 +46,7 @@ class MaintenancePlugin @Inject constructor(
         .shortName(R.string.maintenance_shortname)
         .preferencesId(R.xml.pref_maintenance)
         .description(R.string.description_maintenance),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ) {
 
     fun sendLogs() {
@@ -171,13 +169,13 @@ class MaintenancePlugin @Inject constructor(
         builder.append("If you want to provide logs for event older than a few hours," + System.lineSeparator())
         builder.append("you have to do it manually)" + System.lineSeparator())
         builder.append("-------------------------------------------------------" + System.lineSeparator())
-        builder.append(resourceHelper.gs(R.string.app_name) + " " + BuildConfig.VERSION + System.lineSeparator())
+        builder.append(rh.gs(R.string.app_name) + " " + BuildConfig.VERSION + System.lineSeparator())
         if (config.NSCLIENT) builder.append("NSCLIENT" + System.lineSeparator())
         builder.append("Build: " + BuildConfig.BUILDVERSION + System.lineSeparator())
         builder.append("Remote: " + BuildConfig.REMOTE + System.lineSeparator())
         builder.append("Flavor: " + BuildConfig.FLAVOR + BuildConfig.BUILD_TYPE + System.lineSeparator())
-        builder.append(resourceHelper.gs(R.string.configbuilder_nightscoutversion_label) + " " + nsSettingsStatus.getVersion() + System.lineSeparator())
-        if (buildHelper.isEngineeringMode()) builder.append(resourceHelper.gs(R.string.engineering_mode_enabled))
+        builder.append(rh.gs(R.string.configbuilder_nightscoutversion_label) + " " + nsSettingsStatus.getVersion() + System.lineSeparator())
+        if (buildHelper.isEngineeringMode()) builder.append(rh.gs(R.string.engineering_mode_enabled))
         return sendMail(attachmentUri, recipient, subject, builder.toString())
     }
 
@@ -212,14 +210,4 @@ class MaintenancePlugin @Inject constructor(
         emailIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         return emailIntent
     }
-
-    override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
-        super.preprocessPreferences(preferenceFragment)
-        val encryptSwitch =
-            preferenceFragment.findPreference(resourceHelper.gs(R.string.key_maintenance_encrypt_exported_prefs)) as SwitchPreference?
-                ?: return
-        encryptSwitch.isVisible = buildHelper.isEngineeringMode()
-        encryptSwitch.isEnabled = buildHelper.isEngineeringMode()
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt
index e5d169527ec..54ed71eaf08 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt
@@ -14,7 +14,9 @@ import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class DataSyncSelectorImplementation @Inject constructor(
     private val sp: SP,
     private val aapsLogger: AAPSLogger,
@@ -26,6 +28,42 @@ class DataSyncSelectorImplementation @Inject constructor(
     private val localProfilePlugin: LocalProfilePlugin
 ) : DataSyncSelector {
 
+    class QueueCounter(
+        var bolusesRemaining: Long = 0L,
+        var carbsRemaining: Long = 0L,
+        var bcrRemaining: Long = 0L,
+        var ttsRemaining: Long = 0L,
+        var foodsRemaining: Long = 0L,
+        var gvsRemaining: Long = 0L,
+        var tesRemaining: Long = 0L,
+        var dssRemaining: Long = 0L,
+        var tbrsRemaining: Long = 0L,
+        var ebsRemaining: Long = 0L,
+        var pssRemaining: Long = 0L,
+        var epssRemaining: Long = 0L,
+        var oesRemaining: Long = 0L
+    ) {
+
+        fun size(): Long =
+            bolusesRemaining +
+                carbsRemaining +
+                bcrRemaining +
+                ttsRemaining +
+                foodsRemaining +
+                gvsRemaining +
+                tesRemaining +
+                dssRemaining +
+                tbrsRemaining +
+                ebsRemaining +
+                pssRemaining +
+                epssRemaining +
+                oesRemaining
+    }
+
+    private val queueCounter = QueueCounter()
+
+    override fun queueSize(): Long = queueCounter.size()
+
     override fun doUpload() {
         if (sp.getBoolean(R.string.key_ns_upload, true)) {
             processChangedBolusesCompat()
@@ -46,20 +84,43 @@ class DataSyncSelectorImplementation @Inject constructor(
     }
 
     override fun resetToNextFullSync() {
-        sp.remove(R.string.key_ns_temporary_target_last_synced_id)
+        appRepository.getLastGlucoseValueIdWrapped().blockingGet().run {
+            val currentLast = if (this is ValueWrapper.Existing) this.value else 0L
+            sp.putLong(R.string.key_ns_glucose_value_new_data_id, currentLast)
+        }
         sp.remove(R.string.key_ns_glucose_value_last_synced_id)
+
+        appRepository.getLastTemporaryBasalIdWrapped().blockingGet().run {
+            val currentLast = if (this is ValueWrapper.Existing) this.value else 0L
+            sp.putLong(R.string.key_ns_temporary_basal_new_data_id, currentLast)
+        }
+        sp.remove(R.string.key_ns_temporary_basal_last_synced_id)
+
+        appRepository.getLastTempTargetIdWrapped().blockingGet().run {
+            val currentLast = if (this is ValueWrapper.Existing) this.value else 0L
+            sp.putLong(R.string.key_ns_temporary_target_new_data_id, currentLast)
+        }
+        sp.remove(R.string.key_ns_temporary_target_last_synced_id)
+
+        appRepository.getLastExtendedBolusIdWrapped().blockingGet().run {
+            val currentLast = if (this is ValueWrapper.Existing) this.value else 0L
+            sp.putLong(R.string.key_ns_extended_bolus_new_data_id, currentLast)
+        }
+        sp.remove(R.string.key_ns_extended_bolus_last_synced_id)
+
         sp.remove(R.string.key_ns_food_last_synced_id)
         sp.remove(R.string.key_ns_bolus_last_synced_id)
         sp.remove(R.string.key_ns_carbs_last_synced_id)
         sp.remove(R.string.key_ns_bolus_calculator_result_last_synced_id)
-        sp.remove(R.string.key_ns_device_status_last_synced_id)
-        sp.remove(R.string.key_ns_temporary_basal_last_synced_id)
-        sp.remove(R.string.key_ns_extended_bolus_last_synced_id)
         sp.remove(R.string.key_ns_therapy_event_last_synced_id)
         sp.remove(R.string.key_ns_profile_switch_last_synced_id)
         sp.remove(R.string.key_ns_effective_profile_switch_last_synced_id)
         sp.remove(R.string.key_ns_offline_event_last_synced_id)
         sp.remove(R.string.key_ns_profile_store_last_synced_timestamp)
+
+        val lastDeviceStatusDbIdWrapped = appRepository.getLastDeviceStatusIdWrapped().blockingGet()
+        if (lastDeviceStatusDbIdWrapped is ValueWrapper.Existing) sp.putLong(R.string.key_ns_device_status_last_synced_id, lastDeviceStatusDbIdWrapped.value)
+        else sp.remove(R.string.key_ns_device_status_last_synced_id)
     }
 
     override fun confirmLastBolusIdIfGreater(lastSynced: Long) {
@@ -80,8 +141,8 @@ class DataSyncSelectorImplementation @Inject constructor(
             }
     }
 
-    @Volatile private var lastBolusId = -1L
-    @Volatile private var lastBolusTime = -1L
+    //private var lastBolusId = -1L
+    //private var lastBolusTime = -1L
     override fun processChangedBolusesCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastBolusIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -90,18 +151,33 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_bolus_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastBolusId && dateUtil.now() - lastBolusTime < 5000) return false
-        lastBolusId = startId
-        lastBolusTime = dateUtil.now()
+        //if (startId == lastBolusId && dateUtil.now() - lastBolusTime < 5000) return false
+        //lastBolusId = startId
+        //lastBolusTime = dateUtil.now()
+        queueCounter.bolusesRemaining = lastDbId - startId
         appRepository.getNextSyncElementBolus(startId).blockingGet()?.let { bolus ->
-            aapsLogger.info(LTag.DATABASE, "Loading Bolus data Start: $startId ID: ${bolus.first.id} HistoryID: ${bolus.second} ")
+            aapsLogger.info(LTag.DATABASE, "Loading Bolus data Start: $startId ID: ${bolus.first.id} HistoryID: ${bolus.second.id} ")
             when {
+                // only NsId changed, no need to upload
+                bolus.first.onlyNsIdAdded(bolus.second)       -> {
+                    confirmLastBolusIdIfGreater(bolus.second.id)
+                    //lastBolusId = -1
+                    processChangedBolusesCompat()
+                    aapsLogger.info(LTag.DATABASE, "Ignoring Bolus. Only NS id changed ID: ${bolus.first.id} HistoryID: ${bolus.second.id} ")
+                    return false
+                }
                 // without nsId = create new
                 bolus.first.interfaceIDs.nightscoutId == null ->
-                    nsClientPlugin.nsClientService?.dbAdd("treatments", bolus.first.toJson(true, dateUtil), DataSyncSelector.PairBolus(bolus.first, bolus.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", bolus.first.toJson(true, dateUtil), DataSyncSelector.PairBolus(bolus.first, bolus.second.id), "$startId/$lastDbId")
                 // with nsId = update
                 bolus.first.interfaceIDs.nightscoutId != null ->
-                    nsClientPlugin.nsClientService?.dbUpdate("treatments", bolus.first.interfaceIDs.nightscoutId, bolus.first.toJson(false, dateUtil), DataSyncSelector.PairBolus(bolus.first, bolus.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbUpdate(
+                        "treatments",
+                        bolus.first.interfaceIDs.nightscoutId,
+                        bolus.first.toJson(false, dateUtil),
+                        DataSyncSelector.PairBolus(bolus.first, bolus.second.id),
+                        "$startId/$lastDbId"
+                    )
             }
             return true
         }
@@ -123,8 +199,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastCarbsId = -1L
-    @Volatile private var lastCarbsTime = -1L
+    //private var lastCarbsId = -1L
+    //private var lastCarbsTime = -1L
     override fun processChangedCarbsCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastCarbsIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -133,18 +209,33 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_carbs_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastCarbsId && dateUtil.now() - lastCarbsTime < 5000) return false
-        lastCarbsId = startId
-        lastCarbsTime = dateUtil.now()
+        //if (startId == lastCarbsId && dateUtil.now() - lastCarbsTime < 5000) return false
+        //lastCarbsId = startId
+        //lastCarbsTime = dateUtil.now()
+        queueCounter.carbsRemaining = lastDbId - startId
         appRepository.getNextSyncElementCarbs(startId).blockingGet()?.let { carb ->
-            aapsLogger.info(LTag.DATABASE, "Loading Carbs data Start: $startId ID: ${carb.first.id} HistoryID: ${carb.second} ")
+            aapsLogger.info(LTag.DATABASE, "Loading Carbs data Start: $startId ID: ${carb.first.id} HistoryID: ${carb.second.id} ")
             when {
+                // only NsId changed, no need to upload
+                carb.first.onlyNsIdAdded(carb.second)        -> {
+                    confirmLastCarbsIdIfGreater(carb.second.id)
+                    //lastCarbsId = -1
+                    processChangedCarbsCompat()
+                    aapsLogger.info(LTag.DATABASE, "Ignoring Carbs. Only NS id changed ID: ${carb.first.id} HistoryID: ${carb.second.id} ")
+                    return false
+                }
                 // without nsId = create new
                 carb.first.interfaceIDs.nightscoutId == null ->
-                    nsClientPlugin.nsClientService?.dbAdd("treatments", carb.first.toJson(true, dateUtil), DataSyncSelector.PairCarbs(carb.first, carb.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", carb.first.toJson(true, dateUtil), DataSyncSelector.PairCarbs(carb.first, carb.second.id), "$startId/$lastDbId")
                 // with nsId = update
                 carb.first.interfaceIDs.nightscoutId != null ->
-                    nsClientPlugin.nsClientService?.dbUpdate("treatments", carb.first.interfaceIDs.nightscoutId, carb.first.toJson(false, dateUtil), DataSyncSelector.PairCarbs(carb.first, carb.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbUpdate(
+                        "treatments",
+                        carb.first.interfaceIDs.nightscoutId,
+                        carb.first.toJson(false, dateUtil),
+                        DataSyncSelector.PairCarbs(carb.first, carb.second.id),
+                        "$startId/$lastDbId"
+                    )
             }
             return true
         }
@@ -166,8 +257,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastBcrId = -1L
-    @Volatile private var lastBcrTime = -1L
+    //private var lastBcrId = -1L
+    //private var lastBcrTime = -1L
     override fun processChangedBolusCalculatorResultsCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastBolusCalculatorResultIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -176,18 +267,35 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_bolus_calculator_result_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastBcrId && dateUtil.now() - lastBcrTime < 5000) return false
-        lastBcrId = startId
-        lastBcrTime = dateUtil.now()
+        //if (startId == lastBcrId && dateUtil.now() - lastBcrTime < 5000) return false
+        //lastBcrId = startId
+        //lastBcrTime = dateUtil.now()
+        queueCounter.bcrRemaining = lastDbId - startId
         appRepository.getNextSyncElementBolusCalculatorResult(startId).blockingGet()?.let { bolusCalculatorResult ->
-            aapsLogger.info(LTag.DATABASE, "Loading BolusCalculatorResult data Start: $startId ID: ${bolusCalculatorResult.first.id} HistoryID: ${bolusCalculatorResult.second} ")
+            aapsLogger.info(LTag.DATABASE, "Loading BolusCalculatorResult data Start: $startId ID: ${bolusCalculatorResult.first.id} HistoryID: ${bolusCalculatorResult.second.id} ")
             when {
+                // only NsId changed, no need to upload
+                bolusCalculatorResult.first.onlyNsIdAdded(bolusCalculatorResult.second) -> {
+                    confirmLastBolusCalculatorResultsIdIfGreater(bolusCalculatorResult.second.id)
+                    //lastBcrId = -1
+                    processChangedBolusCalculatorResultsCompat()
+                    aapsLogger.info(LTag.DATABASE, "Ignoring BolusCalculatorResult. Only NS id changed ID: ${bolusCalculatorResult.first.id} HistoryID: ${bolusCalculatorResult.second.id} ")
+                    return false
+                }
                 // without nsId = create new
-                bolusCalculatorResult.first.interfaceIDs.nightscoutId == null ->
-                    nsClientPlugin.nsClientService?.dbAdd("treatments", bolusCalculatorResult.first.toJson(true, dateUtil), DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second), "$startId/$lastDbId")
+                bolusCalculatorResult.first.interfaceIDs.nightscoutId == null           ->
+                    nsClientPlugin.nsClientService?.dbAdd(
+                        "treatments",
+                        bolusCalculatorResult.first.toJson(true, dateUtil),
+                        DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second.id),
+                        "$startId/$lastDbId"
+                    )
                 // with nsId = update
-                bolusCalculatorResult.first.interfaceIDs.nightscoutId != null ->
-                    nsClientPlugin.nsClientService?.dbUpdate("treatments", bolusCalculatorResult.first.interfaceIDs.nightscoutId, bolusCalculatorResult.first.toJson(false, dateUtil), DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second), "$startId/$lastDbId")
+                bolusCalculatorResult.first.interfaceIDs.nightscoutId != null           ->
+                    nsClientPlugin.nsClientService?.dbUpdate(
+                        "treatments", bolusCalculatorResult.first.interfaceIDs.nightscoutId, bolusCalculatorResult.first.toJson(false, dateUtil),
+                        DataSyncSelector.PairBolusCalculatorResult(bolusCalculatorResult.first, bolusCalculatorResult.second.id), "$startId/$lastDbId"
+                    )
             }
             return true
         }
@@ -209,8 +317,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastTtId = -1L
-    @Volatile private var lastTtTime = -1L
+    //private var lastTtId = -1L
+    //private var lastTtTime = -1L
     override fun processChangedTempTargetsCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastTempTargetIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -219,18 +327,46 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_temporary_target_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastTtId && dateUtil.now() - lastTtTime < 5000) return false
-        lastTtId = startId
-        lastTtTime = dateUtil.now()
+        //if (startId == lastTtId && dateUtil.now() - lastTtTime < 5000) return false
+        //lastTtId = startId
+        //lastTtTime = dateUtil.now()
+        queueCounter.ttsRemaining = lastDbId - startId
         appRepository.getNextSyncElementTemporaryTarget(startId).blockingGet()?.let { tt ->
-            aapsLogger.info(LTag.DATABASE, "Loading TemporaryTarget data Start: $startId ID: ${tt.first.id} HistoryID: ${tt.second} ")
+            aapsLogger.info(LTag.DATABASE, "Loading TemporaryTarget data Start: $startId ID: ${tt.first.id} HistoryID: ${tt.second.id} ")
             when {
+                // record is not valid record and we are within first sync, no need to upload
+                tt.first.id != tt.second.id && tt.second.id <= sp.getLong(R.string.key_ns_temporary_target_new_data_id, 0) -> {
+                    confirmLastTempTargetsIdIfGreater(tt.second.id)
+                    //lastTbrId = -1
+                    processChangedTempTargetsCompat()
+                    aapsLogger.info(LTag.DATABASE, "Ignoring TemporaryTarget. Change within first sync ID: ${tt.first.id} HistoryID: ${tt.second.id} ")
+                    return false
+                }
+                // only NsId changed, no need to upload
+                tt.first.onlyNsIdAdded(tt.second)          -> {
+                    confirmLastTempTargetsIdIfGreater(tt.second.id)
+                    //lastTtId = -1
+                    processChangedTempTargetsCompat()
+                    aapsLogger.info(LTag.DATABASE, "Ignoring TemporaryTarget. Only NS id changed ID: ${tt.first.id} HistoryID: ${tt.second.id} ")
+                    return false
+                }
                 // without nsId = create new
                 tt.first.interfaceIDs.nightscoutId == null ->
-                    nsClientPlugin.nsClientService?.dbAdd("treatments", tt.first.toJson(true, profileFunction.getUnits(), dateUtil), DataSyncSelector.PairTemporaryTarget(tt.first, tt.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbAdd(
+                        "treatments",
+                        tt.first.toJson(true, profileFunction.getUnits(), dateUtil),
+                        DataSyncSelector.PairTemporaryTarget(tt.first, tt.second.id),
+                        "$startId/$lastDbId"
+                    )
                 // existing with nsId = update
                 tt.first.interfaceIDs.nightscoutId != null ->
-                    nsClientPlugin.nsClientService?.dbUpdate("treatments", tt.first.interfaceIDs.nightscoutId, tt.first.toJson(false, profileFunction.getUnits(), dateUtil), DataSyncSelector.PairTemporaryTarget(tt.first, tt.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbUpdate(
+                        "treatments",
+                        tt.first.interfaceIDs.nightscoutId,
+                        tt.first.toJson(false, profileFunction.getUnits(), dateUtil),
+                        DataSyncSelector.PairTemporaryTarget(tt.first, tt.second.id),
+                        "$startId/$lastDbId"
+                    )
             }
             return true
         }
@@ -252,8 +388,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastFoodId = -1L
-    @Volatile private var lastFoodTime = -1L
+    //private var lastFoodId = -1L
+    //private var lastFoodTime = -1L
     override fun processChangedFoodsCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastFoodIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -262,18 +398,33 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_food_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastFoodId && dateUtil.now() - lastFoodTime < 5000) return false
-        lastFoodId = startId
-        lastFoodTime = dateUtil.now()
+        //if (startId == lastFoodId && dateUtil.now() - lastFoodTime < 5000) return false
+        //lastFoodId = startId
+        //lastFoodTime = dateUtil.now()
+        queueCounter.foodsRemaining = lastDbId - startId
         appRepository.getNextSyncElementFood(startId).blockingGet()?.let { food ->
             aapsLogger.info(LTag.DATABASE, "Loading Food data Start: $startId ID: ${food.first.id} HistoryID: ${food.second} ")
             when {
+                // only NsId changed, no need to upload
+                food.first.onlyNsIdAdded(food.second)        -> {
+                    confirmLastFoodIdIfGreater(food.second.id)
+                    //lastFoodId = -1
+                    processChangedFoodsCompat()
+                    aapsLogger.info(LTag.DATABASE, "Ignoring Food. Only NS id changed ID: ${food.first.id} HistoryID: ${food.second.id} ")
+                    return false
+                }
                 // without nsId = create new
                 food.first.interfaceIDs.nightscoutId == null ->
-                    nsClientPlugin.nsClientService?.dbAdd("food", food.first.toJson(true), DataSyncSelector.PairFood(food.first, food.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbAdd("food", food.first.toJson(true), DataSyncSelector.PairFood(food.first, food.second.id), "$startId/$lastDbId")
                 // with nsId = update
                 food.first.interfaceIDs.nightscoutId != null ->
-                    nsClientPlugin.nsClientService?.dbUpdate("food", food.first.interfaceIDs.nightscoutId, food.first.toJson(false), DataSyncSelector.PairFood(food.first, food.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbUpdate(
+                        "food",
+                        food.first.interfaceIDs.nightscoutId,
+                        food.first.toJson(false),
+                        DataSyncSelector.PairFood(food.first, food.second.id),
+                        "$startId/$lastDbId"
+                    )
             }
             return true
         }
@@ -295,9 +446,9 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastGvId = -1L
-    @Volatile private var lastGvTime = -1L
-    override fun processChangedGlucoseValuesCompat(): Boolean {
+    //private var lastGvId = -1L
+    //private var lastGvTime = -1L
+    override tailrec fun processChangedGlucoseValuesCompat() {
         val lastDbIdWrapped = appRepository.getLastGlucoseValueIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
         var startId = sp.getLong(R.string.key_ns_glucose_value_last_synced_id, 0)
@@ -305,28 +456,51 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_glucose_value_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastGvId && dateUtil.now() - lastGvTime < 5000) return false
-        lastGvId = startId
-        lastGvTime = dateUtil.now()
+        //if (startId == lastGvId && dateUtil.now() - lastGvTime < 5000) return false
+        //lastGvId = startId
+        //lastGvTime = dateUtil.now()
+        queueCounter.gvsRemaining = lastDbId - startId
+        var tailCall = false
         appRepository.getNextSyncElementGlucoseValue(startId).blockingGet()?.let { gv ->
-            aapsLogger.info(LTag.DATABASE, "Loading GlucoseValue data Start: $startId ID: ${gv.first.id} HistoryID: ${gv.second} ")
+            aapsLogger.info(LTag.DATABASE, "Loading GlucoseValue data ID: ${gv.first.id} HistoryID: ${gv.second.id} ")
             if (activePlugin.activeBgSource.shouldUploadToNs(gv.first)) {
                 when {
+                    // record is not valid record and we are within first sync, no need to upload
+                    gv.first.id != gv.second.id && gv.second.id <= sp.getLong(R.string.key_ns_glucose_value_new_data_id, 0) -> {
+                        confirmLastGlucoseValueIdIfGreater(gv.second.id)
+                        //lastGvId = -1
+                        aapsLogger.info(LTag.DATABASE, "Ignoring GlucoseValue. Change within first sync ID: ${gv.first.id} HistoryID: ${gv.second.id} ")
+                        tailCall = true
+                    }
+                    // only NsId changed, no need to upload
+                    gv.first.onlyNsIdAdded(gv.second)          -> {
+                        confirmLastGlucoseValueIdIfGreater(gv.second.id)
+                        //lastGvId = -1
+                        aapsLogger.info(LTag.DATABASE, "Ignoring GlucoseValue. Only NS id changed ID: ${gv.first.id} HistoryID: ${gv.second.id} ")
+                        tailCall = true
+                    }
                     // without nsId = create new
                     gv.first.interfaceIDs.nightscoutId == null ->
-                        nsClientPlugin.nsClientService?.dbAdd("entries", gv.first.toJson(true, dateUtil), DataSyncSelector.PairGlucoseValue(gv.first, gv.second), "$startId/$lastDbId")
+                        nsClientPlugin.nsClientService?.dbAdd("entries", gv.first.toJson(true, dateUtil), DataSyncSelector.PairGlucoseValue(gv.first, gv.second.id), "$startId/$lastDbId")
                     // with nsId = update
-                    gv.first.interfaceIDs.nightscoutId != null ->
-                        nsClientPlugin.nsClientService?.dbUpdate("entries", gv.first.interfaceIDs.nightscoutId, gv.first.toJson(false, dateUtil), DataSyncSelector.PairGlucoseValue(gv.first, gv.second), "$startId/$lastDbId")
+                    else ->  //  gv.first.interfaceIDs.nightscoutId != null
+                        nsClientPlugin.nsClientService?.dbUpdate(
+                            "entries",
+                            gv.first.interfaceIDs.nightscoutId,
+                            gv.first.toJson(false, dateUtil),
+                            DataSyncSelector.PairGlucoseValue(gv.first, gv.second.id),
+                            "$startId/$lastDbId"
+                        )
                 }
-                return true
             } else {
-                confirmLastGlucoseValueIdIfGreater(gv.second)
-                lastGvId = -1
-                processChangedGlucoseValuesCompat()
+                confirmLastGlucoseValueIdIfGreater(gv.second.id)
+                //lastGvId = -1
+                tailCall = true
             }
         }
-        return false
+        if (tailCall) {
+            processChangedGlucoseValuesCompat()
+        }
     }
 
     override fun confirmLastTherapyEventIdIfGreater(lastSynced: Long) {
@@ -344,8 +518,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastTeId = -1L
-    @Volatile private var lastTeTime = -1L
+    //private var lastTeId = -1L
+    //private var lastTeTime = -1L
     override fun processChangedTherapyEventsCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastTherapyEventIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -354,18 +528,33 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_therapy_event_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastTeId && dateUtil.now() - lastTeTime < 5000) return false
-        lastTeId = startId
-        lastTeTime = dateUtil.now()
+        //if (startId == lastTeId && dateUtil.now() - lastTeTime < 5000) return false
+        //lastTeId = startId
+        //lastTeTime = dateUtil.now()
+        queueCounter.tesRemaining = lastDbId - startId
         appRepository.getNextSyncElementTherapyEvent(startId).blockingGet()?.let { te ->
             aapsLogger.info(LTag.DATABASE, "Loading TherapyEvents data Start: $startId ID: ${te.first.id} HistoryID: ${te.second} ")
             when {
+                // only NsId changed, no need to upload
+                te.first.onlyNsIdAdded(te.second)          -> {
+                    confirmLastTherapyEventIdIfGreater(te.second.id)
+                    //lastTeId = -1
+                    processChangedTherapyEventsCompat()
+                    aapsLogger.info(LTag.DATABASE, "Ignoring TherapyEvents. Only NS id changed ID: ${te.first.id} HistoryID: ${te.second.id} ")
+                    return false
+                }
                 // without nsId = create new
                 te.first.interfaceIDs.nightscoutId == null ->
-                    nsClientPlugin.nsClientService?.dbAdd("treatments", te.first.toJson(true, dateUtil), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", te.first.toJson(true, dateUtil), DataSyncSelector.PairTherapyEvent(te.first, te.second.id), "$startId/$lastDbId")
                 // nsId = update
                 te.first.interfaceIDs.nightscoutId != null ->
-                    nsClientPlugin.nsClientService?.dbUpdate("treatments", te.first.interfaceIDs.nightscoutId, te.first.toJson(false, dateUtil), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbUpdate(
+                        "treatments",
+                        te.first.interfaceIDs.nightscoutId,
+                        te.first.toJson(false, dateUtil),
+                        DataSyncSelector.PairTherapyEvent(te.first, te.second.id),
+                        "$startId/$lastDbId"
+                    )
             }
             return true
         }
@@ -386,8 +575,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastDsId = -1L
-    @Volatile private var lastDsTime = -1L
+    //private var lastDsId = -1L
+    //private var lastDsTime = -1L
     override fun processChangedDeviceStatusesCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastDeviceStatusIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -396,9 +585,10 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_device_status_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastDsId && dateUtil.now() - lastDsTime < 5000) return false
-        lastDsId = startId
-        lastDsTime = dateUtil.now()
+        //if (startId == lastDsId && dateUtil.now() - lastDsTime < 5000) return false
+        //lastDsId = startId
+        //lastDsTime = dateUtil.now()
+        queueCounter.dssRemaining = lastDbId - startId
         appRepository.getNextSyncElementDeviceStatus(startId).blockingGet()?.let { deviceStatus ->
             aapsLogger.info(LTag.DATABASE, "Loading DeviceStatus data Start: $startId ID: ${deviceStatus.id}")
             when {
@@ -428,10 +618,9 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastTbrId = -1L
-    @Volatile private var lastTbrTime = -1L
+    //private var lastTbrId = -1L
+    //private var lastTbrTime = -1L
     override fun processChangedTemporaryBasalsCompat(): Boolean {
-        val useAbsolute = sp.getBoolean(R.string.key_ns_sync_use_absolute, false)
         val lastDbIdWrapped = appRepository.getLastTemporaryBasalIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
         var startId = sp.getLong(R.string.key_ns_temporary_basal_last_synced_id, 0)
@@ -439,25 +628,53 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_temporary_basal_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastTbrId && dateUtil.now() - lastTbrTime < 5000) return false
-        lastTbrId = startId
-        lastTbrTime = dateUtil.now()
+        //if (startId == lastTbrId && dateUtil.now() - lastTbrTime < 5000) return false
+        //lastTbrId = startId
+        //lastTbrTime = dateUtil.now()
+        queueCounter.tbrsRemaining = lastDbId - startId
         appRepository.getNextSyncElementTemporaryBasal(startId).blockingGet()?.let { tb ->
             aapsLogger.info(LTag.DATABASE, "Loading TemporaryBasal data Start: $startId ID: ${tb.first.id} HistoryID: ${tb.second} ")
             val profile = profileFunction.getProfile(tb.first.timestamp)
             if (profile != null) {
                 when {
+                    // record is not valid record and we are within first sync, no need to upload
+                    tb.first.id != tb.second.id && tb.second.id <= sp.getLong(R.string.key_ns_temporary_basal_new_data_id, 0) -> {
+                        confirmLastTemporaryBasalIdIfGreater(tb.second.id)
+                        //lastTbrId = -1
+                        processChangedTemporaryBasalsCompat()
+                        aapsLogger.info(LTag.DATABASE, "Ignoring TemporaryBasal. Change within first sync ID: ${tb.first.id} HistoryID: ${tb.second.id} ")
+                        return false
+                    }
+                    // only NsId changed, no need to upload
+                    tb.first.onlyNsIdAdded(tb.second)          -> {
+                        confirmLastTemporaryBasalIdIfGreater(tb.second.id)
+                        //lastTbrId = -1
+                        processChangedTemporaryBasalsCompat()
+                        aapsLogger.info(LTag.DATABASE, "Ignoring TemporaryBasal. Only NS id changed ID: ${tb.first.id} HistoryID: ${tb.second.id} ")
+                        return false
+                    }
                     // without nsId = create new
                     tb.first.interfaceIDs.nightscoutId == null ->
-                        nsClientPlugin.nsClientService?.dbAdd("treatments", tb.first.toJson(true, profile, dateUtil, useAbsolute), DataSyncSelector.PairTemporaryBasal(tb.first, tb.second), "$startId/$lastDbId")
+                        nsClientPlugin.nsClientService?.dbAdd(
+                            "treatments",
+                            tb.first.toJson(true, profile, dateUtil),
+                            DataSyncSelector.PairTemporaryBasal(tb.first, tb.second.id),
+                            "$startId/$lastDbId"
+                        )
                     // with nsId = update
                     tb.first.interfaceIDs.nightscoutId != null ->
-                        nsClientPlugin.nsClientService?.dbUpdate("treatments", tb.first.interfaceIDs.nightscoutId, tb.first.toJson(false, profile, dateUtil, useAbsolute), DataSyncSelector.PairTemporaryBasal(tb.first, tb.second), "$startId/$lastDbId")
+                        nsClientPlugin.nsClientService?.dbUpdate(
+                            "treatments",
+                            tb.first.interfaceIDs.nightscoutId,
+                            tb.first.toJson(false, profile, dateUtil),
+                            DataSyncSelector.PairTemporaryBasal(tb.first, tb.second.id),
+                            "$startId/$lastDbId"
+                        )
                 }
                 return true
             } else {
-                confirmLastTemporaryBasalIdIfGreater(tb.second)
-                lastTbrId = -1
+                confirmLastTemporaryBasalIdIfGreater(tb.second.id)
+                //lastTbrId = -1
                 processChangedTemporaryBasalsCompat()
             }
         }
@@ -479,10 +696,9 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastEbId = -1L
-    @Volatile private var lastEbTime = -1L
+    //private var lastEbId = -1L
+    //private var lastEbTime = -1L
     override fun processChangedExtendedBolusesCompat(): Boolean {
-        val useAbsolute = sp.getBoolean(R.string.key_ns_sync_use_absolute, false)
         val lastDbIdWrapped = appRepository.getLastExtendedBolusIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
         var startId = sp.getLong(R.string.key_ns_extended_bolus_last_synced_id, 0)
@@ -490,25 +706,53 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_extended_bolus_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastEbId && dateUtil.now() - lastEbTime < 5000) return false
-        lastEbId = startId
-        lastEbTime = dateUtil.now()
+        //if (startId == lastEbId && dateUtil.now() - lastEbTime < 5000) return false
+        //lastEbId = startId
+        //lastEbTime = dateUtil.now()
+        queueCounter.ebsRemaining = lastDbId - startId
         appRepository.getNextSyncElementExtendedBolus(startId).blockingGet()?.let { eb ->
             aapsLogger.info(LTag.DATABASE, "Loading ExtendedBolus data Start: $startId ID: ${eb.first.id} HistoryID: ${eb.second} ")
             val profile = profileFunction.getProfile(eb.first.timestamp)
             if (profile != null) {
                 when {
+                    // record is not valid record and we are within first sync, no need to upload
+                    eb.first.id != eb.second.id && eb.second.id <= sp.getLong(R.string.key_ns_extended_bolus_new_data_id, 0) -> {
+                        confirmLastExtendedBolusIdIfGreater(eb.second.id)
+                        //lastTbrId = -1
+                        processChangedExtendedBolusesCompat()
+                        aapsLogger.info(LTag.DATABASE, "Ignoring ExtendedBolus. Change within first sync ID: ${eb.first.id} HistoryID: ${eb.second.id} ")
+                        return false
+                    }
+                    // only NsId changed, no need to upload
+                    eb.first.onlyNsIdAdded(eb.second)          -> {
+                        confirmLastExtendedBolusIdIfGreater(eb.second.id)
+                        //lastEbId = -1
+                        processChangedExtendedBolusesCompat()
+                        aapsLogger.info(LTag.DATABASE, "Ignoring ExtendedBolus. Only NS id changed ID: ${eb.first.id} HistoryID: ${eb.second.id} ")
+                        return false
+                    }
                     // without nsId = create new
                     eb.first.interfaceIDs.nightscoutId == null ->
-                        nsClientPlugin.nsClientService?.dbAdd("treatments", eb.first.toJson(true, profile, dateUtil, useAbsolute), DataSyncSelector.PairExtendedBolus(eb.first, eb.second), "$startId/$lastDbId")
+                        nsClientPlugin.nsClientService?.dbAdd(
+                            "treatments",
+                            eb.first.toJson(true, profile, dateUtil),
+                            DataSyncSelector.PairExtendedBolus(eb.first, eb.second.id),
+                            "$startId/$lastDbId"
+                        )
                     // with nsId = update
                     eb.first.interfaceIDs.nightscoutId != null ->
-                        nsClientPlugin.nsClientService?.dbUpdate("treatments", eb.first.interfaceIDs.nightscoutId, eb.first.toJson(false, profile, dateUtil, useAbsolute), DataSyncSelector.PairExtendedBolus(eb.first, eb.second), "$startId/$lastDbId")
+                        nsClientPlugin.nsClientService?.dbUpdate(
+                            "treatments",
+                            eb.first.interfaceIDs.nightscoutId,
+                            eb.first.toJson(false, profile, dateUtil),
+                            DataSyncSelector.PairExtendedBolus(eb.first, eb.second.id),
+                            "$startId/$lastDbId"
+                        )
                 }
                 return true
             } else {
-                confirmLastExtendedBolusIdIfGreater(eb.second)
-                lastEbId = -1
+                confirmLastExtendedBolusIdIfGreater(eb.second.id)
+                //lastEbId = -1
                 processChangedExtendedBolusesCompat()
             }
         }
@@ -529,8 +773,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastPsId = -1L
-    @Volatile private var lastPsTime = -1L
+    //private var lastPsId = -1L
+    //private var lastPsTime = -1L
     override fun processChangedProfileSwitchesCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastProfileSwitchIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -539,18 +783,33 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_profile_switch_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastPsId && dateUtil.now() - lastPsTime < 5000) return false
-        lastPsId = startId
-        lastPsTime = dateUtil.now()
+        //if (startId == lastPsId && dateUtil.now() - lastPsTime < 5000) return false
+        //lastPsId = startId
+        //lastPsTime = dateUtil.now()
+        queueCounter.pssRemaining = lastDbId - startId
         appRepository.getNextSyncElementProfileSwitch(startId).blockingGet()?.let { ps ->
             aapsLogger.info(LTag.DATABASE, "Loading ProfileSwitch data Start: $startId ID: ${ps.first.id} HistoryID: ${ps.second} ")
             when {
+                // only NsId changed, no need to upload
+                ps.first.onlyNsIdAdded(ps.second)          -> {
+                    confirmLastProfileSwitchIdIfGreater(ps.second.id)
+                    //lastPsId = -1
+                    processChangedProfileSwitchesCompat()
+                    aapsLogger.info(LTag.DATABASE, "Ignoring ProfileSwitch. Only NS id changed ID: ${ps.first.id} HistoryID: ${ps.second.id} ")
+                    return false
+                }
                 // without nsId = create new
                 ps.first.interfaceIDs.nightscoutId == null ->
-                    nsClientPlugin.nsClientService?.dbAdd("treatments", ps.first.toJson(true, dateUtil), DataSyncSelector.PairProfileSwitch(ps.first, ps.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", ps.first.toJson(true, dateUtil), DataSyncSelector.PairProfileSwitch(ps.first, ps.second.id), "$startId/$lastDbId")
                 // with nsId = update
                 ps.first.interfaceIDs.nightscoutId != null ->
-                    nsClientPlugin.nsClientService?.dbUpdate("treatments", ps.first.interfaceIDs.nightscoutId, ps.first.toJson(false, dateUtil), DataSyncSelector.PairProfileSwitch(ps.first, ps.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbUpdate(
+                        "treatments",
+                        ps.first.interfaceIDs.nightscoutId,
+                        ps.first.toJson(false, dateUtil),
+                        DataSyncSelector.PairProfileSwitch(ps.first, ps.second.id),
+                        "$startId/$lastDbId"
+                    )
             }
             return true
         }
@@ -571,8 +830,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastEpsId = -1L
-    @Volatile private var lastEpsTime = -1L
+    //private var lastEpsId = -1L
+    //private var lastEpsTime = -1L
     override fun processChangedEffectiveProfileSwitchesCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastEffectiveProfileSwitchIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -581,18 +840,33 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastEpsId && dateUtil.now() - lastEpsTime < 5000) return false
-        lastEpsId = startId
-        lastEpsTime = dateUtil.now()
+        //if (startId == lastEpsId && dateUtil.now() - lastEpsTime < 5000) return false
+        //lastEpsId = startId
+        //lastEpsTime = dateUtil.now()
+        queueCounter.epssRemaining = lastDbId - startId
         appRepository.getNextSyncElementEffectiveProfileSwitch(startId).blockingGet()?.let { ps ->
             aapsLogger.info(LTag.DATABASE, "Loading EffectiveProfileSwitch data Start: $startId ID: ${ps.first.id} HistoryID: ${ps.second} ")
             when {
+                // only NsId changed, no need to upload
+                ps.first.onlyNsIdAdded(ps.second)          -> {
+                    confirmLastEffectiveProfileSwitchIdIfGreater(ps.second.id)
+                    //lastEpsId = -1
+                    processChangedEffectiveProfileSwitchesCompat()
+                    aapsLogger.info(LTag.DATABASE, "Ignoring EffectiveProfileSwitch. Only NS id changed ID: ${ps.first.id} HistoryID: ${ps.second.id} ")
+                    return false
+                }
                 // without nsId = create new
                 ps.first.interfaceIDs.nightscoutId == null ->
-                    nsClientPlugin.nsClientService?.dbAdd("treatments", ps.first.toJson(true, dateUtil), DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", ps.first.toJson(true, dateUtil), DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second.id), "$startId/$lastDbId")
                 // with nsId = update
                 ps.first.interfaceIDs.nightscoutId != null ->
-                    nsClientPlugin.nsClientService?.dbUpdate("treatments", ps.first.interfaceIDs.nightscoutId, ps.first.toJson(false, dateUtil), DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbUpdate(
+                        "treatments",
+                        ps.first.interfaceIDs.nightscoutId,
+                        ps.first.toJson(false, dateUtil),
+                        DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second.id),
+                        "$startId/$lastDbId"
+                    )
             }
             return true
         }
@@ -614,8 +888,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    @Volatile private var lastOeId = -1L
-    @Volatile private var lastOeTime = -1L
+    //private var lastOeId = -1L
+    //private var lastOeTime = -1L
     override fun processChangedOfflineEventsCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastOfflineEventIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -624,18 +898,33 @@ class DataSyncSelectorImplementation @Inject constructor(
             sp.putLong(R.string.key_ns_offline_event_last_synced_id, 0)
             startId = 0
         }
-        if (startId == lastOeId && dateUtil.now() - lastOeTime < 5000) return false
-        lastOeId = startId
-        lastOeTime = dateUtil.now()
+        //if (startId == lastOeId && dateUtil.now() - lastOeTime < 5000) return false
+        //lastOeId = startId
+        //lastOeTime = dateUtil.now()
+        queueCounter.oesRemaining = lastDbId - startId
         appRepository.getNextSyncElementOfflineEvent(startId).blockingGet()?.let { oe ->
             aapsLogger.info(LTag.DATABASE, "Loading OfflineEvent data Start: $startId ID: ${oe.first.id} HistoryID: ${oe.second} ")
             when {
+                // only NsId changed, no need to upload
+                oe.first.onlyNsIdAdded(oe.second)          -> {
+                    confirmLastOfflineEventIdIfGreater(oe.second.id)
+                    //lastOeId = -1
+                    processChangedOfflineEventsCompat()
+                    aapsLogger.info(LTag.DATABASE, "Ignoring OfflineEvent. Only NS id changed ID: ${oe.first.id} HistoryID: ${oe.second.id} ")
+                    return false
+                }
                 // without nsId = create new
                 oe.first.interfaceIDs.nightscoutId == null ->
-                    nsClientPlugin.nsClientService?.dbAdd("treatments", oe.first.toJson(true, dateUtil), DataSyncSelector.PairOfflineEvent(oe.first, oe.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", oe.first.toJson(true, dateUtil), DataSyncSelector.PairOfflineEvent(oe.first, oe.second.id), "$startId/$lastDbId")
                 // existing with nsId = update
                 oe.first.interfaceIDs.nightscoutId != null ->
-                    nsClientPlugin.nsClientService?.dbUpdate("treatments", oe.first.interfaceIDs.nightscoutId, oe.first.toJson(false, dateUtil), DataSyncSelector.PairOfflineEvent(oe.first, oe.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbUpdate(
+                        "treatments",
+                        oe.first.interfaceIDs.nightscoutId,
+                        oe.first.toJson(false, dateUtil),
+                        DataSyncSelector.PairOfflineEvent(oe.first, oe.second.id),
+                        "$startId/$lastDbId"
+                    )
             }
             return true
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddAckWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddAckWorker.kt
index 68b888f764d..1bfbd3e4e2a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddAckWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddAckWorker.kt
@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.general.nsclient
 
 import android.content.Context
+import android.os.SystemClock
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.DeviceStatus
 import info.nightscout.androidaps.database.transactions.*
@@ -12,11 +14,12 @@ import info.nightscout.androidaps.interfaces.DataSyncSelector
 import info.nightscout.androidaps.interfaces.DataSyncSelector.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.acks.NSAddAck
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog
 import info.nightscout.androidaps.receivers.DataWorker
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
 
 class NSClientAddAckWorker(
@@ -27,9 +30,10 @@ class NSClientAddAckWorker(
     @Inject lateinit var dataWorker: DataWorker
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var repository: AppRepository
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var dataSyncSelector: DataSyncSelector
     @Inject lateinit var aapsSchedulers: AapsSchedulers
+    @Inject lateinit var sp: SP
 
     override fun doWork(): Result {
         var ret = Result.success()
@@ -37,6 +41,8 @@ class NSClientAddAckWorker(
         val ack = dataWorker.pickupObject(inputData.getLong(DataWorker.STORE_KEY, -1)) as NSAddAck?
             ?: return Result.failure(workDataOf("Error" to "missing input data"))
 
+        if (sp.getBoolean(R.string.key_ns_sync_slow, false)) SystemClock.sleep(1000)
+
         when (ack.originalObject) {
             is PairTemporaryTarget       -> {
                 val pair = ack.originalObject
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
index 3bd4bf76ca7..04845c27b5d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.receivers.DataWorker
@@ -45,7 +45,7 @@ class NSClientAddUpdateWorker(
     @Inject lateinit var config: Config
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var uel: UserEntryLogger
 
     override fun doWork(): Result {
@@ -74,7 +74,7 @@ class NSClientAddUpdateWorker(
             if (insulin > 0) {
                 if (sp.getBoolean(R.string.key_ns_receive_insulin, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
                     bolusFromJson(json)?.let { bolus ->
-                        repository.runTransactionForResult(SyncNsBolusTransaction(bolus, invalidateByNsOnly = false))
+                        repository.runTransactionForResult(SyncNsBolusTransaction(bolus))
                             .doOnError {
                                 aapsLogger.error(LTag.DATABASE, "Error while saving bolus", it)
                                 ret = Result.failure(workDataOf("Error" to it.toString()))
@@ -105,7 +105,7 @@ class NSClientAddUpdateWorker(
             if (carbs > 0) {
                 if (sp.getBoolean(R.string.key_ns_receive_carbs, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
                     carbsFromJson(json)?.let { carb ->
-                        repository.runTransactionForResult(SyncNsCarbsTransaction(carb, invalidateByNsOnly = false))
+                        repository.runTransactionForResult(SyncNsCarbsTransaction(carb))
                             .doOnError {
                                 aapsLogger.error(LTag.DATABASE, "Error while saving carbs", it)
                                 ret = Result.failure(workDataOf("Error" to it.toString()))
@@ -145,7 +145,7 @@ class NSClientAddUpdateWorker(
                 eventType == TherapyEvent.Type.TEMPORARY_TARGET.text        ->
                     if (sp.getBoolean(R.string.key_ns_receive_temp_target, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
                         temporaryTargetFromJson(json)?.let { temporaryTarget ->
-                            repository.runTransactionForResult(SyncNsTemporaryTargetTransaction(temporaryTarget, invalidateByNsOnly = false))
+                            repository.runTransactionForResult(SyncNsTemporaryTargetTransaction(temporaryTarget))
                                 .doOnError {
                                     aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
                                     ret = Result.failure(workDataOf("Error" to it.toString()))
@@ -182,13 +182,16 @@ class NSClientAddUpdateWorker(
                                     result.updatedNsId.forEach {
                                         aapsLogger.debug(LTag.DATABASE, "Updated nsId TemporaryTarget $it")
                                     }
+                                    result.updatedDuration.forEach {
+                                        aapsLogger.debug(LTag.DATABASE, "Updated duration TemporaryTarget $it")
+                                    }
                                 }
                         } ?: aapsLogger.error("Error parsing TT json $json")
                     }
                 eventType == TherapyEvent.Type.NOTE.text  && json.isEffectiveProfileSwitch()        -> // replace this by new Type when available in NS
                     if (sp.getBoolean(R.string.key_ns_receive_profile_switch, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
                         effectiveProfileSwitchFromJson(json, dateUtil)?.let { effectiveProfileSwitch ->
-                            repository.runTransactionForResult(SyncNsEffectiveProfileSwitchTransaction(effectiveProfileSwitch, invalidateByNsOnly = false))
+                            repository.runTransactionForResult(SyncNsEffectiveProfileSwitchTransaction(effectiveProfileSwitch))
                                 .doOnError {
                                     aapsLogger.error(LTag.DATABASE, "Error while saving EffectiveProfileSwitch", it)
                                     ret = Result.failure(workDataOf("Error" to it.toString()))
@@ -211,6 +214,34 @@ class NSClientAddUpdateWorker(
                                 }
                         } ?: aapsLogger.error("Error parsing EffectiveProfileSwitch json $json")
                     }
+                eventType == TherapyEvent.Type.BOLUS_WIZARD.text             ->
+                    if (config.NSCLIENT) {
+                        bolusCalculatorResultFromJson(json)?.let { bolusCalculatorResult ->
+                            repository.runTransactionForResult(SyncNsBolusCalculatorResultTransaction(bolusCalculatorResult))
+                                .doOnError {
+                                    aapsLogger.error(LTag.DATABASE, "Error while saving BolusCalculatorResult", it)
+                                    ret = Result.failure(workDataOf("Error" to it.toString()))
+                                }
+                                .blockingGet()
+                                .also { result ->
+                                    result.inserted.forEach {
+                                        uel.log(Action.BOLUS_CALCULATOR_RESULT, Sources.NSClient,
+                                                ValueWithUnit.Timestamp(it.timestamp),
+                                        )
+                                        aapsLogger.debug(LTag.DATABASE, "Inserted BolusCalculatorResult $it")
+                                    }
+                                    result.invalidated.forEach {
+                                        uel.log(Action.BOLUS_CALCULATOR_RESULT_REMOVED, Sources.NSClient,
+                                                ValueWithUnit.Timestamp(it.timestamp),
+                                        )
+                                        aapsLogger.debug(LTag.DATABASE, "Invalidated BolusCalculatorResult $it")
+                                    }
+                                    result.updatedNsId.forEach {
+                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId BolusCalculatorResult $it")
+                                    }
+                                }
+                        } ?: aapsLogger.error("Error parsing BolusCalculatorResult json $json")
+                    }
                 eventType == TherapyEvent.Type.CANNULA_CHANGE.text ||
                     eventType == TherapyEvent.Type.INSULIN_CHANGE.text ||
                     eventType == TherapyEvent.Type.SENSOR_CHANGE.text ||
@@ -223,7 +254,7 @@ class NSClientAddUpdateWorker(
                     eventType == TherapyEvent.Type.PUMP_BATTERY_CHANGE.text ->
                     if (sp.getBoolean(R.string.key_ns_receive_therapy_events, false) || config.NSCLIENT) {
                         therapyEventFromJson(json)?.let { therapyEvent ->
-                            repository.runTransactionForResult(SyncNsTherapyEventTransaction(therapyEvent, invalidateByNsOnly = false))
+                            repository.runTransactionForResult(SyncNsTherapyEventTransaction(therapyEvent))
                                 .doOnError {
                                     aapsLogger.error(LTag.DATABASE, "Error while saving therapy event", it)
                                     ret = Result.failure(workDataOf("Error" to it.toString()))
@@ -254,13 +285,16 @@ class NSClientAddUpdateWorker(
                                     result.updatedNsId.forEach {
                                         aapsLogger.debug(LTag.DATABASE, "Updated nsId TherapyEvent $it")
                                     }
+                                    result.updatedDuration.forEach {
+                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId TherapyEvent $it")
+                                    }
                                 }
                         } ?: aapsLogger.error("Error parsing TherapyEvent json $json")
                     }
                 eventType == TherapyEvent.Type.COMBO_BOLUS.text             ->
                     if (config.NSCLIENT) {
                         extendedBolusFromJson(json)?.let { extendedBolus ->
-                            repository.runTransactionForResult(SyncNsExtendedBolusTransaction(extendedBolus, invalidateByNsOnly = false))
+                            repository.runTransactionForResult(SyncNsExtendedBolusTransaction(extendedBolus))
                                 .doOnError {
                                     aapsLogger.error(LTag.DATABASE, "Error while saving extended bolus", it)
                                     ret = Result.failure(workDataOf("Error" to it.toString()))
@@ -297,13 +331,16 @@ class NSClientAddUpdateWorker(
                                     result.updatedNsId.forEach {
                                         aapsLogger.debug(LTag.DATABASE, "Updated nsId ExtendedBolus $it")
                                     }
+                                    result.updatedDuration.forEach {
+                                        aapsLogger.debug(LTag.DATABASE, "Updated duration ExtendedBolus $it")
+                                    }
                                 }
                         } ?: aapsLogger.error("Error parsing ExtendedBolus json $json")
                     }
                 eventType == TherapyEvent.Type.TEMPORARY_BASAL.text         ->
                     if (config.NSCLIENT) {
                         temporaryBasalFromJson(json)?.let { temporaryBasal ->
-                            repository.runTransactionForResult(SyncNsTemporaryBasalTransaction(temporaryBasal, invalidateByNsOnly = false))
+                            repository.runTransactionForResult(SyncNsTemporaryBasalTransaction(temporaryBasal))
                                 .doOnError {
                                     aapsLogger.error(LTag.DATABASE, "Error while saving temporary basal", it)
                                     ret = Result.failure(workDataOf("Error" to it.toString()))
@@ -337,13 +374,16 @@ class NSClientAddUpdateWorker(
                                     result.updatedNsId.forEach {
                                         aapsLogger.debug(LTag.DATABASE, "Updated nsId TemporaryBasal $it")
                                     }
+                                    result.updatedDuration.forEach {
+                                        aapsLogger.debug(LTag.DATABASE, "Updated duration TemporaryBasal $it")
+                                    }
                                 }
                         } ?: aapsLogger.error("Error parsing TemporaryBasal json $json")
                     }
                 eventType == TherapyEvent.Type.PROFILE_SWITCH.text          ->
                     if (sp.getBoolean(R.string.key_ns_receive_profile_switch, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
                         profileSwitchFromJson(json, dateUtil, activePlugin)?.let { profileSwitch ->
-                            repository.runTransactionForResult(SyncNsProfileSwitchTransaction(profileSwitch, invalidateByNsOnly = false))
+                            repository.runTransactionForResult(SyncNsProfileSwitchTransaction(profileSwitch))
                                 .doOnError {
                                     aapsLogger.error(LTag.DATABASE, "Error while saving ProfileSwitch", it)
                                     ret = Result.failure(workDataOf("Error" to it.toString()))
@@ -369,7 +409,7 @@ class NSClientAddUpdateWorker(
                 eventType == TherapyEvent.Type.APS_OFFLINE.text          ->
                     if (sp.getBoolean(R.string.key_ns_receive_offline_event, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
                         offlineEventFromJson(json)?.let { offlineEvent ->
-                            repository.runTransactionForResult(SyncNsOfflineEventTransaction(offlineEvent, invalidateByNsOnly = false))
+                            repository.runTransactionForResult(SyncNsOfflineEventTransaction(offlineEvent))
                                 .doOnError {
                                     aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
                                     ret = Result.failure(workDataOf("Error" to it.toString()))
@@ -400,6 +440,9 @@ class NSClientAddUpdateWorker(
                                     result.updatedNsId.forEach {
                                         aapsLogger.debug(LTag.DATABASE, "Updated nsId OfflineEvent $it")
                                     }
+                                    result.updatedDuration.forEach {
+                                        aapsLogger.debug(LTag.DATABASE, "Updated duration OfflineEvent $it")
+                                    }
                                 }
                         } ?: aapsLogger.error("Error parsing OfflineEvent json $json")
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.kt
index 80b508766d5..c63d153c7b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.NsClientFragmentBinding
 import info.nightscout.androidaps.interfaces.DataSyncSelector
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -28,8 +28,8 @@ class NSClientFragment : DaggerFragment() {
 
     @Inject lateinit var nsClientPlugin: NSClientPlugin
     @Inject lateinit var sp: SP
-    @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rh: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var dataSyncSelector: DataSyncSelector
@@ -70,7 +70,8 @@ class NSClientFragment : DaggerFragment() {
         binding.deliverNow.paintFlags = binding.deliverNow.paintFlags or Paint.UNDERLINE_TEXT_FLAG
         binding.fullSync.setOnClickListener {
             context?.let { context ->
-                OKDialog.showConfirmation(context, resourceHelper.gs(R.string.nsclientinternal), resourceHelper.gs(R.string.full_sync), Runnable {
+                OKDialog.showConfirmation(context, rh.gs(R.string.nsclientinternal),
+                                          rh.gs(R.string.full_sync_comment), Runnable {
                     dataSyncSelector.resetToNextFullSync()
                 })
             }
@@ -101,5 +102,6 @@ class NSClientFragment : DaggerFragment() {
         if (nsClientPlugin.autoscroll) binding.logScrollview.fullScroll(ScrollView.FOCUS_DOWN)
         binding.url.text = nsClientPlugin.url()
         binding.status.text = nsClientPlugin.status
+        binding.queue.text = dataSyncSelector.queueSize().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt
index b7f1d1540c9..0d4a16f3354 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt
@@ -41,7 +41,7 @@ class NSClientMbgWorker(
         for (i in 0 until mbgArray.length()) {
             val nsMbg = NSMbg(mbgArray.getJSONObject(i))
             if (!nsMbg.isValid()) continue
-            repository.runTransactionForResult(SyncNsTherapyEventTransaction(therapyEventFromNsMbg(nsMbg), false))
+            repository.runTransactionForResult(SyncNsTherapyEventTransaction(therapyEventFromNsMbg(nsMbg)))
                 .doOnError {
                     aapsLogger.error("Error while saving therapy event", it)
                     ret = Result.failure(workDataOf("Error" to it.toString()))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt
index 54bc13f0bdf..e7255caf3cd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt
@@ -23,7 +23,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.data.AlarmAck
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog
@@ -48,8 +48,8 @@ class NSClientPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     private val aapsSchedulers: AapsSchedulers,
-    private val rxBus: RxBusWrapper,
-    resourceHelper: ResourceHelper,
+    private val rxBus: RxBus,
+    rh: ResourceHelper,
     private val context: Context,
     private val fabricPrivacy: FabricPrivacy,
     private val sp: SP,
@@ -64,7 +64,7 @@ class NSClientPlugin @Inject constructor(
     .shortName(R.string.nsclientinternal_shortname)
     .preferencesId(R.xml.pref_nsclientinternal)
     .description(R.string.description_ns_client),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ) {
 
     private val disposable = CompositeDisposable()
@@ -100,7 +100,7 @@ class NSClientPlugin @Inject constructor(
             .toObservable(EventNSClientStatus::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ event: EventNSClientStatus ->
-                status = event.getStatus(resourceHelper)
+                status = event.getStatus(rh)
                 rxBus.send(EventNSClientUpdateGUI())
             }, fabricPrivacy::logException)
         )
@@ -148,17 +148,17 @@ class NSClientPlugin @Inject constructor(
     override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
         super.preprocessPreferences(preferenceFragment)
         if (config.NSCLIENT) {
-            preferenceFragment.findPreference<PreferenceScreen>(resourceHelper.gs(R.string.ns_sync_options))?.isVisible = false
+            preferenceFragment.findPreference<PreferenceScreen>(rh.gs(R.string.ns_sync_options))?.isVisible = false
 
-            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_create_announcements_from_errors))?.isVisible = false
-            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_create_announcements_from_carbs_req))?.isVisible = false
-            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_sync_use_absolute))?.isVisible = false
+            preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_ns_create_announcements_from_errors))?.isVisible = false
+            preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_ns_create_announcements_from_carbs_req))?.isVisible = false
+//            preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_ns_sync_use_absolute))?.isVisible = false
         } else {
             // APS or pumpControl mode
-            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_receive_profile_switch))?.isVisible = buildHelper.isEngineeringMode()
-            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_receive_insulin))?.isVisible = buildHelper.isEngineeringMode()
-            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_receive_carbs))?.isVisible = buildHelper.isEngineeringMode()
-            preferenceFragment.findPreference<SwitchPreference>(resourceHelper.gs(R.string.key_ns_receive_temp_target))?.isVisible = buildHelper.isEngineeringMode()
+            preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_ns_receive_profile_switch))?.isVisible = buildHelper.isEngineeringMode()
+            preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_ns_receive_insulin))?.isVisible = buildHelper.isEngineeringMode()
+            preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_ns_receive_carbs))?.isVisible = buildHelper.isEngineeringMode()
+            preferenceFragment.findPreference<SwitchPreference>(rh.gs(R.string.key_ns_receive_temp_target))?.isVisible = buildHelper.isEngineeringMode()
         }
     }
 
@@ -217,7 +217,7 @@ class NSClientPlugin @Inject constructor(
     fun pause(newState: Boolean) {
         sp.putBoolean(R.string.key_nsclientinternal_paused, newState)
         paused = newState
-        rxBus.send(EventPreferenceChange(resourceHelper, R.string.key_nsclientinternal_paused))
+        rxBus.send(EventPreferenceChange(rh, R.string.key_nsclientinternal_paused))
     }
 
     fun url(): String = nsClientService?.nsURL ?: ""
@@ -225,7 +225,7 @@ class NSClientPlugin @Inject constructor(
 
     fun handleClearAlarm(originalAlarm: NSAlarm, silenceTimeInMilliseconds: Long) {
         if (!isEnabled(PluginType.GENERAL)) return
-        if (!sp.getBoolean(R.string.key_ns_upload, false)) {
+        if (!sp.getBoolean(R.string.key_ns_upload, true)) {
             aapsLogger.debug(LTag.NSCLIENT, "Upload disabled. Message dropped")
             return
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
deleted file mode 100644
index ee8dac6c47a..00000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
+++ /dev/null
@@ -1,182 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient
-
-import android.content.Context
-import androidx.work.Worker
-import androidx.work.WorkerParameters
-import androidx.work.workDataOf
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.UserEntry.Action
-import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.*
-import info.nightscout.androidaps.extensions.*
-import info.nightscout.androidaps.interfaces.Config
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.receivers.DataWorker
-import info.nightscout.androidaps.utils.JsonHelper
-import info.nightscout.androidaps.utils.buildHelper.BuildHelper
-import info.nightscout.androidaps.utils.sharedPreferences.SP
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-// This will not be needed fpr NS v3
-// Now NS provides on _id of removed records
-
-class NSClientRemoveWorker(
-    context: Context,
-    params: WorkerParameters) : Worker(context, params) {
-
-    @Inject lateinit var nsClientPlugin: NSClientPlugin
-    @Inject lateinit var dataWorker: DataWorker
-    @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var buildHelper: BuildHelper
-    @Inject lateinit var sp: SP
-    @Inject lateinit var config: Config
-    @Inject lateinit var repository: AppRepository
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var uel: UserEntryLogger
-
-    override fun doWork(): Result {
-        // Do not accept removed data over WS. Only invalidated trough NSClient
-        @Suppress("ConstantConditionIf")
-        if (true) return Result.success()
-
-        var ret = Result.success()
-
-        val treatments = dataWorker.pickupJSONArray(inputData.getLong(DataWorker.STORE_KEY, -1))
-            ?: return Result.failure(workDataOf("Error" to "missing input data"))
-
-        for (i in 0 until treatments.length()) {
-            val json = treatments.getJSONObject(i)
-            val nsId = JsonHelper.safeGetString(json, "_id") ?: continue
-
-            // room  Temporary target
-            val temporaryTarget = temporaryTargetFromNsIdForInvalidating(nsId)
-            repository.runTransactionForResult(SyncNsTemporaryTargetTransaction(temporaryTarget, invalidateByNsOnly = true))
-                .doOnError {
-                    aapsLogger.error(LTag.DATABASE, "Error while invalidating temporary target", it)
-                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                }
-                .blockingGet()
-                .also { result ->
-                    result.invalidated.forEach { tt ->
-                        uel.log(
-                            Action.TT_REMOVED, Sources.NSClient,
-                            ValueWithUnit.TherapyEventTTReason(tt.reason),
-                            ValueWithUnit.Mgdl(tt.lowTarget),
-                            ValueWithUnit.Mgdl(tt.highTarget).takeIf { tt.lowTarget != tt.highTarget },
-                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(tt.duration).toInt()).takeIf { tt.duration != 0L }
-                        )
-                    }
-                }
-
-            // room  Therapy Event
-            val therapyEvent = therapyEventFromNsIdForInvalidating(nsId)
-            repository.runTransactionForResult(SyncNsTherapyEventTransaction(therapyEvent, invalidateByNsOnly = true))
-                .doOnError {
-                    aapsLogger.error(LTag.DATABASE, "Error while invalidating therapy event", it)
-                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                }
-                .blockingGet()
-                .also { result ->
-                    result.invalidated.forEach {
-                        uel.log(Action.CAREPORTAL_REMOVED, Sources.NSClient,
-                            (it.note ?: ""),
-                            ValueWithUnit.Timestamp(it.timestamp),
-                            ValueWithUnit.TherapyEventType(it.type))
-                    }
-                }
-
-            // room  Bolus
-            val bolus = bolusFromNsIdForInvalidating(nsId)
-            repository.runTransactionForResult(SyncNsBolusTransaction(bolus, invalidateByNsOnly = true))
-                .doOnError {
-                    aapsLogger.error(LTag.DATABASE, "Error while invalidating bolus", it)
-                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                }
-                .blockingGet()
-                .also { result ->
-                    result.invalidated.forEach {
-                        uel.log(Action.CAREPORTAL_REMOVED, Sources.NSClient,
-                            ValueWithUnit.Timestamp(it.timestamp),
-                            ValueWithUnit.Insulin(it.amount))
-                    }
-                }
-
-            // room  Carbs
-            val carbs = carbsFromNsIdForInvalidating(nsId)
-            repository.runTransactionForResult(SyncNsCarbsTransaction(carbs, invalidateByNsOnly = true))
-                .doOnError {
-                    aapsLogger.error(LTag.DATABASE, "Error while invalidating carbs", it)
-                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                }
-                .blockingGet()
-                .also { result ->
-                    result.invalidated.forEach {
-                        uel.log(Action.CAREPORTAL_REMOVED, Sources.NSClient,
-                            ValueWithUnit.Timestamp(it.timestamp),
-                            ValueWithUnit.Gram(it.amount.toInt()))
-                    }
-                }
-
-            // room  TemporaryBasal
-            val temporaryBasal = temporaryBasalFromNsIdForInvalidating(nsId)
-            repository.runTransactionForResult(SyncNsTemporaryBasalTransaction(temporaryBasal, invalidateByNsOnly = true))
-                .doOnError {
-                    aapsLogger.error(LTag.DATABASE, "Error while invalidating temporary basal", it)
-                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                }
-                .blockingGet()
-                .also { result ->
-                    result.invalidated.forEach {
-                        uel.log(
-                            Action.CAREPORTAL_REMOVED, Sources.NSClient,
-                            ValueWithUnit.Timestamp(it.timestamp),
-                            ValueWithUnit.UnitPerHour(it.rate))
-                    }
-                }
-            // room  ExtendedBolus
-            val extendedBolus = extendedBolusFromNsIdForInvalidating(nsId)
-            repository.runTransactionForResult(SyncNsExtendedBolusTransaction(extendedBolus, invalidateByNsOnly = true))
-                .doOnError {
-                    aapsLogger.error(LTag.DATABASE, "Error while invalidating extended bolus", it)
-                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                }
-                .blockingGet()
-                .also { result ->
-                    result.invalidated.forEach {
-                        uel.log(
-                            Action.CAREPORTAL_REMOVED, Sources.NSClient,
-                            ValueWithUnit.Timestamp(it.timestamp),
-                            ValueWithUnit.UnitPerHour(it.rate))
-                    }
-                }
-
-            // room  ProfileSwitch
-            repository.runTransactionForResult(InvalidateNsIdProfileSwitchTransaction(nsId))
-                .doOnError {
-                    aapsLogger.error(LTag.DATABASE, "Error while invalidating ProfileSwitch", it)
-                    ret = Result.failure(workDataOf("Error" to it.toString()))
-                }
-                .blockingGet()
-                .also { result ->
-                    result.invalidated.forEach {
-                        uel.log(
-                            Action.CAREPORTAL_REMOVED, Sources.NSClient,
-                            ValueWithUnit.Timestamp(it.timestamp))
-                    }
-                }
-        }
-
-        return ret
-    }
-
-    init {
-        (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientUpdateRemoveAckWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientUpdateRemoveAckWorker.kt
index 8b7aeddc9a7..8a2fc859366 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientUpdateRemoveAckWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientUpdateRemoveAckWorker.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.interfaces.DataSyncSelector
 import info.nightscout.androidaps.interfaces.DataSyncSelector.*
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.acks.NSUpdateAck
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog
 import info.nightscout.androidaps.receivers.DataWorker
@@ -24,7 +24,7 @@ class NSClientUpdateRemoveAckWorker(
     @Inject lateinit var dataWorker: DataWorker
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var repository: AppRepository
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var dataSyncSelector: DataSyncSelector
     @Inject lateinit var aapsSchedulers: AapsSchedulers
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.kt
index fa67b25cda6..dadb14687c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.kt
@@ -4,7 +4,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventChargingState
 import info.nightscout.androidaps.events.EventNetworkChange
 import info.nightscout.androidaps.events.EventPreferenceChange
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -13,8 +13,8 @@ import javax.inject.Singleton
 
 @Singleton
 class NsClientReceiverDelegate @Inject constructor(
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
+    private val rxBus: RxBus,
+    private val rh: ResourceHelper,
     private val sp: SP,
     private val receiverStatusStore: ReceiverStatusStore
 ) {
@@ -28,12 +28,12 @@ class NsClientReceiverDelegate @Inject constructor(
     }
 
     fun onStatusEvent(ev: EventPreferenceChange) {
-        if (ev.isChanged(resourceHelper, R.string.key_ns_wifionly) ||
-            ev.isChanged(resourceHelper, R.string.key_ns_wifi_ssids) ||
-            ev.isChanged(resourceHelper, R.string.key_ns_allowroaming)) {
+        if (ev.isChanged(rh, R.string.key_ns_wifionly) ||
+            ev.isChanged(rh, R.string.key_ns_wifi_ssids) ||
+            ev.isChanged(rh, R.string.key_ns_allowroaming)) {
             receiverStatusStore.updateNetworkStatus()
             onStatusEvent(receiverStatusStore.lastNetworkEvent)
-        } else if (ev.isChanged(resourceHelper, R.string.key_ns_chargingonly)) {
+        } else if (ev.isChanged(rh, R.string.key_ns_chargingonly)) {
             receiverStatusStore.broadcastChargingState()
         }
     }
@@ -58,7 +58,7 @@ class NsClientReceiverDelegate @Inject constructor(
         val newAllowedState = allowedChargingState && allowedNetworkState
         if (newAllowedState != allowed) {
             allowed = newAllowedState
-            rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.key_nsclientinternal_paused)))
+            rxBus.send(EventPreferenceChange(rh.gs(R.string.key_nsclientinternal_paused)))
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.kt
index 78bded1d0dd..41dd35845a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.acks
 import info.nightscout.androidaps.events.Event
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import io.socket.client.Ack
 import org.json.JSONArray
@@ -11,7 +11,7 @@ import org.json.JSONObject
 
 class NSAddAck(
     private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     val originalObject: Any? = null
 ) : Event(), Ack {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.java
deleted file mode 100644
index ea47305be47..00000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.acks;
-
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.events.Event;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import io.socket.client.Ack;
-
-public class NSAuthAck extends Event implements Ack {
-
-    private final RxBusWrapper rxBus;
-
-    public boolean read = false;
-    public boolean write = false;
-    public boolean write_treatment = false;
-
-    public NSAuthAck(RxBusWrapper rxBus) {
-        this.rxBus = rxBus;
-    }
-
-    public void call(Object... args) {
-        JSONObject response = (JSONObject) args[0];
-        read = response.optBoolean("read");
-        write = response.optBoolean("write");
-        write_treatment = response.optBoolean("write_treatment");
-        rxBus.send(this);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.kt
new file mode 100644
index 00000000000..72c6d5bc240
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.general.nsclient.acks
+
+import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.plugins.bus.RxBus
+import io.socket.client.Ack
+import org.json.JSONObject
+
+class NSAuthAck(private val rxBus: RxBus) : Event(), Ack {
+
+    var read = false
+    var write = false
+    var writeTreatment = false
+    override fun call(vararg args: Any) {
+        val response = args[0] as JSONObject
+        read = response.optBoolean("read")
+        write = response.optBoolean("write")
+        writeTreatment = response.optBoolean("write_treatment")
+        rxBus.send(this)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.kt
index 5d91178f821..80ab7a0b1cf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.acks
 import info.nightscout.androidaps.events.Event
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import io.socket.client.Ack
 import org.json.JSONException
 import org.json.JSONObject
@@ -15,7 +15,7 @@ class NSUpdateAck(
     val action : String,
     var _id: String,
     private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     val originalObject: Any? = null
 ) : Event(), Ack {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/DeviceStatusData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/DeviceStatusData.kt
new file mode 100644
index 00000000000..9368d5a110e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/DeviceStatusData.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.plugins.general.nsclient.data
+
+import android.text.Spanned
+import org.json.JSONObject
+import java.util.HashMap
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DeviceStatusData @Inject constructor() {
+
+    class PumpData {
+        var clock = 0L
+        var isPercent = false
+        var percent = 0
+        var voltage = 0.0
+        var status = "N/A"
+        var reservoir = 0.0
+        var extended: Spanned? = null
+        var activeProfileName: String? = null
+    }
+
+    var pumpData: PumpData? = null
+
+    class Uploader {
+        var clock = 0L
+        var battery = 0
+    }
+
+    val uploaderMap = HashMap<String, Uploader>()
+
+    class OpenAPSData {
+        var clockSuggested = 0L
+        var clockEnacted = 0L
+        var suggested: JSONObject? = null
+        var enacted: JSONObject? = null
+    }
+
+    var openAPSData = OpenAPSData()
+}
+
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt
index 5faa6861c13..5352f7f4638 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.plugins.aps.loop.APSResult
 import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HtmlHelper.fromHtml
+import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.Round
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -17,7 +18,6 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
-import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -76,18 +76,19 @@ import javax.inject.Singleton
 class NSDeviceStatus @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val sp: SP,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val nsSettingsStatus: NSSettingsStatus,
     private val config: Config,
     private val dateUtil: DateUtil,
-    private val runningConfiguration: RunningConfiguration
+    private val runningConfiguration: RunningConfiguration,
+    private val deviceStatusData: DeviceStatusData
 ) {
 
     private var data: JSONObject? = null
     fun handleNewData(deviceStatuses: JSONArray) {
-        aapsLogger.debug(LTag.NSCLIENT, "Got NS deviceStatus: \$deviceStatuses}")
+        aapsLogger.debug(LTag.NSCLIENT, "Got NS deviceStatus: \$deviceStatuses")
         try {
-            for (i in 0 until deviceStatuses.length()) {
+            for (i in deviceStatuses.length() -1 downTo 0) {
                 val devicestatusJson = deviceStatuses.getJSONObject(i)
                 if (devicestatusJson != null) {
                     setData(devicestatusJson)
@@ -98,6 +99,7 @@ class NSDeviceStatus @Inject constructor(
                     if (devicestatusJson.has("configuration") && config.NSCLIENT) {
                         // copy configuration of Insulin and Sensitivity from main AAPS
                         runningConfiguration.apply(devicestatusJson.getJSONObject("configuration"))
+                        break
                     }
                 }
             }
@@ -145,21 +147,18 @@ class NSDeviceStatus @Inject constructor(
             }
     }
 
-    // ***** PUMP DATA ******
-    private var deviceStatusPumpData: DeviceStatusPumpData? = null
-
     val extendedPumpStatus: Spanned
-        get() = deviceStatusPumpData?.extended ?: fromHtml("")
+        get() = deviceStatusData.pumpData?.extended ?: fromHtml("")
 
     val pumpStatus: Spanned
         // test warning level // color
         get() {
-            val pumpData = deviceStatusPumpData ?: return fromHtml("")
+            val pumpData = deviceStatusData.pumpData ?: return fromHtml("")
 
             //String[] ALL_STATUS_FIELDS = {"reservoir", "battery", "clock", "status", "device"};
             val string = StringBuilder()
-                .append("<span style=\"color:${resourceHelper.gcs(R.color.defaulttext)}\">")
-                .append(resourceHelper.gs(R.string.pump))
+                .append("<span style=\"color:${rh.gcs(R.color.defaulttext)}\">")
+                .append(rh.gs(R.string.pump))
                 .append(": </span>")
 
             // test warning level
@@ -179,34 +178,23 @@ class NSDeviceStatus @Inject constructor(
             if (fields.contains("reservoir")) string.append(pumpData.reservoir.toInt()).append("U ")
             if (fields.contains("battery") && pumpData.isPercent) string.append(pumpData.percent).append("% ")
             if (fields.contains("battery") && !pumpData.isPercent) string.append(Round.roundTo(pumpData.voltage, 0.001)).append(" ")
-            if (fields.contains("clock")) string.append(dateUtil.minAgo(resourceHelper, pumpData.clock)).append(" ")
+            if (fields.contains("clock")) string.append(dateUtil.minAgo(rh, pumpData.clock)).append(" ")
             if (fields.contains("status")) string.append(pumpData.status).append(" ")
             if (fields.contains("device")) string.append(device).append(" ")
             string.append("</span>") // color
             return fromHtml(string.toString())
         }
 
-    internal class DeviceStatusPumpData {
-
-        var clock = 0L
-        var isPercent = false
-        var percent = 0
-        var voltage = 0.0
-        var status = "N/A"
-        var reservoir = 0.0
-        var extended: Spanned? = null
-    }
-
     private fun updatePumpData() {
         try {
             val data = this.data ?: return
             val pump = if (data.has("pump")) data.getJSONObject("pump") else JSONObject()
             val clock = if (pump.has("clock")) dateUtil.fromISODateString(pump.getString("clock")) else 0L
             // check if this is new data
-            if (clock == 0L || deviceStatusPumpData != null && clock < deviceStatusPumpData!!.clock) return
+            if (clock == 0L || deviceStatusData.pumpData != null && clock < deviceStatusData.pumpData!!.clock) return
 
             // create new status and process data
-            val deviceStatusPumpData = DeviceStatusPumpData()
+            val deviceStatusPumpData = DeviceStatusData.PumpData()
             deviceStatusPumpData.clock = clock
             if (pump.has("status") && pump.getJSONObject("status").has("status")) deviceStatusPumpData.status = pump.getJSONObject("status").getString("status")
             if (pump.has("reservoir")) deviceStatusPumpData.reservoir = pump.getDouble("reservoir")
@@ -227,21 +215,14 @@ class NSDeviceStatus @Inject constructor(
                     extended.append("<b>").append(key).append(":</b> ").append(value).append("<br>")
                 }
                 deviceStatusPumpData.extended = fromHtml(extended.toString())
+                deviceStatusPumpData.activeProfileName = JsonHelper.safeGetStringAllowNull(extendedJson, "ActiveProfile", null)
             }
-            this.deviceStatusPumpData = deviceStatusPumpData
+            deviceStatusData.pumpData = deviceStatusPumpData
         } catch (e: Exception) {
             aapsLogger.error("Unhandled exception", e)
         }
     }
 
-    class DeviceStatusOpenAPSData {
-
-        var clockSuggested = 0L
-        var clockEnacted = 0L
-        var suggested: JSONObject? = null
-        var enacted: JSONObject? = null
-    }
-
     private fun updateOpenApsData(jsonObject: JSONObject) {
         try {
             val openAps = if (jsonObject.has("openaps")) jsonObject.getJSONObject("openaps") else JSONObject()
@@ -249,15 +230,15 @@ class NSDeviceStatus @Inject constructor(
             val enacted = if (openAps.has("enacted")) openAps.getJSONObject("enacted") else JSONObject()
             var clock = if (suggested.has("timestamp")) dateUtil.fromISODateString(suggested.getString("timestamp")) else 0L
             // check if this is new data
-            if (clock != 0L && clock > deviceStatusOpenAPSData.clockSuggested) {
-                deviceStatusOpenAPSData.suggested = suggested
-                deviceStatusOpenAPSData.clockSuggested = clock
+            if (clock != 0L && clock > deviceStatusData.openAPSData.clockSuggested) {
+                deviceStatusData.openAPSData.suggested = suggested
+                deviceStatusData.openAPSData.clockSuggested = clock
             }
             clock = if (enacted.has("timestamp")) dateUtil.fromISODateString(enacted.getString("timestamp")) else 0L
             // check if this is new data
-            if (clock != 0L && clock > deviceStatusOpenAPSData.clockEnacted) {
-                deviceStatusOpenAPSData.enacted = enacted
-                deviceStatusOpenAPSData.clockEnacted = clock
+            if (clock != 0L && clock > deviceStatusData.openAPSData.clockEnacted) {
+                deviceStatusData.openAPSData.enacted = enacted
+                deviceStatusData.openAPSData.clockEnacted = clock
             }
         } catch (e: Exception) {
             aapsLogger.error("Unhandled exception", e)
@@ -267,18 +248,18 @@ class NSDeviceStatus @Inject constructor(
     val openApsStatus: Spanned
         get() {
             val string = StringBuilder()
-                .append("<span style=\"color:${resourceHelper.gcs(R.color.defaulttext)}\">")
-                .append(resourceHelper.gs(R.string.openaps_short))
+                .append("<span style=\"color:${rh.gcs(R.color.defaulttext)}\">")
+                .append(rh.gs(R.string.openaps_short))
                 .append(": </span>")
 
             // test warning level
             val level = when {
-                deviceStatusOpenAPSData.clockSuggested + T.mins(sp.getLong(R.string.key_nsalarm_urgent_staledatavalue, 31)).msecs() < dateUtil.now() -> Levels.URGENT
-                deviceStatusOpenAPSData.clockSuggested + T.mins(sp.getLong(R.string.key_nsalarm_staledatavalue, 16)).msecs() < dateUtil.now()        -> Levels.WARN
+                deviceStatusData.openAPSData.clockSuggested + T.mins(sp.getLong(R.string.key_nsalarm_urgent_staledatavalue, 31)).msecs() < dateUtil.now() -> Levels.URGENT
+                deviceStatusData.openAPSData.clockSuggested + T.mins(sp.getLong(R.string.key_nsalarm_staledatavalue, 16)).msecs() < dateUtil.now()        -> Levels.WARN
                 else                                                                                                                                 -> Levels.INFO
             }
             string.append("<span style=\"color:${level.toColor()}\">")
-            if (deviceStatusOpenAPSData.clockSuggested != 0L) string.append(dateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockSuggested)).append(" ")
+            if (deviceStatusData.openAPSData.clockSuggested != 0L) string.append(dateUtil.minAgo(rh, deviceStatusData.openAPSData.clockSuggested)).append(" ")
             string.append("</span>") // color
             return fromHtml(string.toString())
         }
@@ -287,8 +268,8 @@ class NSDeviceStatus @Inject constructor(
         get() {
             val string = StringBuilder()
             try {
-                if (deviceStatusOpenAPSData.enacted != null && deviceStatusOpenAPSData.clockEnacted != deviceStatusOpenAPSData.clockSuggested) string.append("<b>").append(dateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockEnacted)).append("</b> ").append(deviceStatusOpenAPSData.enacted!!.getString("reason")).append("<br>")
-                if (deviceStatusOpenAPSData.suggested != null) string.append("<b>").append(dateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockSuggested)).append("</b> ").append(deviceStatusOpenAPSData.suggested!!.getString("reason")).append("<br>")
+                if (deviceStatusData.openAPSData.enacted != null && deviceStatusData.openAPSData.clockEnacted != deviceStatusData.openAPSData.clockSuggested) string.append("<b>").append(dateUtil.minAgo(rh, deviceStatusData.openAPSData.clockEnacted)).append("</b> ").append(deviceStatusData.openAPSData.enacted!!.getString("reason")).append("<br>")
+                if (deviceStatusData.openAPSData.suggested != null) string.append("<b>").append(dateUtil.minAgo(rh, deviceStatusData.openAPSData.clockSuggested)).append("</b> ").append(deviceStatusData.openAPSData.suggested!!.getString("reason")).append("<br>")
                 return fromHtml(string.toString())
             } catch (e: JSONException) {
                 aapsLogger.error("Unhandled exception", e)
@@ -296,12 +277,6 @@ class NSDeviceStatus @Inject constructor(
             return fromHtml("")
         }
 
-    internal class Uploader {
-
-        var clock = 0L
-        var battery = 0
-    }
-
     private fun updateUploaderData(jsonObject: JSONObject) {
         try {
             val clock =
@@ -318,13 +293,13 @@ class NSDeviceStatus @Inject constructor(
                     else                                                                              -> 0
                 }
 
-            var uploader = uploaderMap[device]
+            var uploader = deviceStatusData.uploaderMap[device]
             // check if this is new data
             if (clock != 0L && battery != 0 && (uploader == null || clock > uploader.clock)) {
-                if (uploader == null) uploader = Uploader()
+                if (uploader == null) uploader = DeviceStatusData.Uploader()
                 uploader.battery = battery
                 uploader.clock = clock
-                uploaderMap[device] = uploader
+                deviceStatusData.uploaderMap[device] = uploader
             }
         } catch (e: Exception) {
             aapsLogger.error("Unhandled exception", e)
@@ -333,11 +308,11 @@ class NSDeviceStatus @Inject constructor(
 
     val uploaderStatus: String
         get() {
-            val iterator: Iterator<*> = uploaderMap.entries.iterator()
+            val iterator: Iterator<*> = deviceStatusData.uploaderMap.entries.iterator()
             var minBattery = 100
             while (iterator.hasNext()) {
                 val pair = iterator.next() as Map.Entry<*, *>
-                val uploader = pair.value as Uploader
+                val uploader = pair.value as DeviceStatusData.Uploader
                 if (minBattery > uploader.battery) minBattery = uploader.battery
             }
             return "$minBattery%"
@@ -346,14 +321,14 @@ class NSDeviceStatus @Inject constructor(
     val uploaderStatusSpanned: Spanned
         get() {
             val string = StringBuilder()
-            string.append("<span style=\"color:${resourceHelper.gcs(R.color.defaulttext)}\">")
-            string.append(resourceHelper.gs(R.string.uploader_short))
+            string.append("<span style=\"color:${rh.gcs(R.color.defaulttext)}\">")
+            string.append(rh.gs(R.string.uploader_short))
             string.append(": </span>")
-            val iterator: Iterator<*> = uploaderMap.entries.iterator()
+            val iterator: Iterator<*> = deviceStatusData.uploaderMap.entries.iterator()
             var minBattery = 100
             while (iterator.hasNext()) {
                 val pair = iterator.next() as Map.Entry<*, *>
-                val uploader = pair.value as Uploader
+                val uploader = pair.value as DeviceStatusData.Uploader
                 if (minBattery > uploader.battery) minBattery = uploader.battery
             }
             string.append(minBattery)
@@ -364,33 +339,28 @@ class NSDeviceStatus @Inject constructor(
     val extendedUploaderStatus: Spanned
         get() {
             val string = StringBuilder()
-            val iterator: Iterator<*> = uploaderMap.entries.iterator()
+            val iterator: Iterator<*> = deviceStatusData.uploaderMap.entries.iterator()
             while (iterator.hasNext()) {
                 val pair = iterator.next() as Map.Entry<*, *>
-                val uploader = pair.value as Uploader
+                val uploader = pair.value as DeviceStatusData.Uploader
                 val device = pair.key as String
                 string.append("<b>").append(device).append(":</b> ").append(uploader.battery).append("%<br>")
             }
             return fromHtml(string.toString())
         }
 
-    // ********* OpenAPS data ***********
-    var deviceStatusOpenAPSData = DeviceStatusOpenAPSData()
     val openApsTimestamp: Long
         get() =
-            if (deviceStatusOpenAPSData.clockSuggested != 0L) {
-                deviceStatusOpenAPSData.clockSuggested
+            if (deviceStatusData.openAPSData.clockSuggested != 0L) {
+                deviceStatusData.openAPSData.clockSuggested
             } else {
                 -1
             }
 
-    // ********* Uploader data ***********
-    private val uploaderMap = HashMap<String, Uploader>()
-
     fun getAPSResult(injector: HasAndroidInjector): APSResult {
         val result = APSResult(injector)
-        result.json = deviceStatusOpenAPSData.suggested
-        result.date = deviceStatusOpenAPSData.clockSuggested
+        result.json = deviceStatusData.openAPSData.suggested
+        result.date = deviceStatusData.openAPSData.clockSuggested
         return result
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
index 43e68ec7434..3f66d4d7f6b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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
@@ -118,8 +118,8 @@ import javax.inject.Singleton
 @Singleton
 class NSSettingsStatus @Inject constructor(
     private val aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
-    private val rxBus: RxBusWrapper,
+    private val rh: ResourceHelper,
+    private val rxBus: RxBus,
     private val defaultValueHelper: DefaultValueHelper,
     private val sp: SP,
     private val config: Config,
@@ -150,7 +150,7 @@ class NSSettingsStatus @Inject constructor(
         data = status
         aapsLogger.debug(LTag.NSCLIENT, "Got versions: Nightscout: ${getVersion()}")
         if (getVersionNum() < config.SUPPORTEDNSVERSION) {
-            val notification = Notification(Notification.OLD_NS, resourceHelper.gs(R.string.unsupportednsversion), Notification.NORMAL)
+            val notification = Notification(Notification.OLD_NS, rh.gs(R.string.unsupportednsversion), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.OLD_NS))
@@ -252,7 +252,7 @@ class NSSettingsStatus @Inject constructor(
             uel.log(Action.NS_SETTINGS_COPIED, UserEntry.Sources.NSClient)
         }
 
-        if (context != null) OKDialog.showConfirmation(context, resourceHelper.gs(R.string.statuslights), resourceHelper.gs(R.string.copyexistingvalues), action)
+        if (context != null) OKDialog.showConfirmation(context, rh.gs(R.string.statuslights), rh.gs(R.string.copyexistingvalues), action)
         else action.run()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientStatus.kt
index dfe4ede8d42..c4291de2523 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientStatus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientStatus.kt
@@ -4,5 +4,5 @@ import info.nightscout.androidaps.events.EventStatus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class EventNSClientStatus(var text: String) : EventStatus() {
-    override fun getStatus(resourceHelper: ResourceHelper): String = text
+    override fun getStatus(rh: ResourceHelper): String = text
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt
index 8d0a8691c12..5a5bda55a30 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.general.nsclient.services
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
-import android.content.pm.ResolveInfo
 import android.os.*
 import androidx.work.OneTimeWorkRequest
 import com.google.common.base.Charsets
@@ -17,10 +16,9 @@ import info.nightscout.androidaps.events.EventConfigBuilderChange
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.DataSyncSelector
-import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.food.FoodPlugin.FoodWorker
 import info.nightscout.androidaps.plugins.general.nsclient.*
 import info.nightscout.androidaps.plugins.general.nsclient.acks.NSAddAck
@@ -41,14 +39,12 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.source.NSClientSourcePlugin.NSClientSourceWorker
 import info.nightscout.androidaps.receivers.DataWorker
-import info.nightscout.androidaps.services.Intents
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.JsonHelper.safeGetLong
 import info.nightscout.androidaps.utils.JsonHelper.safeGetString
 import info.nightscout.androidaps.utils.JsonHelper.safeGetStringAllowNull
-import info.nightscout.androidaps.utils.T.Companion.days
 import info.nightscout.androidaps.utils.T.Companion.mins
+import info.nightscout.androidaps.utils.XDripBroadcast
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
@@ -71,8 +67,8 @@ class NSClientService : DaggerService() {
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var nsSettingsStatus: NSSettingsStatus
     @Inject lateinit var nsDeviceStatus: NSDeviceStatus
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var sp: SP
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var nsClientPlugin: NSClientPlugin
@@ -82,6 +78,7 @@ class NSClientService : DaggerService() {
     @Inject lateinit var dataWorker: DataWorker
     @Inject lateinit var dataSyncSelector: DataSyncSelector
     @Inject lateinit var repository: AppRepository
+    @Inject lateinit var xDripBroadcast: XDripBroadcast
 
     companion object {
 
@@ -121,7 +118,7 @@ class NSClientService : DaggerService() {
             .toObservable(EventConfigBuilderChange::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({
-                if (nsEnabled != nsClientPlugin.isEnabled(PluginType.GENERAL)) {
+                if (nsEnabled != nsClientPlugin.isEnabled()) {
                     latestDateInReceivedData = 0
                     destroy()
                     initialize()
@@ -132,9 +129,9 @@ class NSClientService : DaggerService() {
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ event: EventPreferenceChange ->
-                if (event.isChanged(resourceHelper, R.string.key_nsclientinternal_url) ||
-                    event.isChanged(resourceHelper, R.string.key_nsclientinternal_api_secret) ||
-                    event.isChanged(resourceHelper, R.string.key_nsclientinternal_paused)) {
+                if (event.isChanged(rh, R.string.key_nsclientinternal_url) ||
+                    event.isChanged(rh, R.string.key_nsclientinternal_api_secret) ||
+                    event.isChanged(rh, R.string.key_nsclientinternal_paused)) {
                     latestDateInReceivedData = 0
                     destroy()
                     initialize()
@@ -201,20 +198,20 @@ class NSClientService : DaggerService() {
         var connectionStatus = "Authenticated ("
         if (ack.read) connectionStatus += "R"
         if (ack.write) connectionStatus += "W"
-        if (ack.write_treatment) connectionStatus += "T"
+        if (ack.writeTreatment) connectionStatus += "T"
         connectionStatus += ')'
         isConnected = true
-        hasWriteAuth = ack.write && ack.write_treatment
+        hasWriteAuth = ack.write && ack.writeTreatment
         rxBus.send(EventNSClientStatus(connectionStatus))
         rxBus.send(EventNSClientNewLog("AUTH", connectionStatus))
         if (!ack.write) {
             rxBus.send(EventNSClientNewLog("ERROR", "Write permission not granted "))
         }
-        if (!ack.write_treatment) {
+        if (!ack.writeTreatment) {
             rxBus.send(EventNSClientNewLog("ERROR", "Write treatment permission not granted "))
         }
         if (!hasWriteAuth) {
-            val noWritePerm = Notification(Notification.NSCLIENT_NO_WRITE_PERMISSION, resourceHelper.gs(R.string.nowritepermission), Notification.URGENT)
+            val noWritePerm = Notification(Notification.NSCLIENT_NO_WRITE_PERMISSION, rh.gs(R.string.nowritepermission), Notification.URGENT)
             rxBus.send(EventNewNotification(noWritePerm))
         } else {
             rxBus.send(EventDismissNotification(Notification.NSCLIENT_NO_WRITE_PERMISSION))
@@ -306,7 +303,7 @@ class NSClientService : DaggerService() {
             }
             rxBus.send(EventNSClientNewLog("WATCHDOG", "connections in last " + WATCHDOG_INTERVAL_MINUTES + " minutes: " + reconnections.size + "/" + WATCHDOG_MAX_CONNECTIONS))
             if (reconnections.size >= WATCHDOG_MAX_CONNECTIONS) {
-                val n = Notification(Notification.NS_MALFUNCTION, resourceHelper.gs(R.string.nsmalfunction), Notification.URGENT)
+                val n = Notification(Notification.NS_MALFUNCTION, rh.gs(R.string.nsmalfunction), Notification.URGENT)
                 rxBus.send(EventNewNotification(n))
                 rxBus.send(EventNSClientNewLog("WATCHDOG", "pausing for $WATCHDOG_RECONNECT_IN minutes"))
                 nsClientPlugin.pause(true)
@@ -358,7 +355,7 @@ class NSClientService : DaggerService() {
     }
 
     fun readPreferences() {
-        nsEnabled = nsClientPlugin.isEnabled(PluginType.GENERAL)
+        nsEnabled = nsClientPlugin.isEnabled()
         nsURL = sp.getString(R.string.key_nsclientinternal_url, "")
         nsAPISecret = sp.getString(R.string.key_nsclientinternal_api_secret, "")
         nsDevice = sp.getString("careportal_enteredby", "")
@@ -478,61 +475,25 @@ class NSClientService : DaggerService() {
                                 OneTimeWorkRequest.Builder(LocalProfilePlugin.NSProfileWorker::class.java)
                                     .setInputData(dataWorker.storeInputData(profileStoreJson, null))
                                     .build())
-                            if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-                                val bundle = Bundle()
-                                bundle.putString("profile", profileStoreJson.toString())
-                                bundle.putBoolean("delta", isDelta)
-                                val intent = Intent(Intents.ACTION_NEW_PROFILE)
-                                intent.putExtras(bundle)
-                                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-                                broadcast(intent)
-                            }
+                            xDripBroadcast.sendProfile(profileStoreJson)
                         }
                     }
                     if (data.has("treatments")) {
                         val treatments = data.getJSONArray("treatments")
-                        val removedTreatments = JSONArray()
                         val addedOrUpdatedTreatments = JSONArray()
                         if (treatments.length() > 0) rxBus.send(EventNSClientNewLog("DATA", "received " + treatments.length() + " treatments"))
                         for (index in 0 until treatments.length()) {
                             val jsonTreatment = treatments.getJSONObject(index)
                             val action = safeGetStringAllowNull(jsonTreatment, "action", null)
-                            val mills = safeGetLong(jsonTreatment, "mills")
-                            if (action == null) addedOrUpdatedTreatments.put(jsonTreatment) else if (action == "update") addedOrUpdatedTreatments.put(jsonTreatment) else if (action == "remove" && mills > dateUtil.now() - days(1).msecs()) // handle 1 day old deletions only
-                                removedTreatments.put(jsonTreatment)
-                        }
-                        if (removedTreatments.length() > 0) {
-                            dataWorker.enqueue(
-                                OneTimeWorkRequest.Builder(NSClientRemoveWorker::class.java)
-                                    .setInputData(dataWorker.storeInputData(removedTreatments, null))
-                                    .build())
-                            if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-                                val bundle = Bundle()
-                                bundle.putString("treatments", removedTreatments.toString())
-                                bundle.putBoolean("delta", isDelta)
-                                val intent = Intent(Intents.ACTION_REMOVED_TREATMENT)
-                                intent.putExtras(bundle)
-                                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-                                broadcast(intent)
-                            }
+                            if (action == null) addedOrUpdatedTreatments.put(jsonTreatment)
+                            else if (action == "update") addedOrUpdatedTreatments.put(jsonTreatment)
                         }
                         if (addedOrUpdatedTreatments.length() > 0) {
                             dataWorker.enqueue(
                                 OneTimeWorkRequest.Builder(NSClientAddUpdateWorker::class.java)
                                     .setInputData(dataWorker.storeInputData(addedOrUpdatedTreatments, null))
                                     .build())
-                            if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-                                val splitted = splitArray(addedOrUpdatedTreatments)
-                                for (part in splitted) {
-                                    val bundle = Bundle()
-                                    bundle.putString("treatments", part.toString())
-                                    bundle.putBoolean("delta", isDelta)
-                                    val intent = Intent(Intents.ACTION_CHANGED_TREATMENT)
-                                    intent.putExtras(bundle)
-                                    intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-                                    broadcast(intent)
-                                }
-                            }
+                            xDripBroadcast.sendTreatments(addedOrUpdatedTreatments)
                         }
                     }
                     if (data.has("devicestatus")) {
@@ -569,18 +530,7 @@ class NSClientService : DaggerService() {
                         dataWorker.enqueue(OneTimeWorkRequest.Builder(NSClientSourceWorker::class.java)
                             .setInputData(dataWorker.storeInputData(sgvs, null))
                             .build())
-                        val splitted = splitArray(sgvs)
-                        if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
-                            for (part in splitted) {
-                                val bundle = Bundle()
-                                bundle.putString("sgvs", part.toString())
-                                bundle.putBoolean("delta", isDelta)
-                                val intent = Intent(Intents.ACTION_NEW_SGV)
-                                intent.putExtras(bundle)
-                                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-                                broadcast(intent)
-                            }
-                        }
+                        xDripBroadcast.sendSgvs(sgvs)
                     }
                     rxBus.send(EventNSClientNewLog("LAST", dateUtil.dateAndTimeString(latestDateInReceivedData)))
                 } catch (e: JSONException) {
@@ -602,7 +552,8 @@ class NSClientService : DaggerService() {
             message.put("_id", _id)
             message.put("data", data)
             socket?.emit("dbUpdate", message, NSUpdateAck("dbUpdate", _id, aapsLogger, rxBus, originalObject))
-            rxBus.send(EventNSClientNewLog("DBUPDATE $collection", "Sent " + originalObject.javaClass.simpleName + " " + _id + " " + progress))
+            rxBus.send(EventNSClientNewLog("DBUPDATE $collection", "Sent " + originalObject.javaClass.simpleName + " " +
+                "" + _id + " " + data + progress))
         } catch (e: JSONException) {
             aapsLogger.error("Unhandled exception", e)
         }
@@ -693,40 +644,6 @@ class NSClientService : DaggerService() {
         }
     }
 
-    private fun splitArray(array: JSONArray): List<JSONArray> {
-        var ret: MutableList<JSONArray> = ArrayList()
-        try {
-            val size = array.length()
-            var count = 0
-            var newarr: JSONArray? = null
-            for (i in 0 until size) {
-                if (count == 0) {
-                    if (newarr != null) ret.add(newarr)
-                    newarr = JSONArray()
-                    count = 20
-                }
-                newarr?.put(array[i])
-                --count
-            }
-            if (newarr != null && newarr.length() > 0) ret.add(newarr)
-        } catch (e: JSONException) {
-            aapsLogger.error("Unhandled exception", e)
-            ret = ArrayList()
-            ret.add(array)
-        }
-        return ret
-    }
-
-    private fun broadcast(intent: Intent) {
-        val receivers: List<ResolveInfo> = packageManager.queryBroadcastReceivers(intent, 0)
-        for (resolveInfo in receivers)
-            resolveInfo.activityInfo.packageName?.let {
-                intent.setPackage(it)
-                sendBroadcast(intent)
-                aapsLogger.debug(LTag.CORE, "Sending broadcast " + intent.action + " to: " + it)
-            }
-    }
-
     init {
         if (handler == null) {
             val handlerThread = HandlerThread(NSClientService::class.java.simpleName + "Handler")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt
index 2cdd860ce37..ca2679e4aa4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt
@@ -38,7 +38,7 @@ import kotlin.math.min
 class OverviewData @Inject constructor(
     private val injector: HasAndroidInjector,
     private val aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val dateUtil: DateUtil,
     private val sp: SP,
     private val activePlugin: ActivePlugin,
@@ -53,20 +53,6 @@ class OverviewData @Inject constructor(
     private val translator: Translator
 ) {
 
-    enum class Property {
-        TIME,
-        CALC_PROGRESS,
-        PROFILE,
-        TEMPORARY_BASAL,
-        EXTENDED_BOLUS,
-        TEMPORARY_TARGET,
-        BG,
-        IOB_COB,
-        SENSITIVITY,
-        GRAPH,
-        PUMPSTATUS
-    }
-
     var rangeToDisplay = 6 // for graph
     var toTime: Long = 0
     var fromTime: Long = 0
@@ -76,8 +62,6 @@ class OverviewData @Inject constructor(
         pumpStatus = ""
         calcProgress = ""
         lastBg = null
-        temporaryBasal = null
-        extendedBolus = null
         bolusIob = null
         basalIob = null
         cobInfo = null
@@ -97,7 +81,7 @@ class OverviewData @Inject constructor(
         iobSeries = FixedLineGraphSeries()
         absIobSeries = FixedLineGraphSeries()
         iobPredictions1Series = PointsWithLabelGraphSeries()
-        iobPredictions2Series = PointsWithLabelGraphSeries()
+        //iobPredictions2Series = PointsWithLabelGraphSeries()
         minusBgiSeries = FixedLineGraphSeries()
         minusBgiHistSeries = FixedLineGraphSeries()
         cobSeries = FixedLineGraphSeries()
@@ -145,11 +129,11 @@ class OverviewData @Inject constructor(
     val lastBgColor: Int
         get() = lastBg?.let { lastBg ->
             when {
-                lastBg.valueToUnits(profileFunction.getUnits()) < defaultValueHelper.determineLowLine()  -> resourceHelper.gc(R.color.low)
-                lastBg.valueToUnits(profileFunction.getUnits()) > defaultValueHelper.determineHighLine() -> resourceHelper.gc(R.color.high)
-                else                                                                                     -> resourceHelper.gc(R.color.inrange)
+                lastBg.valueToUnits(profileFunction.getUnits()) < defaultValueHelper.determineLowLine()  -> rh.gc(R.color.low)
+                lastBg.valueToUnits(profileFunction.getUnits()) > defaultValueHelper.determineHighLine() -> rh.gc(R.color.high)
+                else                                                                                     -> rh.gc(R.color.inrange)
             }
-        } ?: resourceHelper.gc(R.color.inrange)
+        } ?: rh.gc(R.color.inrange)
 
     val isActualBg: Boolean
         get() =
@@ -161,29 +145,28 @@ class OverviewData @Inject constructor(
      * TEMPORARY BASAL
      */
 
-    var temporaryBasal: TemporaryBasal? = null
-
     val temporaryBasalText: String
         get() =
             profileFunction.getProfile()?.let { profile ->
+                var temporaryBasal = iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())
                 if (temporaryBasal?.isInProgress == false) temporaryBasal = null
                 temporaryBasal?.let { "T:" + it.toStringShort() }
-                    ?: resourceHelper.gs(R.string.pump_basebasalrate, profile.getBasal())
-            } ?: resourceHelper.gs(R.string.notavailable)
+                    ?: rh.gs(R.string.pump_basebasalrate, profile.getBasal())
+            } ?: rh.gs(R.string.notavailable)
 
     val temporaryBasalDialogText: String
         get() = profileFunction.getProfile()?.let { profile ->
-            temporaryBasal?.let { temporaryBasal ->
-                "${resourceHelper.gs(R.string.basebasalrate_label)}: ${resourceHelper.gs(R.string.pump_basebasalrate, profile.getBasal())}" +
-                    "\n" + resourceHelper.gs(R.string.tempbasal_label) + ": " + temporaryBasal.toStringFull(profile, dateUtil)
+            iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())?.let { temporaryBasal ->
+                "${rh.gs(R.string.basebasalrate_label)}: ${rh.gs(R.string.pump_basebasalrate, profile.getBasal())}" +
+                    "\n" + rh.gs(R.string.tempbasal_label) + ": " + temporaryBasal.toStringFull(profile, dateUtil)
             }
-                ?: "${resourceHelper.gs(R.string.basebasalrate_label)}: ${resourceHelper.gs(R.string.pump_basebasalrate, profile.getBasal())}"
-        } ?: resourceHelper.gs(R.string.notavailable)
+                ?: "${rh.gs(R.string.basebasalrate_label)}: ${rh.gs(R.string.pump_basebasalrate, profile.getBasal())}"
+        } ?: rh.gs(R.string.notavailable)
 
     val temporaryBasalIcon: Int
         get() =
             profileFunction.getProfile()?.let { profile ->
-                temporaryBasal?.let { temporaryBasal ->
+                iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())?.let { temporaryBasal ->
                     val percentRate = temporaryBasal.convertedToPercent(dateUtil.now(), profile)
                     when {
                         percentRate > 100 -> R.drawable.ic_cp_basal_tbr_high
@@ -194,27 +177,23 @@ class OverviewData @Inject constructor(
             } ?: R.drawable.ic_cp_basal_no_tbr
 
     val temporaryBasalColor: Int
-        get() = temporaryBasal?.let { resourceHelper.gc(R.color.basal) }
-            ?: resourceHelper.gc(R.color.defaulttextcolor)
+        get() = iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())?.let { rh.gc(R.color.basal) }
+            ?: rh.gc(R.color.defaulttextcolor)
 
     /*
      * EXTENDED BOLUS
     */
 
-    var extendedBolus: ExtendedBolus? = null
-
     val extendedBolusText: String
         get() =
-            extendedBolus?.let { extendedBolus ->
-                if (!extendedBolus.isInProgress(dateUtil)) {
-                    this@OverviewData.extendedBolus = null
-                    ""
-                } else if (!activePlugin.activePump.isFakingTempsByExtendedBoluses) resourceHelper.gs(R.string.pump_basebasalrate, extendedBolus.rate)
+            iobCobCalculator.getExtendedBolus(dateUtil.now())?.let { extendedBolus ->
+                if (!extendedBolus.isInProgress(dateUtil)) ""
+                else if (!activePlugin.activePump.isFakingTempsByExtendedBoluses) rh.gs(R.string.pump_basebasalrate, extendedBolus.rate)
                 else ""
             } ?: ""
 
     val extendedBolusDialogText: String
-        get() = extendedBolus?.toStringFull(dateUtil) ?: ""
+        get() = iobCobCalculator.getExtendedBolus(dateUtil.now())?.toStringFull(dateUtil) ?: ""
 
     /*
      * IOB, COB
@@ -229,19 +208,19 @@ class OverviewData @Inject constructor(
         get() =
             bolusIob?.let { bolusIob ->
                 basalIob?.let { basalIob ->
-                    resourceHelper.gs(R.string.formatinsulinunits, bolusIob.iob + basalIob.basaliob)
-                } ?: resourceHelper.gs(R.string.value_unavailable_short)
-            } ?: resourceHelper.gs(R.string.value_unavailable_short)
+                    rh.gs(R.string.formatinsulinunits, bolusIob.iob + basalIob.basaliob)
+                } ?: rh.gs(R.string.value_unavailable_short)
+            } ?: rh.gs(R.string.value_unavailable_short)
 
     val iobDialogText: String
         get() =
             bolusIob?.let { bolusIob ->
                 basalIob?.let { basalIob ->
-                    resourceHelper.gs(R.string.formatinsulinunits, bolusIob.iob + basalIob.basaliob) + "\n" +
-                        resourceHelper.gs(R.string.bolus) + ": " + resourceHelper.gs(R.string.formatinsulinunits, bolusIob.iob) + "\n" +
-                        resourceHelper.gs(R.string.basal) + ": " + resourceHelper.gs(R.string.formatinsulinunits, basalIob.basaliob)
-                } ?: resourceHelper.gs(R.string.value_unavailable_short)
-            } ?: resourceHelper.gs(R.string.value_unavailable_short)
+                    rh.gs(R.string.formatinsulinunits, bolusIob.iob + basalIob.basaliob) + "\n" +
+                        rh.gs(R.string.bolus) + ": " + rh.gs(R.string.formatinsulinunits, bolusIob.iob) + "\n" +
+                        rh.gs(R.string.basal) + ": " + rh.gs(R.string.formatinsulinunits, basalIob.basaliob)
+                } ?: rh.gs(R.string.value_unavailable_short)
+            } ?: rh.gs(R.string.value_unavailable_short)
 
     /*
      * TEMP TARGET
@@ -286,7 +265,7 @@ class OverviewData @Inject constructor(
     var iobSeries: FixedLineGraphSeries<ScaledDataPoint> = FixedLineGraphSeries()
     var absIobSeries: FixedLineGraphSeries<ScaledDataPoint> = FixedLineGraphSeries()
     var iobPredictions1Series: PointsWithLabelGraphSeries<DataPointWithLabelInterface> = PointsWithLabelGraphSeries()
-    var iobPredictions2Series: PointsWithLabelGraphSeries<DataPointWithLabelInterface> = PointsWithLabelGraphSeries()
+    //var iobPredictions2Series: PointsWithLabelGraphSeries<DataPointWithLabelInterface> = PointsWithLabelGraphSeries()
 
     var maxBGIValue = Double.MIN_VALUE
     val bgiScale = Scale()
@@ -324,8 +303,9 @@ class OverviewData @Inject constructor(
         for (bg in bgReadingsArray) {
             if (bg.timestamp < fromTime || bg.timestamp > toTime) continue
             if (bg.value > maxBgValue) maxBgValue = bg.value
-            bgListArray.add(GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, resourceHelper))
+            bgListArray.add(GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, rh))
         }
+        bgListArray.sortWith { o1: DataPointWithLabelInterface, o2: DataPointWithLabelInterface -> o1.x.compareTo(o2.x) }
         bgReadingGraphSeries = PointsWithLabelGraphSeries(Array(bgListArray.size) { i -> bgListArray[i] })
         maxBgValue = Profile.fromMgdlToUnits(maxBgValue, profileFunction.getUnits())
         if (defaultValueHelper.determineHighLine() > maxBgValue) maxBgValue = defaultValueHelper.determineHighLine()
@@ -364,7 +344,7 @@ class OverviewData @Inject constructor(
 
         val bgListArray: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
         val predictions: MutableList<GlucoseValueDataPoint>? = apsResult?.predictions
-            ?.map { bg -> GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, resourceHelper) }
+            ?.map { bg -> GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, rh) }
             ?.toMutableList()
         if (predictions != null) {
             predictions.sortWith { o1: GlucoseValueDataPoint, o2: GlucoseValueDataPoint -> o1.x.compareTo(o2.x) }
@@ -386,8 +366,9 @@ class OverviewData @Inject constructor(
         val bucketedListArray: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
         for (inMemoryGlucoseValue in bucketedData) {
             if (inMemoryGlucoseValue.timestamp < fromTime || inMemoryGlucoseValue.timestamp > toTime) continue
-            bucketedListArray.add(InMemoryGlucoseValueDataPoint(inMemoryGlucoseValue, profileFunction, resourceHelper))
+            bucketedListArray.add(InMemoryGlucoseValueDataPoint(inMemoryGlucoseValue, profileFunction, rh))
         }
+        bucketedListArray.sortWith { o1: DataPointWithLabelInterface, o2: DataPointWithLabelInterface -> o1.x.compareTo(o2.x) }
         bucketedGraphSeries = PointsWithLabelGraphSeries(Array(bucketedListArray.size) { i -> bucketedListArray[i] })
 //        profiler.log(LTag.UI, "prepareBucketedData() $from", start)
     }
@@ -464,27 +445,27 @@ class OverviewData @Inject constructor(
         // create series
         baseBasalGraphSeries = LineGraphSeries(Array(baseBasalArray.size) { i -> baseBasalArray[i] }).also {
             it.isDrawBackground = true
-            it.backgroundColor = resourceHelper.gc(R.color.basebasal)
+            it.backgroundColor = rh.gc(R.color.basebasal)
             it.thickness = 0
         }
         tempBasalGraphSeries = LineGraphSeries(Array(tempBasalArray.size) { i -> tempBasalArray[i] }).also {
             it.isDrawBackground = true
-            it.backgroundColor = resourceHelper.gc(R.color.tempbasal)
+            it.backgroundColor = rh.gc(R.color.tempbasal)
             it.thickness = 0
         }
         basalLineGraphSeries = LineGraphSeries(Array(basalLineArray.size) { i -> basalLineArray[i] }).also {
             it.setCustomPaint(Paint().also { paint ->
                 paint.style = Paint.Style.STROKE
-                paint.strokeWidth = resourceHelper.getDisplayMetrics().scaledDensity * 2
+                paint.strokeWidth = rh.getDisplayMetrics().scaledDensity * 2
                 paint.pathEffect = DashPathEffect(floatArrayOf(2f, 4f), 0f)
-                paint.color = resourceHelper.gc(R.color.basal)
+                paint.color = rh.gc(R.color.basal)
             })
         }
         absoluteBasalGraphSeries = LineGraphSeries(Array(absoluteBasalLineArray.size) { i -> absoluteBasalLineArray[i] }).also {
             it.setCustomPaint(Paint().also { absolutePaint ->
                 absolutePaint.style = Paint.Style.STROKE
-                absolutePaint.strokeWidth = resourceHelper.getDisplayMetrics().scaledDensity * 2
-                absolutePaint.color = resourceHelper.gc(R.color.basal)
+                absolutePaint.strokeWidth = rh.getDisplayMetrics().scaledDensity * 2
+                absolutePaint.color = rh.gc(R.color.basal)
             })
         }
 //        profiler.log(LTag.UI, "prepareBasalData() $from", start)
@@ -520,7 +501,7 @@ class OverviewData @Inject constructor(
         // create series
         temporaryTargetSeries = LineGraphSeries(Array(targetsSeriesArray.size) { i -> targetsSeriesArray[i] }).also {
             it.isDrawBackground = false
-            it.color = resourceHelper.gc(R.color.tempTargetBackground)
+            it.color = rh.gc(R.color.tempTargetBackground)
             it.thickness = 2
         }
 //        profiler.log(LTag.UI, "prepareTemporaryTargetData() $from", start)
@@ -533,14 +514,14 @@ class OverviewData @Inject constructor(
         maxTreatmentsValue = 0.0
         val filteredTreatments: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
         repository.getBolusesDataFromTimeToTime(fromTime, endTime, true).blockingGet()
-            .map { BolusDataPoint(it, resourceHelper, activePlugin, defaultValueHelper) }
+            .map { BolusDataPoint(it, rh, activePlugin, defaultValueHelper) }
             .filter { it.data.type == Bolus.Type.NORMAL || it.data.type == Bolus.Type.SMB }
             .forEach {
                 it.y = getNearestBg(it.x.toLong())
                 filteredTreatments.add(it)
             }
         repository.getCarbsDataFromTimeToTimeExpanded(fromTime, endTime, true).blockingGet()
-            .map { CarbsDataPoint(it, resourceHelper) }
+            .map { CarbsDataPoint(it, rh) }
             .forEach {
                 it.y = getNearestBg(it.x.toLong())
                 filteredTreatments.add(it)
@@ -553,7 +534,14 @@ class OverviewData @Inject constructor(
 
         // OfflineEvent
         repository.getOfflineEventDataFromTimeToTime(fromTime, endTime, true).blockingGet()
-            .map { TherapyEventDataPoint(TherapyEvent(timestamp = it.timestamp, duration = it.duration, type = TherapyEvent.Type.APS_OFFLINE, glucoseUnit = TherapyEvent.GlucoseUnit.MMOL), resourceHelper, profileFunction, translator) }
+            .map {
+                TherapyEventDataPoint(
+                    TherapyEvent(timestamp = it.timestamp, duration = it.duration, type = TherapyEvent.Type.APS_OFFLINE, glucoseUnit = TherapyEvent.GlucoseUnit.MMOL),
+                    rh,
+                    profileFunction,
+                    translator
+                )
+            }
             .forEach(filteredTreatments::add)
 
         // Extended bolus
@@ -569,7 +557,7 @@ class OverviewData @Inject constructor(
 
         // Careportal
         repository.compatGetTherapyEventDataFromToTime(fromTime - T.hours(6).msecs(), endTime).blockingGet()
-            .map { TherapyEventDataPoint(it, resourceHelper, profileFunction, translator) }
+            .map { TherapyEventDataPoint(it, rh, profileFunction, translator) }
             .filterTimeframe(fromTime, endTime)
             .forEach {
                 if (it.y == 0.0) it.y = getNearestBg(it.x.toLong())
@@ -680,15 +668,15 @@ class OverviewData @Inject constructor(
 
             // DEVIATIONS
             if (autosensData != null) {
-                var color = resourceHelper.gc(R.color.deviationblack) // "="
+                var color = rh.gc(R.color.deviationblack) // "="
                 if (autosensData.type == "" || autosensData.type == "non-meal") {
-                    if (autosensData.pastSensitivity == "C") color = resourceHelper.gc(R.color.deviationgrey)
-                    if (autosensData.pastSensitivity == "+") color = resourceHelper.gc(R.color.deviationgreen)
-                    if (autosensData.pastSensitivity == "-") color = resourceHelper.gc(R.color.deviationred)
+                    if (autosensData.pastSensitivity == "C") color = rh.gc(R.color.deviationgrey)
+                    if (autosensData.pastSensitivity == "+") color = rh.gc(R.color.deviationgreen)
+                    if (autosensData.pastSensitivity == "-") color = rh.gc(R.color.deviationred)
                 } else if (autosensData.type == "uam") {
-                    color = resourceHelper.gc(R.color.uam)
+                    color = rh.gc(R.color.uam)
                 } else if (autosensData.type == "csf") {
-                    color = resourceHelper.gc(R.color.deviationgrey)
+                    color = rh.gc(R.color.deviationgrey)
                 }
                 devArray.add(OverviewPlugin.DeviationDataPoint(time.toDouble(), autosensData.deviation, color, devScale))
                 maxDevValueFound = maxOf(maxDevValueFound, abs(autosensData.deviation), abs(bgi))
@@ -714,14 +702,14 @@ class OverviewData @Inject constructor(
         // IOB
         iobSeries = FixedLineGraphSeries(Array(iobArray.size) { i -> iobArray[i] }).also {
             it.isDrawBackground = true
-            it.backgroundColor = -0x7f000001 and resourceHelper.gc(R.color.iob) //50%
-            it.color = resourceHelper.gc(R.color.iob)
+            it.backgroundColor = -0x7f000001 and rh.gc(R.color.iob) //50%
+            it.color = rh.gc(R.color.iob)
             it.thickness = 3
         }
         absIobSeries = FixedLineGraphSeries(Array(absIobArray.size) { i -> absIobArray[i] }).also {
             it.isDrawBackground = true
-            it.backgroundColor = -0x7f000001 and resourceHelper.gc(R.color.iob) //50%
-            it.color = resourceHelper.gc(R.color.iob)
+            it.backgroundColor = -0x7f000001 and rh.gc(R.color.iob) //50%
+            it.color = rh.gc(R.color.iob)
             it.thickness = 3
         }
 
@@ -732,29 +720,31 @@ class OverviewData @Inject constructor(
             val iobPrediction: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
             val iobPredictionArray = iobCobCalculator.calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget)
             for (i in iobPredictionArray) {
-                iobPrediction.add(i.setColor(resourceHelper.gc(R.color.iobPredAS)))
+                iobPrediction.add(i.setColor(rh.gc(R.color.iobPredAS)))
                 maxIobValueFound = max(maxIobValueFound, abs(i.iob))
             }
             iobPredictions1Series = PointsWithLabelGraphSeries(Array(iobPrediction.size) { i -> iobPrediction[i] })
+            aapsLogger.debug(LTag.AUTOSENS, "IOB prediction for AS=" + DecimalFormatter.to2Decimal(lastAutosensResult.ratio) + ": " + iobCobCalculator.iobArrayToString(iobPredictionArray))
+            /*
             val iobPrediction2: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
             val iobPredictionArray2 = iobCobCalculator.calculateIobArrayForSMB(AutosensResult(), SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget)
             for (i in iobPredictionArray2) {
-                iobPrediction2.add(i.setColor(resourceHelper.gc(R.color.iobPred)))
+                iobPrediction2.add(i.setColor(rh.gc(R.color.iobPred)))
                 maxIobValueFound = max(maxIobValueFound, abs(i.iob))
             }
             iobPredictions2Series = PointsWithLabelGraphSeries(Array(iobPrediction2.size) { i -> iobPrediction2[i] })
-            aapsLogger.debug(LTag.AUTOSENS, "IOB prediction for AS=" + DecimalFormatter.to2Decimal(lastAutosensResult.ratio) + ": " + iobCobCalculator.iobArrayToString(iobPredictionArray))
             aapsLogger.debug(LTag.AUTOSENS, "IOB prediction for AS=" + DecimalFormatter.to2Decimal(1.0) + ": " + iobCobCalculator.iobArrayToString(iobPredictionArray2))
+            */
         } else {
             iobPredictions1Series = PointsWithLabelGraphSeries()
-            iobPredictions2Series = PointsWithLabelGraphSeries()
+            //iobPredictions2Series = PointsWithLabelGraphSeries()
         }
 
         // COB
         cobSeries = FixedLineGraphSeries(Array(cobArray.size) { i -> cobArray[i] }).also {
             it.isDrawBackground = true
-            it.backgroundColor = -0x7f000001 and resourceHelper.gc(R.color.cob) //50%
-            it.color = resourceHelper.gc(R.color.cob)
+            it.backgroundColor = -0x7f000001 and rh.gc(R.color.cob) //50%
+            it.color = rh.gc(R.color.cob)
             it.thickness = 3
         }
         cobMinFailOverSeries = PointsWithLabelGraphSeries(Array(minFailOverActiveList.size) { i -> minFailOverActiveList[i] })
@@ -762,7 +752,7 @@ class OverviewData @Inject constructor(
         // ACTIVITY
         activitySeries = FixedLineGraphSeries(Array(actArrayHist.size) { i -> actArrayHist[i] }).also {
             it.isDrawBackground = false
-            it.color = resourceHelper.gc(R.color.activity)
+            it.color = rh.gc(R.color.activity)
             it.thickness = 3
         }
         activityPredictionSeries = FixedLineGraphSeries(Array(actArrayPrediction.size) { i -> actArrayPrediction[i] }).also {
@@ -770,14 +760,14 @@ class OverviewData @Inject constructor(
                 paint.style = Paint.Style.STROKE
                 paint.strokeWidth = 3f
                 paint.pathEffect = DashPathEffect(floatArrayOf(4f, 4f), 0f)
-                paint.color = resourceHelper.gc(R.color.activity)
+                paint.color = rh.gc(R.color.activity)
             })
         }
 
         // BGI
         minusBgiSeries = FixedLineGraphSeries(Array(bgiArrayHist.size) { i -> bgiArrayHist[i] }).also {
             it.isDrawBackground = false
-            it.color = resourceHelper.gc(R.color.bgi)
+            it.color = rh.gc(R.color.bgi)
             it.thickness = 3
         }
         minusBgiHistSeries = FixedLineGraphSeries(Array(bgiArrayPrediction.size) { i -> bgiArrayPrediction[i] }).also {
@@ -785,7 +775,7 @@ class OverviewData @Inject constructor(
                 paint.style = Paint.Style.STROKE
                 paint.strokeWidth = 3f
                 paint.pathEffect = DashPathEffect(floatArrayOf(4f, 4f), 0f)
-                paint.color = resourceHelper.gc(R.color.bgi)
+                paint.color = rh.gc(R.color.bgi)
             })
         }
 
@@ -796,17 +786,17 @@ class OverviewData @Inject constructor(
 
         // RATIO
         ratioSeries = LineGraphSeries(Array(ratioArray.size) { i -> ratioArray[i] }).also {
-            it.color = resourceHelper.gc(R.color.ratio)
+            it.color = rh.gc(R.color.ratio)
             it.thickness = 3
         }
 
         // DEV SLOPE
         dsMaxSeries = LineGraphSeries(Array(dsMaxArray.size) { i -> dsMaxArray[i] }).also {
-            it.color = resourceHelper.gc(R.color.devslopepos)
+            it.color = rh.gc(R.color.devslopepos)
             it.thickness = 3
         }
         dsMinSeries = LineGraphSeries(Array(dsMinArray.size) { i -> dsMinArray[i] }).also {
-            it.color = resourceHelper.gc(R.color.devslopeneg)
+            it.color = rh.gc(R.color.devslopeneg)
             it.thickness = 3
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index e38310b1baa..f19129a4cca 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -12,6 +12,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.HandlerThread
 import android.util.DisplayMetrics
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.OnLongClickListener
@@ -44,14 +45,17 @@ import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.extensions.valueToUnitsString
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.loop.events.EventNewOpenLoopNotification
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
+import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
 import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
-import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverview
+import info.nightscout.androidaps.plugins.general.overview.events.*
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
 import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore
 import info.nightscout.androidaps.plugins.general.wear.events.EventWearInitiateAction
@@ -59,7 +63,6 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.source.DexcomPlugin
 import info.nightscout.androidaps.plugins.source.XdripPlugin
-import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.skins.SkinProvider
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
@@ -72,6 +75,7 @@ import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
+import info.nightscout.androidaps.utils.ui.SingleClickButton
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.androidaps.utils.wizard.QuickWizard
 import io.reactivex.disposables.CompositeDisposable
@@ -89,8 +93,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var sp: SP
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var constraintChecker: ConstraintChecker
@@ -118,6 +122,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
     @Inject lateinit var overviewData: OverviewData
     @Inject lateinit var overviewPlugin: OverviewPlugin
+    @Inject lateinit var automationPlugin: AutomationPlugin
+    @Inject lateinit var bgQualityCheckPlugin: BgQualityCheckPlugin
 
     private val disposable = CompositeDisposable()
 
@@ -161,16 +167,16 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         smallHeight = screenHeight <= Constants.SMALL_HEIGHT
         val landscape = screenHeight < screenWidth
 
-        skinProvider.activeSkin().preProcessLandscapeOverviewLayout(dm, view, landscape, resourceHelper.gb(R.bool.isTablet), smallHeight)
+        skinProvider.activeSkin().preProcessLandscapeOverviewLayout(dm, view, landscape, rh.gb(R.bool.isTablet), smallHeight)
         binding.nsclientLayout.visibility = config.NSCLIENT.toVisibility()
 
         binding.notifications.setHasFixedSize(false)
         binding.notifications.layoutManager = LinearLayoutManager(view.context)
         axisWidth = if (dm.densityDpi <= 120) 3 else if (dm.densityDpi <= 160) 10 else if (dm.densityDpi <= 320) 35 else if (dm.densityDpi <= 420) 50 else if (dm.densityDpi <= 560) 70 else 80
-        binding.graphsLayout.bgGraph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
+        binding.graphsLayout.bgGraph.gridLabelRenderer?.gridColor = rh.gc(R.color.graphgrid)
         binding.graphsLayout.bgGraph.gridLabelRenderer?.reloadStyles()
         binding.graphsLayout.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth
-        binding.graphsLayout.bgGraph.layoutParams?.height = resourceHelper.dpToPx(skinProvider.activeSkin().mainGraphHeight)
+        binding.graphsLayout.bgGraph.layoutParams?.height = rh.dpToPx(skinProvider.activeSkin().mainGraphHeight)
 
         carbAnimation = binding.infoLayout.carbsIcon.background as AnimationDrawable?
         carbAnimation?.setEnterFadeDuration(1200)
@@ -184,8 +190,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             overviewData.initRange()
             overviewData.prepareBucketedData("EventBucketedDataCreated")
             overviewData.prepareBgData("EventBucketedDataCreated")
-            updateGUI("rangeChange", OverviewData.Property.GRAPH)
-            rxBus.send(EventPreferenceChange(resourceHelper, R.string.key_rangetodisplay))
+            updateGraph("rangeChange")
+            rxBus.send(EventPreferenceChange(rh, R.string.key_rangetodisplay))
             sp.putBoolean(R.string.key_objectiveusescale, true)
             false
         }
@@ -221,41 +227,93 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     override fun onResume() {
         super.onResume()
         disposable += activePlugin.activeOverview.overviewBus
-            .toObservable(EventUpdateOverview::class.java)
+            .toObservable(EventUpdateOverviewTime::class.java)
+            .debounce(1L, TimeUnit.SECONDS)
             .observeOn(aapsSchedulers.main)
-            .subscribe({ updateGUI(it.from, it.what) }, fabricPrivacy::logException)
-
-        disposable.add(rxBus
+            .subscribe({ updateTime(it.from) }, fabricPrivacy::logException)
+        disposable += activePlugin.activeOverview.overviewBus
+            .toObservable(EventUpdateOverviewCalcProgress::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateCalcProgress(it.from) }, fabricPrivacy::logException)
+        disposable += activePlugin.activeOverview.overviewBus
+            .toObservable(EventUpdateOverviewProfile::class.java)
+            .debounce(1L, TimeUnit.SECONDS)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateProfile(it.from) }, fabricPrivacy::logException)
+        disposable += activePlugin.activeOverview.overviewBus
+            .toObservable(EventUpdateOverviewTemporaryBasal::class.java)
+            .debounce(1L, TimeUnit.SECONDS)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateTemporaryBasal(it.from) }, fabricPrivacy::logException)
+        disposable += activePlugin.activeOverview.overviewBus
+            .toObservable(EventUpdateOverviewExtendedBolus::class.java)
+            .debounce(1L, TimeUnit.SECONDS)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateExtendedBolus(it.from) }, fabricPrivacy::logException)
+        disposable += activePlugin.activeOverview.overviewBus
+            .toObservable(EventUpdateOverviewTemporaryTarget::class.java)
+            .debounce(1L, TimeUnit.SECONDS)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateTemporaryTarget(it.from) }, fabricPrivacy::logException)
+        disposable += activePlugin.activeOverview.overviewBus
+            .toObservable(EventUpdateOverviewBg::class.java)
+            .debounce(1L, TimeUnit.SECONDS)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateBg(it.from) }, fabricPrivacy::logException)
+        disposable += activePlugin.activeOverview.overviewBus
+            .toObservable(EventUpdateOverviewIobCob::class.java)
+            .debounce(1L, TimeUnit.SECONDS)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateIobCob(it.from) }, fabricPrivacy::logException)
+        disposable += activePlugin.activeOverview.overviewBus
+            .toObservable(EventUpdateOverviewSensitivity::class.java)
+            .debounce(1L, TimeUnit.SECONDS)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateSensitivity(it.from) }, fabricPrivacy::logException)
+        disposable += activePlugin.activeOverview.overviewBus
+            .toObservable(EventUpdateOverviewGraph::class.java)
+            .debounce(1L, TimeUnit.SECONDS)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateGraph(it.from) }, fabricPrivacy::logException)
+        disposable += activePlugin.activeOverview.overviewBus
+            .toObservable(EventUpdateOverviewPumpStatus::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updatePumpStatus(it.from) }, fabricPrivacy::logException)
+        disposable += activePlugin.activeOverview.overviewBus
+            .toObservable(EventUpdateOverviewNotification::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ updateNotification(it.from) }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventRefreshOverview::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({
-                if (it.now) overviewPlugin.refreshLoop(it.from)
-                else scheduleUpdateGUI(it.from)
-            }, fabricPrivacy::logException))
-        disposable.add(rxBus
+                           if (it.now) overviewPlugin.refreshLoop(it.from)
+                           else scheduleUpdateGUI(it.from)
+                       }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventAcceptOpenLoopChange::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ scheduleUpdateGUI("EventAcceptOpenLoopChange") }, fabricPrivacy::logException))
-        disposable.add(rxBus
+            .subscribe({ scheduleUpdateGUI("EventAcceptOpenLoopChange") }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventInitializationChanged::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({ updateGUI("EventInitializationChanged", OverviewData.Property.TIME) }, fabricPrivacy::logException))
-        disposable.add(rxBus
+            .subscribe({ updateTime("EventInitializationChanged") }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ scheduleUpdateGUI("EventPreferenceChange") }, fabricPrivacy::logException))
-        disposable.add(rxBus
+            .subscribe({ scheduleUpdateGUI("EventPreferenceChange") }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventNewOpenLoopNotification::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ scheduleUpdateGUI("EventNewOpenLoopNotification") }, fabricPrivacy::logException))
+            .subscribe({ scheduleUpdateGUI("EventNewOpenLoopNotification") }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventPumpStatusChanged::class.java)
             .observeOn(aapsSchedulers.main)
-            .delay (30, TimeUnit.MILLISECONDS, aapsSchedulers.main)
+            .delay(30, TimeUnit.MILLISECONDS, aapsSchedulers.main)
             .subscribe({
-                overviewData.pumpStatus = it.getStatus(resourceHelper)
-                updateGUI("EventPumpStatusChanged", OverviewData.Property.PUMPSTATUS)
-            }, fabricPrivacy::logException)
+                           overviewData.pumpStatus = it.getStatus(rh)
+                           updatePumpStatus("EventPumpStatusChanged")
+                       }, fabricPrivacy::logException)
 
         refreshLoop = Runnable {
             overviewPlugin.refreshLoop("refreshLoop")
@@ -263,7 +321,17 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
         handler.postDelayed(refreshLoop, 60 * 1000L)
 
-        for (p in OverviewData.Property.values()) updateGUI("onResume", p)
+        updateTime("onResume")
+        updateCalcProgress("onResume")
+        updateProfile("onResume")
+        updateTemporaryBasal("onResume")
+        updateExtendedBolus("onResume")
+        updateTemporaryTarget("onResume")
+        updateBg("onResume")
+        updateIobCob("onResume")
+        updateSensitivity("onResume")
+        updateGraph("onResume")
+        updatePumpStatus("onResume")
     }
 
     @Synchronized
@@ -278,12 +346,27 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (childFragmentManager.isStateSaved) return
         activity?.let { activity ->
             when (v.id) {
-                R.id.treatment_button    -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if (isAdded) TreatmentDialog().show(childFragmentManager, "Overview") })
-                R.id.wizard_button       -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if (isAdded) WizardDialog().show(childFragmentManager, "Overview") })
-                R.id.insulin_button      -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if (isAdded) InsulinDialog().show(childFragmentManager, "Overview") })
+                R.id.treatment_button    -> protectionCheck.queryProtection(
+                    activity,
+                    ProtectionCheck.Protection.BOLUS,
+                    UIRunnable { if (isAdded) TreatmentDialog().show(childFragmentManager, "Overview") })
+                R.id.wizard_button       -> protectionCheck.queryProtection(
+                    activity,
+                    ProtectionCheck.Protection.BOLUS,
+                    UIRunnable { if (isAdded) WizardDialog().show(childFragmentManager, "Overview") })
+                R.id.insulin_button      -> protectionCheck.queryProtection(
+                    activity,
+                    ProtectionCheck.Protection.BOLUS,
+                    UIRunnable { if (isAdded) InsulinDialog().show(childFragmentManager, "Overview") })
                 R.id.quick_wizard_button -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if (isAdded) onClickQuickWizard() })
-                R.id.carbs_button        -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if (isAdded) CarbsDialog().show(childFragmentManager, "Overview") })
-                R.id.temp_target         -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if (isAdded) TempTargetDialog().show(childFragmentManager, "Overview") })
+                R.id.carbs_button        -> protectionCheck.queryProtection(
+                    activity,
+                    ProtectionCheck.Protection.BOLUS,
+                    UIRunnable { if (isAdded) CarbsDialog().show(childFragmentManager, "Overview") })
+                R.id.temp_target         -> protectionCheck.queryProtection(
+                    activity,
+                    ProtectionCheck.Protection.BOLUS,
+                    UIRunnable { if (isAdded) TempTargetDialog().show(childFragmentManager, "Overview") })
 
                 R.id.active_profile      -> {
                     ProfileViewerDialog().also { pvd ->
@@ -295,47 +378,51 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 }
 
                 R.id.cgm_button          -> {
-                    if (xdripPlugin.isEnabled(PluginType.BGSOURCE))
+                    if (xdripPlugin.isEnabled())
                         openCgmApp("com.eveningoutpost.dexdrip")
-                    else if (dexcomPlugin.isEnabled(PluginType.BGSOURCE)) {
+                    else if (dexcomPlugin.isEnabled()) {
                         dexcomMediator.findDexcomPackageName()?.let {
                             openCgmApp(it)
                         }
-                            ?: ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.dexcom_app_not_installed))
+                            ?: ToastUtils.showToastInUiThread(activity, rh.gs(R.string.dexcom_app_not_installed))
                     }
                 }
 
                 R.id.calibration_button  -> {
-                    if (xdripPlugin.isEnabled(PluginType.BGSOURCE)) {
+                    if (xdripPlugin.isEnabled()) {
                         CalibrationDialog().show(childFragmentManager, "CalibrationDialog")
-                    } else if (dexcomPlugin.isEnabled(PluginType.BGSOURCE)) {
+                    } else if (dexcomPlugin.isEnabled()) {
                         try {
                             dexcomMediator.findDexcomPackageName()?.let {
-                                startActivity(Intent("com.dexcom.cgm.activities.MeterEntryActivity").setPackage(it))
+                                startActivity(
+                                    Intent("com.dexcom.cgm.activities.MeterEntryActivity")
+                                        .setPackage(it)
+                                        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                                )
                             }
-                                ?: ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.dexcom_app_not_installed))
+                                ?: ToastUtils.showToastInUiThread(activity, rh.gs(R.string.dexcom_app_not_installed))
                         } catch (e: ActivityNotFoundException) {
-                            ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.g5appnotdetected))
+                            ToastUtils.showToastInUiThread(activity, rh.gs(R.string.g5appnotdetected))
                         }
                     }
                 }
 
                 R.id.accept_temp_button  -> {
                     profileFunction.getProfile() ?: return
-                    if (loopPlugin.isEnabled(PluginType.LOOP)) {
+                    if (loopPlugin.isEnabled()) {
                         handler.post {
                             val lastRun = loopPlugin.lastRun
                             loopPlugin.invoke("Accept temp button", false)
                             if (lastRun?.lastAPSRun != null && lastRun.constraintsProcessed?.isChangeRequested == true) {
                                 protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable {
-                                    OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.tempbasal_label), lastRun.constraintsProcessed?.toSpanned()
+                                    OKDialog.showConfirmation(activity, rh.gs(R.string.tempbasal_label), lastRun.constraintsProcessed?.toSpanned()
                                         ?: "".toSpanned(), {
-                                        uel.log(Action.ACCEPTS_TEMP_BASAL, Sources.Overview)
-                                        binding.buttonsLayout.acceptTempButton.visibility = View.GONE
-                                        (context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(Constants.notificationID)
-                                        rxBus.send(EventWearInitiateAction("cancelChangeRequest"))
-                                        Thread { loopPlugin.acceptChangeRequest() }.run()
-                                    })
+                                                                  uel.log(Action.ACCEPTS_TEMP_BASAL, Sources.Overview)
+                                                                  binding.buttonsLayout.acceptTempButton.visibility = View.GONE
+                                                                  (context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(Constants.notificationID)
+                                                                  rxBus.send(EventWearInitiateAction("cancelChangeRequest"))
+                                                                  Thread { loopPlugin.acceptChangeRequest() }.run()
+                                                              })
                                 })
                             }
                         }
@@ -362,7 +449,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 intent.addCategory(Intent.CATEGORY_LAUNCHER)
                 it.startActivity(intent)
             } catch (e: ActivityNotFoundException) {
-                OKDialog.show(it, "", resourceHelper.gs(R.string.error_starting_cgm))
+                OKDialog.show(it, "", rh.gs(R.string.error_starting_cgm))
             }
         }
     }
@@ -385,7 +472,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             }
 
             R.id.temp_target         -> v.performClick()
-            R.id.active_profile      -> activity?.let { activity -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { ProfileSwitchDialog().show(childFragmentManager, "ProfileSwitchDialog") }) }
+            R.id.active_profile      -> activity?.let { activity ->
+                protectionCheck.queryProtection(
+                    activity,
+                    ProtectionCheck.Protection.BOLUS,
+                    UIRunnable { ProfileSwitchDialog().show(childFragmentManager, "ProfileSwitchDialog") })
+            }
 
         }
         return false
@@ -404,7 +496,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(quickWizardEntry.carbs())).value()
                 activity?.let {
                     if (abs(wizard.insulinAfterConstraints - wizard.calculatedTotalInsulin) >= pump.pumpDescription.pumpType.determineCorrectBolusStepSize(wizard.insulinAfterConstraints) || carbsAfterConstraints != quickWizardEntry.carbs()) {
-                        OKDialog.show(it, resourceHelper.gs(R.string.treatmentdeliveryerror), resourceHelper.gs(R.string.constraints_violation) + "\n" + resourceHelper.gs(R.string.changeyourinput))
+                        OKDialog.show(it, rh.gs(R.string.treatmentdeliveryerror), rh.gs(R.string.constraints_violation) + "\n" + rh.gs(R.string.changeyourinput))
                         return
                     }
                     wizard.confirmAndExecute(it)
@@ -426,8 +518,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (quickWizardEntry != null && lastBG != null && profile != null && pump.isInitialized() && !pump.isSuspended()) {
             binding.buttonsLayout.quickWizardButton.visibility = View.VISIBLE
             val wizard = quickWizardEntry.doCalc(profile, profileName, lastBG, false)
-            binding.buttonsLayout.quickWizardButton.text = quickWizardEntry.buttonText() + "\n" + resourceHelper.gs(R.string.format_carbs, quickWizardEntry.carbs()) +
-                " " + resourceHelper.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin)
+            binding.buttonsLayout.quickWizardButton.text = quickWizardEntry.buttonText() + "\n" + rh.gs(R.string.format_carbs, quickWizardEntry.carbs()) +
+                " " + rh.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin)
             if (wizard.calculatedTotalInsulin <= 0) binding.buttonsLayout.quickWizardButton.visibility = View.GONE
         } else binding.buttonsLayout.quickWizardButton.visibility = View.GONE
 
@@ -440,25 +532,55 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             (lastRun.lastOpenModeAccept == 0L || lastRun.lastOpenModeAccept < lastRun.lastAPSRun) &&// never accepted or before last result
             lastRun.constraintsProcessed?.isChangeRequested == true // change is requested
 
-        if (showAcceptButton && pump.isInitialized() && !pump.isSuspended() && loopPlugin.isEnabled(PluginType.LOOP)) {
+        if (showAcceptButton && pump.isInitialized() && !pump.isSuspended() && loopPlugin.isEnabled()) {
             binding.buttonsLayout.acceptTempButton.visibility = View.VISIBLE
-            binding.buttonsLayout.acceptTempButton.text = "${resourceHelper.gs(R.string.setbasalquestion)}\n${lastRun!!.constraintsProcessed}"
+            binding.buttonsLayout.acceptTempButton.text = "${rh.gs(R.string.setbasalquestion)}\n${lastRun!!.constraintsProcessed}"
         } else {
             binding.buttonsLayout.acceptTempButton.visibility = View.GONE
         }
 
         // **** Various treatment buttons ****
-        binding.buttonsLayout.carbsButton.visibility = ((!activePlugin.activePump.pumpDescription.storesCarbInfo || pump.isInitialized() && !pump.isSuspended()) && profile != null && sp.getBoolean(R.string.key_show_carbs_button, true)).toVisibility()
+        binding.buttonsLayout.carbsButton.visibility =
+            ((!activePlugin.activePump.pumpDescription.storesCarbInfo || pump.isInitialized() && !pump.isSuspended()) && profile != null && sp.getBoolean(
+                R.string.key_show_carbs_button,
+                true
+            )).toVisibility()
         binding.buttonsLayout.treatmentButton.visibility = (pump.isInitialized() && !pump.isSuspended() && profile != null && sp.getBoolean(R.string.key_show_treatment_button, false)).toVisibility()
         binding.buttonsLayout.wizardButton.visibility = (pump.isInitialized() && !pump.isSuspended() && profile != null && sp.getBoolean(R.string.key_show_wizard_button, true)).toVisibility()
         binding.buttonsLayout.insulinButton.visibility = (pump.isInitialized() && !pump.isSuspended() && profile != null && sp.getBoolean(R.string.key_show_insulin_button, true)).toVisibility()
 
         // **** Calibration & CGM buttons ****
-        val xDripIsBgSource = xdripPlugin.isEnabled(PluginType.BGSOURCE)
-        val dexcomIsSource = dexcomPlugin.isEnabled(PluginType.BGSOURCE)
+        val xDripIsBgSource = xdripPlugin.isEnabled()
+        val dexcomIsSource = dexcomPlugin.isEnabled()
         binding.buttonsLayout.calibrationButton.visibility = ((xDripIsBgSource || dexcomIsSource) && actualBG != null && sp.getBoolean(R.string.key_show_calibration_button, true)).toVisibility()
         binding.buttonsLayout.cgmButton.visibility = (sp.getBoolean(R.string.key_show_cgm_button, false) && (xDripIsBgSource || dexcomIsSource)).toVisibility()
 
+        // Automation buttons
+        binding.buttonsLayout.userButtonsLayout.removeAllViews()
+        val events = automationPlugin.userEvents()
+        for (event in events)
+            if (event.isEnabled && event.trigger.shouldRun())
+                context?.let { context ->
+                    SingleClickButton(context).also {
+                        it.setTextColor(rh.gc(R.color.colorTreatmentButton))
+                        it.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10f)
+                        it.layoutParams = LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 0.5f).also { l ->
+                            l.setMargins(0, 0, rh.dpToPx(-4), 0)
+                        }
+                        it.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_danar_useropt), null, null)
+                        it.text = event.title
+
+                        it.setOnClickListener {
+                            OKDialog.showConfirmation(
+                                context,
+                                rh.gs(R.string.run_question, event.title),
+                                { handler.post { automationPlugin.processEvent(event, true) } }
+                            )
+                        }
+                        binding.buttonsLayout.userButtonsLayout.addView(it)
+                    }
+                }
+        binding.buttonsLayout.userButtonsLayout.visibility = events.isNotEmpty().toVisibility()
     }
 
     private fun processAps() {
@@ -472,30 +594,32 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             when {
                 loopPlugin.isEnabled() && loopPlugin.isSuperBolus                       -> {
                     binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_superbolus)
-                    binding.infoLayout.apsModeText.text = dateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
+                    binding.infoLayout.apsModeText.text = dateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, rh)
                     binding.infoLayout.apsModeText.visibility = View.VISIBLE
                 }
 
                 loopPlugin.isDisconnected                                               -> {
                     binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_disconnected)
-                    binding.infoLayout.apsModeText.text = dateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
+                    binding.infoLayout.apsModeText.text = dateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, rh)
                     binding.infoLayout.apsModeText.visibility = View.VISIBLE
                 }
 
                 loopPlugin.isEnabled() && loopPlugin.isSuspended                        -> {
                     binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_paused)
-                    binding.infoLayout.apsModeText.text = dateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
+                    binding.infoLayout.apsModeText.text = dateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, rh)
                     binding.infoLayout.apsModeText.visibility = View.VISIBLE
                 }
 
                 pump.isSuspended()                                                      -> {
-                    binding.infoLayout.apsMode.setImageResource(if (pump.model() == PumpType.OMNIPOD_EROS || pump.model() == PumpType.OMNIPOD_DASH) {
-                        // For Omnipod, indicate the pump as disconnected when it's suspended.
-                        // The only way to 'reconnect' it, is through the Omnipod tab
-                        R.drawable.ic_loop_disconnected
-                    } else {
-                        R.drawable.ic_loop_paused
-                    })
+                    binding.infoLayout.apsMode.setImageResource(
+                        if (pump.model() == PumpType.OMNIPOD_EROS || pump.model() == PumpType.OMNIPOD_DASH) {
+                            // For Omnipod, indicate the pump as disconnected when it's suspended.
+                            // The only way to 'reconnect' it, is through the Omnipod tab
+                            R.drawable.ic_loop_disconnected
+                        } else {
+                            R.drawable.ic_loop_paused
+                        }
+                    )
                     binding.infoLayout.apsModeText.visibility = View.GONE
                 }
 
@@ -528,15 +652,15 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
         // pump status from ns
         binding.pump.text = nsDeviceStatus.pumpStatus
-        binding.pump.setOnClickListener { activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.pump), nsDeviceStatus.extendedPumpStatus) } }
+        binding.pump.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.pump), nsDeviceStatus.extendedPumpStatus) } }
 
         // OpenAPS status from ns
         binding.openaps.text = nsDeviceStatus.openApsStatus
-        binding.openaps.setOnClickListener { activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.openaps), nsDeviceStatus.extendedOpenApsStatus) } }
+        binding.openaps.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.openaps), nsDeviceStatus.extendedOpenApsStatus) } }
 
         // Uploader status from ns
         binding.uploader.text = nsDeviceStatus.uploaderStatusSpanned
-        binding.uploader.setOnClickListener { activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.uploader), nsDeviceStatus.extendedUploaderStatus) } }
+        binding.uploader.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(R.string.uploader), nsDeviceStatus.extendedUploaderStatus) } }
     }
 
     private fun prepareGraphsIfNeeded(numOfGraphs: Int) {
@@ -551,8 +675,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 relativeLayout.layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
 
                 val graph = GraphView(context)
-                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(skinProvider.activeSkin().secondaryGraphHeight)).also { it.setMargins(0, resourceHelper.dpToPx(15), 0, resourceHelper.dpToPx(10)) }
-                graph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
+                graph.layoutParams =
+                    LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, rh.dpToPx(skinProvider.activeSkin().secondaryGraphHeight)).also { it.setMargins(0, rh.dpToPx(15), 0, rh.dpToPx(10)) }
+                graph.gridLabelRenderer?.gridColor = rh.gc(R.color.graphgrid)
                 graph.gridLabelRenderer?.reloadStyles()
                 graph.gridLabelRenderer?.isHorizontalLabelsVisible = false
                 graph.gridLabelRenderer?.labelVerticalWidth = axisWidth
@@ -561,7 +686,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 relativeLayout.addView(graph)
 
                 val label = TextView(context)
-                val layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(resourceHelper.dpToPx(30), resourceHelper.dpToPx(25), 0, 0) }
+                val layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(rh.dpToPx(30), rh.dpToPx(25), 0, 0) }
                 layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP)
                 layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT)
                 label.layoutParams = layoutParams
@@ -589,247 +714,283 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         task?.let { handler.postDelayed(it, 500) }
     }
 
-    @Suppress("UNUSED_PARAMETER")
     @SuppressLint("SetTextI18n")
-    fun updateGUI(from: String, what: OverviewData.Property) {
-//        if (what != OverviewData.Property.CALC_PROGRESS)
-//            aapsLogger.debug(LTag.UI, "UpdateGui $from $what")
-        if (profileFunction.getProfile() == null) {
-            binding.activeProfile.setText(R.string.noprofileset)
-            binding.activeProfile.setBackgroundColor(resourceHelper.gc(R.color.errorAlertBackground))
-            return
+    @Suppress("UNUSED_PARAMETER")
+    fun updateBg(from: String) {
+        val units = profileFunction.getUnits()
+        binding.infoLayout.bg.text = overviewData.lastBg?.valueToUnitsString(units)
+            ?: rh.gs(R.string.notavailable)
+        binding.infoLayout.bg.setTextColor(overviewData.lastBgColor)
+        binding.infoLayout.arrow.setImageResource(trendCalculator.getTrendArrow(overviewData.lastBg).directionToIcon())
+        binding.infoLayout.arrow.setColorFilter(overviewData.lastBgColor)
+
+        val glucoseStatus = glucoseStatusProvider.glucoseStatusData
+        if (glucoseStatus != null) {
+            binding.infoLayout.deltaLarge.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
+            binding.infoLayout.deltaLarge.setTextColor(overviewData.lastBgColor)
+            binding.infoLayout.delta.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
+            binding.infoLayout.avgDelta.text = Profile.toSignedUnitsString(glucoseStatus.shortAvgDelta, glucoseStatus.shortAvgDelta * Constants.MGDL_TO_MMOLL, units)
+            binding.infoLayout.longAvgDelta.text = Profile.toSignedUnitsString(glucoseStatus.longAvgDelta, glucoseStatus.longAvgDelta * Constants.MGDL_TO_MMOLL, units)
+        } else {
+            binding.infoLayout.deltaLarge.text = ""
+            binding.infoLayout.delta.text = "Δ " + rh.gs(R.string.notavailable)
+            binding.infoLayout.avgDelta.text = ""
+            binding.infoLayout.longAvgDelta.text = ""
         }
-        binding.notifications.let { notificationStore.updateNotifications(it) }
 
-        val units = profileFunction.getUnits()
-        val pump = activePlugin.activePump
-        when (what) {
-            OverviewData.Property.BG               -> {
-                binding.infoLayout.bg.text = overviewData.lastBg?.valueToUnitsString(units)
-                    ?: resourceHelper.gs(R.string.notavailable)
-                binding.infoLayout.bg.setTextColor(overviewData.lastBgColor)
-                binding.infoLayout.arrow.setImageResource(trendCalculator.getTrendArrow(overviewData.lastBg).directionToIcon())
-                binding.infoLayout.arrow.setColorFilter(overviewData.lastBgColor)
-
-                val glucoseStatus = glucoseStatusProvider.glucoseStatusData
-                if (glucoseStatus != null) {
-                    binding.infoLayout.deltaLarge.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
-                    binding.infoLayout.deltaLarge.setTextColor(overviewData.lastBgColor)
-                    binding.infoLayout.delta.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
-                    binding.infoLayout.avgDelta.text = Profile.toSignedUnitsString(glucoseStatus.shortAvgDelta, glucoseStatus.shortAvgDelta * Constants.MGDL_TO_MMOLL, units)
-                    binding.infoLayout.longAvgDelta.text = Profile.toSignedUnitsString(glucoseStatus.longAvgDelta, glucoseStatus.longAvgDelta * Constants.MGDL_TO_MMOLL, units)
+        // strike through if BG is old
+        binding.infoLayout.bg.paintFlags =
+            if (!overviewData.isActualBg) binding.infoLayout.bg.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+            else binding.infoLayout.bg.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+        binding.infoLayout.timeAgo.text = dateUtil.minAgo(rh, overviewData.lastBg?.timestamp)
+        binding.infoLayout.timeAgoShort.text = "(" + dateUtil.minAgoShort(overviewData.lastBg?.timestamp) + ")"
+
+        val qualityIcon = bgQualityCheckPlugin.icon()
+        if (qualityIcon != 0) {
+            binding.infoLayout.bgQuality.visibility = View.VISIBLE
+            binding.infoLayout.bgQuality.setImageResource(qualityIcon)
+            binding.infoLayout.bgQuality.setOnClickListener {
+                context?.let { context -> OKDialog.show(context, rh.gs(R.string.data_status), bgQualityCheckPlugin.message) }
+            }
+        } else {
+            binding.infoLayout.bgQuality.visibility = View.GONE
+        }
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun updateProfile(from: String) {
+        val profileBackgroundColor =
+            profileFunction.getProfile()?.let {
+                if (it is ProfileSealed.EPS) {
+                    if (it.value.originalPercentage != 100 || it.value.originalTimeshift != 0L || it.value.originalDuration != 0L)
+                        rh.gc(R.color.ribbonWarning)
+                    else rh.gc(R.color.ribbonDefault)
+                } else if (it is ProfileSealed.PS) {
+                    rh.gc(R.color.ribbonDefault)
                 } else {
-                    binding.infoLayout.deltaLarge.text = ""
-                    binding.infoLayout.delta.text = "Δ " + resourceHelper.gs(R.string.notavailable)
-                    binding.infoLayout.avgDelta.text = ""
-                    binding.infoLayout.longAvgDelta.text = ""
+                    rh.gc(R.color.ribbonDefault)
                 }
+            } ?: rh.gc(R.color.ribbonCritical)
+
+        val profileTextColor =
+            profileFunction.getProfile()?.let {
+                if (it is ProfileSealed.EPS) {
+                    if (it.value.originalPercentage != 100 || it.value.originalTimeshift != 0L || it.value.originalDuration != 0L)
+                        rh.gc(R.color.ribbonTextWarning)
+                    else rh.gc(R.color.ribbonTextDefault)
+                } else if (it is ProfileSealed.PS) {
+                    rh.gc(R.color.ribbonTextDefault)
+                } else {
+                    rh.gc(R.color.ribbonTextDefault)
+                }
+            } ?: rh.gc(R.color.ribbonTextDefault)
 
-                // strike through if BG is old
-                binding.infoLayout.bg.paintFlags =
-                    if (!overviewData.isActualBg) binding.infoLayout.bg.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-                    else binding.infoLayout.bg.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
-                binding.infoLayout.timeAgo.text = dateUtil.minAgo(resourceHelper, overviewData.lastBg?.timestamp)
-                binding.infoLayout.timeAgoShort.text = "(" + dateUtil.minAgoShort(overviewData.lastBg?.timestamp) + ")"
-            }
-
-            OverviewData.Property.PROFILE          -> {
-                val profileBackgroundColor =
-                    profileFunction.getProfile()?.let {
-                        val profile = (it as ProfileSealed.EPS).value
-                        if (profile.originalPercentage != 100 || profile.originalTimeshift != 0L || profile.originalDuration != 0L)
-                            resourceHelper.gc(R.color.ribbonWarning)
-                        else resourceHelper.gc(R.color.ribbonDefault)
-                    } ?: resourceHelper.gc(R.color.ribbonTextDefault)
-
-                val profileTextColor =
-                    profileFunction.getProfile()?.let {
-                        val profile = (it as ProfileSealed.EPS).value
-                        if (profile.originalPercentage != 100 || profile.originalTimeshift != 0L || profile.originalDuration != 0L)
-                            resourceHelper.gc(R.color.ribbonTextWarning)
-                        else resourceHelper.gc(R.color.ribbonTextDefault)
-                    } ?: resourceHelper.gc(R.color.ribbonTextDefault)
-
-                binding.activeProfile.text = profileFunction.getProfileNameWithRemainingTime()
-                binding.activeProfile.setBackgroundColor(profileBackgroundColor)
-                binding.activeProfile.setTextColor(profileTextColor)
-            }
+        binding.activeProfile.text = profileFunction.getProfileNameWithRemainingTime()
+        binding.activeProfile.setBackgroundColor(profileBackgroundColor)
+        binding.activeProfile.setTextColor(profileTextColor)
+    }
 
-            OverviewData.Property.TEMPORARY_BASAL  -> {
-                binding.infoLayout.baseBasal.text = overviewData.temporaryBasalText
-                binding.infoLayout.baseBasal.setTextColor(overviewData.temporaryBasalColor)
-                binding.infoLayout.baseBasalIcon.setImageResource(overviewData.temporaryBasalIcon)
-                binding.infoLayout.basalLayout.setOnClickListener {
-                    activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.basal), overviewData.temporaryBasalDialogText) }
-                }
-            }
+    @Suppress("UNUSED_PARAMETER")
+    fun updateTemporaryBasal(from: String) {
+        binding.infoLayout.baseBasal.text = overviewData.temporaryBasalText
+        binding.infoLayout.baseBasal.setTextColor(overviewData.temporaryBasalColor)
+        binding.infoLayout.baseBasalIcon.setImageResource(overviewData.temporaryBasalIcon)
+        binding.infoLayout.basalLayout.setOnClickListener {
+            activity?.let { OKDialog.show(it, rh.gs(R.string.basal), overviewData.temporaryBasalDialogText) }
+        }
+    }
 
-            OverviewData.Property.EXTENDED_BOLUS   -> {
-                binding.infoLayout.extendedBolus.text = overviewData.extendedBolusText
-                binding.infoLayout.extendedLayout.setOnClickListener {
-                    activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.extended_bolus), overviewData.extendedBolusDialogText) }
-                }
-                binding.infoLayout.extendedLayout.visibility = (overviewData.extendedBolus != null && !pump.isFakingTempsByExtendedBoluses).toVisibility()
+    @Suppress("UNUSED_PARAMETER")
+    fun updateExtendedBolus(from: String) {
+        val pump = activePlugin.activePump
+        binding.infoLayout.extendedBolus.text = overviewData.extendedBolusText
+        binding.infoLayout.extendedLayout.setOnClickListener {
+            activity?.let { OKDialog.show(it, rh.gs(R.string.extended_bolus), overviewData.extendedBolusDialogText) }
+        }
+        binding.infoLayout.extendedLayout.visibility = (iobCobCalculator.getExtendedBolus(dateUtil.now()) != null && !pump.isFakingTempsByExtendedBoluses).toVisibility()
+    }
 
-            }
+    @Suppress("UNUSED_PARAMETER")
+    fun updateTime(from: String) {
+        binding.infoLayout.time.text = dateUtil.timeString(dateUtil.now())
+        // Status lights
+        binding.statusLightsLayout.statusLights.visibility = (sp.getBoolean(R.string.key_show_statuslights, true) || config.NSCLIENT).toVisibility()
+        statusLightHandler.updateStatusLights(
+            binding.statusLightsLayout.cannulaAge,
+            binding.statusLightsLayout.insulinAge,
+            binding.statusLightsLayout.reservoirLevel,
+            binding.statusLightsLayout.sensorAge,
+            null,
+            binding.statusLightsLayout.pbAge,
+            binding.statusLightsLayout.batteryLevel
+        )
+        processButtonsVisibility()
+        processAps()
+    }
 
-            OverviewData.Property.TIME             -> {
-                binding.infoLayout.time.text = dateUtil.timeString(dateUtil.now())
-                // Status lights
-                binding.statusLightsLayout.statusLights.visibility = (sp.getBoolean(R.string.key_show_statuslights, true) || config.NSCLIENT).toVisibility()
-                statusLightHandler.updateStatusLights(binding.statusLightsLayout.cannulaAge, binding.statusLightsLayout.insulinAge, binding.statusLightsLayout.reservoirLevel, binding.statusLightsLayout.sensorAge, null, binding.statusLightsLayout.pbAge, binding.statusLightsLayout.batteryLevel)
-                processButtonsVisibility()
-                processAps()
-            }
+    @Suppress("UNUSED_PARAMETER")
+    fun updateIobCob(from: String) {
+        binding.infoLayout.iob.text = overviewData.iobText
+        binding.infoLayout.iobLayout.setOnClickListener {
+            activity?.let { OKDialog.show(it, rh.gs(R.string.iob), overviewData.iobDialogText) }
+        }
+        // cob
+        var cobText = overviewData.cobInfo?.displayText(rh, dateUtil, buildHelper.isEngineeringMode()) ?: rh.gs(R.string.value_unavailable_short)
 
-            OverviewData.Property.IOB_COB          -> {
-                binding.infoLayout.iob.text = overviewData.iobText
-                binding.infoLayout.iobLayout.setOnClickListener {
-                    activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.iob), overviewData.iobDialogText) }
-                }
-                // cob
-                var cobText = overviewData.cobInfo?.displayText(resourceHelper, dateUtil, buildHelper.isDev()) ?: resourceHelper.gs(R.string.value_unavailable_short)
-
-                val constraintsProcessed = loopPlugin.lastRun?.constraintsProcessed
-                val lastRun = loopPlugin.lastRun
-                if (config.APS && constraintsProcessed != null && lastRun != null) {
-                    if (constraintsProcessed.carbsReq > 0) {
-                        //only display carbsreq when carbs have not been entered recently
-                        if (overviewData.lastCarbsTime < lastRun.lastAPSRun) {
-                            cobText += " | " + constraintsProcessed.carbsReq + " " + resourceHelper.gs(R.string.required)
-                        }
-                        if (carbAnimation?.isRunning == false)
-                            carbAnimation?.start()
-                    } else {
-                        carbAnimation?.stop()
-                        carbAnimation?.selectDrawable(0)
-                    }
+        val constraintsProcessed = loopPlugin.lastRun?.constraintsProcessed
+        val lastRun = loopPlugin.lastRun
+        if (config.APS && constraintsProcessed != null && lastRun != null) {
+            if (constraintsProcessed.carbsReq > 0) {
+                //only display carbsreq when carbs have not been entered recently
+                if (overviewData.lastCarbsTime < lastRun.lastAPSRun) {
+                    cobText += " | " + constraintsProcessed.carbsReq + " " + rh.gs(R.string.required)
                 }
-                binding.infoLayout.cob.text = cobText
+                if (carbAnimation?.isRunning == false)
+                    carbAnimation?.start()
+            } else {
+                carbAnimation?.stop()
+                carbAnimation?.selectDrawable(0)
             }
+        }
+        binding.infoLayout.cob.text = cobText
+    }
 
-            OverviewData.Property.TEMPORARY_TARGET -> {
-                // temp target
-                if (overviewData.temporaryTarget?.isInProgress(dateUtil) == false) overviewData.temporaryTarget = null
-                val tempTarget = overviewData.temporaryTarget
-                if (tempTarget != null) {
-                    binding.tempTarget.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
-                    binding.tempTarget.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
-                    binding.tempTarget.text = Profile.toTargetRangeString(tempTarget.lowTarget, tempTarget.highTarget, GlucoseUnit.MGDL, units) + " " + dateUtil.untilString(tempTarget.end, resourceHelper)
+    @SuppressLint("SetTextI18n")
+    @Suppress("UNUSED_PARAMETER")
+    fun updateTemporaryTarget(from: String) {
+        val units = profileFunction.getUnits()
+        if (overviewData.temporaryTarget?.isInProgress(dateUtil) == false) overviewData.temporaryTarget = null
+        val tempTarget = overviewData.temporaryTarget
+        if (tempTarget != null) {
+            binding.tempTarget.setTextColor(rh.gc(R.color.ribbonTextWarning))
+            binding.tempTarget.setBackgroundColor(rh.gc(R.color.ribbonWarning))
+            binding.tempTarget.text = Profile.toTargetRangeString(tempTarget.lowTarget, tempTarget.highTarget, GlucoseUnit.MGDL, units) + " " + dateUtil.untilString(tempTarget.end, rh)
+        } else {
+            // If the target is not the same as set in the profile then oref has overridden it
+            profileFunction.getProfile()?.let { profile ->
+                val targetUsed = loopPlugin.lastRun?.constraintsProcessed?.targetBG ?: 0.0
+
+                if (targetUsed != 0.0 && abs(profile.getTargetMgdl() - targetUsed) > 0.01) {
+                    aapsLogger.debug("Adjusted target. Profile: ${profile.getTargetMgdl()} APS: $targetUsed")
+                    binding.tempTarget.text = Profile.toTargetRangeString(targetUsed, targetUsed, GlucoseUnit.MGDL, units)
+                    binding.tempTarget.setTextColor(rh.gc(R.color.ribbonTextWarning))
+                    binding.tempTarget.setBackgroundColor(rh.gc(R.color.tempTargetBackground))
                 } else {
-                    // If the target is not the same as set in the profile then oref has overridden it
-                    profileFunction.getProfile()?.let { profile ->
-                        val targetUsed = loopPlugin.lastRun?.constraintsProcessed?.targetBG ?: 0.0
-
-                        if (targetUsed != 0.0 && abs(profile.getTargetMgdl() - targetUsed) > 0.01) {
-                            aapsLogger.debug("Adjusted target. Profile: ${profile.getTargetMgdl()} APS: $targetUsed")
-                            binding.tempTarget.text = Profile.toTargetRangeString(targetUsed, targetUsed, GlucoseUnit.MGDL, units)
-                            binding.tempTarget.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
-                            binding.tempTarget.setBackgroundColor(resourceHelper.gc(R.color.tempTargetBackground))
-                        } else {
-                            binding.tempTarget.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
-                            binding.tempTarget.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
-                            binding.tempTarget.text = Profile.toTargetRangeString(profile.getTargetLowMgdl(), profile.getTargetHighMgdl(), GlucoseUnit.MGDL, units)
-                        }
-                    }
+                    binding.tempTarget.setTextColor(rh.gc(R.color.ribbonTextDefault))
+                    binding.tempTarget.setBackgroundColor(rh.gc(R.color.ribbonDefault))
+                    binding.tempTarget.text = Profile.toTargetRangeString(profile.getTargetLowMgdl(), profile.getTargetHighMgdl(), GlucoseUnit.MGDL, units)
                 }
             }
+        }
+    }
 
-            OverviewData.Property.GRAPH            -> {
-                val graphData = GraphData(injector, binding.graphsLayout.bgGraph, overviewData)
-                val menuChartSettings = overviewMenus.setting
-                graphData.addInRangeArea(overviewData.fromTime, overviewData.endTime, defaultValueHelper.determineLowLine(), defaultValueHelper.determineHighLine())
-                graphData.addBgReadings(menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal])
-                if (buildHelper.isDev()) graphData.addBucketedData()
-                graphData.addTreatments()
-                if (menuChartSettings[0][OverviewMenus.CharType.ACT.ordinal])
-                    graphData.addActivity(0.8)
-                if ((pump.pumpDescription.isTempBasalCapable || config.NSCLIENT) && menuChartSettings[0][OverviewMenus.CharType.BAS.ordinal])
-                    graphData.addBasals()
-                graphData.addTargetLine()
-                graphData.addNowLine(dateUtil.now())
-
-                // set manual x bounds to have nice steps
-                graphData.setNumVerticalLabels()
-                graphData.formatAxis(overviewData.fromTime, overviewData.endTime)
-
-                graphData.performUpdate()
-
-                // 2nd graphs
-                prepareGraphsIfNeeded(menuChartSettings.size)
-                val secondaryGraphsData: ArrayList<GraphData> = ArrayList()
-
-                val now = System.currentTimeMillis()
-                for (g in 0 until min(secondaryGraphs.size, menuChartSettings.size + 1)) {
-                    val secondGraphData = GraphData(injector, secondaryGraphs[g], overviewData)
-                    var useABSForScale = false
-                    var useIobForScale = false
-                    var useCobForScale = false
-                    var useDevForScale = false
-                    var useRatioForScale = false
-                    var useDSForScale = false
-                    var useBGIForScale = false
-                    when {
-                        menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]      -> useABSForScale = true
-                        menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]      -> useIobForScale = true
-                        menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]      -> useCobForScale = true
-                        menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]      -> useDevForScale = true
-                        menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]      -> useBGIForScale = true
-                        menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]      -> useRatioForScale = true
-                        menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true
-                    }
-                    val alignDevBgiScale = menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] && menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]
-
-                    if (menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(useABSForScale, 1.0)
-                    if (menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(useIobForScale, 1.0)
-                    if (menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(useCobForScale, if (useCobForScale) 1.0 else 0.5)
-                    if (menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(useDevForScale, 1.0)
-                    if (menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]) secondGraphData.addMinusBGI(useBGIForScale, if (alignDevBgiScale) 1.0 else 0.8)
-                    if (menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(useRatioForScale, if (useRatioForScale) 1.0 else 0.8)
-                    if (menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(useDSForScale, if(useDSForScale) 1.0 else 0.8, useRatioForScale)
-
-                    // set manual x bounds to have nice steps
-                    secondGraphData.formatAxis(overviewData.fromTime, overviewData.endTime)
-                    secondGraphData.addNowLine(now)
-                    secondaryGraphsData.add(secondGraphData)
-                }
-                for (g in 0 until min(secondaryGraphs.size, menuChartSettings.size + 1)) {
-                    secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
-                    secondaryGraphs[g].visibility = (
-                        menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
-                            menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
-                            menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal] ||
-                            menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
-                            menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal] ||
-                            menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
-                            menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
-                        ).toVisibility()
-                    secondaryGraphsData[g].performUpdate()
-                }
+    @Suppress("UNUSED_PARAMETER")
+    fun updateGraph(from: String) {
+        val pump = activePlugin.activePump
+        val graphData = GraphData(injector, binding.graphsLayout.bgGraph, overviewData)
+        val menuChartSettings = overviewMenus.setting
+        graphData.addInRangeArea(overviewData.fromTime, overviewData.endTime, defaultValueHelper.determineLowLine(), defaultValueHelper.determineHighLine())
+        graphData.addBgReadings(menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal])
+        if (buildHelper.isDev()) graphData.addBucketedData()
+        graphData.addTreatments()
+        if (menuChartSettings[0][OverviewMenus.CharType.ACT.ordinal])
+            graphData.addActivity(0.8)
+        if ((pump.pumpDescription.isTempBasalCapable || config.NSCLIENT) && menuChartSettings[0][OverviewMenus.CharType.BAS.ordinal])
+            graphData.addBasals()
+        graphData.addTargetLine()
+        graphData.addNowLine(dateUtil.now())
+
+        // set manual x bounds to have nice steps
+        graphData.setNumVerticalLabels()
+        graphData.formatAxis(overviewData.fromTime, overviewData.endTime)
+
+        graphData.performUpdate()
+
+        // 2nd graphs
+        prepareGraphsIfNeeded(menuChartSettings.size)
+        val secondaryGraphsData: ArrayList<GraphData> = ArrayList()
+
+        val now = System.currentTimeMillis()
+        for (g in 0 until min(secondaryGraphs.size, menuChartSettings.size + 1)) {
+            val secondGraphData = GraphData(injector, secondaryGraphs[g], overviewData)
+            var useABSForScale = false
+            var useIobForScale = false
+            var useCobForScale = false
+            var useDevForScale = false
+            var useRatioForScale = false
+            var useDSForScale = false
+            var useBGIForScale = false
+            when {
+                menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]      -> useABSForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]      -> useIobForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]      -> useCobForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]      -> useDevForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]      -> useBGIForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]      -> useRatioForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true
             }
+            val alignDevBgiScale = menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] && menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]
+
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(useABSForScale, 1.0)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(useIobForScale, 1.0)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(useCobForScale, if (useCobForScale) 1.0 else 0.5)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(useDevForScale, 1.0)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]) secondGraphData.addMinusBGI(useBGIForScale, if (alignDevBgiScale) 1.0 else 0.8)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(useRatioForScale, if (useRatioForScale) 1.0 else 0.8)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(
+                useDSForScale,
+                if (useDSForScale) 1.0 else 0.8,
+                useRatioForScale
+            )
+
+            // set manual x bounds to have nice steps
+            secondGraphData.formatAxis(overviewData.fromTime, overviewData.endTime)
+            secondGraphData.addNowLine(now)
+            secondaryGraphsData.add(secondGraphData)
+        }
+        for (g in 0 until min(secondaryGraphs.size, menuChartSettings.size + 1)) {
+            secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
+            secondaryGraphs[g].visibility = (
+                menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
+                    menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
+                    menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal] ||
+                    menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
+                    menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal] ||
+                    menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
+                    menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
+                ).toVisibility()
+            secondaryGraphsData[g].performUpdate()
+        }
+    }
 
-            OverviewData.Property.CALC_PROGRESS    -> {
-                binding.graphsLayout.iobCalculationProgress.text = overviewData.calcProgress
-            }
+    @Suppress("UNUSED_PARAMETER")
+    fun updateCalcProgress(from: String) {
+        binding.graphsLayout.iobCalculationProgress.text = overviewData.calcProgress
+    }
 
-            OverviewData.Property.SENSITIVITY      -> {
-                if (sp.getBoolean(R.string.key_openapsama_useautosens, false) && constraintChecker.isAutosensModeEnabled().value()) {
-                    binding.infoLayout.sensitivityIcon.setImageResource(R.drawable.ic_swap_vert_black_48dp_green)
-                } else {
-                    binding.infoLayout.sensitivityIcon.setImageResource(R.drawable.ic_x_swap_vert)
-                }
+    @Suppress("UNUSED_PARAMETER")
+    fun updateSensitivity(from: String) {
+        if (sp.getBoolean(R.string.key_openapsama_useautosens, false) && constraintChecker.isAutosensModeEnabled().value()) {
+            binding.infoLayout.sensitivityIcon.setImageResource(R.drawable.ic_swap_vert_black_48dp_green)
+        } else {
+            binding.infoLayout.sensitivityIcon.setImageResource(R.drawable.ic_x_swap_vert)
+        }
 
-                binding.infoLayout.sensitivity.text =
-                    overviewData.lastAutosensData?.let { autosensData ->
-                        String.format(Locale.ENGLISH, "%.0f%%", autosensData.autosensResult.ratio * 100)
-                    } ?: ""
-            }
+        binding.infoLayout.sensitivity.text =
+            overviewData.lastAutosensData?.let { autosensData ->
+                String.format(Locale.ENGLISH, "%.0f%%", autosensData.autosensResult.ratio * 100)
+            } ?: ""
+    }
 
-            OverviewData.Property.PUMPSTATUS      -> {
-                val status = overviewData.pumpStatus
-                binding.pumpStatus.text = status
-                binding.pumpStatusLayout.visibility = (status != "").toVisibility()
-            }
-        }
+    @Suppress("UNUSED_PARAMETER")
+    fun updatePumpStatus(from: String) {
+        val status = overviewData.pumpStatus
+        binding.pumpStatus.text = status
+        binding.pumpStatusLayout.visibility = (status != "").toVisibility()
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun updateNotification(from: String) {
+        binding.notifications.let { notificationStore.updateNotifications(it) }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
index 6f7f464d5e7..baf807f31c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
@@ -14,7 +14,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -24,9 +24,9 @@ import javax.inject.Singleton
 @Singleton
 class OverviewMenus @Inject constructor(
     private val aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val sp: SP,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val buildHelper: BuildHelper,
     private val loopPlugin: LoopPlugin,
     private val config: Config
@@ -53,7 +53,7 @@ class OverviewMenus @Inject constructor(
     fun enabledTypes(graph: Int): String {
         val r = StringBuilder()
         for (type in CharType.values()) if (_setting[graph][type.ordinal]) {
-            r.append(resourceHelper.gs(type.shortnameId))
+            r.append(rh.gs(type.shortnameId))
             r.append(" ")
         }
         return r.toString()
@@ -102,7 +102,7 @@ class OverviewMenus @Inject constructor(
 
             for (g in 0 until numOfGraphs) {
                 if (g != 0 && g < numOfGraphs) {
-                    val dividerItem = popup.menu.add(Menu.NONE, g, Menu.NONE, "------- ${resourceHelper.gs(R.string.graph_menu_divider_header)} $g -------")
+                    val dividerItem = popup.menu.add(Menu.NONE, g, Menu.NONE, "------- ${rh.gs(R.string.graph_menu_divider_header)} $g -------")
                     dividerItem.isCheckable = true
                     dividerItem.isChecked = true
                 }
@@ -117,10 +117,10 @@ class OverviewMenus @Inject constructor(
                         if (settingsCopy[g2][m.ordinal]) insert = false
                     }
                     if (insert) {
-                        val item = popup.menu.add(Menu.NONE, m.ordinal + 100 * (g + 1), Menu.NONE, resourceHelper.gs(m.nameId))
+                        val item = popup.menu.add(Menu.NONE, m.ordinal + 100 * (g + 1), Menu.NONE, rh.gs(m.nameId))
                         val title = item.title
                         val s = SpannableString(title)
-                        s.setSpan(ForegroundColorSpan(resourceHelper.gc(m.colorId)), 0, s.length, 0)
+                        s.setSpan(ForegroundColorSpan(rh.gc(m.colorId)), 0, s.length, 0)
                         item.title = s
                         item.isCheckable = true
                         item.isChecked = settingsCopy[g][m.ordinal]
@@ -129,7 +129,7 @@ class OverviewMenus @Inject constructor(
                 }
             }
             if (numOfGraphs < MAX_GRAPHS) {
-                val dividerItem = popup.menu.add(Menu.NONE, numOfGraphs, Menu.NONE, "------- ${resourceHelper.gs(R.string.graph_menu_divider_header)} $numOfGraphs -------")
+                val dividerItem = popup.menu.add(Menu.NONE, numOfGraphs, Menu.NONE, "------- ${rh.gs(R.string.graph_menu_divider_header)} $numOfGraphs -------")
                 dividerItem.isCheckable = true
                 dividerItem.isChecked = false
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
index 3a56f7bcee1..fc41c0c5b4f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
@@ -12,10 +12,8 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.events.EventLoopInvoked
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-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.EventUpdateOverview
+import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.general.overview.events.*
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.Scale
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.ScaledDataPoint
 import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore
@@ -34,22 +32,22 @@ import javax.inject.Singleton
 
 @Singleton
 class OverviewPlugin @Inject constructor(
-        injector: HasAndroidInjector,
-        private val notificationStore: NotificationStore,
-        private val fabricPrivacy: FabricPrivacy,
-        private val rxBus: RxBusWrapper,
-        private val sp: SP,
-        aapsLogger: AAPSLogger,
-        private val aapsSchedulers: AapsSchedulers,
-        resourceHelper: ResourceHelper,
-        private val config: Config,
-        private val dateUtil: DateUtil,
-        private val profileFunction: ProfileFunction,
-        private val iobCobCalculator: IobCobCalculator,
-        private val repository: AppRepository,
-        private val overviewData: OverviewData,
-        private val overviewMenus: OverviewMenus
-) : PluginBase(PluginDescription()
+    injector: HasAndroidInjector,
+    private val notificationStore: NotificationStore,
+    private val fabricPrivacy: FabricPrivacy,
+    private val rxBus: RxBus,
+    private val sp: SP,
+    aapsLogger: AAPSLogger,
+    private val aapsSchedulers: AapsSchedulers,
+    rh: ResourceHelper,
+    private val config: Config,
+    private val dateUtil: DateUtil,
+    private val iobCobCalculator: IobCobCalculator,
+    private val repository: AppRepository,
+    private val overviewData: OverviewData,
+    private val overviewMenus: OverviewMenus
+) : PluginBase(
+    PluginDescription()
         .mainType(PluginType.GENERAL)
         .fragmentClass(OverviewFragment::class.qualifiedName)
         .alwaysVisible(true)
@@ -59,12 +57,12 @@ class OverviewPlugin @Inject constructor(
         .shortName(R.string.overview_shortname)
         .preferencesId(R.xml.pref_overview)
         .description(R.string.description_overview),
-        aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), Overview {
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
-    override val overviewBus = RxBusWrapper(aapsSchedulers)
+    override val overviewBus = RxBus(aapsSchedulers, aapsLogger)
 
     class DeviationDataPoint(x: Double, y: Double, var color: Int, scale: Scale) : ScaledDataPoint(x, y, scale)
 
@@ -75,82 +73,97 @@ class OverviewPlugin @Inject constructor(
 
         notificationStore.createNotificationChannel()
         disposable += rxBus
-                .toObservable(EventNewNotification::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({ n ->
-                    if (notificationStore.add(n.notification))
-                        rxBus.send(EventRefreshOverview("EventNewNotification"))
-                }, fabricPrivacy::logException)
+            .toObservable(EventNewNotification::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ n ->
+                           if (notificationStore.add(n.notification))
+                               rxBus.send(EventUpdateOverviewNotification("EventNewNotification"))
+                       }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventDismissNotification::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({ n ->
-                    if (notificationStore.remove(n.id))
-                        rxBus.send(EventRefreshOverview("EventDismissNotification"))
-                }, fabricPrivacy::logException)
+            .toObservable(EventDismissNotification::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ n ->
+                           if (notificationStore.remove(n.id))
+                               rxBus.send(EventUpdateOverviewNotification("EventDismissNotification"))
+                       }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventIobCalculationProgress::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({ overviewData.calcProgress = it.progress; overviewBus.send(EventUpdateOverview("EventIobCalculationProgress", OverviewData.Property.CALC_PROGRESS)) }, fabricPrivacy::logException)
+            .toObservable(EventIobCalculationProgress::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ overviewData.calcProgress = it.progress; overviewBus.send(EventUpdateOverviewCalcProgress("EventIobCalculationProgress")) }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventTempBasalChange::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({ loadTemporaryBasal("EventTempBasalChange") }, fabricPrivacy::logException)
+            .toObservable(EventTempBasalChange::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ overviewBus.send(EventUpdateOverviewTemporaryBasal("EventTempBasalChange")) }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventExtendedBolusChange::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({ loadExtendedBolus("EventExtendedBolusChange") }, fabricPrivacy::logException)
+            .toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ overviewBus.send(EventUpdateOverviewExtendedBolus("EventExtendedBolusChange")) }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventNewBG::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({ loadBg("EventNewBG") }, fabricPrivacy::logException)
+            .toObservable(EventNewBG::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ loadBg("EventNewBG") }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventTempTargetChange::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({ loadTemporaryTarget("EventTempTargetChange") }, fabricPrivacy::logException)
+            .toObservable(EventTempTargetChange::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ loadTemporaryTarget("EventTempTargetChange") }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventTreatmentChange::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({
-                    loadIobCobResults("EventTreatmentChange")
-                    overviewData.prepareTreatmentsData("EventTreatmentChange")
-                    overviewBus.send(EventUpdateOverview("EventTreatmentChange", OverviewData.Property.GRAPH))
-                }, fabricPrivacy::logException)
+            .toObservable(EventTreatmentChange::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({
+                           loadIobCobResults("EventTreatmentChange")
+                           overviewData.prepareTreatmentsData("EventTreatmentChange")
+                           overviewBus.send(EventUpdateOverviewGraph("EventTreatmentChange"))
+                       }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventTherapyEventChange::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({
-                    overviewData.prepareTreatmentsData("EventTherapyEventChange")
-                    overviewBus.send(EventUpdateOverview("EventTherapyEventChange", OverviewData.Property.GRAPH))
-                }, fabricPrivacy::logException)
+            .toObservable(EventTherapyEventChange::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({
+                           overviewData.prepareTreatmentsData("EventTherapyEventChange")
+                           overviewBus.send(EventUpdateOverviewGraph("EventTherapyEventChange"))
+                       }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventBucketedDataCreated::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({
-                    overviewData.prepareBucketedData("EventBucketedDataCreated")
-                    overviewData.prepareBgData("EventBucketedDataCreated")
-                    overviewBus.send(EventUpdateOverview("EventBucketedDataCreated", OverviewData.Property.GRAPH))
-                }, fabricPrivacy::logException)
+            .toObservable(EventBucketedDataCreated::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({
+                           overviewData.prepareBucketedData("EventBucketedDataCreated")
+                           overviewData.prepareBgData("EventBucketedDataCreated")
+                           overviewBus.send(EventUpdateOverviewGraph("EventBucketedDataCreated"))
+                       }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventLoopInvoked::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({ overviewData.preparePredictions("EventLoopInvoked") }, fabricPrivacy::logException)
+            .toObservable(EventLoopInvoked::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ overviewData.preparePredictions("EventLoopInvoked") }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventNewBasalProfile::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({ loadProfile("EventNewBasalProfile") }, fabricPrivacy::logException)
+            .toObservable(EventEffectiveProfileSwitchChanged::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({
+                           loadProfile("EventEffectiveProfileSwitchChanged")
+                           overviewData.prepareBasalData("EventEffectiveProfileSwitchChanged")
+                       }, fabricPrivacy::logException)
         disposable += rxBus
-                .toObservable(EventAutosensCalculationFinished::class.java)
-                .observeOn(aapsSchedulers.io)
-                .subscribe({
-                    if (it.cause !is EventCustomCalculationFinished) refreshLoop("EventAutosensCalculationFinished")
-                }, fabricPrivacy::logException)
+            .toObservable(EventAutosensCalculationFinished::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({
+                           if (it.cause !is EventCustomCalculationFinished) refreshLoop("EventAutosensCalculationFinished")
+                       }, fabricPrivacy::logException)
         disposable += rxBus
-               .toObservable(EventPumpStatusChanged::class.java)
-               .observeOn(aapsSchedulers.io)
-               .subscribe({
-                    overviewData.pumpStatus = it.getStatus(resourceHelper)
-               }, fabricPrivacy::logException)
+            .toObservable(EventPumpStatusChanged::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({
+                           overviewData.pumpStatus = it.getStatus(rh)
+                       }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ event ->
+                           if (event.isChanged(rh, R.string.key_units)) {
+                               overviewData.reset()
+                               overviewData.prepareBucketedData("EventBucketedDataCreated")
+                               overviewData.prepareBgData("EventBucketedDataCreated")
+                               overviewBus.send(EventUpdateOverviewGraph("EventBucketedDataCreated"))
+                               loadAll("EventPreferenceChange")
+                           }
+                       }, fabricPrivacy::logException)
 
         Thread { loadAll("onResume") }.start()
     }
@@ -163,11 +176,11 @@ class OverviewPlugin @Inject constructor(
     override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
         super.preprocessPreferences(preferenceFragment)
         if (config.NSCLIENT) {
-            (preferenceFragment.findPreference(resourceHelper.gs(R.string.key_show_cgm_button)) as SwitchPreference?)?.let {
+            (preferenceFragment.findPreference(rh.gs(R.string.key_show_cgm_button)) as SwitchPreference?)?.let {
                 it.isVisible = false
                 it.isEnabled = false
             }
-            (preferenceFragment.findPreference(resourceHelper.gs(R.string.key_show_calibration_button)) as SwitchPreference?)?.let {
+            (preferenceFragment.findPreference(rh.gs(R.string.key_show_calibration_button)) as SwitchPreference?)?.let {
                 it.isVisible = false
                 it.isEnabled = false
             }
@@ -175,58 +188,58 @@ class OverviewPlugin @Inject constructor(
     }
 
     override fun configuration(): JSONObject =
-            JSONObject()
-                    .putInt(R.string.key_units, sp, resourceHelper)
-                    .putString(R.string.key_quickwizard, sp, resourceHelper)
-                    .putInt(R.string.key_eatingsoon_duration, sp, resourceHelper)
-                    .putDouble(R.string.key_eatingsoon_target, sp, resourceHelper)
-                    .putInt(R.string.key_activity_duration, sp, resourceHelper)
-                    .putDouble(R.string.key_activity_target, sp, resourceHelper)
-                    .putInt(R.string.key_hypo_duration, sp, resourceHelper)
-                    .putDouble(R.string.key_hypo_target, sp, resourceHelper)
-                    .putDouble(R.string.key_low_mark, sp, resourceHelper)
-                    .putDouble(R.string.key_high_mark, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_cage_warning, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_cage_critical, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_iage_warning, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_iage_critical, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_sage_warning, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_sage_critical, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_sbat_warning, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_sbat_critical, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_bage_warning, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_bage_critical, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_res_warning, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_res_critical, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_bat_warning, sp, resourceHelper)
-                    .putDouble(R.string.key_statuslights_bat_critical, sp, resourceHelper)
+        JSONObject()
+            .putString(R.string.key_units, sp, rh)
+            .putString(R.string.key_quickwizard, sp, rh)
+            .putInt(R.string.key_eatingsoon_duration, sp, rh)
+            .putDouble(R.string.key_eatingsoon_target, sp, rh)
+            .putInt(R.string.key_activity_duration, sp, rh)
+            .putDouble(R.string.key_activity_target, sp, rh)
+            .putInt(R.string.key_hypo_duration, sp, rh)
+            .putDouble(R.string.key_hypo_target, sp, rh)
+            .putDouble(R.string.key_low_mark, sp, rh)
+            .putDouble(R.string.key_high_mark, sp, rh)
+            .putDouble(R.string.key_statuslights_cage_warning, sp, rh)
+            .putDouble(R.string.key_statuslights_cage_critical, sp, rh)
+            .putDouble(R.string.key_statuslights_iage_warning, sp, rh)
+            .putDouble(R.string.key_statuslights_iage_critical, sp, rh)
+            .putDouble(R.string.key_statuslights_sage_warning, sp, rh)
+            .putDouble(R.string.key_statuslights_sage_critical, sp, rh)
+            .putDouble(R.string.key_statuslights_sbat_warning, sp, rh)
+            .putDouble(R.string.key_statuslights_sbat_critical, sp, rh)
+            .putDouble(R.string.key_statuslights_bage_warning, sp, rh)
+            .putDouble(R.string.key_statuslights_bage_critical, sp, rh)
+            .putDouble(R.string.key_statuslights_res_warning, sp, rh)
+            .putDouble(R.string.key_statuslights_res_critical, sp, rh)
+            .putDouble(R.string.key_statuslights_bat_warning, sp, rh)
+            .putDouble(R.string.key_statuslights_bat_critical, sp, rh)
 
     override fun applyConfiguration(configuration: JSONObject) {
         configuration
-                .storeInt(R.string.key_units, sp, resourceHelper)
-                .storeString(R.string.key_quickwizard, sp, resourceHelper)
-                .storeInt(R.string.key_eatingsoon_duration, sp, resourceHelper)
-                .storeDouble(R.string.key_eatingsoon_target, sp, resourceHelper)
-                .storeInt(R.string.key_activity_duration, sp, resourceHelper)
-                .storeDouble(R.string.key_activity_target, sp, resourceHelper)
-                .storeInt(R.string.key_hypo_duration, sp, resourceHelper)
-                .storeDouble(R.string.key_hypo_target, sp, resourceHelper)
-                .storeDouble(R.string.key_low_mark, sp, resourceHelper)
-                .storeDouble(R.string.key_high_mark, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_cage_warning, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_cage_critical, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_iage_warning, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_iage_critical, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_sage_warning, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_sage_critical, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_sbat_warning, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_sbat_critical, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_bage_warning, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_bage_critical, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_res_warning, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_res_critical, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_bat_warning, sp, resourceHelper)
-                .storeDouble(R.string.key_statuslights_bat_critical, sp, resourceHelper)
+            .storeString(R.string.key_units, sp, rh)
+            .storeString(R.string.key_quickwizard, sp, rh)
+            .storeInt(R.string.key_eatingsoon_duration, sp, rh)
+            .storeDouble(R.string.key_eatingsoon_target, sp, rh)
+            .storeInt(R.string.key_activity_duration, sp, rh)
+            .storeDouble(R.string.key_activity_target, sp, rh)
+            .storeInt(R.string.key_hypo_duration, sp, rh)
+            .storeDouble(R.string.key_hypo_target, sp, rh)
+            .storeDouble(R.string.key_low_mark, sp, rh)
+            .storeDouble(R.string.key_high_mark, sp, rh)
+            .storeDouble(R.string.key_statuslights_cage_warning, sp, rh)
+            .storeDouble(R.string.key_statuslights_cage_critical, sp, rh)
+            .storeDouble(R.string.key_statuslights_iage_warning, sp, rh)
+            .storeDouble(R.string.key_statuslights_iage_critical, sp, rh)
+            .storeDouble(R.string.key_statuslights_sage_warning, sp, rh)
+            .storeDouble(R.string.key_statuslights_sage_critical, sp, rh)
+            .storeDouble(R.string.key_statuslights_sbat_warning, sp, rh)
+            .storeDouble(R.string.key_statuslights_sbat_critical, sp, rh)
+            .storeDouble(R.string.key_statuslights_bage_warning, sp, rh)
+            .storeDouble(R.string.key_statuslights_bage_critical, sp, rh)
+            .storeDouble(R.string.key_statuslights_res_warning, sp, rh)
+            .storeDouble(R.string.key_statuslights_res_critical, sp, rh)
+            .storeDouble(R.string.key_statuslights_bat_warning, sp, rh)
+            .storeDouble(R.string.key_statuslights_bat_critical, sp, rh)
     }
 
     @Volatile
@@ -234,22 +247,23 @@ class OverviewPlugin @Inject constructor(
     override fun refreshLoop(from: String) {
         if (runningRefresh) return
         runningRefresh = true
+        overviewBus.send(EventUpdateOverviewNotification(from))
         loadIobCobResults(from)
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.PROFILE))
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.BG))
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.TIME))
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.TEMPORARY_BASAL))
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.EXTENDED_BOLUS))
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.TEMPORARY_TARGET))
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.SENSITIVITY))
+        overviewBus.send(EventUpdateOverviewProfile(from))
+        overviewBus.send(EventUpdateOverviewBg(from))
+        overviewBus.send(EventUpdateOverviewTime(from))
+        overviewBus.send(EventUpdateOverviewTemporaryBasal(from))
+        overviewBus.send(EventUpdateOverviewExtendedBolus(from))
+        overviewBus.send(EventUpdateOverviewTemporaryTarget(from))
+        overviewBus.send(EventUpdateOverviewSensitivity(from))
         loadAsData(from)
         overviewData.preparePredictions(from)
         overviewData.prepareBasalData(from)
         overviewData.prepareTemporaryTargetData(from)
         overviewData.prepareTreatmentsData(from)
         overviewData.prepareIobAutosensData(from)
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.GRAPH))
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.IOB_COB))
+        overviewBus.send(EventUpdateOverviewGraph(from))
+        overviewBus.send(EventUpdateOverviewIobCob(from))
         aapsLogger.debug(LTag.UI, "refreshLoop finished")
         runningRefresh = false
     }
@@ -258,8 +272,6 @@ class OverviewPlugin @Inject constructor(
     private fun loadAll(from: String) {
         loadBg(from)
         loadProfile(from)
-        loadTemporaryBasal(from)
-        loadExtendedBolus(from)
         loadTemporaryTarget(from)
         loadIobCobResults(from)
         loadAsData(from)
@@ -268,41 +280,31 @@ class OverviewPlugin @Inject constructor(
         overviewData.prepareTreatmentsData(from)
 //        prepareIobAutosensData(from)
 //        preparePredictions(from)
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.GRAPH))
+        overviewBus.send(EventUpdateOverviewGraph(from))
         aapsLogger.debug(LTag.UI, "loadAll finished")
     }
 
     private fun loadProfile(from: String) {
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.PROFILE))
-    }
-
-    private fun loadTemporaryBasal(from: String) {
-        overviewData.temporaryBasal = iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.TEMPORARY_BASAL))
-    }
-
-    private fun loadExtendedBolus(from: String) {
-        overviewData.extendedBolus = iobCobCalculator.getExtendedBolus(dateUtil.now())
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.EXTENDED_BOLUS))
+        overviewBus.send(EventUpdateOverviewProfile(from))
     }
 
     private fun loadTemporaryTarget(from: String) {
         val tempTarget = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet()
         if (tempTarget is ValueWrapper.Existing) overviewData.temporaryTarget = tempTarget.value
         else overviewData.temporaryTarget = null
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.TEMPORARY_TARGET))
+        overviewBus.send(EventUpdateOverviewTemporaryTarget(from))
     }
 
     private fun loadAsData(from: String) {
         overviewData.lastAutosensData = iobCobCalculator.ads.getLastAutosensData("Overview", aapsLogger, dateUtil)
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.SENSITIVITY))
+        overviewBus.send(EventUpdateOverviewSensitivity(from))
     }
 
     private fun loadBg(from: String) {
         val gvWrapped = repository.getLastGlucoseValueWrapped().blockingGet()
         if (gvWrapped is ValueWrapper.Existing) overviewData.lastBg = gvWrapped.value
         else overviewData.lastBg = null
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.BG))
+        overviewBus.send(EventUpdateOverviewBg(from))
     }
 
     private fun loadIobCobResults(from: String) {
@@ -312,7 +314,7 @@ class OverviewPlugin @Inject constructor(
         val lastCarbs = repository.getLastCarbsRecordWrapped().blockingGet()
         overviewData.lastCarbsTime = if (lastCarbs is ValueWrapper.Existing) lastCarbs.value.timestamp else 0L
 
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.IOB_COB))
+        overviewBus.send(EventUpdateOverviewIobCob(from))
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
index 2fd42278d54..8fe3863db25 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
@@ -23,7 +23,7 @@ import javax.inject.Singleton
 
 @Singleton
 class StatusLightHandler @Inject constructor(
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val sp: SP,
     private val dateUtil: DateUtil,
     private val activePlugin: ActivePlugin,
@@ -59,7 +59,7 @@ class StatusLightHandler @Inject constructor(
         if (!config.NSCLIENT) {
             if (pump.model() == PumpType.OMNIPOD_DASH) {
                 // Omnipod Dash does not report its battery level
-                careportal_battery_level?.text = resourceHelper.gs(R.string.notavailable)
+                careportal_battery_level?.text = rh.gs(R.string.notavailable)
                 careportal_battery_level?.setTextColor(Color.WHITE)
             } else if (pump.model() == PumpType.OMNIPOD_EROS && pump is OmnipodErosPumpPlugin) { // instance of check is needed because at startup, pump can still be VirtualPumpPlugin and that will cause a crash because of the class cast below
                 // The Omnipod Eros does not report its battery level. However, some RileyLink alternatives do.
@@ -77,9 +77,9 @@ class StatusLightHandler @Inject constructor(
         val therapyEvent = repository.getLastTherapyRecordUpToNow(type).blockingGet()
         if (therapyEvent is ValueWrapper.Existing) {
             warnColors.setColorByAge(view, therapyEvent.value, warn, urgent)
-            view?.text = therapyEvent.value.age(resourceHelper.shortTextMode(), resourceHelper, dateUtil)
+            view?.text = therapyEvent.value.age(rh.shortTextMode(), rh, dateUtil)
         } else {
-            view?.text = if (resourceHelper.shortTextMode()) "-" else resourceHelper.gs(R.string.notavailable)
+            view?.text = if (rh.shortTextMode()) "-" else rh.gs(R.string.notavailable)
         }
     }
 
@@ -108,7 +108,7 @@ class StatusLightHandler @Inject constructor(
         if (useRileyLinkBatteryLevel) {
             handleLevel(view, criticalSetting, criticalDefaultValue, warnSetting, warnDefaultValue, level, units)
         } else {
-            view?.text = resourceHelper.gs(R.string.notavailable)
+            view?.text = rh.gs(R.string.notavailable)
             view?.setTextColor(Color.WHITE)
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
index ebc37704881..eb56d8067e3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.databinding.OverviewQuickwizardlistActivityBinding
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.dialogs.EditQuickWizardDialog
 import info.nightscout.androidaps.plugins.general.overview.events.EventQuickWizardChange
 import info.nightscout.androidaps.utils.DateUtil
@@ -26,7 +26,7 @@ import javax.inject.Inject
 class QuickWizardListActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var quickWizard: QuickWizard
     @Inject lateinit var dateUtil: DateUtil
@@ -45,7 +45,7 @@ class QuickWizardListActivity : NoSplashAppCompatActivity() {
             holder.from.text = dateUtil.timeString(quickWizard[position].validFromDate())
             holder.to.text = dateUtil.timeString(quickWizard[position].validToDate())
             holder.buttonText.text = quickWizard[position].buttonText()
-            holder.carbs.text = resourceHelper.gs(R.string.format_carbs, quickWizard[position].carbs())
+            holder.carbs.text = rh.gs(R.string.format_carbs, quickWizard[position].carbs())
         }
 
         override fun getItemCount(): Int = quickWizard.size()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
index 366850607f6..72e1b46983c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
@@ -11,7 +11,7 @@ import android.view.WindowManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.databinding.OverviewEditquickwizardDialogBinding
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventQuickWizardChange
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.SafeParse
@@ -26,7 +26,7 @@ import javax.inject.Inject
 
 class EditQuickWizardDialog : DaggerDialogFragment(), View.OnClickListener {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var quickWizard: QuickWizard
     @Inject lateinit var dateUtil: DateUtil
@@ -100,19 +100,19 @@ class EditQuickWizardDialog : DaggerDialogFragment(), View.OnClickListener {
 
         val toTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
             toSeconds = (T.hours(hour.toLong()).secs() + T.mins(minute.toLong()).secs()).toInt()
-            binding.from.text = dateUtil.timeString(dateUtil.secondsOfTheDayToMilliseconds(toSeconds))
+            binding.to.text = dateUtil.timeString(dateUtil.secondsOfTheDayToMilliseconds(toSeconds))
         }
 
         binding.to.setOnClickListener {
             context?.let {
                 TimePickerDialog(it, toTimeSetListener,
-                    T.secs(fromSeconds.toLong()).hours().toInt(),
-                    T.secs((fromSeconds % 3600).toLong()).mins().toInt(),
+                    T.secs(toSeconds.toLong()).hours().toInt(),
+                    T.secs((toSeconds % 3600).toLong()).mins().toInt(),
                     DateFormat.is24HourFormat(context)
                 ).show()
             }
         }
-        toSeconds = entry.validFrom()
+        toSeconds = entry.validTo()
         binding.to.text = dateUtil.timeString(dateUtil.secondsOfTheDayToMilliseconds(toSeconds))
 
         binding.buttonEdit.setText(entry.buttonText())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverview.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverview.kt
deleted file mode 100644
index 969ed4feed1..00000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverview.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package info.nightscout.androidaps.plugins.general.overview.events
-
-import info.nightscout.androidaps.events.Event
-import info.nightscout.androidaps.plugins.general.overview.OverviewData
-
-class EventUpdateOverview(val from: String, val what: OverviewData.Property) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewBg.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewBg.kt
new file mode 100644
index 00000000000..2bbfb7813ca
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewBg.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewBg(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewCalcProgress.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewCalcProgress.kt
new file mode 100644
index 00000000000..6932500fe3f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewCalcProgress.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewCalcProgress(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewExtendedBolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewExtendedBolus.kt
new file mode 100644
index 00000000000..51b493acf45
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewExtendedBolus.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewExtendedBolus(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewGraph.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewGraph.kt
new file mode 100644
index 00000000000..3f7ad2faad3
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewGraph.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewGraph(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewIobCob.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewIobCob.kt
new file mode 100644
index 00000000000..75c8d16bac5
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewIobCob.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewIobCob(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewNotification.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewNotification.kt
new file mode 100644
index 00000000000..7a4ce41eea3
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewNotification.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewNotification(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewProfile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewProfile.kt
new file mode 100644
index 00000000000..6e4bb954909
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewProfile.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewProfile(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewPumpStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewPumpStatus.kt
new file mode 100644
index 00000000000..30ad6b75077
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewPumpStatus.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewPumpStatus(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewSensitivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewSensitivity.kt
new file mode 100644
index 00000000000..93c432f507f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewSensitivity.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewSensitivity(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewTemporaryBasal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewTemporaryBasal.kt
new file mode 100644
index 00000000000..315bf8d651f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewTemporaryBasal.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewTemporaryBasal(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewTemporaryTarget.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewTemporaryTarget.kt
new file mode 100644
index 00000000000..83cafcd664a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewTemporaryTarget.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewTemporaryTarget(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewTime.kt
new file mode 100644
index 00000000000..5da5b721363
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventUpdateOverviewTime.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.general.overview.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventUpdateOverviewTime(val from: String) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
index 3fcc046cbde..b9cac049b1f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
@@ -32,7 +32,7 @@ class GraphData(
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
 
     private var maxY = Double.MIN_VALUE
@@ -66,7 +66,7 @@ class GraphData(
         addSeries(AreaGraphSeries(inRangeAreaDataPoints).also {
             it.color = 0
             it.isDrawBackground = true
-            it.backgroundColor = resourceHelper.gc(R.color.inrangebackground)
+            it.backgroundColor = rh.gc(R.color.inrangebackground)
         })
     }
 
@@ -114,7 +114,7 @@ class GraphData(
         overviewData.iobScale.multiplier = maxY * scale / overviewData.maxIobValueFound
         addSeries(overviewData.iobSeries)
         addSeries(overviewData.iobPredictions1Series)
-        addSeries(overviewData.iobPredictions2Series)
+        //addSeries(overviewData.iobPredictions2Series)
     }
 
     // scale in % of vertical size (like 0.3)
@@ -202,7 +202,7 @@ class GraphData(
     }
 
     fun setNumVerticalLabels() {
-        graph.gridLabelRenderer.numVerticalLabels = if (units == GlucoseUnit.MGDL) (maxY / 40 + 1).toInt() else (maxY / 2 + 1).toInt()
+        graph.gridLabelRenderer.numVerticalLabels = max(3, if (units == GlucoseUnit.MGDL) (maxY / 40 + 1).toInt() else (maxY / 2 + 1).toInt())
     }
 
     fun formatAxis(fromTime: Long, endTime: Long) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt
index 89136b5b69f..f0138d70b42 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt
@@ -11,7 +11,7 @@ import javax.inject.Inject
 
 class BolusDataPoint @Inject constructor(
     val data: Bolus,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val activePlugin: ActivePlugin,
     private val defaultValueHelper: DefaultValueHelper
 ) : DataPointWithLabelInterface {
@@ -20,7 +20,7 @@ class BolusDataPoint @Inject constructor(
 
     override fun getX(): Double = data.timestamp.toDouble()
     override fun getY(): Double = if (data.type == Bolus.Type.SMB) defaultValueHelper.determineLowLine() else yValue
-    override fun getLabel(): String = DecimalFormatter.toPumpSupportedBolus(data.amount, activePlugin.activePump, resourceHelper)
+    override fun getLabel(): String = DecimalFormatter.toPumpSupportedBolus(data.amount, activePlugin.activePump, rh)
     override fun getDuration(): Long = 0
     override fun getSize(): Float = 2f
 
@@ -29,9 +29,9 @@ class BolusDataPoint @Inject constructor(
         else PointsWithLabelGraphSeries.Shape.BOLUS
 
     override fun getColor(): Int =
-        if (data.type == Bolus.Type.SMB) resourceHelper.gc(R.color.tempbasal)
+        if (data.type == Bolus.Type.SMB) rh.gc(R.color.tempbasal)
         else if (data.isValid) Color.CYAN
-        else resourceHelper.gc(android.R.color.holo_red_light)
+        else rh.gc(android.R.color.holo_red_light)
 
     override fun setY(y: Double) {
         yValue = y
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/CarbsDataPoint.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/CarbsDataPoint.kt
index 719533da985..5eece0277fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/CarbsDataPoint.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/CarbsDataPoint.kt
@@ -7,22 +7,22 @@ import javax.inject.Inject
 
 class CarbsDataPoint @Inject constructor(
     val data: Carbs,
-    private val resourceHelper: ResourceHelper
+    private val rh: ResourceHelper
 ) : DataPointWithLabelInterface {
 
     private var yValue = 0.0
 
     override fun getX(): Double = data.timestamp.toDouble()
     override fun getY(): Double = yValue
-    override fun getLabel(): String = resourceHelper.gs(R.string.format_carbs, data.amount.toInt())
+    override fun getLabel(): String = rh.gs(R.string.format_carbs, data.amount.toInt())
     override fun getDuration(): Long = 0
     override fun getSize(): Float = 2f
 
     override fun getShape(): PointsWithLabelGraphSeries.Shape = PointsWithLabelGraphSeries.Shape.CARBS
 
     override fun getColor(): Int =
-        if (data.isValid) resourceHelper.gc(R.color.carbs)
-        else resourceHelper.gc(android.R.color.holo_red_light)
+        if (data.isValid) rh.gc(R.color.carbs)
+        else rh.gc(android.R.color.holo_red_light)
 
     override fun setY(y: Double) {
         yValue = y
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/GlucoseValueDataPoint.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/GlucoseValueDataPoint.kt
index 3c4c6aa367c..ea5b79727dd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/GlucoseValueDataPoint.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/GlucoseValueDataPoint.kt
@@ -13,7 +13,7 @@ class GlucoseValueDataPoint @Inject constructor(
     val data: GlucoseValue,
     private val defaultValueHelper: DefaultValueHelper,
     private val profileFunction: ProfileFunction,
-    private val resourceHelper: ResourceHelper
+    private val rh: ResourceHelper
 ) : DataPointWithLabelInterface {
 
     fun valueToUnits(units: GlucoseUnit): Double =
@@ -42,20 +42,20 @@ class GlucoseValueDataPoint @Inject constructor(
         val highLine = defaultValueHelper.determineHighLine()
         return when {
             isPrediction                   -> predictionColor
-            valueToUnits(units) < lowLine  -> resourceHelper.gc(R.color.low)
-            valueToUnits(units) > highLine -> resourceHelper.gc(R.color.high)
-            else                           -> resourceHelper.gc(R.color.inrange)
+            valueToUnits(units) < lowLine  -> rh.gc(R.color.low)
+            valueToUnits(units) > highLine -> rh.gc(R.color.high)
+            else                           -> rh.gc(R.color.inrange)
         }
     }
 
     val predictionColor: Int
         get() {
             return when (data.sourceSensor) {
-                GlucoseValue.SourceSensor.IOB_PREDICTION  -> resourceHelper.gc(R.color.iob)
-                GlucoseValue.SourceSensor.COB_PREDICTION   -> resourceHelper.gc(R.color.cob)
-                GlucoseValue.SourceSensor.A_COB_PREDICTION -> -0x7f000001 and resourceHelper.gc(R.color.cob)
-                GlucoseValue.SourceSensor.UAM_PREDICTION   -> resourceHelper.gc(R.color.uam)
-                GlucoseValue.SourceSensor.ZT_PREDICTION   -> resourceHelper.gc(R.color.zt)
+                GlucoseValue.SourceSensor.IOB_PREDICTION  -> rh.gc(R.color.iob)
+                GlucoseValue.SourceSensor.COB_PREDICTION   -> rh.gc(R.color.cob)
+                GlucoseValue.SourceSensor.A_COB_PREDICTION -> -0x7f000001 and rh.gc(R.color.cob)
+                GlucoseValue.SourceSensor.UAM_PREDICTION   -> rh.gc(R.color.uam)
+                GlucoseValue.SourceSensor.ZT_PREDICTION   -> rh.gc(R.color.zt)
                 else                                      -> R.color.white
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/InMemoryGlucoseValueDataPoint.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/InMemoryGlucoseValueDataPoint.kt
index 04540d91313..dbb04b6f5d2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/InMemoryGlucoseValueDataPoint.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/InMemoryGlucoseValueDataPoint.kt
@@ -11,7 +11,7 @@ import javax.inject.Inject
 class InMemoryGlucoseValueDataPoint @Inject constructor(
     val data: InMemoryGlucoseValue,
     private val profileFunction: ProfileFunction,
-    private val resourceHelper: ResourceHelper
+    private val rh: ResourceHelper
 ) : DataPointWithLabelInterface {
 
     fun valueToUnits(units: GlucoseUnit): Double =
@@ -24,5 +24,5 @@ class InMemoryGlucoseValueDataPoint @Inject constructor(
     override fun getDuration(): Long = 0
     override fun getShape(): PointsWithLabelGraphSeries.Shape = PointsWithLabelGraphSeries.Shape.BUCKETED_BG
     override fun getSize(): Float = 0.3f
-    override fun getColor(): Int = resourceHelper.gc(R.color.white)
+    override fun getColor(): Int = rh.gc(R.color.white)
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt
index 7f88e33cd1e..4a06f79dd04 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt
@@ -12,7 +12,7 @@ import javax.inject.Inject
 
 class TherapyEventDataPoint @Inject constructor(
     val data: TherapyEvent,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val translator: Translator
 ) : DataPointWithLabelInterface {
@@ -62,10 +62,10 @@ class TherapyEventDataPoint @Inject constructor(
             else                                                 -> PointsWithLabelGraphSeries.Shape.GENERAL
         }
 
-    override fun getSize(): Float = if (resourceHelper.gb(R.bool.isTablet)) 12.0f else 10.0f
+    override fun getSize(): Float = if (rh.gb(R.bool.isTablet)) 12.0f else 10.0f
     override fun getColor(): Int =
         when (data.type) {
-            TherapyEvent.Type.ANNOUNCEMENT          -> resourceHelper.gc(R.color.notificationAnnouncement)
+            TherapyEvent.Type.ANNOUNCEMENT          -> rh.gc(R.color.notificationAnnouncement)
             TherapyEvent.Type.NS_MBG                -> Color.RED
             TherapyEvent.Type.FINGER_STICK_BG_VALUE -> Color.RED
             TherapyEvent.Type.EXERCISE              -> Color.BLUE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.kt
index da3fe07f6fb..f1ed81de61a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.kt
@@ -2,12 +2,12 @@ package info.nightscout.androidaps.plugins.general.overview.notifications
 
 import android.content.Intent
 import dagger.android.DaggerIntentService
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import javax.inject.Inject
 
 class DismissNotificationService : DaggerIntentService(DismissNotificationService::class.simpleName) {
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
 
     override fun onHandleIntent(intent: Intent?) {
         intent?.let {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
index b273ac952ee..fa7cdfc9c82 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
@@ -14,11 +14,12 @@ import androidx.core.app.NotificationCompat
 import androidx.recyclerview.widget.RecyclerView
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.OverviewNotificationItemBinding
+import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.IconsProvider
 import info.nightscout.androidaps.interfaces.NotificationHolder
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.services.AlarmSoundServiceHelper
 import info.nightscout.androidaps.utils.DateUtil
@@ -32,8 +33,8 @@ import javax.inject.Singleton
 class NotificationStore @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val sp: SP,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
+    private val rxBus: RxBus,
+    private val rh: ResourceHelper,
     private val context: Context,
     private val iconsProvider: IconsProvider,
     private val alarmSoundServiceHelper: AlarmSoundServiceHelper,
@@ -103,7 +104,7 @@ class NotificationStore @Inject constructor(
 
     private fun raiseSystemNotification(n: Notification) {
         val mgr = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        val largeIcon = resourceHelper.decodeResource(iconsProvider.getIcon())
+        val largeIcon = rh.decodeResource(iconsProvider.getIcon())
         val smallIcon = iconsProvider.getNotificationIcon()
         val sound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM)
         val notificationBuilder = NotificationCompat.Builder(context, CHANNEL_ID)
@@ -116,11 +117,11 @@ class NotificationStore @Inject constructor(
             .setContentIntent(notificationHolder.openAppIntent(context))
         if (n.level == Notification.URGENT) {
             notificationBuilder.setVibrate(longArrayOf(1000, 1000, 1000, 1000))
-                .setContentTitle(resourceHelper.gs(R.string.urgent_alarm))
+                .setContentTitle(rh.gs(R.string.urgent_alarm))
                 .setSound(sound, AudioManager.STREAM_ALARM)
         } else {
             notificationBuilder.setVibrate(longArrayOf(0, 100, 50, 100, 50))
-                .setContentTitle(resourceHelper.gs(R.string.info))
+                .setContentTitle(rh.gs(R.string.info))
         }
         mgr.notify(n.id, notificationBuilder.build())
     }
@@ -150,7 +151,8 @@ class NotificationStore @Inject constructor(
         }
     }
 
-    inner class NotificationRecyclerViewAdapter internal constructor(private val notificationsList: List<Notification>) : RecyclerView.Adapter<NotificationRecyclerViewAdapter.NotificationsViewHolder>() {
+    inner class NotificationRecyclerViewAdapter internal constructor(private val notificationsList: List<Notification>) :
+        RecyclerView.Adapter<NotificationRecyclerViewAdapter.NotificationsViewHolder>() {
 
         override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): NotificationsViewHolder =
             NotificationsViewHolder(LayoutInflater.from(viewGroup.context).inflate(R.layout.overview_notification_item, viewGroup, false))
@@ -163,11 +165,11 @@ class NotificationStore @Inject constructor(
             @Suppress("SetTextI18n")
             holder.binding.text.text = dateUtil.timeString(notification.date) + " " + notification.text
             when (notification.level) {
-                Notification.URGENT       -> holder.binding.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationUrgent))
-                Notification.NORMAL       -> holder.binding.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationNormal))
-                Notification.LOW          -> holder.binding.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationLow))
-                Notification.INFO         -> holder.binding.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationInfo))
-                Notification.ANNOUNCEMENT -> holder.binding.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationAnnouncement))
+                Notification.URGENT       -> holder.binding.cv.setBackgroundColor(rh.gc(R.color.notificationUrgent))
+                Notification.NORMAL       -> holder.binding.cv.setBackgroundColor(rh.gc(R.color.notificationNormal))
+                Notification.LOW          -> holder.binding.cv.setBackgroundColor(rh.gc(R.color.notificationLow))
+                Notification.INFO         -> holder.binding.cv.setBackgroundColor(rh.gc(R.color.notificationInfo))
+                Notification.ANNOUNCEMENT -> holder.binding.cv.setBackgroundColor(rh.gc(R.color.notificationAnnouncement))
             }
         }
 
@@ -182,8 +184,9 @@ class NotificationStore @Inject constructor(
             init {
                 binding.dismiss.setOnClickListener {
                     val notification = it.tag as Notification
-                    rxBus.send(EventDismissNotification(notification.id))
+                    notification.contextForAction = itemView.context
                     notification.action?.run()
+                    if (remove(notification.id)) rxBus.send(EventRefreshOverview("NotificationCleared"))
                 }
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt
index 9c60e104c2c..075308ec441 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt
@@ -18,7 +18,7 @@ class NotificationWithAction constructor(
 ) : Notification() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var sp: SP
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var nsClientPlugin: NSClientPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
index 85675df3504..3f84d33162b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.events.EventAppExit
 import info.nightscout.androidaps.interfaces.NotificationHolder
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.disposables.CompositeDisposable
@@ -22,7 +22,7 @@ import javax.inject.Inject
 class DummyService : DaggerService() {
 
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var notificationHolder: NotificationHolder
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
index ceac37b7235..7304cffa71d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
@@ -10,19 +10,19 @@ import androidx.core.app.RemoteInput
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.events.*
+import info.nightscout.androidaps.extensions.toStringShort
+import info.nightscout.androidaps.extensions.valueToUnitsString
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.extensions.toStringShort
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import info.nightscout.androidaps.extensions.valueToUnitsString
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -31,27 +31,28 @@ import javax.inject.Singleton
 class PersistentNotificationPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val aapsSchedulers: AapsSchedulers,
     private val profileFunction: ProfileFunction,
     private val fabricPrivacy: FabricPrivacy,
     private val activePlugins: ActivePlugin,
     private val iobCobCalculator: IobCobCalculator,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val context: Context,
     private val notificationHolder: NotificationHolder,
     private val dummyServiceHelper: DummyServiceHelper,
     private val iconsProvider: IconsProvider,
     private val glucoseStatusProvider: GlucoseStatusProvider
-) : PluginBase(PluginDescription()
-    .mainType(PluginType.GENERAL)
-    .neverVisible(true)
-    .pluginName(R.string.ongoingnotificaction)
-    .enableByDefault(true)
-    .alwaysEnabled(true)
-    .showInList(false)
-    .description(R.string.description_persistent_notification),
-    aapsLogger, resourceHelper, injector
+) : PluginBase(
+    PluginDescription()
+        .mainType(PluginType.GENERAL)
+        .neverVisible(true)
+        .pluginName(R.string.ongoingnotificaction)
+        .enableByDefault(true)
+        .alwaysEnabled(true)
+        .showInList(false)
+        .description(R.string.description_persistent_notification),
+    aapsLogger, rh, injector
 ) {
 
     // For Android Auto
@@ -64,49 +65,48 @@ class PersistentNotificationPlugin @Inject constructor(
     // End Android auto
 
     private val disposable = CompositeDisposable()
+    private var channel: NotificationChannel? = null
 
     override fun onStart() {
         super.onStart()
-        createNotificationChannel() // make sure channels exist before triggering updates through the bus
-        disposable.add(rxBus
+        disposable += rxBus
             .toObservable(EventRefreshOverview::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException))
-        disposable.add(rxBus
+            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventExtendedBolusChange::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException))
-        disposable.add(rxBus
+            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventTempBasalChange::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException))
-        disposable.add(rxBus
+            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventTreatmentChange::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException))
-        disposable.add(rxBus
+            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventInitializationChanged::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException))
-        disposable.add(rxBus
-            .toObservable(EventNewBasalProfile::class.java)
+            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventEffectiveProfileSwitchChanged::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException))
-        disposable.add(rxBus
+            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventAutosensCalculationFinished::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException))
-        disposable.add(rxBus
+            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException))
-        triggerNotificationUpdate()
+            .subscribe({ triggerNotificationUpdate() }, fabricPrivacy::logException)
     }
 
     private fun createNotificationChannel() {
         val mNotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        val channel = NotificationChannel(notificationHolder.channelID, notificationHolder.channelID as CharSequence, NotificationManager.IMPORTANCE_HIGH)
-        mNotificationManager.createNotificationChannel(channel)
+        channel = NotificationChannel(notificationHolder.channelID, notificationHolder.channelID as CharSequence, NotificationManager.IMPORTANCE_HIGH)
+        channel?.let { mNotificationManager.createNotificationChannel(it) }
     }
 
     override fun onStop() {
@@ -116,6 +116,8 @@ class PersistentNotificationPlugin @Inject constructor(
     }
 
     private fun triggerNotificationUpdate() {
+        if (channel == null)
+            createNotificationChannel() // make sure channels exist before triggering updates through the bus
         updateNotification()
         dummyServiceHelper.startService(context)
     }
@@ -140,12 +142,12 @@ class PersistentNotificationPlugin @Inject constructor(
                     line1aa += "  " + lastBG.trendArrow.symbol
                 } else {
                     line1 += " " +
-                        resourceHelper.gs(R.string.old_data) +
+                        rh.gs(R.string.old_data) +
                         " "
                     line1aa += "$line1."
                 }
             } else {
-                line1aa = resourceHelper.gs(R.string.missed_bg_readings)
+                line1aa = rh.gs(R.string.missed_bg_readings)
                 line1 = line1aa
             }
             val activeTemp = iobCobCalculator.getTempBasalIncludingConvertedExtended(System.currentTimeMillis())
@@ -156,8 +158,16 @@ class PersistentNotificationPlugin @Inject constructor(
             //IOB
             val bolusIob = iobCobCalculator.calculateIobFromBolus().round()
             val basalIob = iobCobCalculator.calculateIobFromTempBasalsIncludingConvertedExtended().round()
-            line2 = resourceHelper.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + resourceHelper.gs(R.string.cob) + ": " + iobCobCalculator.getCobInfo(false, "PersistentNotificationPlugin").generateCOBString()
-            val line2aa = resourceHelper.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U. " + resourceHelper.gs(R.string.cob) + ": " + iobCobCalculator.getCobInfo(false, "PersistentNotificationPlugin").generateCOBString() + "."
+            line2 =
+                rh.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + rh.gs(R.string.cob) + ": " + iobCobCalculator.getCobInfo(
+                    false,
+                    "PersistentNotificationPlugin"
+                ).generateCOBString()
+            val line2aa =
+                rh.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U. " + rh.gs(R.string.cob) + ": " + iobCobCalculator.getCobInfo(
+                    false,
+                    "PersistentNotificationPlugin"
+                ).generateCOBString() + "."
             line3 = DecimalFormatter.to2Decimal(pump.baseBasalRate) + " U/h"
             var line3aa = DecimalFormatter.to2Decimal(pump.baseBasalRate) + " U/h."
             line3 += " - " + profileFunction.getProfileName()
@@ -168,10 +178,12 @@ class PersistentNotificationPlugin @Inject constructor(
                 .setAction(READ_ACTION)
                 .putExtra(CONVERSATION_ID, notificationHolder.notificationID)
                 .setPackage(PACKAGE)
-            val msgReadPendingIntent = PendingIntent.getBroadcast(context,
+            val msgReadPendingIntent = PendingIntent.getBroadcast(
+                context,
                 notificationHolder.notificationID,
                 msgReadIntent,
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
             val msgReplyIntent = Intent()
                 .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
                 .setAction(REPLY_ACTION)
@@ -181,7 +193,8 @@ class PersistentNotificationPlugin @Inject constructor(
                 context,
                 notificationHolder.notificationID,
                 msgReplyIntent,
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
             // Build a RemoteInput for receiving voice input from devices
             val remoteInput = RemoteInput.Builder(EXTRA_VOICE_REPLY).build()
             // Create the UnreadConversation
@@ -193,21 +206,23 @@ class PersistentNotificationPlugin @Inject constructor(
             unreadConversationBuilder.addMessage(line3aa)
             /// End Android Auto
         } else {
-            line1 = resourceHelper.gs(R.string.noprofileset)
+            line1 = rh.gs(R.string.noprofileset)
         }
         val builder = NotificationCompat.Builder(context, notificationHolder.channelID)
         builder.setOngoing(true)
         builder.setOnlyAlertOnce(true)
         builder.setCategory(NotificationCompat.CATEGORY_STATUS)
         builder.setSmallIcon(iconsProvider.getNotificationIcon())
-        builder.setLargeIcon(resourceHelper.decodeResource(iconsProvider.getIcon()))
+        builder.setLargeIcon(rh.decodeResource(iconsProvider.getIcon()))
         builder.setContentTitle(line1)
         if (line2 != null) builder.setContentText(line2)
         if (line3 != null) builder.setSubText(line3)
         /// Android Auto
         if (unreadConversationBuilder != null) {
-            builder.extend(NotificationCompat.CarExtender()
-                .setUnreadConversation(unreadConversationBuilder.build()))
+            builder.extend(
+                NotificationCompat.CarExtender()
+                    .setUnreadConversation(unreadConversationBuilder.build())
+            )
         }
         /// End Android Auto
         builder.setContentIntent(notificationHolder.openAppIntent(context))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
index a8e22abdf24..0910717c590 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
@@ -4,7 +4,7 @@ import android.os.SystemClock
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
@@ -23,10 +23,10 @@ class AuthRequest internal constructor(
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var otp: OneTimePassword
     @Inject lateinit var dateUtil: DateUtil
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
 
     private var date = 0L
     private var processed = false
@@ -48,7 +48,7 @@ class AuthRequest internal constructor(
         if (!codeIsValid(codeReceived)) {
             processed = true
             aapsLogger.debug(LTag.SMS, "Wrong code")
-            smsCommunicatorPlugin.sendSMS(Sms(requester.phoneNumber, resourceHelper.gs(R.string.sms_wrongcode)))
+            smsCommunicatorPlugin.sendSMS(Sms(requester.phoneNumber, rh.gs(R.string.sms_wrongcode)))
             return
         }
         if (dateUtil.now() - date < Constants.SMS_CONFIRM_TIMEOUT) {
@@ -62,7 +62,7 @@ class AuthRequest internal constructor(
                 }
                 if (commandQueue.size() != 0) {
                     aapsLogger.debug(LTag.SMS, "Command timed out: " + requester.text)
-                    smsCommunicatorPlugin.sendSMS(Sms(requester.phoneNumber, resourceHelper.gs(R.string.sms_timeout_while_wating)))
+                    smsCommunicatorPlugin.sendSMS(Sms(requester.phoneNumber, rh.gs(R.string.sms_timeout_while_wating)))
                     return
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
index b1bee8dca86..6f422dad47d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.databinding.SmscommunicatorFragmentBinding
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -22,7 +22,7 @@ class SmsCommunicatorFragment : DaggerFragment() {
 
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
     @Inject lateinit var dateUtil: DateUtil
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index 4b9890d4918..9ef28c1ba53 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -32,7 +32,7 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
@@ -65,16 +65,16 @@ import kotlin.math.min
 class SmsCommunicatorPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val smsManager: SmsManager,
     private val aapsSchedulers: AapsSchedulers,
     private val sp: SP,
     private val constraintChecker: ConstraintChecker,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val profileFunction: ProfileFunction,
     private val fabricPrivacy: FabricPrivacy,
     private val activePlugin: ActivePlugin,
-    private val commandQueue: CommandQueueProvider,
+    private val commandQueue: CommandQueue,
     private val loop: Loop,
     private val iobCobCalculator: IobCobCalculator,
     private val xdripCalibrations: XdripCalibrations,
@@ -92,7 +92,7 @@ class SmsCommunicatorPlugin @Inject constructor(
     .shortName(R.string.smscommunicator_shortname)
     .preferencesId(R.xml.pref_smscommunicator)
     .description(R.string.description_sms_communicator),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), SmsCommunicator {
 
     private val disposable = CompositeDisposable()
@@ -133,28 +133,28 @@ class SmsCommunicatorPlugin @Inject constructor(
 
     override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
         super.preprocessPreferences(preferenceFragment)
-        val distance = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_smscommunicator_remotebolusmindistance)) as ValidatingEditTextPreference?
+        val distance = preferenceFragment.findPreference(rh.gs(R.string.key_smscommunicator_remotebolusmindistance)) as ValidatingEditTextPreference?
             ?: return
-        val allowedNumbers = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_smscommunicator_allowednumbers)) as EditTextPreference?
+        val allowedNumbers = preferenceFragment.findPreference(rh.gs(R.string.key_smscommunicator_allowednumbers)) as EditTextPreference?
             ?: return
         if (!areMoreNumbers(allowedNumbers.text)) {
-            distance.title = (resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance)
+            distance.title = (rh.gs(R.string.smscommunicator_remotebolusmindistance)
                 + ".\n"
-                + resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance_caveat))
+                + rh.gs(R.string.smscommunicator_remotebolusmindistance_caveat))
             distance.isEnabled = false
         } else {
-            distance.title = resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance)
+            distance.title = rh.gs(R.string.smscommunicator_remotebolusmindistance)
             distance.isEnabled = true
         }
         allowedNumbers.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _: Preference?, newValue: Any ->
             if (!areMoreNumbers(newValue as String)) {
                 distance.text = (Constants.remoteBolusMinDistance / (60 * 1000L)).toString()
-                distance.title = (resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance)
+                distance.title = (rh.gs(R.string.smscommunicator_remotebolusmindistance)
                     + ".\n"
-                    + resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance_caveat))
+                    + rh.gs(R.string.smscommunicator_remotebolusmindistance_caveat))
                 distance.isEnabled = false
             } else {
-                distance.title = resourceHelper.gs(R.string.smscommunicator_remotebolusmindistance)
+                distance.title = rh.gs(R.string.smscommunicator_remotebolusmindistance)
                 distance.isEnabled = true
             }
             true
@@ -165,7 +165,7 @@ class SmsCommunicatorPlugin @Inject constructor(
         super.updatePreferenceSummary(pref)
         if (pref is EditTextPreference) {
             if (pref.getKey().contains("smscommunicator_allowednumbers") && (pref.text == null || TextUtils.isEmpty(pref.text.trim { it <= ' ' }))) {
-                pref.setSummary(resourceHelper.gs(R.string.smscommunicator_allowednumbers_summary))
+                pref.setSummary(rh.gs(R.string.smscommunicator_allowednumbers_summary))
             }
         }
     }
@@ -199,7 +199,7 @@ class SmsCommunicatorPlugin @Inject constructor(
     }
 
     private fun processSettings(ev: EventPreferenceChange?) {
-        if (ev == null || ev.isChanged(resourceHelper, R.string.key_smscommunicator_allowednumbers)) {
+        if (ev == null || ev.isChanged(rh, R.string.key_smscommunicator_allowednumbers)) {
             val settings = sp.getString(R.string.key_smscommunicator_allowednumbers, "")
             allowedNumbers.clear()
             val substrings = settings.split(";").toTypedArray()
@@ -253,56 +253,56 @@ class SmsCommunicatorPlugin @Inject constructor(
             when (divided[0].uppercase(Locale.getDefault())) {
                 "BG"       ->
                     if (divided.size == 1) processBG(receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "LOOP"     ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (divided.size == 2 || divided.size == 3) processLOOP(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "NSCLIENT" ->
                     if (divided.size == 2) processNSCLIENT(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "PUMP"     ->
-                    if (!remoteCommandsAllowed && divided.size > 1) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    if (!remoteCommandsAllowed && divided.size > 1) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (divided.size <= 3) processPUMP(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "PROFILE"  ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (divided.size == 2 || divided.size == 3) processPROFILE(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "BASAL"    ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (divided.size == 2 || divided.size == 3) processBASAL(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "EXTENDED" ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (divided.size == 2 || divided.size == 3) processEXTENDED(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "BOLUS"    ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
-                    else if (commandQueue.bolusInQueue()) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_another_bolus_in_queue)))
-                    else if (divided.size == 2 && dateUtil.now() - lastRemoteBolusTime < minDistance) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotebolusnotallowed)))
-                    else if (divided.size == 2 && pump.isSuspended()) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.pumpsuspended)))
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    else if (commandQueue.bolusInQueue()) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_another_bolus_in_queue)))
+                    else if (divided.size == 2 && dateUtil.now() - lastRemoteBolusTime < minDistance) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remotebolusnotallowed)))
+                    else if (divided.size == 2 && pump.isSuspended()) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.pumpsuspended)))
                     else if (divided.size == 2 || divided.size == 3) processBOLUS(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "CARBS"    ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (divided.size == 2 || divided.size == 3) processCARBS(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "CAL"      ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (divided.size == 2) processCAL(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "TARGET"   ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (divided.size == 2) processTARGET(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "SMS"      ->
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remotecommandnotallowed)))
                     else if (divided.size == 2) processSMS(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 "HELP"     ->
                     if (divided.size == 1 || divided.size == 2) processHELP(divided, receivedSms)
-                    else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                    else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 else       ->
                     if (messageToConfirm?.requester?.phoneNumber == receivedSms.phoneNumber) {
                         val execute = messageToConfirm
@@ -310,7 +310,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                         execute?.action(divided[0])
                     } else {
                         messageToConfirm = null
-                        sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_unknowncommand)))
+                        sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_unknowncommand)))
                     }
             }
         }
@@ -323,21 +323,21 @@ class SmsCommunicatorPlugin @Inject constructor(
         var reply = ""
         val units = profileFunction.getUnits()
         if (actualBG != null) {
-            reply = resourceHelper.gs(R.string.sms_actualbg) + " " + actualBG.valueToUnitsString(units) + ", "
+            reply = rh.gs(R.string.sms_actualbg) + " " + actualBG.valueToUnitsString(units) + ", "
         } else if (lastBG != null) {
             val agoMilliseconds = dateUtil.now() - lastBG.timestamp
             val agoMin = (agoMilliseconds / 60.0 / 1000.0).toInt()
-            reply = resourceHelper.gs(R.string.sms_lastbg) + " " + lastBG.valueToUnitsString(units) + " " + String.format(resourceHelper.gs(R.string.sms_minago), agoMin) + ", "
+            reply = rh.gs(R.string.sms_lastbg) + " " + lastBG.valueToUnitsString(units) + " " + String.format(rh.gs(R.string.sms_minago), agoMin) + ", "
         }
         val glucoseStatus = glucoseStatusProvider.glucoseStatusData
-        if (glucoseStatus != null) reply += resourceHelper.gs(R.string.sms_delta) + " " + Profile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", "
+        if (glucoseStatus != null) reply += rh.gs(R.string.sms_delta) + " " + Profile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", "
         val bolusIob = iobCobCalculator.calculateIobFromBolus().round()
         val basalIob = iobCobCalculator.calculateIobFromTempBasalsIncludingConvertedExtended().round()
         val cobInfo = iobCobCalculator.getCobInfo(false, "SMS COB")
-        reply += (resourceHelper.gs(R.string.sms_iob) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
-            + resourceHelper.gs(R.string.sms_bolus) + " " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
-            + resourceHelper.gs(R.string.sms_basal) + " " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U), "
-            + resourceHelper.gs(R.string.cob) + ": " + cobInfo.generateCOBString())
+        reply += (rh.gs(R.string.sms_iob) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
+            + rh.gs(R.string.sms_bolus) + " " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
+            + rh.gs(R.string.sms_basal) + " " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U), "
+            + rh.gs(R.string.cob) + ": " + cobInfo.generateCOBString())
         sendSMS(Sms(receivedSms.phoneNumber, reply))
         receivedSms.processed = true
     }
@@ -347,7 +347,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             "DISABLE", "STOP" -> {
                 if (loop.enabled) {
                     val passCode = generatePassCode()
-                    val reply = String.format(resourceHelper.gs(R.string.smscommunicator_loopdisablereplywithcode), passCode)
+                    val reply = String.format(rh.gs(R.string.smscommunicator_loopdisablereplywithcode), passCode)
                     receivedSms.processed = true
                     messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false) {
                         override fun run() {
@@ -356,49 +356,49 @@ class SmsCommunicatorPlugin @Inject constructor(
                             commandQueue.cancelTempBasal(true, object : Callback() {
                                 override fun run() {
                                     rxBus.send(EventRefreshOverview("SMS_LOOP_STOP"))
-                                    val replyText = resourceHelper.gs(R.string.smscommunicator_loophasbeendisabled) + " " +
-                                        resourceHelper.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
+                                    val replyText = rh.gs(R.string.smscommunicator_loophasbeendisabled) + " " +
+                                        rh.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
                                     sendSMS(Sms(receivedSms.phoneNumber, replyText))
                                 }
                             })
                         }
                     })
                 } else
-                    sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.loopisdisabled)))
+                    sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.loopisdisabled)))
                 receivedSms.processed = true
             }
 
             "ENABLE", "START" -> {
                 if (!loop.enabled) {
                     val passCode = generatePassCode()
-                    val reply = String.format(resourceHelper.gs(R.string.smscommunicator_loopenablereplywithcode), passCode)
+                    val reply = String.format(rh.gs(R.string.smscommunicator_loopenablereplywithcode), passCode)
                     receivedSms.processed = true
                     messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false) {
                         override fun run() {
                             uel.log(Action.LOOP_ENABLED, Sources.SMS)
                             loop.enabled = true
-                            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loophasbeenenabled)))
+                            sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_loophasbeenenabled)))
                             rxBus.send(EventRefreshOverview("SMS_LOOP_START"))
                         }
                     })
                 } else
-                    sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loopisenabled)))
+                    sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_loopisenabled)))
                 receivedSms.processed = true
             }
 
             "STATUS"          -> {
                 val reply = if (loop.enabled) {
-                    if (loop.isSuspended) String.format(resourceHelper.gs(R.string.loopsuspendedfor), loop.minutesToEndOfSuspend())
-                    else resourceHelper.gs(R.string.smscommunicator_loopisenabled)
+                    if (loop.isSuspended) String.format(rh.gs(R.string.loopsuspendedfor), loop.minutesToEndOfSuspend())
+                    else rh.gs(R.string.smscommunicator_loopisenabled)
                 } else
-                    resourceHelper.gs(R.string.loopisdisabled)
+                    rh.gs(R.string.loopisdisabled)
                 sendSMS(Sms(receivedSms.phoneNumber, reply))
                 receivedSms.processed = true
             }
 
             "RESUME"          -> {
                 val passCode = generatePassCode()
-                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_loopresumereplywithcode), passCode)
+                val reply = String.format(rh.gs(R.string.smscommunicator_loopresumereplywithcode), passCode)
                 receivedSms.processed = true
                 messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true) {
                     override fun run() {
@@ -413,13 +413,13 @@ class SmsCommunicatorPlugin @Inject constructor(
                         commandQueue.cancelTempBasal(true, object : Callback() {
                             override fun run() {
                                 if (!result.success) {
-                                    var replyText = resourceHelper.gs(R.string.smscommunicator_tempbasalfailed)
+                                    var replyText = rh.gs(R.string.smscommunicator_tempbasalfailed)
                                     replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMS(Sms(receivedSms.phoneNumber, replyText))
                                 }
                             }
                         })
-                        sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loopresumed)))
+                        sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_loopresumed)))
                     }
                 })
             }
@@ -431,11 +431,11 @@ class SmsCommunicatorPlugin @Inject constructor(
                 duration = min(180, duration)
                 if (duration == 0) {
                     receivedSms.processed = true
-                    sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_wrongduration)))
+                    sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_wrongduration)))
                     return
                 } else {
                     val passCode = generatePassCode()
-                    val reply = String.format(resourceHelper.gs(R.string.smscommunicator_suspendreplywithcode), duration, passCode)
+                    val reply = String.format(rh.gs(R.string.smscommunicator_suspendreplywithcode), duration, passCode)
                     receivedSms.processed = true
                     messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, duration) {
                         override fun run() {
@@ -451,11 +451,11 @@ class SmsCommunicatorPlugin @Inject constructor(
                                                 aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
                                             })
                                         rxBus.send(EventRefreshOverview("SMS_LOOP_SUSPENDED"))
-                                        val replyText = resourceHelper.gs(R.string.smscommunicator_loopsuspended) + " " +
-                                            resourceHelper.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
+                                        val replyText = rh.gs(R.string.smscommunicator_loopsuspended) + " " +
+                                            rh.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
                                         sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                                     } else {
-                                        var replyText = resourceHelper.gs(R.string.smscommunicator_tempbasalcancelfailed)
+                                        var replyText = rh.gs(R.string.smscommunicator_tempbasalcancelfailed)
                                         replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                         sendSMS(Sms(receivedSms.phoneNumber, replyText))
                                     }
@@ -466,7 +466,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                 }
             }
 
-            else              -> sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            else              -> sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
         }
     }
 
@@ -476,7 +476,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             sendSMS(Sms(receivedSms.phoneNumber, "NSCLIENT RESTART SENT"))
             receivedSms.processed = true
         } else
-            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
     }
 
     private fun processHELP(divided: Array<String>, receivedSms: Sms) {
@@ -493,7 +493,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                 }
             }
 
-            else                                                                          -> sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            else                                                                          -> sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
         }
     }
 
@@ -506,7 +506,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                         val reply = pump.shortStatus(true)
                         sendSMS(Sms(receivedSms.phoneNumber, reply))
                     } else {
-                        val reply = resourceHelper.gs(R.string.readstatusfailed)
+                        val reply = rh.gs(R.string.readstatusfailed)
                         sendSMS(Sms(receivedSms.phoneNumber, reply))
                     }
                 }
@@ -514,7 +514,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             receivedSms.processed = true
         } else if ((divided.size == 2) && (divided[1].equals("CONNECT", ignoreCase = true))) {
             val passCode = generatePassCode()
-            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpconnectwithcode), passCode)
+            val reply = String.format(rh.gs(R.string.smscommunicator_pumpconnectwithcode), passCode)
             receivedSms.processed = true
             messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true) {
                 override fun run() {
@@ -522,7 +522,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                     commandQueue.cancelTempBasal(true, object : Callback() {
                         override fun run() {
                             if (!result.success) {
-                                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_pumpconnectfail)))
+                                sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_pumpconnectfail)))
                             } else {
                                 disposable += repository.runTransactionForResult(CancelCurrentOfflineEventIfAnyTransaction(dateUtil.now()))
                                     .subscribe({ result ->
@@ -530,7 +530,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                                     }, {
                                         aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
                                     })
-                                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_reconnect)))
+                                sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_reconnect)))
                                 rxBus.send(EventRefreshOverview("SMS_PUMP_START"))
                             }
                         }
@@ -543,11 +543,11 @@ class SmsCommunicatorPlugin @Inject constructor(
             duration = min(120, duration)
             if (duration == 0) {
                 receivedSms.processed = true
-                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_wrongduration)))
+                sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_wrongduration)))
                 return
             } else {
                 val passCode = generatePassCode()
-                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpdisconnectwithcode), duration, passCode)
+                val reply = String.format(rh.gs(R.string.smscommunicator_pumpdisconnectwithcode), duration, passCode)
                 receivedSms.processed = true
                 messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true) {
                     override fun run() {
@@ -555,12 +555,12 @@ class SmsCommunicatorPlugin @Inject constructor(
                         val profile = profileFunction.getProfile() ?: return
                         loop.goToZeroTemp(duration, profile, OfflineEvent.Reason.DISCONNECT_PUMP)
                         rxBus.send(EventRefreshOverview("SMS_PUMP_DISCONNECT"))
-                        sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_pumpdisconnected)))
+                        sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_pumpdisconnected)))
                     }
                 })
             }
         } else {
-            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
             return
         }
     }
@@ -569,7 +569,7 @@ class SmsCommunicatorPlugin @Inject constructor(
         val anInterface = activePlugin.activeProfileSource
         val store = anInterface.profile
         if (store == null) {
-            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.notconfigured)))
+            sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.notconfigured)))
             receivedSms.processed = true
             return
         }
@@ -578,7 +578,7 @@ class SmsCommunicatorPlugin @Inject constructor(
         if (divided[1].uppercase(Locale.getDefault()) == "STATUS") {
             sendSMS(Sms(receivedSms.phoneNumber, profileName))
         } else if (divided[1].uppercase(Locale.getDefault()) == "LIST") {
-            if (list.isEmpty()) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.invalidprofile)))
+            if (list.isEmpty()) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.invalidprofile)))
             else {
                 var reply = ""
                 for (i in list.indices) {
@@ -592,24 +592,29 @@ class SmsCommunicatorPlugin @Inject constructor(
             val pIndex = SafeParse.stringToInt(divided[1])
             var percentage = 100
             if (divided.size > 2) percentage = SafeParse.stringToInt(divided[2])
-            if (pIndex > list.size) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
-            else if (percentage == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
-            else if (pIndex == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            if (pIndex > list.size) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
+            else if (percentage == 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
+            else if (pIndex == 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
             else {
                 val profile = store.getSpecificProfile(list[pIndex - 1] as String)
-                if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.noprofile)))
+                if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.noprofile)))
                 else {
                     val passCode = generatePassCode()
-                    val reply = String.format(resourceHelper.gs(R.string.smscommunicator_profilereplywithcode), list[pIndex - 1], percentage, passCode)
+                    val reply = String.format(rh.gs(R.string.smscommunicator_profilereplywithcode), list[pIndex - 1], percentage, passCode)
                     receivedSms.processed = true
                     val finalPercentage = percentage
                     messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, list[pIndex - 1] as String, finalPercentage) {
                         override fun run() {
-                            profileFunction.createProfileSwitch(store, list[pIndex - 1] as String, 0, finalPercentage, 0, dateUtil.now())
-                            val replyText = resourceHelper.gs(R.string.profileswitchcreated)
-                            sendSMS(Sms(receivedSms.phoneNumber, replyText))
-                            uel.log(Action.PROFILE_SWITCH, Sources.SMS, resourceHelper.gs(R.string.profileswitchcreated),
-                                ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.profileswitchcreated)))
+                            if (profileFunction.createProfileSwitch(store, list[pIndex - 1] as String, 0, finalPercentage, 0, dateUtil.now())) {
+                                val replyText = rh.gs(R.string.profileswitchcreated)
+                                sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                                uel.log(
+                                    Action.PROFILE_SWITCH, Sources.SMS, rh.gs(R.string.profileswitchcreated),
+                                    ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.profileswitchcreated))
+                                )
+                            } else {
+                                sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.invalidprofile)))
+                            }
                         }
                     })
                 }
@@ -621,24 +626,24 @@ class SmsCommunicatorPlugin @Inject constructor(
     private fun processBASAL(divided: Array<String>, receivedSms: Sms) {
         if (divided[1].uppercase(Locale.getDefault()) == "CANCEL" || divided[1].uppercase(Locale.getDefault()) == "STOP") {
             val passCode = generatePassCode()
-            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_basalstopreplywithcode), passCode)
+            val reply = String.format(rh.gs(R.string.smscommunicator_basalstopreplywithcode), passCode)
             receivedSms.processed = true
             messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true) {
                 override fun run() {
                     commandQueue.cancelTempBasal(true, object : Callback() {
                         override fun run() {
                             if (result.success) {
-                                var replyText = resourceHelper.gs(R.string.smscommunicator_tempbasalcanceled)
+                                var replyText = rh.gs(R.string.smscommunicator_tempbasalcanceled)
                                 replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
-                                uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_tempbasalcanceled),
-                                    ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.smscommunicator_tempbasalcanceled)))
+                                uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_tempbasalcanceled),
+                                        ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.smscommunicator_tempbasalcanceled)))
                             } else {
-                                var replyText = resourceHelper.gs(R.string.smscommunicator_tempbasalcancelfailed)
+                                var replyText = rh.gs(R.string.smscommunicator_tempbasalcancelfailed)
                                 replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMS(Sms(receivedSms.phoneNumber, replyText))
-                                uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_tempbasalcancelfailed),
-                                    ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.smscommunicator_tempbasalcancelfailed)))
+                                uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_tempbasalcancelfailed),
+                                        ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.smscommunicator_tempbasalcancelfailed)))
                             }
                         }
                     })
@@ -650,38 +655,38 @@ class SmsCommunicatorPlugin @Inject constructor(
             var duration = 30
             if (divided.size > 2) duration = SafeParse.stringToInt(divided[2])
             val profile = profileFunction.getProfile()
-            if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.noprofile)))
-            else if (tempBasalPct == 0 && divided[1] != "0%") sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
-            else if (duration <= 0 || duration % durationStep != 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongTbrDuration, durationStep)))
+            if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.noprofile)))
+            else if (tempBasalPct == 0 && divided[1] != "0%") sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
+            else if (duration <= 0 || duration % durationStep != 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongTbrDuration, durationStep)))
             else {
                 tempBasalPct = constraintChecker.applyBasalPercentConstraints(Constraint(tempBasalPct), profile).value()
                 val passCode = generatePassCode()
-                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_basalpctreplywithcode), tempBasalPct, duration, passCode)
+                val reply = String.format(rh.gs(R.string.smscommunicator_basalpctreplywithcode), tempBasalPct, duration, passCode)
                 receivedSms.processed = true
                 messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, tempBasalPct, duration) {
                     override fun run() {
                         commandQueue.tempBasalPercent(anInteger(), secondInteger(), true, profile, PumpSync.TemporaryBasalType.NORMAL, object : Callback() {
                             override fun run() {
                                 if (result.success) {
-                                    var replyText = if (result.isPercent) String.format(resourceHelper.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration) else String.format(resourceHelper.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration)
+                                    var replyText = if (result.isPercent) String.format(rh.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration) else String.format(rh.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration)
                                     replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                                     if (result.isPercent)
                                         uel.log(Action.TEMP_BASAL, Sources.SMS,
-                                            activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_tempbasalset_percent, result.percent, result.duration),
-                                            ValueWithUnit.Percent(result.percent),
-                                            ValueWithUnit.Minute(result.duration))
+                                                activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_tempbasalset_percent, result.percent, result.duration),
+                                                ValueWithUnit.Percent(result.percent),
+                                                ValueWithUnit.Minute(result.duration))
                                     else
                                         uel.log(Action.TEMP_BASAL, Sources.SMS,
-                                            activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_tempbasalset, result.absolute, result.duration),
-                                            ValueWithUnit.UnitPerHour(result.absolute),
-                                            ValueWithUnit.Minute(result.duration))
+                                                activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_tempbasalset, result.absolute, result.duration),
+                                                ValueWithUnit.UnitPerHour(result.absolute),
+                                                ValueWithUnit.Minute(result.duration))
                                 } else {
-                                    var replyText = resourceHelper.gs(R.string.smscommunicator_tempbasalfailed)
+                                    var replyText = rh.gs(R.string.smscommunicator_tempbasalfailed)
                                     replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMS(Sms(receivedSms.phoneNumber, replyText))
-                                    uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_tempbasalfailed),
-                                        ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.smscommunicator_tempbasalfailed)))
+                                    uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_tempbasalfailed),
+                                            ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.smscommunicator_tempbasalfailed)))
                                 }
                             }
                         })
@@ -694,37 +699,37 @@ class SmsCommunicatorPlugin @Inject constructor(
             var duration = 30
             if (divided.size > 2) duration = SafeParse.stringToInt(divided[2])
             val profile = profileFunction.getProfile()
-            if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.noprofile)))
-            else if (tempBasal == 0.0 && divided[1] != "0") sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
-            else if (duration <= 0 || duration % durationStep != 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongTbrDuration, durationStep)))
+            if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.noprofile)))
+            else if (tempBasal == 0.0 && divided[1] != "0") sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
+            else if (duration <= 0 || duration % durationStep != 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongTbrDuration, durationStep)))
             else {
                 tempBasal = constraintChecker.applyBasalConstraints(Constraint(tempBasal), profile).value()
                 val passCode = generatePassCode()
-                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_basalreplywithcode), tempBasal, duration, passCode)
+                val reply = String.format(rh.gs(R.string.smscommunicator_basalreplywithcode), tempBasal, duration, passCode)
                 receivedSms.processed = true
                 messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, tempBasal, duration) {
                     override fun run() {
                         commandQueue.tempBasalAbsolute(aDouble(), secondInteger(), true, profile, PumpSync.TemporaryBasalType.NORMAL, object : Callback() {
                             override fun run() {
                                 if (result.success) {
-                                    var replyText = if (result.isPercent) String.format(resourceHelper.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration)
-                                    else String.format(resourceHelper.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration)
+                                    var replyText = if (result.isPercent) String.format(rh.gs(R.string.smscommunicator_tempbasalset_percent), result.percent, result.duration)
+                                    else String.format(rh.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration)
                                     replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                                     if (result.isPercent)
-                                        uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_tempbasalset_percent, result.percent, result.duration),
-                                            ValueWithUnit.Percent(result.percent),
-                                            ValueWithUnit.Minute(result.duration))
+                                        uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_tempbasalset_percent, result.percent, result.duration),
+                                                ValueWithUnit.Percent(result.percent),
+                                                ValueWithUnit.Minute(result.duration))
                                     else
-                                        uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_tempbasalset, result.absolute, result.duration),
-                                            ValueWithUnit.UnitPerHour(result.absolute),
-                                            ValueWithUnit.Minute(result.duration))
+                                        uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_tempbasalset, result.absolute, result.duration),
+                                                ValueWithUnit.UnitPerHour(result.absolute),
+                                                ValueWithUnit.Minute(result.duration))
                                 } else {
-                                    var replyText = resourceHelper.gs(R.string.smscommunicator_tempbasalfailed)
+                                    var replyText = rh.gs(R.string.smscommunicator_tempbasalfailed)
                                     replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMS(Sms(receivedSms.phoneNumber, replyText))
-                                    uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_tempbasalfailed),
-                                        ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.smscommunicator_tempbasalfailed)))
+                                    uel.log(Action.TEMP_BASAL, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_tempbasalfailed),
+                                            ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.smscommunicator_tempbasalfailed)))
                                 }
                             }
                         })
@@ -737,62 +742,62 @@ class SmsCommunicatorPlugin @Inject constructor(
     private fun processEXTENDED(divided: Array<String>, receivedSms: Sms) {
         if (divided[1].uppercase(Locale.getDefault()) == "CANCEL" || divided[1].uppercase(Locale.getDefault()) == "STOP") {
             val passCode = generatePassCode()
-            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_extendedstopreplywithcode), passCode)
+            val reply = String.format(rh.gs(R.string.smscommunicator_extendedstopreplywithcode), passCode)
             receivedSms.processed = true
             messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true) {
                 override fun run() {
                     commandQueue.cancelExtended(object : Callback() {
                         override fun run() {
                             if (result.success) {
-                                var replyText = resourceHelper.gs(R.string.smscommunicator_extendedcanceled)
+                                var replyText = rh.gs(R.string.smscommunicator_extendedcanceled)
                                 replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                             } else {
-                                var replyText = resourceHelper.gs(R.string.smscommunicator_extendedcancelfailed)
+                                var replyText = rh.gs(R.string.smscommunicator_extendedcancelfailed)
                                 replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMS(Sms(receivedSms.phoneNumber, replyText))
-                                uel.log(Action.EXTENDED_BOLUS, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_extendedcanceled),
-                                    ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.smscommunicator_extendedcanceled)))
+                                uel.log(Action.EXTENDED_BOLUS, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_extendedcanceled),
+                                        ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.smscommunicator_extendedcanceled)))
                             }
                         }
                     })
                 }
             })
         } else if (divided.size != 3) {
-            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
         } else {
             var extended = SafeParse.stringToDouble(divided[1])
             val duration = SafeParse.stringToInt(divided[2])
             extended = constraintChecker.applyExtendedBolusConstraints(Constraint(extended)).value()
-            if (extended == 0.0 || duration == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            if (extended == 0.0 || duration == 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
             else {
                 val passCode = generatePassCode()
-                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_extendedreplywithcode), extended, duration, passCode)
+                val reply = String.format(rh.gs(R.string.smscommunicator_extendedreplywithcode), extended, duration, passCode)
                 receivedSms.processed = true
                 messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, extended, duration) {
                     override fun run() {
                         commandQueue.extendedBolus(aDouble(), secondInteger(), object : Callback() {
                             override fun run() {
                                 if (result.success) {
-                                    var replyText = String.format(resourceHelper.gs(R.string.smscommunicator_extendedset), aDouble, duration)
-                                    if (config.APS) replyText += "\n" + resourceHelper.gs(R.string.loopsuspended)
+                                    var replyText = String.format(rh.gs(R.string.smscommunicator_extendedset), aDouble, duration)
+                                    if (config.APS) replyText += "\n" + rh.gs(R.string.loopsuspended)
                                     replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                                     if (config.APS)
-                                        uel.log(Action.EXTENDED_BOLUS, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_extendedset, aDouble, duration) + " / " + resourceHelper.gs(R.string.loopsuspended),
-                                            ValueWithUnit.Insulin(aDouble ?: 0.0),
-                                            ValueWithUnit.Minute(duration),
-                                            ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.loopsuspended)))
+                                        uel.log(Action.EXTENDED_BOLUS, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_extendedset, aDouble, duration) + " / " + rh.gs(R.string.loopsuspended),
+                                                ValueWithUnit.Insulin(aDouble ?: 0.0),
+                                                ValueWithUnit.Minute(duration),
+                                                ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.loopsuspended)))
                                     else
-                                        uel.log(Action.EXTENDED_BOLUS, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_extendedset, aDouble, duration),
-                                            ValueWithUnit.Insulin(aDouble ?: 0.0),
-                                            ValueWithUnit.Minute(duration))
+                                        uel.log(Action.EXTENDED_BOLUS, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_extendedset, aDouble, duration),
+                                                ValueWithUnit.Insulin(aDouble ?: 0.0),
+                                                ValueWithUnit.Minute(duration))
                                 } else {
-                                    var replyText = resourceHelper.gs(R.string.smscommunicator_extendedfailed)
+                                    var replyText = rh.gs(R.string.smscommunicator_extendedfailed)
                                     replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMS(Sms(receivedSms.phoneNumber, replyText))
-                                    uel.log(Action.EXTENDED_BOLUS, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_extendedfailed),
-                                        ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.smscommunicator_extendedfailed)))
+                                    uel.log(Action.EXTENDED_BOLUS, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_extendedfailed),
+                                            ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.smscommunicator_extendedfailed)))
                                 }
                             }
                         })
@@ -807,13 +812,13 @@ class SmsCommunicatorPlugin @Inject constructor(
         val isMeal = divided.size > 2 && divided[2].equals("MEAL", ignoreCase = true)
         bolus = constraintChecker.applyBolusConstraints(Constraint(bolus)).value()
         if (divided.size == 3 && !isMeal) {
-            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
         } else if (bolus > 0.0) {
             val passCode = generatePassCode()
             val reply = if (isMeal)
-                String.format(resourceHelper.gs(R.string.smscommunicator_mealbolusreplywithcode), bolus, passCode)
+                String.format(rh.gs(R.string.smscommunicator_mealbolusreplywithcode), bolus, passCode)
             else
-                String.format(resourceHelper.gs(R.string.smscommunicator_bolusreplywithcode), bolus, passCode)
+                String.format(rh.gs(R.string.smscommunicator_bolusreplywithcode), bolus, passCode)
             receivedSms.processed = true
             messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, bolus) {
                 override fun run() {
@@ -827,9 +832,9 @@ class SmsCommunicatorPlugin @Inject constructor(
                                 override fun run() {
                                     if (resultSuccess) {
                                         var replyText = if (isMeal)
-                                            String.format(resourceHelper.gs(R.string.smscommunicator_mealbolusdelivered), resultBolusDelivered)
+                                            String.format(rh.gs(R.string.smscommunicator_mealbolusdelivered), resultBolusDelivered)
                                         else
-                                            String.format(resourceHelper.gs(R.string.smscommunicator_bolusdelivered), resultBolusDelivered)
+                                            String.format(rh.gs(R.string.smscommunicator_bolusdelivered), resultBolusDelivered)
                                         replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                         lastRemoteBolusTime = dateUtil.now()
                                         if (isMeal) {
@@ -860,17 +865,17 @@ class SmsCommunicatorPlugin @Inject constructor(
                                                 val tt = if (currentProfile.units == GlucoseUnit.MMOL) {
                                                     DecimalFormatter.to1Decimal(eatingSoonTT)
                                                 } else DecimalFormatter.to0Decimal(eatingSoonTT)
-                                                replyText += "\n" + String.format(resourceHelper.gs(R.string.smscommunicator_mealbolusdelivered_tt), tt, eatingSoonTTDuration)
+                                                replyText += "\n" + String.format(rh.gs(R.string.smscommunicator_mealbolusdelivered_tt), tt, eatingSoonTTDuration)
                                             }
                                         }
                                         sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                                         uel.log(Action.BOLUS, Sources.SMS, replyText)
                                     } else {
-                                        var replyText = resourceHelper.gs(R.string.smscommunicator_bolusfailed)
+                                        var replyText = rh.gs(R.string.smscommunicator_bolusfailed)
                                         replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                         sendSMS(Sms(receivedSms.phoneNumber, replyText))
-                                        uel.log(Action.BOLUS, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + resourceHelper.gs(R.string.smscommunicator_bolusfailed),
-                                            ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.smscommunicator_bolusfailed)))
+                                        uel.log(Action.BOLUS, Sources.SMS, activePlugin.activePump.shortStatus(true) + "\n" + rh.gs(R.string.smscommunicator_bolusfailed),
+                                                ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.smscommunicator_bolusfailed)))
                                     }
                                 }
                             })
@@ -878,7 +883,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                     })
                 }
             })
-        } else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+        } else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
     }
 
     private fun toTodayTime(hh_colon_mm: String): Long {
@@ -906,15 +911,15 @@ class SmsCommunicatorPlugin @Inject constructor(
         if (divided.size > 2) {
             time = toTodayTime(divided[2].uppercase(Locale.getDefault()))
             if (time == 0L) {
-                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
                 return
             }
         }
         grams = constraintChecker.applyCarbsConstraints(Constraint(grams)).value()
-        if (grams == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+        if (grams == 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
         else {
             val passCode = generatePassCode()
-            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_carbsreplywithcode), grams, dateUtil.timeString(time), passCode)
+            val reply = String.format(rh.gs(R.string.smscommunicator_carbsreplywithcode), grams, dateUtil.timeString(time), passCode)
             receivedSms.processed = true
             messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, grams, time) {
                 override fun run() {
@@ -924,17 +929,17 @@ class SmsCommunicatorPlugin @Inject constructor(
                     commandQueue.bolus(detailedBolusInfo, object : Callback() {
                         override fun run() {
                             if (result.success) {
-                                var replyText = String.format(resourceHelper.gs(R.string.smscommunicator_carbsset), anInteger)
+                                var replyText = String.format(rh.gs(R.string.smscommunicator_carbsset), anInteger)
                                 replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
-                                uel.log(Action.CARBS, Sources.SMS, activePlugin.activePump.shortStatus(true) + ": " + resourceHelper.gs(R.string.smscommunicator_carbsset, anInteger),
-                                    ValueWithUnit.Gram(anInteger ?: 0))
+                                uel.log(Action.CARBS, Sources.SMS, activePlugin.activePump.shortStatus(true) + ": " + rh.gs(R.string.smscommunicator_carbsset, anInteger),
+                                        ValueWithUnit.Gram(anInteger ?: 0))
                             } else {
-                                var replyText = resourceHelper.gs(R.string.smscommunicator_carbsfailed, anInteger)
+                                var replyText = rh.gs(R.string.smscommunicator_carbsfailed, anInteger)
                                 replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                 sendSMS(Sms(receivedSms.phoneNumber, replyText))
-                                uel.log(Action.CARBS, Sources.SMS, activePlugin.activePump.shortStatus(true) + ": " + resourceHelper.gs(R.string.smscommunicator_carbsfailed, anInteger),
-                                    ValueWithUnit.Gram(anInteger ?: 0))
+                                uel.log(Action.CARBS, Sources.SMS, activePlugin.activePump.shortStatus(true) + ": " + rh.gs(R.string.smscommunicator_carbsfailed, anInteger),
+                                        ValueWithUnit.Gram(anInteger ?: 0))
                             }
                         }
                     })
@@ -950,7 +955,7 @@ class SmsCommunicatorPlugin @Inject constructor(
         val isStop = divided[1].equals("STOP", ignoreCase = true) || divided[1].equals("CANCEL", ignoreCase = true)
         if (isMeal || isActivity || isHypo) {
             val passCode = generatePassCode()
-            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_temptargetwithcode), divided[1].uppercase(Locale.getDefault()), passCode)
+            val reply = String.format(rh.gs(R.string.smscommunicator_temptargetwithcode), divided[1].uppercase(Locale.getDefault()), passCode)
             receivedSms.processed = true
             messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false) {
                 override fun run() {
@@ -1003,7 +1008,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                         aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
                     })
                     val ttString = if (units == GlucoseUnit.MMOL) DecimalFormatter.to1Decimal(tt) else DecimalFormatter.to0Decimal(tt)
-                    val replyText = String.format(resourceHelper.gs(R.string.smscommunicator_tt_set), ttString, ttDuration)
+                    val replyText = String.format(rh.gs(R.string.smscommunicator_tt_set), ttString, ttDuration)
                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                     uel.log(Action.TT, Sources.SMS,
                         ValueWithUnit.fromGlucoseUnit(tt, units.asText),
@@ -1012,7 +1017,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             })
         } else if (isStop) {
             val passCode = generatePassCode()
-            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_temptargetcancel), passCode)
+            val reply = String.format(rh.gs(R.string.smscommunicator_temptargetcancel), passCode)
             receivedSms.processed = true
             messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false) {
                 override fun run() {
@@ -1022,14 +1027,14 @@ class SmsCommunicatorPlugin @Inject constructor(
                         }, {
                             aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
                         })
-                    val replyText = String.format(resourceHelper.gs(R.string.smscommunicator_tt_canceled))
+                    val replyText = String.format(rh.gs(R.string.smscommunicator_tt_canceled))
                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
-                    uel.log(Action.CANCEL_TT, Sources.SMS, resourceHelper.gs(R.string.smscommunicator_tt_canceled),
-                        ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.smscommunicator_tt_canceled)))
+                    uel.log(Action.CANCEL_TT, Sources.SMS, rh.gs(R.string.smscommunicator_tt_canceled),
+                            ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.smscommunicator_tt_canceled)))
                 }
             })
         } else
-            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
     }
 
     private fun processSMS(divided: Array<String>, receivedSms: Sms) {
@@ -1037,41 +1042,41 @@ class SmsCommunicatorPlugin @Inject constructor(
             || divided[1].equals("DISABLE", ignoreCase = true))
         if (isStop) {
             val passCode = generatePassCode()
-            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_stopsmswithcode), passCode)
+            val reply = String.format(rh.gs(R.string.smscommunicator_stopsmswithcode), passCode)
             receivedSms.processed = true
             messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false) {
                 override fun run() {
                     sp.putBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)
-                    val replyText = String.format(resourceHelper.gs(R.string.smscommunicator_stoppedsms))
+                    val replyText = String.format(rh.gs(R.string.smscommunicator_stoppedsms))
                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
-                    uel.log(Action.STOP_SMS, Sources.SMS, resourceHelper.gs(R.string.smscommunicator_stoppedsms),
-                        ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.smscommunicator_stoppedsms)))
+                    uel.log(Action.STOP_SMS, Sources.SMS, rh.gs(R.string.smscommunicator_stoppedsms),
+                            ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.smscommunicator_stoppedsms)))
                 }
             })
-        } else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+        } else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
     }
 
     private fun processCAL(divided: Array<String>, receivedSms: Sms) {
         val cal = SafeParse.stringToDouble(divided[1])
         if (cal > 0.0) {
             val passCode = generatePassCode()
-            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_calibrationreplywithcode), cal, passCode)
+            val reply = String.format(rh.gs(R.string.smscommunicator_calibrationreplywithcode), cal, passCode)
             receivedSms.processed = true
             messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false, cal) {
                 override fun run() {
                     val result = xdripCalibrations.sendIntent(aDouble!!)
                     val replyText =
-                        if (result) resourceHelper.gs(R.string.smscommunicator_calibrationsent) else resourceHelper.gs(R.string.smscommunicator_calibrationfailed)
+                        if (result) rh.gs(R.string.smscommunicator_calibrationsent) else rh.gs(R.string.smscommunicator_calibrationfailed)
                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                     if (result)
-                        uel.log(Action.CALIBRATION, Sources.SMS, resourceHelper.gs(R.string.smscommunicator_calibrationsent),
-                            ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.smscommunicator_calibrationsent)))
+                        uel.log(Action.CALIBRATION, Sources.SMS, rh.gs(R.string.smscommunicator_calibrationsent),
+                                ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.smscommunicator_calibrationsent)))
                     else
-                        uel.log(Action.CALIBRATION, Sources.SMS, resourceHelper.gs(R.string.smscommunicator_calibrationfailed),
-                            ValueWithUnit.SimpleString(resourceHelper.gsNotLocalised(R.string.smscommunicator_calibrationfailed)))
+                        uel.log(Action.CALIBRATION, Sources.SMS, rh.gs(R.string.smscommunicator_calibrationfailed),
+                                ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.smscommunicator_calibrationfailed)))
                 }
             })
-        } else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+        } else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrongformat)))
     }
 
     override fun sendNotificationToAllNumbers(text: String): Boolean {
@@ -1103,16 +1108,16 @@ class SmsCommunicatorPlugin @Inject constructor(
             messages.add(sms)
         } catch (e: IllegalArgumentException) {
             return if (e.message == "Invalid message body") {
-                val notification = Notification(Notification.INVALID_MESSAGE_BODY, resourceHelper.gs(R.string.smscommunicator_messagebody), Notification.NORMAL)
+                val notification = Notification(Notification.INVALID_MESSAGE_BODY, rh.gs(R.string.smscommunicator_messagebody), Notification.NORMAL)
                 rxBus.send(EventNewNotification(notification))
                 false
             } else {
-                val notification = Notification(Notification.INVALID_PHONE_NUMBER, resourceHelper.gs(R.string.smscommunicator_invalidphonennumber), Notification.NORMAL)
+                val notification = Notification(Notification.INVALID_PHONE_NUMBER, rh.gs(R.string.smscommunicator_invalidphonennumber), Notification.NORMAL)
                 rxBus.send(EventNewNotification(notification))
                 false
             }
         } catch (e: SecurityException) {
-            val notification = Notification(Notification.MISSING_SMS_PERMISSION, resourceHelper.gs(R.string.smscommunicator_missingsmspermission), Notification.NORMAL)
+            val notification = Notification(Notification.MISSING_SMS_PERMISSION, rh.gs(R.string.smscommunicator_missingsmspermission), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
             return false
         }
@@ -1121,12 +1126,13 @@ class SmsCommunicatorPlugin @Inject constructor(
     }
 
     private fun generatePassCode(): String =
-        String.format(resourceHelper.gs(R.string.smscommunicator_code_from_authenticator_for), otp.name())
+        String.format(rh.gs(R.string.smscommunicator_code_from_authenticator_for), otp.name())
 
     private fun stripAccents(str: String): String {
         var s = str
         s = Normalizer.normalize(s, Normalizer.Form.NFD)
         s = s.replace("[\\p{InCombiningDiacriticalMarks}]".toRegex(), "")
+        s = s.replace("ł", "l") // hack for Polish language (bug in libs)
         return s
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
index f227a205dbb..f3f7b150bb2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
@@ -18,7 +18,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.ActivitySmscommunicatorOtpBinding
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
 import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult
@@ -31,7 +31,7 @@ import javax.inject.Inject
 class SmsCommunicatorOtpActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
     @Inject lateinit var otp: OneTimePassword
     @Inject lateinit var uel: UserEntryLogger
@@ -71,25 +71,25 @@ class SmsCommunicatorOtpActivity : NoSplashAppCompatActivity() {
 
         binding.otpReset.setOnClickListener {
             OKDialog.showConfirmation(this,
-                resourceHelper.gs(R.string.smscommunicator_otp_reset_title),
-                resourceHelper.gs(R.string.smscommunicator_otp_reset_prompt),
+                rh.gs(R.string.smscommunicator_otp_reset_title),
+                rh.gs(R.string.smscommunicator_otp_reset_prompt),
                 Runnable {
                     uel.log(Action.OTP_RESET, Sources.SMS)
                     otp.ensureKey(true)
                     updateGui()
-                    ToastUtils.Long.infoToast(this, resourceHelper.gs(R.string.smscommunicator_otp_reset_successful))
+                    ToastUtils.Long.infoToast(this, rh.gs(R.string.smscommunicator_otp_reset_successful))
                 })
         }
 
         binding.otpProvisioning.setOnLongClickListener {
             OKDialog.showConfirmation(this,
-                resourceHelper.gs(R.string.smscommunicator_otp_export_title),
-                resourceHelper.gs(R.string.smscommunicator_otp_export_prompt),
+                rh.gs(R.string.smscommunicator_otp_export_title),
+                rh.gs(R.string.smscommunicator_otp_export_prompt),
                 Runnable {
                     val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
                     val clip = ClipData.newPlainText("OTP Secret", otp.provisioningSecret())
                     clipboard.setPrimaryClip(clip)
-                    ToastUtils.Long.infoToast(this, resourceHelper.gs(R.string.smscommunicator_otp_export_successful))
+                    ToastUtils.Long.infoToast(this, rh.gs(R.string.smscommunicator_otp_export_successful))
                     uel.log(Action.OTP_EXPORT, Sources.SMS)
                 })
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePassword.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePassword.kt
index 75235ca487e..2e73121ce74 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePassword.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePassword.kt
@@ -20,7 +20,7 @@ import javax.inject.Singleton
 @Singleton
 class OneTimePassword @Inject constructor(
     private val sp: SP,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val dateUtil: DateUtil
 ) {
 
@@ -36,7 +36,7 @@ class OneTimePassword @Inject constructor(
      * Name of master device (target of OTP)
      */
     fun name(): String {
-        val defaultUserName = resourceHelper.gs(R.string.patient_name_default)
+        val defaultUserName = rh.gs(R.string.patient_name_default)
         var userName = sp.getString(R.string.key_patient_name, defaultUserName).replace(":", "").trim()
         if (userName.isEmpty())
             userName = defaultUserName
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt
index a1126eafcb1..5f35b21487b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt
@@ -8,7 +8,7 @@ import android.widget.ScrollView
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.TidepoolFragmentBinding
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.tidepool.comm.TidepoolUploader
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolDoUpload
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolResetData
@@ -22,7 +22,7 @@ import javax.inject.Inject
 
 class TidepoolFragment : DaggerFragment() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var tidepoolPlugin: TidepoolPlugin
     @Inject lateinit var tidepoolUploader: TidepoolUploader
     @Inject lateinit var sp: SP
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
index 24efde91d7e..9c4a64c25e5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.tidepool.comm.TidepoolUploader
 import info.nightscout.androidaps.plugins.general.tidepool.comm.TidepoolUploader.ConnectionStatus.CONNECTED
 import info.nightscout.androidaps.plugins.general.tidepool.comm.TidepoolUploader.ConnectionStatus.DISCONNECTED
@@ -43,9 +43,9 @@ import javax.inject.Singleton
 class TidepoolPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val aapsSchedulers: AapsSchedulers,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val context: Context,
     private val fabricPrivacy: FabricPrivacy,
     private val tidepoolUploader: TidepoolUploader,
@@ -60,7 +60,7 @@ class TidepoolPlugin @Inject constructor(
     .fragmentClass(TidepoolFragment::class.qualifiedName)
     .preferencesId(R.xml.pref_tidepool)
     .description(R.string.description_tidepool),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ) {
 
     private var disposable: CompositeDisposable = CompositeDisposable()
@@ -108,9 +108,9 @@ class TidepoolPlugin @Inject constructor(
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ event ->
-                if (event.isChanged(resourceHelper, R.string.key_tidepool_dev_servers)
-                    || event.isChanged(resourceHelper, R.string.key_tidepool_username)
-                    || event.isChanged(resourceHelper, R.string.key_tidepool_password)
+                if (event.isChanged(rh, R.string.key_tidepool_dev_servers)
+                    || event.isChanged(rh, R.string.key_tidepool_username)
+                    || event.isChanged(rh, R.string.key_tidepool_password)
                 )
                     tidepoolUploader.resetInstance()
             }, fabricPrivacy::logException)
@@ -129,7 +129,7 @@ class TidepoolPlugin @Inject constructor(
     override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
         super.preprocessPreferences(preferenceFragment)
 
-        val tidepoolTestLogin: Preference? = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_tidepool_test_login))
+        val tidepoolTestLogin: Preference? = preferenceFragment.findPreference(rh.gs(R.string.key_tidepool_test_login))
         tidepoolTestLogin?.setOnPreferenceClickListener {
             preferenceFragment.context?.let {
                 tidepoolUploader.testLogin(it)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt
index bbc7646011e..328832eae02 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt
@@ -2,13 +2,13 @@ package info.nightscout.androidaps.plugins.general.tidepool.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolStatus
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-internal class TidepoolCallback<T>(private val aapsLogger: AAPSLogger, private val rxBus: RxBusWrapper, private val session: Session, val name: String, val onSuccess: () -> Unit, val onFail: () -> Unit) : Callback<T> {
+internal class TidepoolCallback<T>(private val aapsLogger: AAPSLogger, private val rxBus: RxBus, private val session: Session, val name: String, val onSuccess: () -> Unit, val onFail: () -> Unit) : Callback<T> {
 
     override fun onResponse(call: Call<T>, response: Response<T>) {
         if (response.isSuccessful && response.body() != null) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt
index c7bb146343a..85186371779 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolStatus
 import info.nightscout.androidaps.plugins.general.tidepool.messages.AuthReplyMessage
 import info.nightscout.androidaps.plugins.general.tidepool.messages.AuthRequestMessage
@@ -32,9 +32,9 @@ import javax.inject.Singleton
 @Singleton
 class TidepoolUploader @Inject constructor(
     private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val ctx: Context,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val sp: SP,
     private val uploadChunk: UploadChunk,
     private val activePlugin: ActivePlugin,
@@ -130,13 +130,13 @@ class TidepoolUploader @Inject constructor(
             val call = session.service?.getLogin(it)
 
             call?.enqueue(TidepoolCallback<AuthReplyMessage>(aapsLogger, rxBus, session, "Login", {
-                OKDialog.show(rootContext, resourceHelper.gs(R.string.tidepool), "Successfully logged into Tidepool.")
+                OKDialog.show(rootContext, rh.gs(R.string.tidepool), "Successfully logged into Tidepool.")
             }, {
-                OKDialog.show(rootContext, resourceHelper.gs(R.string.tidepool), "Failed to log into Tidepool.\nCheck that your user name and password are correct.")
+                OKDialog.show(rootContext, rh.gs(R.string.tidepool), "Failed to log into Tidepool.\nCheck that your user name and password are correct.")
             }))
 
         }
-            ?: OKDialog.show(rootContext, resourceHelper.gs(R.string.tidepool), "Cannot do login as user credentials have not been set correctly")
+            ?: OKDialog.show(rootContext, rh.gs(R.string.tidepool), "Cannot do login as user credentials have not been set correctly")
 
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
index f48d07d6170..14cfcd282f9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
 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.bus.RxBus
 import info.nightscout.androidaps.plugins.general.tidepool.elements.*
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolStatus
 import info.nightscout.androidaps.plugins.general.tidepool.utils.GsonInstance
@@ -24,7 +24,7 @@ import kotlin.math.min
 @Singleton
 class UploadChunk @Inject constructor(
     private val sp: SP,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val aapsLogger: AAPSLogger,
     private val profileFunction: ProfileFunction,
     private val activePlugin: ActivePlugin,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
index df0881d9080..f3a5348a653 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
@@ -28,7 +28,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.wear.events.EventWearConfirmAction
@@ -56,10 +56,10 @@ import kotlin.math.min
 @Singleton
 class ActionStringHandler @Inject constructor(
     private val sp: SP,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val aapsLogger: AAPSLogger,
     private val aapsSchedulers: AapsSchedulers,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val injector: HasAndroidInjector,
     private val context: Context,
     private val constraintChecker: ConstraintChecker,
@@ -67,7 +67,7 @@ class ActionStringHandler @Inject constructor(
     private val loopPlugin: LoopPlugin,
     private val wearPlugin: WearPlugin,
     private val fabricPrivacy: FabricPrivacy,
-    private val commandQueue: CommandQueueProvider,
+    private val commandQueue: CommandQueue,
     private val activePlugin: ActivePlugin,
     private val iobCobCalculator: IobCobCalculator,
     private val localInsightPlugin: LocalInsightPlugin,
@@ -122,24 +122,24 @@ class ActionStringHandler @Inject constructor(
                 else          -> return
             }
             val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
-            rMessage += resourceHelper.gs(R.string.primefill) + ": " + insulinAfterConstraints + "U"
-            if (insulinAfterConstraints - amount != 0.0) rMessage += "\n" + resourceHelper.gs(R.string.constraintapllied)
+            rMessage += rh.gs(R.string.primefill) + ": " + insulinAfterConstraints + "U"
+            if (insulinAfterConstraints - amount != 0.0) rMessage += "\n" + rh.gs(R.string.constraintapllied)
             rAction += "fill $insulinAfterConstraints"
         } else if ("fill" == act[0]) { ////////////////////////////////////////////// PRIME/FILL
             val amount = SafeParse.stringToDouble(act[1])
             val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
-            rMessage += resourceHelper.gs(R.string.primefill) + ": " + insulinAfterConstraints + "U"
-            if (insulinAfterConstraints - amount != 0.0) rMessage += "\n" + resourceHelper.gs(R.string.constraintapllied)
+            rMessage += rh.gs(R.string.primefill) + ": " + insulinAfterConstraints + "U"
+            if (insulinAfterConstraints - amount != 0.0) rMessage += "\n" + rh.gs(R.string.constraintapllied)
             rAction += "fill $insulinAfterConstraints"
         } else if ("bolus" == act[0]) { ////////////////////////////////////////////// BOLUS
             val insulin = SafeParse.stringToDouble(act[1])
             val carbs = SafeParse.stringToInt(act[2])
             val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value()
             val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
-            rMessage += resourceHelper.gs(R.string.bolus) + ": " + insulinAfterConstraints + "U\n"
-            rMessage += resourceHelper.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g"
+            rMessage += rh.gs(R.string.bolus) + ": " + insulinAfterConstraints + "U\n"
+            rMessage += rh.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g"
             if (insulinAfterConstraints - insulin != 0.0 || carbsAfterConstraints - carbs != 0) {
-                rMessage += "\n" + resourceHelper.gs(R.string.constraintapllied)
+                rMessage += "\n" + rh.gs(R.string.constraintapllied)
             }
             rAction += "bolus $insulinAfterConstraints $carbsAfterConstraints"
         } else if ("temptarget" == act[0]) { ///////////////////////////////////////////////////////// TEMPTARGET
@@ -280,7 +280,7 @@ class ActionStringHandler @Inject constructor(
                 rMessage = "OLD DATA - "
                 //if pump is not busy: try to fetch data
                 if (activePump.isBusy()) {
-                    rMessage += resourceHelper.gs(R.string.pumpbusy)
+                    rMessage += rh.gs(R.string.pumpbusy)
                 } else {
                     rMessage += "trying to fetch data from pump."
                     commandQueue.loadTDDs(object : Callback() {
@@ -306,11 +306,11 @@ class ActionStringHandler @Inject constructor(
             val duration = SafeParse.stringToInt(act[3])
             val starttimestamp = System.currentTimeMillis() + starttime * 60 * 1000
             val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
-            rMessage += resourceHelper.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g"
-            rMessage += "\n" + resourceHelper.gs(R.string.time) + ": " + dateUtil.timeString(starttimestamp)
-            rMessage += "\n" + resourceHelper.gs(R.string.duration) + ": " + duration + "h"
+            rMessage += rh.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g"
+            rMessage += "\n" + rh.gs(R.string.time) + ": " + dateUtil.timeString(starttimestamp)
+            rMessage += "\n" + rh.gs(R.string.duration) + ": " + duration + "h"
             if (carbsAfterConstraints - carbs != 0) {
-                rMessage += "\n" + resourceHelper.gs(R.string.constraintapllied)
+                rMessage += "\n" + rh.gs(R.string.constraintapllied)
             }
             if (carbsAfterConstraints <= 0) {
                 sendError("Carbs = 0! No action taken!")
@@ -318,7 +318,7 @@ class ActionStringHandler @Inject constructor(
             }
             rAction += "ecarbs $carbsAfterConstraints $starttimestamp $duration"
         } else if ("changeRequest" == act[0]) { ////////////////////////////////////////////// CHANGE REQUEST
-            rTitle = resourceHelper.gs(R.string.openloop_newsuggestion)
+            rTitle = rh.gs(R.string.openloop_newsuggestion)
             rAction = "changeRequest"
             loopPlugin.lastRun?.let {
                 rMessage += it.constraintsProcessed
@@ -472,15 +472,15 @@ class ActionStringHandler @Inject constructor(
             val usedAPS = activePlugin.activeAPS
             val result = usedAPS.lastAPSResult ?: return "Last result not available!"
             ret += if (!result.isChangeRequested) {
-                resourceHelper.gs(R.string.nochangerequested) + "\n"
+                rh.gs(R.string.nochangerequested) + "\n"
             } else if (result.rate == 0.0 && result.duration == 0) {
-                resourceHelper.gs(R.string.canceltemp) + "\n"
+                rh.gs(R.string.canceltemp) + "\n"
             } else {
-                resourceHelper.gs(R.string.rate) + ": " + DecimalFormatter.to2Decimal(result.rate) + " U/h " +
+                rh.gs(R.string.rate) + ": " + DecimalFormatter.to2Decimal(result.rate) + " U/h " +
                     "(" + DecimalFormatter.to2Decimal(result.rate / activePlugin.activePump.baseBasalRate * 100) + "%)\n" +
-                    resourceHelper.gs(R.string.duration) + ": " + DecimalFormatter.to0Decimal(result.duration.toDouble()) + " min\n"
+                    rh.gs(R.string.duration) + ": " + DecimalFormatter.to0Decimal(result.duration.toDouble()) + " min\n"
             }
-            ret += "\n" + resourceHelper.gs(R.string.reason) + ": " + result.reason
+            ret += "\n" + rh.gs(R.string.reason) + ": " + result.reason
             return ret
         }
 
@@ -507,11 +507,6 @@ class ActionStringHandler @Inject constructor(
             val duration = SafeParse.stringToInt(act[2])
             var low = SafeParse.stringToDouble(act[3])
             var high = SafeParse.stringToDouble(act[4])
-            val isMGDL = java.lang.Boolean.parseBoolean(act[1])
-            if (!isMGDL) {
-                low *= Constants.MMOLL_TO_MGDL
-                high *= Constants.MMOLL_TO_MGDL
-            }
             generateTempTarget(duration, low, high)
         } else if ("wizard2" == act[0]) {
             if (lastBolusWizard != null) { //use last calculation as confirmed string matches
@@ -545,17 +540,17 @@ class ActionStringHandler @Inject constructor(
         var msg = ""
         //check for validity
         if (percentage < Constants.CPP_MIN_PERCENTAGE || percentage > Constants.CPP_MAX_PERCENTAGE) {
-            msg += String.format(resourceHelper.gs(R.string.valueoutofrange), "Profile-Percentage") + "\n"
+            msg += String.format(rh.gs(R.string.valueoutofrange), "Profile-Percentage") + "\n"
         }
         if (timeshift < 0 || timeshift > 23) {
-            msg += String.format(resourceHelper.gs(R.string.valueoutofrange), "Profile-Timeshift") + "\n"
+            msg += String.format(rh.gs(R.string.valueoutofrange), "Profile-Timeshift") + "\n"
         }
         val profile = profileFunction.getProfile()
         if (profile == null) {
-            msg += resourceHelper.gs(R.string.notloadedplugins) + "\n"
+            msg += rh.gs(R.string.notloadedplugins) + "\n"
         }
         if ("" != msg) {
-            msg += resourceHelper.gs(R.string.valuesnotstored)
+            msg += rh.gs(R.string.valuesnotstored)
             val rTitle = "STATUS"
             val rAction = "statusmessage"
             wearPlugin.requestActionConfirmation(rTitle, msg, rAction)
@@ -610,7 +605,7 @@ class ActionStringHandler @Inject constructor(
         commandQueue.bolus(detailedBolusInfo, object : Callback() {
             override fun run() {
                 if (!result.success) {
-                    sendError(resourceHelper.gs(R.string.treatmentdeliveryerror) +
+                    sendError(rh.gs(R.string.treatmentdeliveryerror) +
                         "\n" +
                         result.comment)
                 }
@@ -647,7 +642,7 @@ class ActionStringHandler @Inject constructor(
             commandQueue.bolus(detailedBolusInfo, object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        sendError(resourceHelper.gs(R.string.treatmentdeliveryerror) +
+                        sendError(rh.gs(R.string.treatmentdeliveryerror) +
                             "\n" +
                             result.comment)
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt
index d08dba47d86..d7666098c5e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt
@@ -12,7 +12,7 @@ import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService
@@ -28,13 +28,13 @@ import javax.inject.Singleton
 class WearPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val aapsSchedulers: AapsSchedulers,
     private val sp: SP,
     private val ctx: Context,
     private val fabricPrivacy: FabricPrivacy,
     private val loopPlugin: Lazy<LoopPlugin>,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val actionStringHandler: Lazy<ActionStringHandler>
 
 ) : PluginBase(PluginDescription()
@@ -45,7 +45,7 @@ class WearPlugin @Inject constructor(
     .shortName(R.string.wear_shortname)
     .preferencesId(R.xml.pref_wear)
     .description(R.string.description_wear),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ) {
 
     private val disposable = CompositeDisposable()
@@ -68,7 +68,7 @@ class WearPlugin @Inject constructor(
             .observeOn(aapsSchedulers.io)
             .subscribe({ sendDataToWatch(status = true, basals = true, bgValue = false) }, fabricPrivacy::logException))
         disposable.add(rxBus
-            .toObservable(EventNewBasalProfile::class.java)
+            .toObservable(EventEffectiveProfileSwitchChanged::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ sendDataToWatch(status = false, basals = true, bgValue = false) }, fabricPrivacy::logException))
         disposable.add(rxBus
@@ -88,14 +88,14 @@ class WearPlugin @Inject constructor(
             .toObservable(EventRefreshOverview::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({
-                if (WatchUpdaterService.shouldReportLoopStatus(loopPlugin.get().isEnabled(PluginType.LOOP)))
+                if (WatchUpdaterService.shouldReportLoopStatus(loopPlugin.get().isEnabled()))
                     sendDataToWatch(status = true, basals = false, bgValue = false)
             }, fabricPrivacy::logException))
         disposable.add(rxBus
             .toObservable(EventBolusRequested::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ event: EventBolusRequested ->
-                val status = String.format(resourceHelper.gs(R.string.bolusrequested), event.amount)
+                val status = String.format(rh.gs(R.string.bolusrequested), event.amount)
                 val intent = Intent(ctx, WatchUpdaterService::class.java).setAction(WatchUpdaterService.ACTION_SEND_BOLUSPROGRESS)
                 intent.putExtra("progresspercent", 0)
                 intent.putExtra("progressstatus", status)
@@ -107,9 +107,9 @@ class WearPlugin @Inject constructor(
             .subscribe({ event: EventDismissBolusProgressIfRunning ->
                 if (event.result == null) return@subscribe
                 val status: String = if (event.result!!.success) {
-                    resourceHelper.gs(R.string.success)
+                    rh.gs(R.string.success)
                 } else {
-                    resourceHelper.gs(R.string.nosuccess)
+                    rh.gs(R.string.nosuccess)
                 }
                 val intent = Intent(ctx, WatchUpdaterService::class.java).setAction(WatchUpdaterService.ACTION_SEND_BOLUSPROGRESS)
                 intent.putExtra("progresspercent", 100)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index 1e5c4364e6d..72e63f1faf5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -42,13 +42,12 @@
 import info.nightscout.androidaps.interfaces.Config;
 import info.nightscout.androidaps.interfaces.GlucoseUnit;
 import info.nightscout.androidaps.interfaces.IobCobCalculator;
-import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.GlucoseValueDataPoint;
 import info.nightscout.androidaps.plugins.general.wear.WearPlugin;
@@ -67,9 +66,9 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     @Inject public GlucoseStatusProvider glucoseStatusProvider;
     @Inject public AAPSLogger aapsLogger;
     @Inject public WearPlugin wearPlugin;
-    @Inject public ResourceHelper resourceHelper;
+    @Inject public ResourceHelper rh;
     @Inject public SP sp;
-    @Inject public RxBusWrapper rxBus;
+    @Inject public RxBus rxBus;
     @Inject public ProfileFunction profileFunction;
     @Inject public DefaultValueHelper defaultValueHelper;
     @Inject public NSDeviceStatus nsDeviceStatus;
@@ -133,7 +132,7 @@ public void onCreate() {
     }
 
     private boolean wearIntegration() {
-        return wearPlugin.isEnabled(PluginType.GENERAL);
+        return wearPlugin.isEnabled();
     }
 
     private void googleApiConnect() {
@@ -514,7 +513,7 @@ private void sendBasals() {
         if (sp.getBoolean("wear_predictions", true) && finalLastRun != null && finalLastRun.getRequest().getHasPredictions() && finalLastRun.getConstraintsProcessed() != null) {
             List<GlucoseValueDataPoint> predArray =
                     finalLastRun.getConstraintsProcessed().getPredictions()
-                            .stream().map(bg -> new GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, resourceHelper))
+                            .stream().map(bg -> new GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, rh))
                             .collect(Collectors.toList());
 
             if (!predArray.isEmpty()) {
@@ -658,7 +657,7 @@ private void sendStatus() {
 
         if (googleApiClient != null && googleApiClient.isConnected()) {
             Profile profile = profileFunction.getProfile();
-            String status = resourceHelper.gs(R.string.noprofile);
+            String status = rh.gs(R.string.noprofile);
             String iobSum, iobDetail, cobString, currentBasal, bgiString;
             iobSum = iobDetail = cobString = currentBasal = bgiString = "";
             if (profile != null) {
@@ -722,7 +721,7 @@ private void sendPreferences() {
             PutDataMapRequest dataMapRequest = PutDataMapRequest.create(NEW_PREFERENCES_PATH);
             //unique content
             dataMapRequest.getDataMap().putLong("timestamp", System.currentTimeMillis());
-            dataMapRequest.getDataMap().putBoolean(resourceHelper.gs(R.string.key_wear_control), wearcontrol);
+            dataMapRequest.getDataMap().putBoolean(rh.gs(R.string.key_wear_control), wearcontrol);
             PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
             Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
         } else {
@@ -736,12 +735,12 @@ private String generateStatusString(Profile profile, String currentBasal, String
         String status = "";
 
         if (profile == null) {
-            status = resourceHelper.gs(R.string.noprofile);
+            status = rh.gs(R.string.noprofile);
             return status;
         }
 
-        if (!loopPlugin.isEnabled(PluginType.LOOP)) {
-            status += resourceHelper.gs(R.string.disabledloop) + "\n";
+        if (!loopPlugin.isEnabled()) {
+            status += rh.gs(R.string.disabledloop) + "\n";
             lastLoopStatus = false;
         } else {
             lastLoopStatus = true;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt
index 1bfb7f7bd39..5eb9ac1c47c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.extensions.toStringShort
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -26,13 +26,13 @@ class StatusLinePlugin @Inject constructor(
     injector: HasAndroidInjector,
     private val sp: SP,
     private val profileFunction: ProfileFunction,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val aapsSchedulers: AapsSchedulers,
     private val context: Context,
     private val fabricPrivacy: FabricPrivacy,
     private val loopPlugin: LoopPlugin,
     private val iobCobCalculator: IobCobCalculator,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     aapsLogger: AAPSLogger
 ) : PluginBase(
     PluginDescription()
@@ -43,7 +43,7 @@ class StatusLinePlugin @Inject constructor(
         .neverVisible(true)
         .preferencesId(R.xml.pref_xdripstatus)
         .description(R.string.description_xdrip_status_line),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ) {
 
     private val disposable = CompositeDisposable()
@@ -66,7 +66,7 @@ class StatusLinePlugin @Inject constructor(
         super.onStart()
         disposable += rxBus.toObservable(EventRefreshOverview::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ if (lastLoopStatus != loopPlugin.isEnabled(PluginType.LOOP)) sendStatus() }, fabricPrivacy::logException)
+            .subscribe({ if (lastLoopStatus != loopPlugin.isEnabled()) sendStatus() }, fabricPrivacy::logException)
         disposable += rxBus.toObservable(EventExtendedBolusChange::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ sendStatus() }, fabricPrivacy::logException)
@@ -113,10 +113,10 @@ class StatusLinePlugin @Inject constructor(
 
     private fun buildStatusString(profile: Profile): String {
         var status = ""
-        if (!loopPlugin.isEnabled(PluginType.LOOP)) {
-            status += resourceHelper.gs(R.string.disabledloop) + "\n"
+        if (!loopPlugin.isEnabled()) {
+            status += rh.gs(R.string.disabledloop) + "\n"
             lastLoopStatus = false
-        } else if (loopPlugin.isEnabled(PluginType.LOOP)) {
+        } else if (loopPlugin.isEnabled()) {
             lastLoopStatus = true
         }
         //Temp basal
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.kt
index 640a0b80be8..080fbd41fe0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinFragment.kt
@@ -14,7 +14,7 @@ import javax.inject.Inject
 class InsulinFragment : DaggerFragment() {
 
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
 
     private var _binding: InsulinFragmentBinding? = null
 
@@ -32,7 +32,7 @@ class InsulinFragment : DaggerFragment() {
         super.onResume()
         binding.name.text = activePlugin.activeInsulin.friendlyName
         binding.comment.text = activePlugin.activeInsulin.comment
-        binding.dia.text = resourceHelper.gs(R.string.dia) + ":  " + resourceHelper.gs(R.string.format_hours, activePlugin.activeInsulin.dia)
+        binding.dia.text = rh.gs(R.string.dia) + ":  " + rh.gs(R.string.format_hours, activePlugin.activeInsulin.dia)
         binding.graph.show(activePlugin.activeInsulin)
     }
 
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
index 9c40a7bcdce..a2e0b3c2ec8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinLyumjevPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinLyumjevPlugin.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Insulin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import javax.inject.Inject
@@ -14,18 +14,18 @@ import javax.inject.Singleton
 @Singleton
 class InsulinLyumjevPlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     profileFunction: ProfileFunction,
-    rxBus: RxBusWrapper, aapsLogger: AAPSLogger
-) : InsulinOrefBasePlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger) {
+    rxBus: RxBus, aapsLogger: AAPSLogger
+) : InsulinOrefBasePlugin(injector, rh, profileFunction, rxBus, aapsLogger) {
 
     override val id get(): Insulin.InsulinType = Insulin.InsulinType.OREF_LYUMJEV
-    override val friendlyName get(): String = resourceHelper.gs(R.string.lyumjev)
+    override val friendlyName get(): String = rh.gs(R.string.lyumjev)
 
     override fun configuration(): JSONObject = JSONObject()
     override fun applyConfiguration(configuration: JSONObject) {}
 
-    override fun commentStandardText(): String = resourceHelper.gs(R.string.lyumjev)
+    override fun commentStandardText(): String = rh.gs(R.string.lyumjev)
 
     override val peak = 45
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.kt
index 708f1dde9f0..e33bcacc93e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.utils.T
@@ -27,16 +27,16 @@ import kotlin.math.pow
  */
 abstract class InsulinOrefBasePlugin(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     val profileFunction: ProfileFunction,
-    val rxBus: RxBusWrapper, aapsLogger: AAPSLogger
+    val rxBus: RxBus, aapsLogger: AAPSLogger
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.INSULIN)
     .fragmentClass(InsulinFragment::class.java.name)
     .pluginIcon(R.drawable.ic_insulin)
     .shortName(R.string.insulin_shortname)
     .visibleByDefault(false),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), Insulin {
 
     private var lastWarned: Long = 0
@@ -60,7 +60,7 @@ abstract class InsulinOrefBasePlugin(
     }
 
     private val notificationPattern: String
-        get() = resourceHelper.gs(R.string.dia_too_short)
+        get() = rh.gs(R.string.dia_too_short)
 
     open val userDefinedDia: Double
         get() {
@@ -96,7 +96,7 @@ abstract class InsulinOrefBasePlugin(
             var comment = commentStandardText()
             val userDia = userDefinedDia
             if (userDia < MIN_DIA) {
-                comment += "\n" + resourceHelper.gs(R.string.dia_too_short, userDia, MIN_DIA)
+                comment += "\n" + rh.gs(R.string.dia_too_short, userDia, MIN_DIA)
             }
             return comment
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.kt
index d80ac43481c..5a14fed8f93 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Insulin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.extensions.storeInt
 import info.nightscout.androidaps.extensions.putInt
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -21,22 +21,22 @@ import javax.inject.Singleton
 class InsulinOrefFreePeakPlugin @Inject constructor(
     injector: HasAndroidInjector,
     private val sp: SP,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     profileFunction: ProfileFunction,
-    rxBus: RxBusWrapper, aapsLogger: AAPSLogger
-) : InsulinOrefBasePlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger) {
+    rxBus: RxBus, aapsLogger: AAPSLogger
+) : InsulinOrefBasePlugin(injector, rh, profileFunction, rxBus, aapsLogger) {
 
     override val id get(): Insulin.InsulinType = Insulin.InsulinType.OREF_FREE_PEAK
 
-    override val friendlyName get(): String = resourceHelper.gs(R.string.free_peak_oref)
+    override val friendlyName get(): String = rh.gs(R.string.free_peak_oref)
 
-    override fun configuration(): JSONObject = JSONObject().putInt(R.string.key_insulin_oref_peak, sp, resourceHelper)
+    override fun configuration(): JSONObject = JSONObject().putInt(R.string.key_insulin_oref_peak, sp, rh)
     override fun applyConfiguration(configuration: JSONObject) {
-            configuration.storeInt(R.string.key_insulin_oref_peak, sp, resourceHelper)
+            configuration.storeInt(R.string.key_insulin_oref_peak, sp, rh)
     }
 
     override fun commentStandardText(): String {
-        return resourceHelper.gs(R.string.insulin_peak_time) + ": " + peak
+        return rh.gs(R.string.insulin_peak_time) + ": " + peak
     }
 
     override val peak: Int
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 c18313a405d..9ec79e428c7 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
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Insulin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import javax.inject.Inject
@@ -17,18 +17,18 @@ import javax.inject.Singleton
 @Singleton
 class InsulinOrefRapidActingPlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     profileFunction: ProfileFunction,
-    rxBus: RxBusWrapper, aapsLogger: AAPSLogger
-) : InsulinOrefBasePlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger) {
+    rxBus: RxBus, aapsLogger: AAPSLogger
+) : InsulinOrefBasePlugin(injector, rh, profileFunction, rxBus, aapsLogger) {
 
     override val id get(): Insulin.InsulinType = Insulin.InsulinType.OREF_RAPID_ACTING
-    override val friendlyName get(): String = resourceHelper.gs(R.string.rapid_acting_oref)
+    override val friendlyName get(): String = rh.gs(R.string.rapid_acting_oref)
 
     override fun configuration(): JSONObject = JSONObject()
     override fun applyConfiguration(configuration: JSONObject) {}
 
-    override fun commentStandardText(): String = resourceHelper.gs(R.string.fastactinginsulincomment)
+    override fun commentStandardText(): String = rh.gs(R.string.fastactinginsulincomment)
 
     override val peak = 75
 
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 7a32408984c..dfa800291b4 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
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Insulin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import javax.inject.Inject
@@ -17,18 +17,18 @@ import javax.inject.Singleton
 @Singleton
 class InsulinOrefUltraRapidActingPlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     profileFunction: ProfileFunction,
-    rxBus: RxBusWrapper, aapsLogger: AAPSLogger
-) : InsulinOrefBasePlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger) {
+    rxBus: RxBus, aapsLogger: AAPSLogger
+) : InsulinOrefBasePlugin(injector, rh, profileFunction, rxBus, aapsLogger) {
 
     override val id get(): Insulin.InsulinType = Insulin.InsulinType.OREF_ULTRA_RAPID_ACTING
-    override val friendlyName get(): String = resourceHelper.gs(R.string.ultrarapid_oref)
+    override val friendlyName get(): String = rh.gs(R.string.ultrarapid_oref)
 
     override fun configuration(): JSONObject = JSONObject()
     override fun applyConfiguration(configuration: JSONObject) {}
 
-    override fun commentStandardText(): String = resourceHelper.gs(R.string.ultrafastactinginsulincomment)
+    override fun commentStandardText(): String = rh.gs(R.string.ultrafastactinginsulincomment)
 
     override val peak = 55
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
index 3ecfbc1f86a..5efd0af7e81 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
@@ -21,7 +21,7 @@ import info.nightscout.androidaps.extensions.toTemporaryBasal
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
@@ -37,6 +37,9 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import org.json.JSONArray
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledFuture
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.floor
@@ -49,9 +52,9 @@ class IobCobCalculatorPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     private val aapsSchedulers: AapsSchedulers,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val sp: SP,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val activePlugin: ActivePlugin,
     private val sensitivityOref1Plugin: SensitivityOref1Plugin,
@@ -60,13 +63,14 @@ class IobCobCalculatorPlugin @Inject constructor(
     private val fabricPrivacy: FabricPrivacy,
     private val dateUtil: DateUtil,
     private val repository: AppRepository
-) : PluginBase(PluginDescription()
-    .mainType(PluginType.GENERAL)
-    .pluginName(R.string.iobcobcalculator)
-    .showInList(false)
-    .neverVisible(true)
-    .alwaysEnabled(true),
-    aapsLogger, resourceHelper, injector
+) : PluginBase(
+    PluginDescription()
+        .mainType(PluginType.GENERAL)
+        .pluginName(R.string.iobcobcalculator)
+        .showInList(false)
+        .neverVisible(true)
+        .alwaysEnabled(true),
+    aapsLogger, rh, injector
 ), IobCobCalculator {
 
     private val disposable = CompositeDisposable()
@@ -86,38 +90,46 @@ class IobCobCalculatorPlugin @Inject constructor(
         disposable += rxBus
             .toObservable(EventConfigBuilderChange::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ event -> resetDataAndRunCalculation("onEventConfigBuilderChange", event) }, fabricPrivacy::logException)
-        // EventNewBasalProfile
+            .subscribe({ event ->
+                           resetDataAndRunCalculation("onEventConfigBuilderChange", event)
+                       }, fabricPrivacy::logException)
+        // EventEffectiveProfileSwitchChanged
         disposable += rxBus
-            .toObservable(EventNewBasalProfile::class.java)
+            .toObservable(EventEffectiveProfileSwitchChanged::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ event -> resetDataAndRunCalculation("onNewProfile", event) }, fabricPrivacy::logException)
+            .subscribe({ event ->
+                           newHistoryData(event.startDate, false, event)
+                       }, fabricPrivacy::logException)
         // EventPreferenceChange
         disposable += rxBus
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ event ->
-                if (event.isChanged(resourceHelper, R.string.key_openapsama_autosens_period) ||
-                    event.isChanged(resourceHelper, R.string.key_age) ||
-                    event.isChanged(resourceHelper, R.string.key_absorption_maxtime) ||
-                    event.isChanged(resourceHelper, R.string.key_openapsama_min_5m_carbimpact) ||
-                    event.isChanged(resourceHelper, R.string.key_absorption_cutoff) ||
-                    event.isChanged(resourceHelper, R.string.key_openapsama_autosens_max) ||
-                    event.isChanged(resourceHelper, R.string.key_openapsama_autosens_min) ||
-                    event.isChanged(resourceHelper, R.string.key_insulin_oref_peak)) {
-                    resetDataAndRunCalculation("onEventPreferenceChange", event)
-                }
-            }, fabricPrivacy::logException)
+                           if (event.isChanged(rh, R.string.key_openapsama_autosens_period) ||
+                               event.isChanged(rh, R.string.key_age) ||
+                               event.isChanged(rh, R.string.key_absorption_maxtime) ||
+                               event.isChanged(rh, R.string.key_openapsama_min_5m_carbimpact) ||
+                               event.isChanged(rh, R.string.key_absorption_cutoff) ||
+                               event.isChanged(rh, R.string.key_openapsama_autosens_max) ||
+                               event.isChanged(rh, R.string.key_openapsama_autosens_min) ||
+                               event.isChanged(rh, R.string.key_insulin_oref_peak)
+                           ) {
+                               resetDataAndRunCalculation("onEventPreferenceChange", event)
+                           }
+                       }, fabricPrivacy::logException)
         // EventAppInitialized
         disposable += rxBus
             .toObservable(EventAppInitialized::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ event -> runCalculation("onEventAppInitialized", System.currentTimeMillis(), bgDataReload = true, limitDataToOldestAvailable = true, cause = event) }, fabricPrivacy::logException)
+            .subscribe(
+                { event -> runCalculation("onEventAppInitialized", System.currentTimeMillis(), bgDataReload = true, limitDataToOldestAvailable = true, cause = event) },
+                fabricPrivacy::logException
+            )
         // EventNewHistoryData
         disposable += rxBus
             .toObservable(EventNewHistoryData::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ event -> newHistoryData(event.oldDataTimestamp, event.reloadBgData, if (event.newestGlucoseValue != null) EventNewBG(event.newestGlucoseValue) else event) }, fabricPrivacy::logException)
+            .subscribe({ event -> scheduleHistoryDataChange(event) }, fabricPrivacy::logException)
     }
 
     override fun onStop() {
@@ -187,7 +199,8 @@ class IobCobCalculatorPlugin @Inject constructor(
             duration = 240,
             rate = 0.0,
             isAbsolute = true,
-            type = TemporaryBasal.Type.NORMAL)
+            type = TemporaryBasal.Type.NORMAL
+        )
         if (t.timestamp < time) {
             val calc = t.iobCalc(time, profile, activePlugin.activeInsulin)
             basalIobWithZeroTemp.plus(calc)
@@ -214,7 +227,8 @@ class IobCobCalculatorPlugin @Inject constructor(
             duration = 240,
             rate = 0.0,
             isAbsolute = true,
-            type = TemporaryBasal.Type.NORMAL)
+            type = TemporaryBasal.Type.NORMAL
+        )
         if (t.timestamp < time) {
             val profile = profileFunction.getProfile(t.timestamp)
             if (profile != null) {
@@ -373,6 +387,44 @@ class IobCobCalculatorPlugin @Inject constructor(
         }
     }
 
+    // Limit rate of EventNewHistoryData
+    private val historyWorker = Executors.newSingleThreadScheduledExecutor()
+    private var scheduledHistoryPost: ScheduledFuture<*>? = null
+    private var scheduledEvent: EventNewHistoryData? = null
+
+    @Synchronized
+    private fun scheduleHistoryDataChange(event: EventNewHistoryData) {
+        // if there is nothing scheduled or asking reload deeper to the past
+        if (scheduledEvent == null || event.oldDataTimestamp < (scheduledEvent?.oldDataTimestamp) ?: 0L) {
+            // cancel waiting task to prevent sending multiple posts
+            scheduledHistoryPost?.cancel(false)
+            // prepare task for execution in 1 sec
+            scheduledEvent = event
+            scheduledHistoryPost = historyWorker.schedule({
+                                                              synchronized(this) {
+                                                                  aapsLogger.debug(LTag.DATABASE, "Running newHistoryData")
+                                                                  newHistoryData(
+                                                                      event.oldDataTimestamp,
+                                                                      event.reloadBgData,
+                                                                      if (event.newestGlucoseValue != null) EventNewBG(event.newestGlucoseValue) else event
+                                                                  )
+                                                                  scheduledEvent = null
+                                                                  scheduledHistoryPost = null
+                                                              }
+                                                          }, 1L, TimeUnit.SECONDS)
+        } else {
+            // asked reload is newer -> adjust params only
+            scheduledEvent?.let {
+                // set reload bg data if was not set
+                if (!it.reloadBgData) it.reloadBgData = event.reloadBgData
+                // set Glucose value if newer
+                event.newestGlucoseValue?.let { gv ->
+                    if (gv.timestamp > (it.newestGlucoseValue?.timestamp ?: 0L)) it.newestGlucoseValue = gv
+                }
+            }
+        }
+    }
+
     // When historical data is changed (coming from NS etc) finished calculations after this date must be invalidated
     private fun newHistoryData(oldDataTimestamp: Long, bgDataReload: Boolean, event: Event) {
         //log.debug("Locking onNewHistoryData");
@@ -400,7 +452,7 @@ class IobCobCalculatorPlugin @Inject constructor(
             }
             ads.newHistoryData(time, aapsLogger, dateUtil)
         }
-        runCalculation("onEventNewHistoryData", System.currentTimeMillis(), bgDataReload, true, event)
+        runCalculation(event.javaClass.simpleName, System.currentTimeMillis(), bgDataReload, true, event)
         //log.debug("Releasing onNewHistoryData");
     }
 
@@ -485,7 +537,11 @@ class IobCobCalculatorPlugin @Inject constructor(
             for (pos in extendedBoluses.indices) {
                 val e = extendedBoluses[pos]
                 if (e.timestamp > toTime) continue
-                if (e.end > now) e.duration = now - e.timestamp
+                if (e.end > now) {
+                    val newDuration = now - e.timestamp
+                    e.amount *= newDuration.toDouble() / e.duration
+                    e.duration = newDuration
+                }
                 val profile = profileFunction.getProfile(e.timestamp) ?: return total
                 val calc = e.iobCalc(toTime, profile, activePlugin.activeInsulin)
                 total.plus(calc)
@@ -506,10 +562,7 @@ class IobCobCalculatorPlugin @Inject constructor(
         return null
     }
 
-    override fun getTempBasalIncludingConvertedExtended(timestamp: Long): TemporaryBasal? {
-
-        val tb = repository.getTemporaryBasalActiveAt(timestamp).blockingGet()
-        if (tb is ValueWrapper.Existing) return tb.value
+    private fun getConvertedExtended(timestamp: Long): TemporaryBasal? {
         if (activePlugin.activePump.isFakingTempsByExtendedBoluses) {
             val eb = repository.getExtendedBolusActiveAt(timestamp).blockingGet()
             val profile = profileFunction.getProfile(timestamp) ?: return null
@@ -518,6 +571,22 @@ class IobCobCalculatorPlugin @Inject constructor(
         return null
     }
 
+    override fun getTempBasalIncludingConvertedExtended(timestamp: Long): TemporaryBasal? {
+        val tb = repository.getTemporaryBasalActiveAt(timestamp).blockingGet()
+        if (tb is ValueWrapper.Existing) return tb.value
+        return getConvertedExtended(timestamp);
+    }
+
+    override fun getTempBasalIncludingConvertedExtendedForRange(startTime: Long, endTime: Long, calculationStep: Long): Map<Long, TemporaryBasal?> {
+        val tempBasals = HashMap<Long, TemporaryBasal?>();
+        val tbs = repository.getTemporaryBasalsDataActiveBetweenTimeAndTime(startTime, endTime).blockingGet()
+        for (t in startTime until endTime step calculationStep) {
+            val tb = tbs.firstOrNull { basal -> basal.timestamp <= t && (basal.timestamp + basal.duration) > t }
+            tempBasals[t] = tb ?: getConvertedExtended(t)
+        }
+        return tempBasals;
+    }
+
     override fun calculateAbsoluteIobFromBaseBasals(toTime: Long): IobTotal {
         val total = IobTotal(toTime)
         var i = toTime - range()
@@ -567,7 +636,11 @@ class IobCobCalculatorPlugin @Inject constructor(
                 val e = extendedBoluses[pos]
                 if (e.timestamp > toTime) continue
                 val profile = profileFunction.getProfile(e.timestamp) ?: continue
-                if (e.end > now) e.duration = now - e.timestamp
+                if (e.end > now) {
+                    val newDuration = now - e.timestamp
+                    e.amount *= newDuration.toDouble() / e.duration
+                    e.duration = newDuration
+                }
                 val calc = e.iobCalc(toTime, profile, activePlugin.activeInsulin)
                 totalExt.plus(calc)
             }
@@ -602,7 +675,11 @@ class IobCobCalculatorPlugin @Inject constructor(
                 val e = extendedBoluses[pos]
                 if (e.timestamp > toTime) continue
                 val profile = profileFunction.getProfile(e.timestamp) ?: continue
-                if (e.end > now) e.duration = now - e.timestamp
+                if (e.end > now) {
+                    val newDuration = now - e.timestamp
+                    e.amount *= newDuration.toDouble() / e.duration
+                    e.duration = newDuration
+                }
                 val calc = e.iobCalc(toTime, profile, lastAutosensResult, exercise_mode, half_basal_exercise_target, isTempTarget, activePlugin.activeInsulin)
                 totalExt.plus(calc)
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.kt
index 51ef6da52fc..4e8bb936bf9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.kt
@@ -16,7 +16,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
@@ -50,8 +50,8 @@ class IobCobOref1Thread internal constructor(
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var sp: SP
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var context: Context
     @Inject lateinit var sensitivityAAPSPlugin: SensitivityAAPSPlugin
@@ -67,7 +67,7 @@ class IobCobOref1Thread internal constructor(
 
     init {
         injector.androidInjector().inject(this)
-        mWakeLock = (context.applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, resourceHelper.gs(R.string.app_name) + ":iobCobThread")
+        mWakeLock = (context.applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, rh.gs(R.string.app_name) + ":iobCobThread")
     }
 
     override fun run() {
@@ -161,7 +161,7 @@ class IobCobOref1Thread internal constructor(
                                     aapsLogger.debug(LTag.AUTOSENS, autosensDataTable.toString())
                                     aapsLogger.debug(LTag.AUTOSENS, bucketedData.toString())
                                     //aapsLogger.debug(LTag.AUTOSENS, iobCobCalculatorPlugin.getBgReadingsDataTable().toString())
-                                    val notification = Notification(Notification.SEND_LOGFILES, resourceHelper.gs(R.string.sendlogfiles), Notification.LOW)
+                                    val notification = Notification(Notification.SEND_LOGFILES, rh.gs(R.string.sendlogfiles), Notification.LOW)
                                     rxBus.send(EventNewNotification(notification))
                                     sp.putBoolean("log_AUTOSENS", true)
                                     break
@@ -184,7 +184,7 @@ class IobCobOref1Thread internal constructor(
                             aapsLogger.debug(autosensDataTable.toString())
                             aapsLogger.debug(bucketedData.toString())
                             //aapsLogger.debug(iobCobCalculatorPlugin.getBgReadingsDataTable().toString())
-                            val notification = Notification(Notification.SEND_LOGFILES, resourceHelper.gs(R.string.sendlogfiles), Notification.LOW)
+                            val notification = Notification(Notification.SEND_LOGFILES, rh.gs(R.string.sendlogfiles), Notification.LOW)
                             rxBus.send(EventNewNotification(notification))
                             sp.putBoolean("log_AUTOSENS", true)
                             break
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.kt
index cd3c12c4387..1561575796c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.kt
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
@@ -49,8 +49,8 @@ class IobCobThread @Inject internal constructor(
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var sp: SP
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var context: Context
     @Inject lateinit var sensitivityAAPSPlugin: SensitivityAAPSPlugin
@@ -66,7 +66,7 @@ class IobCobThread @Inject internal constructor(
 
     init {
         injector.androidInjector().inject(this)
-        mWakeLock = (context.applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, resourceHelper.gs(R.string.app_name) + ":iobCobThread")
+        mWakeLock = (context.applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, rh.gs(R.string.app_name) + ":iobCobThread")
     }
 
     override fun run() {
@@ -160,7 +160,7 @@ class IobCobThread @Inject internal constructor(
                                     aapsLogger.debug(LTag.AUTOSENS, autosensDataTable.toString())
                                     aapsLogger.debug(LTag.AUTOSENS, bucketedData.toString())
                                     //aapsLogger.debug(LTag.AUTOSENS, iobCobCalculatorPlugin.getBgReadingsDataTable().toString())
-                                    val notification = Notification(Notification.SEND_LOGFILES, resourceHelper.gs(R.string.sendlogfiles), Notification.LOW)
+                                    val notification = Notification(Notification.SEND_LOGFILES, rh.gs(R.string.sendlogfiles), Notification.LOW)
                                     rxBus.send(EventNewNotification(notification))
                                     sp.putBoolean("log_AUTOSENS", true)
                                     break
@@ -183,7 +183,7 @@ class IobCobThread @Inject internal constructor(
                             aapsLogger.debug(autosensDataTable.toString())
                             aapsLogger.debug(bucketedData.toString())
                             //aapsLogger.debug(iobCobCalculatorPlugin.getBgReadingsDataTable().toString())
-                            val notification = Notification(Notification.SEND_LOGFILES, resourceHelper.gs(R.string.sendlogfiles), Notification.LOW)
+                            val notification = Notification(Notification.SEND_LOGFILES, rh.gs(R.string.sendlogfiles), Notification.LOW)
                             rxBus.send(EventNewNotification(notification))
                             sp.putBoolean("log_AUTOSENS", true)
                             break
@@ -204,7 +204,7 @@ class IobCobThread @Inject internal constructor(
                 if (previous != null && previous.cob > 0) {
                     // calculate sum of min carb impact from all active treatments
                     var totalMinCarbsImpact = 0.0
-                    if (sensitivityAAPSPlugin.isEnabled(PluginType.SENSITIVITY) || sensitivityWeightedAveragePlugin.isEnabled(PluginType.SENSITIVITY)) {
+                    if (sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled()) {
                         //when the impact depends on a max time, sum them up as smaller carb sizes make them smaller
                         for (ii in autosensData.activeCarbsList.indices) {
                             val c = autosensData.activeCarbsList[ii]
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventNewHistoryData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventNewHistoryData.kt
index c842a1dcb76..da887297183 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventNewHistoryData.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventNewHistoryData.kt
@@ -2,5 +2,17 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator.events
 
 import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.events.Event
+import org.joda.time.DateTime
+import org.joda.time.format.DateTimeFormat
+import java.text.DateFormat
 
-class EventNewHistoryData(val oldDataTimestamp: Long, val reloadBgData: Boolean, val newestGlucoseValue : GlucoseValue? = null) : Event()
\ No newline at end of file
+class EventNewHistoryData(val oldDataTimestamp: Long, var reloadBgData: Boolean, var newestGlucoseValue : GlucoseValue? = null) : Event() {
+
+    override fun toString(): String {
+        return super.toString() +
+            " " +
+            DateFormat.getDateInstance(DateFormat.SHORT).format(oldDataTimestamp) +
+            " " +
+            DateTime(oldDataTimestamp).toString(DateTimeFormat.forPattern("HH:mm:ss"))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
index 989ef9dbdb9..a227f557966 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.profile.local.events.EventLocalProfileChanged
 import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
@@ -38,8 +38,8 @@ import javax.inject.Inject
 class LocalProfileFragment : DaggerFragment() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
@@ -55,7 +55,7 @@ class LocalProfileFragment : DaggerFragment() {
 
     private val save = Runnable {
         doEdit()
-        basalView?.updateLabel(resourceHelper.gs(R.string.basal_label) + ": " + sumLabel())
+        basalView?.updateLabel(rh.gs(R.string.basal_label) + ": " + sumLabel())
         localProfilePlugin.profile?.getSpecificProfile(spinner?.selectedItem.toString())?.let {
             binding.basalGraph.show(ProfileSealed.Pure(it))
         }
@@ -74,7 +74,7 @@ class LocalProfileFragment : DaggerFragment() {
     private fun sumLabel(): String {
         val profile = localProfilePlugin.getEditProfile()
         val sum = profile?.let { ProfileSealed.Pure(profile).baseBasalSum() } ?: 0.0
-        return " ∑" + DecimalFormatter.to2Decimal(sum) + resourceHelper.gs(R.string.insulin_unit_shortname)
+        return " ∑" + DecimalFormatter.to2Decimal(sum) + rh.gs(R.string.insulin_unit_shortname)
     }
 
     private var _binding: LocalprofileFragmentBinding? = null
@@ -126,16 +126,16 @@ class LocalProfileFragment : DaggerFragment() {
         binding.name.removeTextChangedListener(textWatch)
         binding.name.setText(currentProfile.name)
         binding.name.addTextChangedListener(textWatch)
-        binding.dia.setParams(currentProfile.dia, hardLimits.minDia(), hardLimits.maxDia(), 0.1, DecimalFormat("0.0"), false, binding.save, textWatch)
+        binding.dia.setParams(currentProfile.dia, hardLimits.minDia(), hardLimits.maxDia(), 0.1, DecimalFormat("0.0"), false, null, textWatch)
         binding.dia.tag = "LP_DIA"
-        TimeListEdit(context, aapsLogger, dateUtil, view, R.id.ic, "IC", resourceHelper.gs(R.string.ic_label), currentProfile.ic, null, hardLimits.minIC(), hardLimits.maxIC(), 0.1, DecimalFormat("0.0"), save)
-        basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.basal_holder, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), currentProfile.basal, null, pumpDescription.basalMinimumRate, pumpDescription.basalMaximumRate, 0.01, DecimalFormat("0.00"), save)
+        TimeListEdit(context, aapsLogger, dateUtil, view, R.id.ic, "IC", rh.gs(R.string.ic_label), currentProfile.ic, null, hardLimits.minIC(), hardLimits.maxIC(), 0.1, DecimalFormat("0.0"), save)
+        basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.basal_holder, "BASAL", rh.gs(R.string.basal_label) + ": " + sumLabel(), currentProfile.basal, null, pumpDescription.basalMinimumRate, pumpDescription.basalMaximumRate, 0.01, DecimalFormat("0.00"), save)
         if (units == Constants.MGDL) {
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.isf, "ISF", resourceHelper.gs(R.string.isf_label), currentProfile.isf, null, HardLimits.MIN_ISF, HardLimits.MAX_ISF, 1.0, DecimalFormat("0"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.target, "TARGET", resourceHelper.gs(R.string.target_label), currentProfile.targetLow, currentProfile.targetHigh, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), 1.0, DecimalFormat("0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.isf, "ISF", rh.gs(R.string.isf_label), currentProfile.isf, null, HardLimits.MIN_ISF, HardLimits.MAX_ISF, 1.0, DecimalFormat("0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.target, "TARGET", rh.gs(R.string.target_label), currentProfile.targetLow, currentProfile.targetHigh, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TARGET_BG[1], 1.0, DecimalFormat("0"), save)
         } else {
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.isf, "ISF", resourceHelper.gs(R.string.isf_label), currentProfile.isf, null, Profile.fromMgdlToUnits(HardLimits.MIN_ISF, GlucoseUnit.MMOL), Profile.fromMgdlToUnits(HardLimits.MAX_ISF, GlucoseUnit.MMOL), 0.1, DecimalFormat("0.0"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.target, "TARGET", resourceHelper.gs(R.string.target_label), currentProfile.targetLow, currentProfile.targetHigh, Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), GlucoseUnit.MMOL), Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), GlucoseUnit.MMOL), 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.isf, "ISF", rh.gs(R.string.isf_label), currentProfile.isf, null, Profile.fromMgdlToUnits(HardLimits.MIN_ISF, GlucoseUnit.MMOL), Profile.fromMgdlToUnits(HardLimits.MAX_ISF, GlucoseUnit.MMOL), 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.target, "TARGET", rh.gs(R.string.target_label), currentProfile.targetLow, currentProfile.targetHigh, Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[0], GlucoseUnit.MMOL), Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[1], GlucoseUnit.MMOL), 0.1, DecimalFormat("0.0"), save)
         }
 
         // Spinner
@@ -154,8 +154,9 @@ class LocalProfileFragment : DaggerFragment() {
             override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 if (localProfilePlugin.isEdited) {
                     activity?.let { activity ->
-                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.doyouwantswitchprofile), {
+                        OKDialog.showConfirmation(activity, rh.gs(R.string.doyouwantswitchprofile), {
                             localProfilePlugin.currentProfileIndex = position
+                            localProfilePlugin.isEdited = false
                             build()
                         }, {
                             spinner?.setSelection(localProfilePlugin.currentProfileIndex)
@@ -173,7 +174,7 @@ class LocalProfileFragment : DaggerFragment() {
 
         binding.profileAdd.setOnClickListener {
             if (localProfilePlugin.isEdited) {
-                activity?.let { OKDialog.show(it, "", resourceHelper.gs(R.string.saveorresetchangesfirst)) }
+                activity?.let { OKDialog.show(it, "", rh.gs(R.string.saveorresetchangesfirst)) }
             } else {
                 uel.log(Action.NEW_PROFILE, Sources.LocalProfile)
                 localProfilePlugin.addNewProfile()
@@ -183,7 +184,7 @@ class LocalProfileFragment : DaggerFragment() {
 
         binding.profileClone.setOnClickListener {
             if (localProfilePlugin.isEdited) {
-                activity?.let { OKDialog.show(it, "", resourceHelper.gs(R.string.saveorresetchangesfirst)) }
+                activity?.let { OKDialog.show(it, "", rh.gs(R.string.saveorresetchangesfirst)) }
             } else {
                 uel.log(Action.CLONE_PROFILE, Sources.LocalProfile, ValueWithUnit.SimpleString(localProfilePlugin.currentProfile()?.name
                     ?: ""))
@@ -194,7 +195,7 @@ class LocalProfileFragment : DaggerFragment() {
 
         binding.profileRemove.setOnClickListener {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.deletecurrentprofile), {
+                OKDialog.showConfirmation(activity, rh.gs(R.string.deletecurrentprofile), {
                     uel.log(Action.PROFILE_REMOVED, Sources.LocalProfile, ValueWithUnit.SimpleString(localProfilePlugin.currentProfile()?.name
                         ?: ""))
                     localProfilePlugin.removeCurrentProfile()
@@ -207,7 +208,7 @@ class LocalProfileFragment : DaggerFragment() {
         // if (!pumpDescription.isTempBasalCapable) binding.basal.visibility = View.GONE
 
         @Suppress("SetTextI18n")
-        binding.units.text = resourceHelper.gs(R.string.units_colon) + " " + (if (currentProfile.mgdl) resourceHelper.gs(R.string.mgdl) else resourceHelper.gs(R.string.mmol))
+        binding.units.text = rh.gs(R.string.units_colon) + " " + (if (currentProfile.mgdl) rh.gs(R.string.mgdl) else rh.gs(R.string.mmol))
 
         binding.profileswitch.setOnClickListener {
             ProfileSwitchDialog()
@@ -221,7 +222,7 @@ class LocalProfileFragment : DaggerFragment() {
         }
 
         binding.save.setOnClickListener {
-            if (!localProfilePlugin.isValidEditState()) {
+            if (!localProfilePlugin.isValidEditState(activity)) {
                 return@setOnClickListener  //Should not happen as saveButton should not be visible if not valid
             }
             uel.log(Action.STORE_PROFILE, Sources.LocalProfile, ValueWithUnit.SimpleString(localProfilePlugin.currentProfile()?.name
@@ -261,10 +262,10 @@ class LocalProfileFragment : DaggerFragment() {
 
     private fun updateGUI() {
         if (_binding == null) return
-        val isValid = localProfilePlugin.isValidEditState()
+        val isValid = localProfilePlugin.isValidEditState(activity)
         val isEdited = localProfilePlugin.isEdited
         if (isValid) {
-            this.view?.setBackgroundColor(resourceHelper.gc(R.color.ok_background))
+            this.view?.setBackgroundColor(rh.gc(R.color.ok_background))
 
             if (isEdited) {
                 //edited profile -> save first
@@ -275,7 +276,7 @@ class LocalProfileFragment : DaggerFragment() {
                 binding.save.visibility = View.GONE
             }
         } else {
-            this.view?.setBackgroundColor(resourceHelper.gc(R.color.error_background))
+            this.view?.setBackgroundColor(rh.gc(R.color.error_background))
             binding.profileswitch.visibility = View.GONE
             binding.save.visibility = View.GONE //don't save an invalid profile
         }
@@ -289,12 +290,12 @@ class LocalProfileFragment : DaggerFragment() {
     }
 
     private fun processVisibilityOnClick(selected: View) {
-        binding.diaTab.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        binding.icTab.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        binding.isfTab.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        binding.basalTab.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        binding.targetTab.setBackgroundColor(resourceHelper.gc(R.color.defaultbackground))
-        selected.setBackgroundColor(resourceHelper.gc(R.color.tabBgColorSelected))
+        binding.diaTab.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        binding.icTab.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        binding.isfTab.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        binding.basalTab.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        binding.targetTab.setBackgroundColor(rh.gc(R.color.defaultbackground))
+        selected.setBackgroundColor(rh.gc(R.color.tabBgColorSelected))
         binding.diaPlaceholder.visibility = View.GONE
         binding.ic.visibility = View.GONE
         binding.isf.visibility = View.GONE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
index 026bcbb603e..830eff37409 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
@@ -17,13 +17,13 @@ import info.nightscout.androidaps.extensions.pureProfileFromJson
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
 import info.nightscout.androidaps.plugins.profile.local.events.EventLocalProfileChanged
 import info.nightscout.androidaps.receivers.DataWorker
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.HardLimits
-import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -41,13 +41,14 @@ import kotlin.collections.ArrayList
 class LocalProfilePlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    resourceHelper: ResourceHelper,
+    private val rxBus: RxBus,
+    rh: ResourceHelper,
     private val sp: SP,
     private val profileFunction: ProfileFunction,
     private val activePlugin: ActivePlugin,
     private val hardLimits: HardLimits,
-    private val dateUtil: DateUtil
+    private val dateUtil: DateUtil,
+    private val config: Config
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.PROFILE)
     .fragmentClass(LocalProfileFragment::class.java.name)
@@ -57,7 +58,7 @@ class LocalProfilePlugin @Inject constructor(
     .shortName(R.string.localprofile_shortname)
     .description(R.string.description_profile_local)
     .setDefault(),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), ProfileSource {
 
     private var rawProfile: ProfileStore? = null
@@ -104,25 +105,66 @@ class LocalProfilePlugin @Inject constructor(
     fun currentProfile(): SingleProfile? = if (numOfProfiles > 0 && currentProfileIndex < numOfProfiles) profiles[currentProfileIndex] else null
 
     @Synchronized
-    fun isValidEditState(): Boolean {
+    fun isValidEditState(activity: FragmentActivity?): Boolean {
         val pumpDescription = activePlugin.activePump.pumpDescription
         with(profiles[currentProfileIndex]) {
-            if (dia < hardLimits.minDia() || dia > hardLimits.maxDia()) return false
-            if (name.isNullOrEmpty()) return false
-            if (blockFromJsonArray(ic, dateUtil)?.any { it.amount < hardLimits.minIC() || it.amount > hardLimits.maxIC() } != false) return false
-            if (blockFromJsonArray(basal, dateUtil)?.any { it.amount < pumpDescription.basalMinimumRate || it.amount > 10.0 } != false) return false
+            if (dia < hardLimits.minDia() || dia > hardLimits.maxDia()) {
+                ToastUtils.errorToast(activity, rh.gs(R.string.value_out_of_hard_limits, rh.gs(info.nightscout.androidaps.core.R.string.profile_dia), dia))
+                return false
+            }
+            if (name.isNullOrEmpty()){
+                ToastUtils.errorToast(activity, rh.gs(R.string.missing_profile_name))
+                return false
+            }
+            if (blockFromJsonArray(ic, dateUtil)?.any { it.amount < hardLimits.minIC() || it.amount > hardLimits.maxIC() } != false) {
+                ToastUtils.errorToast(activity, rh.gs(R.string.error_in_ic_values))
+                return false
+            }
             val low = blockFromJsonArray(targetLow, dateUtil)
             val high = blockFromJsonArray(targetHigh, dateUtil)
-            if (profileFunction.getUnits() == GlucoseUnit.MGDL) {
-                if (low?.any { it.amount < HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble() || it.amount > HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble() } != false) return false
-                if (high?.any { it.amount < HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble() || it.amount > HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble() } != false) return false
-                if (blockFromJsonArray(isf, dateUtil)?.any { it.amount < HardLimits.MIN_ISF || it.amount > HardLimits.MAX_ISF } != false) return false
+            if (mgdl) {
+                if (blockFromJsonArray(isf, dateUtil)?.any {  hardLimits.isInRange(it.amount, HardLimits.MIN_ISF, HardLimits.MAX_ISF) } == false) {
+                    ToastUtils.errorToast(activity, rh.gs(R.string.error_in_isf_values))
+                    return false
+                }
+                if (blockFromJsonArray(basal, dateUtil)?.any { it.amount < pumpDescription.basalMinimumRate || it.amount > 10.0 } != false)  {
+                    ToastUtils.errorToast(activity, rh.gs(R.string.error_in_basal_values))
+                    return false
+                }
+                if (low?.any { hardLimits.isInRange(it.amount, HardLimits.VERY_HARD_LIMIT_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_MIN_BG[1]) } == false) {
+                    ToastUtils.errorToast(activity, rh.gs(R.string.error_in_target_values))
+                    return false
+                }
+                if (high?.any { hardLimits.isInRange(it.amount, HardLimits.VERY_HARD_LIMIT_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_MAX_BG[1]) } == false) {
+                    ToastUtils.errorToast(activity, rh.gs(R.string.error_in_target_values))
+                    return false
+                }
             } else {
-                if (low?.any { it.amount < Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), GlucoseUnit.MMOL) || it.amount > Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), GlucoseUnit.MMOL) } != false) return false
-                if (high?.any { it.amount < Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), GlucoseUnit.MMOL) || it.amount > Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), GlucoseUnit.MMOL) } != false) return false
-                if (blockFromJsonArray(isf, dateUtil)?.any { it.amount < Profile.fromMgdlToUnits(HardLimits.MIN_ISF, GlucoseUnit.MMOL) || it.amount > Profile.fromMgdlToUnits(HardLimits.MAX_ISF, GlucoseUnit.MMOL) } != false) return false
+                if (blockFromJsonArray(isf, dateUtil)?.any { hardLimits.isInRange(Profile.toMgdl(it.amount, GlucoseUnit.MMOL), HardLimits.MIN_ISF, HardLimits.MAX_ISF) } == false) {
+                    ToastUtils.errorToast(activity, rh.gs(R.string.error_in_isf_values))
+                    return false
+                }
+                if (blockFromJsonArray(basal, dateUtil)?.any { it.amount < pumpDescription.basalMinimumRate || it.amount > 10.0 } != false)  {
+                    ToastUtils.errorToast(activity, rh.gs(R.string.error_in_basal_values))
+                    return false
+                }
+                if (low?.any { hardLimits.isInRange(Profile.toMgdl(it.amount, GlucoseUnit.MMOL), HardLimits.VERY_HARD_LIMIT_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_MIN_BG[1]) } == false) {
+                    ToastUtils.errorToast(activity, rh.gs(R.string.error_in_target_values))
+                    return false
+                }
+                if (high?.any {  hardLimits.isInRange(Profile.toMgdl(it.amount, GlucoseUnit.MMOL), HardLimits.VERY_HARD_LIMIT_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_MAX_BG[1]) } == false) {
+                    ToastUtils.errorToast(activity, rh.gs(R.string.error_in_target_values))
+                    return false
+                }
+            }
+            low?.let {
+                high?.let {
+                    for (i in low.indices) if (low[i].amount > high[i].amount) {
+                        ToastUtils.errorToast(activity, rh.gs(R.string.error_in_target_values))
+                        return false
+                    }
+                }
             }
-            for (i in low.indices) if (low[i].amount > high[i].amount) return false
         }
         return true
     }
@@ -174,7 +216,7 @@ class LocalProfilePlugin @Inject constructor(
             if (name.contains(".")) namesOK = false
         }
         if (!namesOK) activity?.let {
-            OKDialog.show(it, "", resourceHelper.gs(R.string.profilenamecontainsdot))
+            OKDialog.show(it, "", rh.gs(R.string.profilenamecontainsdot))
         }
     }
 
@@ -203,8 +245,6 @@ class LocalProfilePlugin @Inject constructor(
                 aapsLogger.error("Exception", e)
             }
         }
-        // create at least one profile if doesn't exist
-        if (profiles.size < 1) profiles.add(defaultProfile())
         isEdited = false
         numOfProfiles = profiles.size
         createAndStoreConvertedProfile()
@@ -215,10 +255,25 @@ class LocalProfilePlugin @Inject constructor(
         try {
             val newProfiles: ArrayList<SingleProfile> = ArrayList()
             for (p in store.getProfileList()) {
-                store.getSpecificProfile(p.toString())?.let {
-                    val sp = copyFrom(it, p.toString())
+                val profile = store.getSpecificProfile(p.toString())
+                val validityCheck = profile?.let { ProfileSealed.Pure(profile).isValid("NS", activePlugin.activePump, config, rh, rxBus, hardLimits, false) } ?: Profile.ValidityCheck()
+                if (profile != null && validityCheck.isValid) {
+                    val sp = copyFrom(profile, p.toString())
                     sp.name = p.toString()
                     newProfiles.add(sp)
+                } else {
+                    val n = NotificationWithAction(
+                        injector,
+                        Notification.INVALID_PROFILE_NOT_ACCEPTED,
+                        rh.gs(R.string.invalid_profile_not_accepted, p.toString()),
+                        Notification.NORMAL
+                    )
+                    n.action(R.string.view) {
+                        n.contextForAction?.let {
+                            OKDialog.show(it, rh.gs(R.string.errors), validityCheck.reasons.joinToString(separator = "\n"), null)
+                        }
+                    }
+                    rxBus.send(EventNewNotification(n))
                 }
             }
             if (newProfiles.size > 0) {
@@ -236,22 +291,6 @@ class LocalProfilePlugin @Inject constructor(
         }
     }
 
-    private fun defaultProfile(): SingleProfile =
-        SingleProfile().also { p ->
-            p.name = Constants.LOCAL_PROFILE
-            p.mgdl = profileFunction.getUnits() == GlucoseUnit.MGDL
-            p.dia = Constants.defaultDIA
-            try {
-                p.ic = JSONArray(defaultArray)
-                p.isf = JSONArray(defaultArray)
-                p.basal = JSONArray(defaultArray)
-                p.targetLow = JSONArray(defaultArray)
-                p.targetHigh = JSONArray(defaultArray)
-            } catch (e: JSONException) {
-                aapsLogger.error("Exception", e)
-            }
-        }
-
     fun copyFrom(pureProfile: PureProfile, newName: String): SingleProfile {
         var verifiedName = newName
         if (rawProfile?.getSpecificProfile(newName) != null) {
@@ -422,7 +461,7 @@ class LocalProfilePlugin @Inject constructor(
 
         @Inject lateinit var injector: HasAndroidInjector
         @Inject lateinit var aapsLogger: AAPSLogger
-        @Inject lateinit var rxBus: RxBusWrapper
+        @Inject lateinit var rxBus: RxBus
         @Inject lateinit var dateUtil: DateUtil
         @Inject lateinit var dataWorker: DataWorker
         @Inject lateinit var sp: SP
@@ -438,11 +477,11 @@ class LocalProfilePlugin @Inject constructor(
                 ?: return Result.failure(workDataOf("Error" to "missing input data"))
             if (sp.getBoolean(R.string.key_ns_receive_profile_store, true) || config.NSCLIENT) {
                 val store = ProfileStore(injector, profileJson, dateUtil)
-                val startDate = store.getStartDate()
+                val createdAt = store.getStartDate()
                 val lastLocalChange = sp.getLong(R.string.key_local_profile_last_change, 0)
-                aapsLogger.debug(LTag.PROFILE, "Received profileStore: StartDate: $startDate Local last modification: $lastLocalChange")
+                aapsLogger.debug(LTag.PROFILE, "Received profileStore: createdAt: $createdAt Local last modification: $lastLocalChange")
                 @Suppress("LiftReturnOrAssignment")
-                if (startDate > lastLocalChange || startDate % 1000 == 0L) {// whole second means edited in NS
+                if (createdAt > lastLocalChange || createdAt % 1000 == 0L) {// whole second means edited in NS
                     localProfilePlugin.loadFromStore(store)
                     aapsLogger.debug(LTag.PROFILE, "Received profileStore: $profileJson")
                     return Result.success(workDataOf("Data" to profileJson.toString().substring(0..min(5000, profileJson.length()))))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.kt
index 936f2c007ad..d7e1870ca54 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.kt
@@ -21,8 +21,8 @@ import javax.inject.Singleton
 class MDIPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
-    commandQueue: CommandQueueProvider,
+    rh: ResourceHelper,
+    commandQueue: CommandQueue,
     private val dateUtil: DateUtil,
     private val pumpSync: PumpSync
 ) : PumpPluginBase(PluginDescription()
@@ -30,7 +30,7 @@ class MDIPlugin @Inject constructor(
     .pluginIcon(R.drawable.ic_ict)
     .pluginName(R.string.mdi)
     .description(R.string.description_pump_mdi),
-    injector, aapsLogger, resourceHelper, commandQueue
+    injector, aapsLogger, rh, commandQueue
 ), Pump {
 
     override val pumpDescription = PumpDescription()
@@ -71,7 +71,7 @@ class MDIPlugin @Inject constructor(
         result.success = true
         result.bolusDelivered = detailedBolusInfo.insulin
         result.carbsDelivered = detailedBolusInfo.carbs
-        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        result.comment = rh.gs(R.string.virtualpump_resultok)
         if (detailedBolusInfo.insulin > 0)
             pumpSync.syncBolusWithPumpId(
                 timestamp = detailedBolusInfo.timestamp,
@@ -94,7 +94,7 @@ class MDIPlugin @Inject constructor(
     override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult {
         val result = PumpEnactResult(injector)
         result.success = false
-        result.comment = resourceHelper.gs(R.string.pumperror)
+        result.comment = rh.gs(R.string.pumperror)
         aapsLogger.debug(LTag.PUMPBTCOMM, "Setting temp basal absolute: $result")
         return result
     }
@@ -102,7 +102,7 @@ class MDIPlugin @Inject constructor(
     override fun setTempBasalPercent(percent: Int, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult {
         val result = PumpEnactResult(injector)
         result.success = false
-        result.comment = resourceHelper.gs(R.string.pumperror)
+        result.comment = rh.gs(R.string.pumperror)
         aapsLogger.debug(LTag.PUMPBTCOMM, "Settings temp basal percent: $result")
         return result
     }
@@ -110,7 +110,7 @@ class MDIPlugin @Inject constructor(
     override fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult {
         val result = PumpEnactResult(injector)
         result.success = false
-        result.comment = resourceHelper.gs(R.string.pumperror)
+        result.comment = rh.gs(R.string.pumperror)
         aapsLogger.debug(LTag.PUMPBTCOMM, "Setting extended bolus: $result")
         return result
     }
@@ -118,7 +118,7 @@ class MDIPlugin @Inject constructor(
     override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult {
         val result = PumpEnactResult(injector)
         result.success = false
-        result.comment = resourceHelper.gs(R.string.pumperror)
+        result.comment = rh.gs(R.string.pumperror)
         aapsLogger.debug(LTag.PUMPBTCOMM, "Cancel temp basal: $result")
         return result
     }
@@ -126,7 +126,7 @@ class MDIPlugin @Inject constructor(
     override fun cancelExtendedBolus(): PumpEnactResult {
         val result = PumpEnactResult(injector)
         result.success = false
-        result.comment = resourceHelper.gs(R.string.pumperror)
+        result.comment = rh.gs(R.string.pumperror)
         aapsLogger.debug(LTag.PUMPBTCOMM, "Canceling extended bolus: $result")
         return result
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
index 951a9db839d..95bfc25dd7a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
@@ -14,7 +14,7 @@ import info.nightscout.androidaps.events.EventTempBasalChange
 import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.virtual.events.EventVirtualPumpUpdateGui
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -27,8 +27,8 @@ import javax.inject.Inject
 
 class VirtualPumpFragment : DaggerFragment() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var virtualPumpPlugin: VirtualPumpPlugin
@@ -96,19 +96,19 @@ class VirtualPumpFragment : DaggerFragment() {
     private fun updateGui() {
         if (_binding == null) return
         val profile = profileFunction.getProfile() ?: return
-        binding.basabasalrate.text = resourceHelper.gs(R.string.pump_basebasalrate, virtualPumpPlugin.baseBasalRate)
+        binding.basabasalrate.text = rh.gs(R.string.pump_basebasalrate, virtualPumpPlugin.baseBasalRate)
         binding.tempbasal.text = iobCobCalculator.getTempBasal(dateUtil.now())?.toStringFull(profile, dateUtil)
             ?: ""
         binding.extendedbolus.text = iobCobCalculator.getExtendedBolus(dateUtil.now())?.toStringFull(dateUtil)
             ?: ""
-        binding.battery.text = resourceHelper.gs(R.string.format_percent, virtualPumpPlugin.batteryPercent)
-        binding.reservoir.text = resourceHelper.gs(R.string.formatinsulinunits, virtualPumpPlugin.reservoirInUnits.toDouble())
+        binding.battery.text = rh.gs(R.string.format_percent, virtualPumpPlugin.batteryPercent)
+        binding.reservoir.text = rh.gs(R.string.formatinsulinunits, virtualPumpPlugin.reservoirInUnits.toDouble())
 
         virtualPumpPlugin.refreshConfiguration()
         val pumpType = virtualPumpPlugin.pumpType
 
         binding.type.text = pumpType?.description
-        binding.typeDef.text = pumpType?.getFullDescription(resourceHelper.gs(R.string.virtualpump_pump_def), pumpType.hasExtendedBasals(), resourceHelper)
+        binding.typeDef.text = pumpType?.getFullDescription(rh.gs(R.string.virtualpump_pump_def), pumpType.hasExtendedBasals(), rh)
         binding.serialNumber.text = virtualPumpPlugin.serialNumber()
     }
 }
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 21e474b310e..8780b8bc1ba 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
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.common.ManufacturerType
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
@@ -40,27 +40,29 @@ import kotlin.math.min
 open class VirtualPumpPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private var fabricPrivacy: FabricPrivacy,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val aapsSchedulers: AapsSchedulers,
     private val sp: SP,
     private val profileFunction: ProfileFunction,
     private val iobCobCalculator: IobCobCalculator,
-    commandQueue: CommandQueueProvider,
+    commandQueue: CommandQueue,
     private val pumpSync: PumpSync,
     private val config: Config,
     private val dateUtil: DateUtil
-) : PumpPluginBase(PluginDescription()
-    .mainType(PluginType.PUMP)
-    .fragmentClass(VirtualPumpFragment::class.java.name)
-    .pluginIcon(R.drawable.ic_virtual_pump)
-    .pluginName(R.string.virtualpump)
-    .shortName(R.string.virtualpump_shortname)
-    .preferencesId(R.xml.pref_virtualpump)
-    .description(R.string.description_pump_virtual)
-    .setDefault(),
-    injector, aapsLogger, resourceHelper, commandQueue
+) : PumpPluginBase(
+    PluginDescription()
+        .mainType(PluginType.PUMP)
+        .fragmentClass(VirtualPumpFragment::class.java.name)
+        .pluginIcon(R.drawable.ic_virtual_pump)
+        .pluginName(R.string.virtualpump)
+        .shortName(R.string.virtualpump_shortname)
+        .preferencesId(R.xml.pref_virtualpump)
+        .description(R.string.description_pump_virtual)
+        .setDefault()
+        .neverVisible(config.NSCLIENT),
+    injector, aapsLogger, rh, commandQueue
 ), Pump {
 
     private val disposable = CompositeDisposable()
@@ -106,7 +108,7 @@ open class VirtualPumpPlugin @Inject constructor(
         disposable += rxBus
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.io)
-            .subscribe({ event: EventPreferenceChange -> if (event.isChanged(resourceHelper, R.string.key_virtualpump_type)) refreshConfiguration() }, fabricPrivacy::logException)
+            .subscribe({ event: EventPreferenceChange -> if (event.isChanged(rh, R.string.key_virtualpump_type)) refreshConfiguration() }, fabricPrivacy::logException)
         refreshConfiguration()
     }
 
@@ -117,7 +119,7 @@ open class VirtualPumpPlugin @Inject constructor(
 
     override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
         super.preprocessPreferences(preferenceFragment)
-        val uploadStatus = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_virtualpump_uploadstatus)) as SwitchPreference?
+        val uploadStatus = preferenceFragment.findPreference(rh.gs(R.string.key_virtualpump_uploadstatus)) as SwitchPreference?
             ?: return
         uploadStatus.isVisible = !config.NSCLIENT
     }
@@ -149,7 +151,7 @@ open class VirtualPumpPlugin @Inject constructor(
 
     override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
         lastDataTime = System.currentTimeMillis()
-        rxBus.send(EventNewNotification(Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60)))
+        rxBus.send(EventNewNotification(Notification(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, 60)))
         // Do nothing here. we are using database profile
         return PumpEnactResult(injector).success(true).enacted(true)
     }
@@ -178,18 +180,18 @@ open class VirtualPumpPlugin @Inject constructor(
             .bolusDelivered(detailedBolusInfo.insulin)
             .carbsDelivered(detailedBolusInfo.carbs)
             .enacted(detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0)
-            .comment(resourceHelper.gs(R.string.virtualpump_resultok))
+            .comment(rh.gs(R.string.virtualpump_resultok))
         val bolusingEvent = EventOverviewBolusProgress
         var delivering = 0.0
         while (delivering < detailedBolusInfo.insulin) {
             SystemClock.sleep(200)
-            bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, delivering)
+            bolusingEvent.status = rh.gs(R.string.bolusdelivering, delivering)
             bolusingEvent.percent = min((delivering / detailedBolusInfo.insulin * 100).toInt(), 100)
             rxBus.send(bolusingEvent)
             delivering += 0.1
         }
         SystemClock.sleep(200)
-        bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivered, detailedBolusInfo.insulin)
+        bolusingEvent.status = rh.gs(R.string.bolusdelivered, detailedBolusInfo.insulin)
         bolusingEvent.percent = 100
         rxBus.send(bolusingEvent)
         SystemClock.sleep(1000)
@@ -203,14 +205,16 @@ open class VirtualPumpPlugin @Inject constructor(
                 type = detailedBolusInfo.bolusType,
                 pumpId = dateUtil.now(),
                 pumpType = pumpType ?: PumpType.GENERIC_AAPS,
-                pumpSerial = serialNumber())
+                pumpSerial = serialNumber()
+            )
         if (detailedBolusInfo.carbs > 0)
             pumpSync.syncCarbsWithTimestamp(
                 timestamp = detailedBolusInfo.carbsTimestamp ?: detailedBolusInfo.timestamp,
                 amount = detailedBolusInfo.carbs,
                 pumpId = null,
                 pumpType = pumpType ?: PumpType.GENERIC_AAPS,
-                pumpSerial = serialNumber())
+                pumpSerial = serialNumber()
+            )
         return result
     }
 
@@ -222,7 +226,7 @@ open class VirtualPumpPlugin @Inject constructor(
         result.isTempCancel = false
         result.absolute = absoluteRate
         result.duration = durationInMinutes
-        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        result.comment = rh.gs(R.string.virtualpump_resultok)
         pumpSync.syncTemporaryBasalWithPumpId(
             timestamp = dateUtil.now(),
             rate = absoluteRate,
@@ -247,7 +251,7 @@ open class VirtualPumpPlugin @Inject constructor(
         result.isPercent = true
         result.isTempCancel = false
         result.duration = durationInMinutes
-        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        result.comment = rh.gs(R.string.virtualpump_resultok)
         pumpSync.syncTemporaryBasalWithPumpId(
             timestamp = dateUtil.now(),
             rate = percent.toDouble(),
@@ -272,7 +276,7 @@ open class VirtualPumpPlugin @Inject constructor(
         result.bolusDelivered = insulin
         result.isTempCancel = false
         result.duration = durationInMinutes
-        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        result.comment = rh.gs(R.string.virtualpump_resultok)
         pumpSync.syncExtendedBolusWithPumpId(
             timestamp = dateUtil.now(),
             amount = insulin,
@@ -292,7 +296,7 @@ open class VirtualPumpPlugin @Inject constructor(
         val result = PumpEnactResult(injector)
         result.success = true
         result.isTempCancel = true
-        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        result.comment = rh.gs(R.string.virtualpump_resultok)
         if (pumpSync.expectedPumpState().temporaryBasal != null) {
             result.enacted = true
             pumpSync.syncStopTemporaryBasalWithPumpId(
@@ -321,7 +325,7 @@ open class VirtualPumpPlugin @Inject constructor(
         result.success = true
         result.enacted = true
         result.isTempCancel = true
-        result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+        result.comment = rh.gs(R.string.virtualpump_resultok)
         aapsLogger.debug(LTag.PUMP, "Canceling extended bolus: $result")
         rxBus.send(EventVirtualPumpUpdateGui())
         lastDataTime = System.currentTimeMillis()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
index 66b070075d7..bfd9630b127 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
@@ -20,9 +20,9 @@ abstract class AbstractSensitivityPlugin(
     pluginDescription: PluginDescription,
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     val sp: SP
-) : PluginBase(pluginDescription, aapsLogger, resourceHelper, injector), Sensitivity {
+) : PluginBase(pluginDescription, aapsLogger, rh, injector), Sensitivity {
 
     abstract override fun detectSensitivity(ads: AutosensDataStore, fromTime: Long, toTime: Long): AutosensResult
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt
index b07b2375abe..36bda32853d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt
@@ -33,7 +33,7 @@ import kotlin.math.roundToInt
 class SensitivityAAPSPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     sp: SP,
     private val profileFunction: ProfileFunction,
     private val dateUtil: DateUtil,
@@ -45,15 +45,15 @@ class SensitivityAAPSPlugin @Inject constructor(
     .shortName(R.string.sensitivity_shortname)
     .preferencesId(R.xml.pref_absorption_aaps)
     .description(R.string.description_sensitivity_aaps),
-    injector, aapsLogger, resourceHelper, sp
+    injector, aapsLogger, rh, sp
 ) {
 
     override fun detectSensitivity(ads: AutosensDataStore, fromTime: Long, toTime: Long): AutosensResult {
         val age = sp.getString(R.string.key_age, "")
         var defaultHours = 24
-        if (age == resourceHelper.gs(R.string.key_adult)) defaultHours = 24
-        if (age == resourceHelper.gs(R.string.key_teenage)) defaultHours = 4
-        if (age == resourceHelper.gs(R.string.key_child)) defaultHours = 4
+        if (age == rh.gs(R.string.key_adult)) defaultHours = 24
+        if (age == rh.gs(R.string.key_teenage)) defaultHours = 4
+        if (age == rh.gs(R.string.key_child)) defaultHours = 4
         val hoursForDetection = sp.getInt(R.string.key_openapsama_autosens_period, defaultHours)
         val profile = profileFunction.getProfile()
         if (profile == null) {
@@ -141,10 +141,10 @@ class SensitivityAAPSPlugin @Inject constructor(
     override fun configuration(): JSONObject {
         val c = JSONObject()
         try {
-            c.put(resourceHelper.gs(R.string.key_absorption_maxtime), sp.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME))
-            c.put(resourceHelper.gs(R.string.key_openapsama_autosens_period), sp.getInt(R.string.key_openapsama_autosens_period, 24))
-            c.put(resourceHelper.gs(R.string.key_openapsama_autosens_max), sp.getDouble(R.string.key_openapsama_autosens_max, 1.2))
-            c.put(resourceHelper.gs(R.string.key_openapsama_autosens_min), sp.getDouble(R.string.key_openapsama_autosens_min, 0.7))
+            c.put(rh.gs(R.string.key_absorption_maxtime), sp.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME))
+            c.put(rh.gs(R.string.key_openapsama_autosens_period), sp.getInt(R.string.key_openapsama_autosens_period, 24))
+            c.put(rh.gs(R.string.key_openapsama_autosens_max), sp.getDouble(R.string.key_openapsama_autosens_max, 1.2))
+            c.put(rh.gs(R.string.key_openapsama_autosens_min), sp.getDouble(R.string.key_openapsama_autosens_min, 0.7))
         } catch (e: JSONException) {
             e.printStackTrace()
         }
@@ -153,10 +153,10 @@ class SensitivityAAPSPlugin @Inject constructor(
 
     override fun applyConfiguration(configuration: JSONObject) {
         try {
-            if (configuration.has(resourceHelper.gs(R.string.key_absorption_maxtime))) sp.putDouble(R.string.key_absorption_maxtime, configuration.getDouble(resourceHelper.gs(R.string.key_absorption_maxtime)))
-            if (configuration.has(resourceHelper.gs(R.string.key_openapsama_autosens_period))) sp.putDouble(R.string.key_openapsama_autosens_period, configuration.getDouble(resourceHelper.gs(R.string.key_openapsama_autosens_period)))
-            if (configuration.has(resourceHelper.gs(R.string.key_openapsama_autosens_max))) sp.getDouble(R.string.key_openapsama_autosens_max, configuration.getDouble(resourceHelper.gs(R.string.key_openapsama_autosens_max)))
-            if (configuration.has(resourceHelper.gs(R.string.key_openapsama_autosens_min))) sp.getDouble(R.string.key_openapsama_autosens_min, configuration.getDouble(resourceHelper.gs(R.string.key_openapsama_autosens_min)))
+            if (configuration.has(rh.gs(R.string.key_absorption_maxtime))) sp.putDouble(R.string.key_absorption_maxtime, configuration.getDouble(rh.gs(R.string.key_absorption_maxtime)))
+            if (configuration.has(rh.gs(R.string.key_openapsama_autosens_period))) sp.putDouble(R.string.key_openapsama_autosens_period, configuration.getDouble(rh.gs(R.string.key_openapsama_autosens_period)))
+            if (configuration.has(rh.gs(R.string.key_openapsama_autosens_max))) sp.getDouble(R.string.key_openapsama_autosens_max, configuration.getDouble(rh.gs(R.string.key_openapsama_autosens_max)))
+            if (configuration.has(rh.gs(R.string.key_openapsama_autosens_min))) sp.getDouble(R.string.key_openapsama_autosens_min, configuration.getDouble(rh.gs(R.string.key_openapsama_autosens_min)))
         } catch (e: JSONException) {
             e.printStackTrace()
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt
index d93cd057457..85a31e70cb4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt
@@ -34,7 +34,7 @@ import kotlin.math.roundToInt
 class SensitivityOref1Plugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     sp: SP,
     private val profileFunction: ProfileFunction,
     private val dateUtil: DateUtil,
@@ -48,7 +48,7 @@ class SensitivityOref1Plugin @Inject constructor(
     .preferencesId(R.xml.pref_absorption_oref1)
     .description(R.string.description_sensitivity_oref1)
     .setDefault(),
-    injector, aapsLogger, resourceHelper, sp
+    injector, aapsLogger, rh, sp
 ) {
 
     override fun detectSensitivity(ads: AutosensDataStore, fromTime: Long, toTime: Long): AutosensResult {
@@ -105,7 +105,6 @@ class SensitivityOref1Plugin @Inject constructor(
                 if (siteChanges.isTherapyEventEvent5minBack(autosensData.time)) {
                     deviationsArray.clear()
                     pastSensitivity += "(SITECHANGE)"
-                    pastSensitivity += "(SITECHANGE)"
                 }
 
                 // reset deviations after profile switch
@@ -206,10 +205,10 @@ class SensitivityOref1Plugin @Inject constructor(
     override fun configuration(): JSONObject {
         val c = JSONObject()
         try {
-            c.put(resourceHelper.gs(R.string.key_openapsama_min_5m_carbimpact), sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact))
-            c.put(resourceHelper.gs(R.string.key_absorption_cutoff), sp.getDouble(R.string.key_absorption_cutoff, Constants.DEFAULT_MAX_ABSORPTION_TIME))
-            c.put(resourceHelper.gs(R.string.key_openapsama_autosens_max), sp.getDouble(R.string.key_openapsama_autosens_max, 1.2))
-            c.put(resourceHelper.gs(R.string.key_openapsama_autosens_min), sp.getDouble(R.string.key_openapsama_autosens_min, 0.7))
+            c.put(rh.gs(R.string.key_openapsama_min_5m_carbimpact), sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact))
+            c.put(rh.gs(R.string.key_absorption_cutoff), sp.getDouble(R.string.key_absorption_cutoff, Constants.DEFAULT_MAX_ABSORPTION_TIME))
+            c.put(rh.gs(R.string.key_openapsama_autosens_max), sp.getDouble(R.string.key_openapsama_autosens_max, 1.2))
+            c.put(rh.gs(R.string.key_openapsama_autosens_min), sp.getDouble(R.string.key_openapsama_autosens_min, 0.7))
         } catch (e: JSONException) {
             e.printStackTrace()
         }
@@ -218,10 +217,10 @@ class SensitivityOref1Plugin @Inject constructor(
 
     override fun applyConfiguration(configuration: JSONObject) {
         try {
-            if (configuration.has(resourceHelper.gs(R.string.key_openapsama_min_5m_carbimpact))) sp.putDouble(R.string.key_openapsama_min_5m_carbimpact, configuration.getDouble(resourceHelper.gs(R.string.key_openapsama_min_5m_carbimpact)))
-            if (configuration.has(resourceHelper.gs(R.string.key_absorption_cutoff))) sp.putDouble(R.string.key_absorption_cutoff, configuration.getDouble(resourceHelper.gs(R.string.key_absorption_cutoff)))
-            if (configuration.has(resourceHelper.gs(R.string.key_openapsama_autosens_max))) sp.getDouble(R.string.key_openapsama_autosens_max, configuration.getDouble(resourceHelper.gs(R.string.key_openapsama_autosens_max)))
-            if (configuration.has(resourceHelper.gs(R.string.key_openapsama_autosens_min))) sp.getDouble(R.string.key_openapsama_autosens_min, configuration.getDouble(resourceHelper.gs(R.string.key_openapsama_autosens_min)))
+            if (configuration.has(rh.gs(R.string.key_openapsama_min_5m_carbimpact))) sp.putDouble(R.string.key_openapsama_min_5m_carbimpact, configuration.getDouble(rh.gs(R.string.key_openapsama_min_5m_carbimpact)))
+            if (configuration.has(rh.gs(R.string.key_absorption_cutoff))) sp.putDouble(R.string.key_absorption_cutoff, configuration.getDouble(rh.gs(R.string.key_absorption_cutoff)))
+            if (configuration.has(rh.gs(R.string.key_openapsama_autosens_max))) sp.getDouble(R.string.key_openapsama_autosens_max, configuration.getDouble(rh.gs(R.string.key_openapsama_autosens_max)))
+            if (configuration.has(rh.gs(R.string.key_openapsama_autosens_min))) sp.getDouble(R.string.key_openapsama_autosens_min, configuration.getDouble(rh.gs(R.string.key_openapsama_autosens_min)))
         } catch (e: JSONException) {
             e.printStackTrace()
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt
index df1b743f6f4..00a5ea432e9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt
@@ -32,7 +32,7 @@ import kotlin.math.roundToInt
 class SensitivityWeightedAveragePlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     sp: SP,
     private val profileFunction: ProfileFunction,
     private val dateUtil: DateUtil,
@@ -44,15 +44,15 @@ class SensitivityWeightedAveragePlugin @Inject constructor(
     .shortName(R.string.sensitivity_shortname)
     .preferencesId(R.xml.pref_absorption_aaps)
     .description(R.string.description_sensitivity_weighted_average),
-    injector, aapsLogger, resourceHelper, sp
+    injector, aapsLogger, rh, sp
 ) {
 
     override fun detectSensitivity(ads: AutosensDataStore, fromTime: Long, toTime: Long): AutosensResult {
         val age = sp.getString(R.string.key_age, "")
         var defaultHours = 24
-        if (age == resourceHelper.gs(R.string.key_adult)) defaultHours = 24
-        if (age == resourceHelper.gs(R.string.key_teenage)) defaultHours = 4
-        if (age == resourceHelper.gs(R.string.key_child)) defaultHours = 4
+        if (age == rh.gs(R.string.key_adult)) defaultHours = 24
+        if (age == rh.gs(R.string.key_teenage)) defaultHours = 4
+        if (age == rh.gs(R.string.key_child)) defaultHours = 4
         val hoursForDetection = sp.getInt(R.string.key_openapsama_autosens_period, defaultHours)
         if (ads.autosensDataTable.size() < 4) {
             aapsLogger.debug(LTag.AUTOSENS, "No autosens data available. lastDataTime=" + ads.lastDataTime(dateUtil))
@@ -161,10 +161,10 @@ class SensitivityWeightedAveragePlugin @Inject constructor(
     override fun configuration(): JSONObject {
         val c = JSONObject()
         try {
-            c.put(resourceHelper.gs(R.string.key_absorption_maxtime), sp.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME))
-            c.put(resourceHelper.gs(R.string.key_openapsama_autosens_period), sp.getInt(R.string.key_openapsama_autosens_period, 24))
-            c.put(resourceHelper.gs(R.string.key_openapsama_autosens_max), sp.getDouble(R.string.key_openapsama_autosens_max, 1.2))
-            c.put(resourceHelper.gs(R.string.key_openapsama_autosens_min), sp.getDouble(R.string.key_openapsama_autosens_min, 0.7))
+            c.put(rh.gs(R.string.key_absorption_maxtime), sp.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME))
+            c.put(rh.gs(R.string.key_openapsama_autosens_period), sp.getInt(R.string.key_openapsama_autosens_period, 24))
+            c.put(rh.gs(R.string.key_openapsama_autosens_max), sp.getDouble(R.string.key_openapsama_autosens_max, 1.2))
+            c.put(rh.gs(R.string.key_openapsama_autosens_min), sp.getDouble(R.string.key_openapsama_autosens_min, 0.7))
         } catch (e: JSONException) {
             e.printStackTrace()
         }
@@ -173,10 +173,10 @@ class SensitivityWeightedAveragePlugin @Inject constructor(
 
     override fun applyConfiguration(configuration: JSONObject) {
         try {
-            if (configuration.has(resourceHelper.gs(R.string.key_absorption_maxtime))) sp.putDouble(R.string.key_absorption_maxtime, configuration.getDouble(resourceHelper.gs(R.string.key_absorption_maxtime)))
-            if (configuration.has(resourceHelper.gs(R.string.key_openapsama_autosens_period))) sp.putDouble(R.string.key_openapsama_autosens_period, configuration.getDouble(resourceHelper.gs(R.string.key_openapsama_autosens_period)))
-            if (configuration.has(resourceHelper.gs(R.string.key_openapsama_autosens_max))) sp.getDouble(R.string.key_openapsama_autosens_max, configuration.getDouble(resourceHelper.gs(R.string.key_openapsama_autosens_max)))
-            if (configuration.has(resourceHelper.gs(R.string.key_openapsama_autosens_min))) sp.getDouble(R.string.key_openapsama_autosens_min, configuration.getDouble(resourceHelper.gs(R.string.key_openapsama_autosens_min)))
+            if (configuration.has(rh.gs(R.string.key_absorption_maxtime))) sp.putDouble(R.string.key_absorption_maxtime, configuration.getDouble(rh.gs(R.string.key_absorption_maxtime)))
+            if (configuration.has(rh.gs(R.string.key_openapsama_autosens_period))) sp.putDouble(R.string.key_openapsama_autosens_period, configuration.getDouble(rh.gs(R.string.key_openapsama_autosens_period)))
+            if (configuration.has(rh.gs(R.string.key_openapsama_autosens_max))) sp.getDouble(R.string.key_openapsama_autosens_max, configuration.getDouble(rh.gs(R.string.key_openapsama_autosens_max)))
+            if (configuration.has(rh.gs(R.string.key_openapsama_autosens_min))) sp.getDouble(R.string.key_openapsama_autosens_min, configuration.getDouble(rh.gs(R.string.key_openapsama_autosens_min)))
         } catch (e: JSONException) {
             e.printStackTrace()
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
index 8d37940f340..c942bf413d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
@@ -25,7 +25,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
@@ -39,9 +39,9 @@ import javax.inject.Inject
 
 class BGSourceFragment : DaggerFragment() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var repository: AppRepository
@@ -50,7 +50,7 @@ class BGSourceFragment : DaggerFragment() {
     @Inject lateinit var activePlugin: ActivePlugin
 
     private val disposable = CompositeDisposable()
-    private val millsToThePast = T.hours(12).msecs()
+    private val millsToThePast = T.hours(36).msecs()
 
     private var _binding: BgsourceFragmentBinding? = null
 
@@ -131,7 +131,7 @@ class BGSourceFragment : DaggerFragment() {
                     val glucoseValue = v.tag as GlucoseValue
                     activity?.let { activity ->
                         val text = dateUtil.dateAndTimeString(glucoseValue.timestamp) + "\n" + glucoseValue.valueToUnitsString(profileFunction.getUnits())
-                        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
+                        OKDialog.showConfirmation(activity, rh.gs(R.string.removerecord), text, Runnable {
                             val source = when((activePlugin.activeBgSource as PluginBase).pluginDescription.pluginName) {
                                 R.string.dexcom_app_patched -> Sources.Dexcom
                                 R.string.eversense          -> Sources.Eversense
@@ -140,6 +140,7 @@ class BGSourceFragment : DaggerFragment() {
                                 R.string.nsclientbg         -> Sources.NSClientSource
                                 R.string.poctech            -> Sources.PocTech
                                 R.string.tomato             -> Sources.Tomato
+                                R.string.glunovo            -> Sources.Glunovo
                                 R.string.xdrip              -> Sources.Xdrip
                                 else                        -> Sources.Unknown
                             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
index d744d813407..2f4f7d935e0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
@@ -34,7 +34,7 @@ import javax.inject.Singleton
 @Singleton
 class DexcomPlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     aapsLogger: AAPSLogger,
     private val sp: SP,
     private val dexcomMediator: DexcomMediator,
@@ -47,7 +47,7 @@ class DexcomPlugin @Inject constructor(
     .shortName(R.string.dexcom_short)
     .preferencesId(R.xml.pref_bgsourcedexcom)
     .description(R.string.description_source_dexcom),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), BgSource {
 
     init {
@@ -83,7 +83,7 @@ class DexcomPlugin @Inject constructor(
         @Inject lateinit var sp: SP
         @Inject lateinit var dateUtil: DateUtil
         @Inject lateinit var dataWorker: DataWorker
-        @Inject lateinit var broadcastToXDrip: XDripBroadcast
+        @Inject lateinit var xDripBroadcast: XDripBroadcast
         @Inject lateinit var repository: AppRepository
         @Inject lateinit var uel: UserEntryLogger
 
@@ -94,7 +94,7 @@ class DexcomPlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!dexcomPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
+            if (!dexcomPlugin.isEnabled()) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             val bundle = dataWorker.pickupBundle(inputData.getLong(DataWorker.STORE_KEY, -1))
                 ?: return Result.failure(workDataOf("Error" to "missing input data"))
             try {
@@ -147,11 +147,11 @@ class DexcomPlugin @Inject constructor(
                     .blockingGet()
                     .also { result ->
                         result.inserted.forEach {
-                            broadcastToXDrip(it)
+                            xDripBroadcast.send(it)
                             aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
                         }
                         result.updated.forEach {
-                            broadcastToXDrip(it)
+                            xDripBroadcast.send(it)
                             aapsLogger.debug(LTag.DATABASE, "Updated bg $it")
                         }
                         result.sensorInsertionsInserted.forEach {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
index a6c51cf5de9..e1f464f7f33 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
@@ -29,7 +29,7 @@ import javax.inject.Singleton
 @Singleton
 class EversensePlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     aapsLogger: AAPSLogger,
     private val sp: SP
 ) : PluginBase(PluginDescription()
@@ -40,7 +40,7 @@ class EversensePlugin @Inject constructor(
     .shortName(R.string.eversense_shortname)
     .preferencesId(R.xml.pref_bgsource)
     .description(R.string.description_source_eversense),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), BgSource {
 
     override var sensorBatteryLevel = -1
@@ -60,7 +60,7 @@ class EversensePlugin @Inject constructor(
         @Inject lateinit var dateUtil: DateUtil
         @Inject lateinit var dataWorker: DataWorker
         @Inject lateinit var repository: AppRepository
-        @Inject lateinit var broadcastToXDrip: XDripBroadcast
+        @Inject lateinit var xDripBroadcast: XDripBroadcast
 
         init {
             (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
@@ -69,7 +69,7 @@ class EversensePlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!eversensePlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
+            if (!eversensePlugin.isEnabled()) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             val bundle = dataWorker.pickupBundle(inputData.getLong(DataWorker.STORE_KEY, -1))
                 ?: return Result.failure(workDataOf("Error" to "missing input data"))
             if (bundle.containsKey("currentCalibrationPhase")) aapsLogger.debug(LTag.BGSOURCE, "currentCalibrationPhase: " + bundle.getString("currentCalibrationPhase"))
@@ -117,7 +117,7 @@ class EversensePlugin @Inject constructor(
                         .blockingGet()
                         .also { savedValues ->
                             savedValues.inserted.forEach {
-                                broadcastToXDrip(it)
+                                xDripBroadcast.send(it)
                                 aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
                             }
                         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt
index a6e0f24821f..d23831a4138 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt
@@ -26,7 +26,7 @@ import javax.inject.Singleton
 @Singleton
 class GlimpPlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     aapsLogger: AAPSLogger,
     private val sp: SP
 ) : PluginBase(PluginDescription()
@@ -36,7 +36,7 @@ class GlimpPlugin @Inject constructor(
     .pluginName(R.string.Glimp)
     .preferencesId(R.xml.pref_bgsource)
     .description(R.string.description_source_glimp),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), BgSource {
 
     // cannot be inner class because of needed injection
@@ -49,7 +49,7 @@ class GlimpPlugin @Inject constructor(
         @Inject lateinit var glimpPlugin: GlimpPlugin
         @Inject lateinit var aapsLogger: AAPSLogger
         @Inject lateinit var repository: AppRepository
-        @Inject lateinit var broadcastToXDrip: XDripBroadcast
+        @Inject lateinit var xDripBroadcast: XDripBroadcast
 
         init {
             (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
@@ -58,7 +58,7 @@ class GlimpPlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!glimpPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
+            if (!glimpPlugin.isEnabled()) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             aapsLogger.debug(LTag.BGSOURCE, "Received Glimp Data: $inputData}")
             val glucoseValues = mutableListOf<CgmSourceTransaction.TransactionGlucoseValue>()
             glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
@@ -77,7 +77,7 @@ class GlimpPlugin @Inject constructor(
                 .blockingGet()
                 .also { savedValues ->
                     savedValues.inserted.forEach {
-                        broadcastToXDrip(it)
+                        xDripBroadcast.send(it)
                         aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
                     }
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt
new file mode 100644
index 00000000000..906c9094ec2
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt
@@ -0,0 +1,163 @@
+package info.nightscout.androidaps.plugins.source
+
+import android.content.Context
+import android.net.Uri
+import android.os.Handler
+import android.os.HandlerThread
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.entities.GlucoseValue
+import info.nightscout.androidaps.database.entities.TherapyEvent
+import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
+import info.nightscout.androidaps.interfaces.BgSource
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.XDripBroadcast
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GlunovoPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger,
+    private val sp: SP,
+    private val context: Context,
+    private val repository: AppRepository,
+    private val xDripBroadcast: XDripBroadcast,
+    private val dateUtil: DateUtil,
+    private val fabricPrivacy: FabricPrivacy
+) : PluginBase(
+    PluginDescription()
+        .mainType(PluginType.BGSOURCE)
+        .fragmentClass(BGSourceFragment::class.java.name)
+        .pluginIcon(R.drawable.ic_glunovo)
+        .pluginName(R.string.glunovo)
+        .preferencesId(R.xml.pref_bgsource)
+        .shortName(R.string.glunovo)
+        .description(R.string.description_source_glunovo),
+    aapsLogger, resourceHelper, injector
+), BgSource {
+
+    private val loopHandler: Handler = Handler(HandlerThread(this::class.java.simpleName + "Handler").also { it.start() }.looper)
+    private lateinit var refreshLoop: Runnable
+
+    private val contentUri: Uri = Uri.parse("content://$AUTHORITY/$TABLE_NAME")
+
+    init {
+        refreshLoop = Runnable {
+            try {
+                handleNewData()
+            } catch (e: Exception) {
+                fabricPrivacy.logException(e)
+                aapsLogger.error("Error while processing data", e)
+            }
+            val lastReadTimestamp = sp.getLong(R.string.key_last_processed_glunovo_timestamp, 0L)
+            val differenceToNow = INTERVAL - (dateUtil.now() - lastReadTimestamp) % INTERVAL + T.secs(10).msecs()
+            loopHandler.postDelayed(refreshLoop, differenceToNow)
+        }
+    }
+
+    private val disposable = CompositeDisposable()
+
+    override fun onStart() {
+        super.onStart()
+        loopHandler.postDelayed(refreshLoop, T.secs(30).msecs()) // do not start immediately, app may be still starting
+    }
+
+    override fun onStop() {
+        super.onStop()
+        loopHandler.removeCallbacks(refreshLoop)
+        disposable.clear()
+    }
+
+    private fun handleNewData() {
+        if (!isEnabled()) return
+
+        context.contentResolver.query(contentUri, null, null, null, null)?.let { cr ->
+            val glucoseValues = mutableListOf<CgmSourceTransaction.TransactionGlucoseValue>()
+            val calibrations = mutableListOf<CgmSourceTransaction.Calibration>()
+            cr.moveToFirst()
+
+            while (!cr.isAfterLast) {
+                val timestamp = cr.getLong(0)
+                val value = cr.getDouble(1) //value in mmol/l...
+                val curr = cr.getDouble(2)
+
+                // bypass already processed
+                if (timestamp < sp.getLong(R.string.key_last_processed_glunovo_timestamp, 0L)) {
+                    cr.moveToNext()
+                    continue
+                }
+
+                if (timestamp > dateUtil.now() || timestamp == 0L) {
+                    aapsLogger.error(LTag.BGSOURCE, "Error in received data date/time $timestamp")
+                    cr.moveToNext()
+                    continue
+                }
+
+                if (value < 2 || value > 25) {
+                    aapsLogger.error(LTag.BGSOURCE, "Error in received data value (value out of bounds) $value")
+                    cr.moveToNext()
+                    continue
+                }
+
+                if (curr != 0.0)
+                    glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
+                        timestamp = timestamp,
+                        value = value * Constants.MMOLL_TO_MGDL,
+                        raw = 0.0,
+                        noise = null,
+                        trendArrow = GlucoseValue.TrendArrow.NONE,
+                        sourceSensor = GlucoseValue.SourceSensor.GLUNOVO_NATIVE
+                    )
+                else
+                    calibrations.add(
+                        CgmSourceTransaction.Calibration(
+                            timestamp = timestamp,
+                            value = value,
+                            glucoseUnit = TherapyEvent.GlucoseUnit.MMOL
+                        )
+                    )
+                sp.putLong(R.string.key_last_processed_glunovo_timestamp, timestamp)
+                cr.moveToNext()
+            }
+            cr.close()
+
+            if (glucoseValues.isNotEmpty() || calibrations.isNotEmpty())
+                repository.runTransactionForResult(CgmSourceTransaction(glucoseValues, calibrations, null))
+                    .doOnError {
+                        aapsLogger.error(LTag.DATABASE, "Error while saving values from Glunovo App", it)
+                    }
+                    .blockingGet()
+                    .also { savedValues ->
+                        savedValues.inserted.forEach {
+                            xDripBroadcast.send(it)
+                            aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
+                        }
+                    }
+        }
+    }
+
+    override fun shouldUploadToNs(glucoseValue: GlucoseValue): Boolean =
+        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.GLUNOVO_NATIVE && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)
+
+    companion object {
+
+        @Suppress("SpellCheckingInspection")
+        const val AUTHORITY = "alexpr.co.uk.infinivocgm.cgm_db.CgmExternalProvider/"
+        const val TABLE_NAME = "CgmReading"
+        const val INTERVAL = 180000L // 3 min
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt
index 728e9c12c97..63da6b87615 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt
@@ -28,7 +28,7 @@ import javax.inject.Singleton
 @Singleton
 class MM640gPlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     aapsLogger: AAPSLogger,
     private val sp: SP
 ) : PluginBase(PluginDescription()
@@ -37,7 +37,7 @@ class MM640gPlugin @Inject constructor(
     .pluginIcon(R.drawable.ic_generic_cgm)
     .pluginName(R.string.MM640g)
     .description(R.string.description_source_mm640g),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), BgSource {
 
     // cannot be inner class because of needed injection
@@ -52,7 +52,7 @@ class MM640gPlugin @Inject constructor(
         @Inject lateinit var dateUtil: DateUtil
         @Inject lateinit var dataWorker: DataWorker
         @Inject lateinit var repository: AppRepository
-        @Inject lateinit var broadcastToXDrip: XDripBroadcast
+        @Inject lateinit var xDripBroadcast: XDripBroadcast
 
         init {
             (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
@@ -61,7 +61,7 @@ class MM640gPlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!mM640gPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success()
+            if (!mM640gPlugin.isEnabled()) return Result.success()
             val collection = inputData.getString("collection") ?: return Result.failure(workDataOf("Error" to "missing collection"))
             if (collection == "entries") {
                 val data = inputData.getString("data")
@@ -93,7 +93,7 @@ class MM640gPlugin @Inject constructor(
                             .blockingGet()
                             .also { savedValues ->
                                 savedValues.all().forEach {
-                                    broadcastToXDrip(it)
+                                    xDripBroadcast.send(it)
                                     aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
                                 }
                             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
index e9181c6abd6..00695864989 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
@@ -16,7 +16,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
@@ -34,7 +34,7 @@ import javax.inject.Singleton
 @Singleton
 class NSClientSourcePlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     aapsLogger: AAPSLogger,
     config: Config
 ) : PluginBase(PluginDescription()
@@ -44,7 +44,7 @@ class NSClientSourcePlugin @Inject constructor(
     .pluginName(R.string.nsclientbg)
     .shortName(R.string.nsclientbgshort)
     .description(R.string.description_source_ns_client),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), BgSource {
 
     private var lastBGTimeStamp: Long = 0
@@ -87,11 +87,11 @@ class NSClientSourcePlugin @Inject constructor(
         @Inject lateinit var injector: HasAndroidInjector
         @Inject lateinit var aapsLogger: AAPSLogger
         @Inject lateinit var sp: SP
-        @Inject lateinit var rxBus: RxBusWrapper
+        @Inject lateinit var rxBus: RxBus
         @Inject lateinit var dateUtil: DateUtil
         @Inject lateinit var dataWorker: DataWorker
         @Inject lateinit var repository: AppRepository
-        @Inject lateinit var broadcastToXDrip: XDripBroadcast
+        @Inject lateinit var xDripBroadcast: XDripBroadcast
         @Inject lateinit var dexcomPlugin: DexcomPlugin
         @Inject lateinit var nsClientPlugin: NSClientPlugin
 
@@ -116,7 +116,7 @@ class NSClientSourcePlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!nsClientSourcePlugin.isEnabled() && !sp.getBoolean(R.string.key_ns_receive_cgm, true) && !dexcomPlugin.isEnabled()) return Result.success(workDataOf("Result" to "Sync not enabled"))
+            if (!nsClientSourcePlugin.isEnabled() && !sp.getBoolean(R.string.key_ns_receive_cgm, false)) return Result.success(workDataOf("Result" to "Sync not enabled"))
 
             val sgvs = dataWorker.pickupJSONArray(inputData.getLong(DataWorker.STORE_KEY, -1))
                 ?: return Result.failure(workDataOf("Error" to "missing input data"))
@@ -148,12 +148,12 @@ class NSClientSourcePlugin @Inject constructor(
                     .blockingGet()
                     .also { result ->
                         result.updated.forEach {
-                            broadcastToXDrip(it)
+                            xDripBroadcast.send(it)
                             nsClientSourcePlugin.detectSource(it)
                             aapsLogger.debug(LTag.DATABASE, "Updated bg $it")
                         }
                         result.inserted.forEach {
-                            broadcastToXDrip(it)
+                            xDripBroadcast.send(it)
                             nsClientSourcePlugin.detectSource(it)
                             aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
                         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
index fa7e0a278a3..d17bef33e69 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
@@ -28,7 +28,7 @@ import javax.inject.Singleton
 @Singleton
 class PoctechPlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     aapsLogger: AAPSLogger,
     private val sp: SP
 ) : PluginBase(PluginDescription()
@@ -38,7 +38,7 @@ class PoctechPlugin @Inject constructor(
     .pluginName(R.string.poctech)
     .preferencesId(R.xml.pref_bgsource)
     .description(R.string.description_source_poctech),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), BgSource {
 
     // cannot be inner class because of needed injection
@@ -51,7 +51,7 @@ class PoctechPlugin @Inject constructor(
         @Inject lateinit var poctechPlugin: PoctechPlugin
         @Inject lateinit var aapsLogger: AAPSLogger
         @Inject lateinit var repository: AppRepository
-        @Inject lateinit var broadcastToXDrip: XDripBroadcast
+        @Inject lateinit var xDripBroadcast: XDripBroadcast
 
         init {
             (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
@@ -60,7 +60,7 @@ class PoctechPlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!poctechPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
+            if (!poctechPlugin.isEnabled()) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             aapsLogger.debug(LTag.BGSOURCE, "Received Poctech Data $inputData")
             try {
                 val glucoseValues = mutableListOf<CgmSourceTransaction.TransactionGlucoseValue>()
@@ -86,7 +86,7 @@ class PoctechPlugin @Inject constructor(
                     .blockingGet()
                     .also { savedValues ->
                         savedValues.inserted.forEach {
-                            broadcastToXDrip(it)
+                            xDripBroadcast.send(it)
                             aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
                         }
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
index 06c78220364..66cf7f43ee8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
@@ -13,11 +13,8 @@ import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.XDripBroadcast
-import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
@@ -31,23 +28,21 @@ import kotlin.math.sin
 @Singleton
 class RandomBgPlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     aapsLogger: AAPSLogger,
-    private val virtualPumpPlugin: VirtualPumpPlugin,
-    private val buildHelper: BuildHelper,
     private val sp: SP,
-    private val dateUtil: DateUtil,
     private val repository: AppRepository,
     private val xDripBroadcast: XDripBroadcast
-) : PluginBase(PluginDescription()
-    .mainType(PluginType.BGSOURCE)
-    .fragmentClass(BGSourceFragment::class.java.name)
-    .pluginIcon(R.drawable.ic_dice)
-    .pluginName(R.string.randombg)
-    .shortName(R.string.randombg_short)
-    .preferencesId(R.xml.pref_bgsource)
-    .description(R.string.description_source_randombg),
-    aapsLogger, resourceHelper, injector
+) : PluginBase(
+    PluginDescription()
+        .mainType(PluginType.BGSOURCE)
+        .fragmentClass(BGSourceFragment::class.java.name)
+        .pluginIcon(R.drawable.ic_dice)
+        .pluginName(R.string.randombg)
+        .shortName(R.string.randombg_short)
+        .preferencesId(R.xml.pref_bgsource)
+        .description(R.string.description_source_randombg),
+    aapsLogger, rh, injector
 ), BgSource {
 
     private val loopHandler: Handler = Handler(HandlerThread(RandomBgPlugin::class.java.simpleName + "Handler").also { it.start() }.looper)
@@ -58,7 +53,7 @@ class RandomBgPlugin @Inject constructor(
         const val interval = 5L // minutes
         const val min = 70 // mgdl
         const val max = 190 // mgdl
-        const val period = 90.0 // minutes
+        const val period = 120.0 // minutes
     }
 
     init {
@@ -89,20 +84,23 @@ class RandomBgPlugin @Inject constructor(
     }
 
     override fun specialEnableCondition(): Boolean {
-//        return isRunningTest() || virtualPumpPlugin.isEnabled(PluginType.PUMP) && buildHelper.isEngineeringMode()
+//        return isRunningTest() || virtualPumpPlugin.isEnabled() && buildHelper.isEngineeringMode()
         return true
     }
 
     private fun handleNewData() {
-        if (!isEnabled(PluginType.BGSOURCE)) return
+        if (!isEnabled()) return
 
         val cal = GregorianCalendar()
-        val currentMinute = cal.get(Calendar.MINUTE) + (cal.get(Calendar.HOUR_OF_DAY) % 2) * 60
+        val currentMinute = cal[Calendar.MINUTE] + (cal[Calendar.HOUR_OF_DAY] % 2) * 60
         val bgMgdl = min + ((max - min) + (max - min) * sin(currentMinute / period * 2 * PI)) / 2
 
+        cal[Calendar.MILLISECOND] = 0
+        cal[Calendar.SECOND] = 0
+        cal[Calendar.MINUTE] -= cal[Calendar.MINUTE] % 5
         val glucoseValues = mutableListOf<CgmSourceTransaction.TransactionGlucoseValue>()
         glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
-            timestamp = dateUtil.now(),
+            timestamp = cal.timeInMillis,
             value = bgMgdl,
             raw = 0.0,
             noise = null,
@@ -111,11 +109,11 @@ class RandomBgPlugin @Inject constructor(
         )
         disposable += repository.runTransactionForResult(CgmSourceTransaction(glucoseValues, emptyList(), null))
             .subscribe({ savedValues ->
-                savedValues.inserted.forEach {
-                    xDripBroadcast(it)
-                    aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
-                }
-            }, { aapsLogger.error(LTag.DATABASE, "Error while saving values from Random plugin", it) }
+                           savedValues.inserted.forEach {
+                               xDripBroadcast.send(it)
+                               aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
+                           }
+                       }, { aapsLogger.error(LTag.DATABASE, "Error while saving values from Random plugin", it) }
             )
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
index 52773e1d767..fd0eeb48dc2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
@@ -24,7 +24,7 @@ import javax.inject.Singleton
 @Singleton
 class TomatoPlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     aapsLogger: AAPSLogger,
     private val sp: SP
 ) : PluginBase(PluginDescription()
@@ -35,7 +35,7 @@ class TomatoPlugin @Inject constructor(
     .preferencesId(R.xml.pref_bgsource)
     .shortName(R.string.tomato_short)
     .description(R.string.description_source_tomato),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), BgSource {
 
     // cannot be inner class because of needed injection
@@ -49,7 +49,7 @@ class TomatoPlugin @Inject constructor(
         @Inject lateinit var aapsLogger: AAPSLogger
         @Inject lateinit var sp: SP
         @Inject lateinit var repository: AppRepository
-        @Inject lateinit var broadcastToXDrip: XDripBroadcast
+        @Inject lateinit var xDripBroadcast: XDripBroadcast
 
         init {
             (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
@@ -59,7 +59,7 @@ class TomatoPlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!tomatoPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
+            if (!tomatoPlugin.isEnabled()) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             val glucoseValues = mutableListOf<CgmSourceTransaction.TransactionGlucoseValue>()
             glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
                 timestamp = inputData.getLong("com.fanqies.tomatofn.Extras.Time", 0),
@@ -77,7 +77,7 @@ class TomatoPlugin @Inject constructor(
                 .blockingGet()
                 .also { savedValues ->
                     savedValues.inserted.forEach {
-                        broadcastToXDrip(it)
+                        xDripBroadcast.send(it)
                         aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
                     }
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt
index bbb8b2c7e13..80a656b82f2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt
@@ -24,7 +24,7 @@ import javax.inject.Singleton
 @Singleton
 class XdripPlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     aapsLogger: AAPSLogger
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.BGSOURCE)
@@ -32,7 +32,7 @@ class XdripPlugin @Inject constructor(
     .pluginIcon((R.drawable.ic_blooddrop_48))
     .pluginName(R.string.xdrip)
     .description(R.string.description_source_xdrip),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ), BgSource {
 
     private var advancedFiltering = false
@@ -73,7 +73,7 @@ class XdripPlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!xdripPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
+            if (!xdripPlugin.isEnabled()) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             val bundle = dataWorker.pickupBundle(inputData.getLong(DataWorker.STORE_KEY, -1))
                 ?: return Result.failure(workDataOf("Error" to "missing input data"))
 
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueueImplementation.kt
similarity index 79%
rename from app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
rename to app/src/main/java/info/nightscout/androidaps/queue/CommandQueueImplementation.kt
index 8553f76596d..6841ac4c258 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueueImplementation.kt
@@ -20,13 +20,12 @@ import info.nightscout.androidaps.database.entities.ProfileSwitch
 import info.nightscout.androidaps.database.interfaces.end
 import info.nightscout.androidaps.dialogs.BolusProgressDialog
 import info.nightscout.androidaps.events.EventBolusRequested
-import info.nightscout.androidaps.events.EventNewBasalProfile
 import info.nightscout.androidaps.events.EventProfileSwitchChanged
 import info.nightscout.androidaps.extensions.getCustomizedName
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
@@ -50,12 +49,12 @@ import javax.inject.Singleton
 
 @OpenForTesting
 @Singleton
-class CommandQueue @Inject constructor(
+class CommandQueueImplementation @Inject constructor(
     private val injector: HasAndroidInjector,
     private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val aapsSchedulers: AapsSchedulers,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val constraintChecker: ConstraintChecker,
     private val profileFunction: ProfileFunction,
     private val activePlugin: ActivePlugin,
@@ -66,7 +65,7 @@ class CommandQueue @Inject constructor(
     private val repository: AppRepository,
     private val fabricPrivacy: FabricPrivacy,
     private val config: Config
-) : CommandQueueProvider {
+) : CommandQueue {
 
     private val disposable = CompositeDisposable()
 
@@ -80,42 +79,40 @@ class CommandQueue @Inject constructor(
             .toObservable(EventProfileSwitchChanged::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({
-                if (config.NSCLIENT) { // Effective profileswitch should be synced over NS
-                    rxBus.send(EventNewBasalProfile())
-                    return@subscribe
-                }
-                aapsLogger.debug(LTag.PROFILE, "onProfileSwitch")
-                profileFunction.getRequestedProfile()?.let {
-                    val nonCustomized = ProfileSealed.PS(it).convertToNonCustomizedProfile(dateUtil)
-                    setProfile(ProfileSealed.Pure(nonCustomized), it.interfaceIDs.nightscoutId != null, object : Callback() {
-                        override fun run() {
-                            if (!result.success) {
-                                ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.failedupdatebasalprofile), R.raw.boluserror)
-                            }
-                            if (result.enacted) {
-                                repository.createEffectiveProfileSwitch(
-                                    EffectiveProfileSwitch(
-                                        timestamp = dateUtil.now(),
-                                        basalBlocks = nonCustomized.basalBlocks,
-                                        isfBlocks = nonCustomized.isfBlocks,
-                                        icBlocks = nonCustomized.icBlocks,
-                                        targetBlocks = nonCustomized.targetBlocks,
-                                        glucoseUnit = if (it.glucoseUnit == ProfileSwitch.GlucoseUnit.MGDL) EffectiveProfileSwitch.GlucoseUnit.MGDL else EffectiveProfileSwitch.GlucoseUnit.MMOL,
-                                        originalProfileName = it.profileName,
-                                        originalCustomizedName = it.getCustomizedName(),
-                                        originalTimeshift = it.timeshift,
-                                        originalPercentage = it.percentage,
-                                        originalDuration = it.duration,
-                                        originalEnd = it.end,
-                                        insulinConfiguration = it.insulinConfiguration
-                                    )
-                                )
-                                rxBus.send(EventNewBasalProfile())
-                            }
-                        }
-                    })
-                }
-            }, fabricPrivacy::logException)
+                           if (config.NSCLIENT) { // Effective profileswitch should be synced over NS, do not create EffectiveProfileSwitch here
+                               return@subscribe
+                           }
+                           aapsLogger.debug(LTag.PROFILE, "onEventProfileSwitchChanged")
+                           profileFunction.getRequestedProfile()?.let {
+                               setProfile(ProfileSealed.PS(it), it.interfaceIDs.nightscoutId != null, object : Callback() {
+                                   override fun run() {
+                                       if (!result.success) {
+                                           ErrorHelperActivity.runAlarm(context, result.comment, rh.gs(R.string.failedupdatebasalprofile), R.raw.boluserror)
+                                       } else if (result.enacted) {
+                                           val nonCustomized = ProfileSealed.PS(it).convertToNonCustomizedProfile(dateUtil)
+                                           EffectiveProfileSwitch(
+                                               timestamp = dateUtil.now(),
+                                               basalBlocks = nonCustomized.basalBlocks,
+                                               isfBlocks = nonCustomized.isfBlocks,
+                                               icBlocks = nonCustomized.icBlocks,
+                                               targetBlocks = nonCustomized.targetBlocks,
+                                               glucoseUnit = if (it.glucoseUnit == ProfileSwitch.GlucoseUnit.MGDL) EffectiveProfileSwitch.GlucoseUnit.MGDL else EffectiveProfileSwitch.GlucoseUnit.MMOL,
+                                               originalProfileName = it.profileName,
+                                               originalCustomizedName = it.getCustomizedName(),
+                                               originalTimeshift = it.timeshift,
+                                               originalPercentage = it.percentage,
+                                               originalDuration = it.duration,
+                                               originalEnd = it.end,
+                                               insulinConfiguration = it.insulinConfiguration
+                                           ).also { eps ->
+                                               repository.createEffectiveProfileSwitch(eps)
+                                               aapsLogger.debug(LTag.DATABASE, "Inserted EffectiveProfileSwitch $eps")
+                                           }
+                                       }
+                                   }
+                               })
+                           }
+                       }, fabricPrivacy::logException)
     }
 
     private fun executingNowError(): PumpEnactResult =
@@ -180,7 +177,7 @@ class CommandQueue @Inject constructor(
     @Synchronized fun notifyAboutNewCommand() {
         waitForFinishedThread()
         if (thread == null || thread!!.state == Thread.State.TERMINATED) {
-            thread = QueueThread(this, context, aapsLogger, rxBus, activePlugin, resourceHelper, sp)
+            thread = QueueThread(this, context, aapsLogger, rxBus, activePlugin, rh, sp)
             thread!!.start()
             aapsLogger.debug(LTag.PUMPQUEUE, "Starting new thread")
         } else {
@@ -199,9 +196,11 @@ class CommandQueue @Inject constructor(
 
     override fun independentConnect(reason: String, callback: Callback?) {
         aapsLogger.debug(LTag.PUMPQUEUE, "Starting new queue")
-        val tempCommandQueue = CommandQueue(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper,
-                                            constraintChecker, profileFunction, activePlugin, context, sp,
-                                            buildHelper, dateUtil, repository, fabricPrivacy, config)
+        val tempCommandQueue = CommandQueueImplementation(
+            injector, aapsLogger, rxBus, aapsSchedulers, rh,
+            constraintChecker, profileFunction, activePlugin, context, sp,
+            buildHelper, dateUtil, repository, fabricPrivacy, config
+        )
         tempCommandQueue.readStatus(reason, callback)
         tempCommandQueue.disposable.clear()
     }
@@ -225,27 +224,36 @@ class CommandQueue @Inject constructor(
         // Check if pump store carbs
         // If not, it's not necessary add command to the queue and initiate connection
         // Assuming carbs in the future and carbs with duration are NOT stores anyway
+
+        var carbsRunnable = Runnable { }
+        val originalCarbs = detailedBolusInfo.carbs
         if ((detailedBolusInfo.carbs > 0) &&
             (!activePlugin.activePump.pumpDescription.storesCarbInfo ||
                 detailedBolusInfo.carbsDuration != 0L ||
                 (detailedBolusInfo.carbsTimestamp ?: detailedBolusInfo.timestamp) > dateUtil.now())
         ) {
-            disposable += repository.runTransactionForResult(detailedBolusInfo.insertCarbsTransaction())
-                .subscribeBy(
-                    onSuccess = { result ->
-                        result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted carbs $it") }
-                        callback?.result(PumpEnactResult(injector).enacted(false).success(true))?.run()
-
-                    },
-                    onError = {
-                        aapsLogger.error(LTag.DATABASE, "Error while saving carbs", it)
-                        callback?.result(PumpEnactResult(injector).enacted(false).success(false))?.run()
-                    }
-                )
+            carbsRunnable = Runnable {
+                detailedBolusInfo.carbs = originalCarbs
+                disposable += repository.runTransactionForResult(detailedBolusInfo.insertCarbsTransaction())
+                    .subscribeBy(
+                        onSuccess = { result ->
+                            result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted carbs $it") }
+                            callback?.result(PumpEnactResult(injector).enacted(false).success(true))?.run()
+
+                        },
+                        onError = {
+                            aapsLogger.error(LTag.DATABASE, "Error while saving carbs", it)
+                            callback?.result(PumpEnactResult(injector).enacted(false).success(false))?.run()
+                        }
+                    )
+            }
             // Do not process carbs anymore
             detailedBolusInfo.carbs = 0.0
             // if no insulin just exit
-            if (detailedBolusInfo.insulin == 0.0) return true
+            if (detailedBolusInfo.insulin == 0.0) {
+                carbsRunnable.run() // store carbs
+                return true
+            }
 
         }
         var type = if (detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB) CommandType.SMB_BOLUS else CommandType.BOLUS
@@ -281,10 +289,10 @@ class CommandQueue @Inject constructor(
         if (detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB) {
             add(CommandSMBBolus(injector, detailedBolusInfo, callback))
         } else {
-            add(CommandBolus(injector, detailedBolusInfo, callback, type))
+            add(CommandBolus(injector, detailedBolusInfo, callback, type, carbsRunnable))
             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).
-                showBolusProgressDialog(detailedBolusInfo.insulin, detailedBolusInfo.context)
+                showBolusProgressDialog(detailedBolusInfo)
                 // Notify Wear about upcoming bolus
                 rxBus.send(EventBolusRequested(detailedBolusInfo.insulin))
             }
@@ -311,7 +319,7 @@ class CommandQueue @Inject constructor(
     @Synchronized
     override fun cancelAllBoluses() {
         if (!isRunning(CommandType.BOLUS)) {
-            rxBus.send(EventDismissBolusProgressIfRunning(PumpEnactResult(injector).success(true).enacted(false)))
+            rxBus.send(EventDismissBolusProgressIfRunning(PumpEnactResult(injector).success(true).enacted(false), null))
         }
         removeAll(CommandType.BOLUS)
         removeAll(CommandType.SMB_BOLUS)
@@ -393,24 +401,21 @@ class CommandQueue @Inject constructor(
 
     // returns true if command is queued
     override fun setProfile(profile: Profile, hasNsId: Boolean, callback: Callback?): Boolean {
-        if (isThisProfileSet(profile) && repository.getEffectiveProfileSwitchActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing) {
-            aapsLogger.debug(LTag.PUMPQUEUE, "Correct profile already set")
+        if (isRunning(CommandType.BASAL_PROFILE)) {
+            aapsLogger.debug(LTag.PUMPQUEUE, "Command is already executed")
             callback?.result(PumpEnactResult(injector).success(true).enacted(false))?.run()
             return false
         }
-        /* this is breaking setting of profile at all if not engineering mode
-        if (!buildHelper.isEngineeringModeOrRelease()) {
-            val notification = Notification(Notification.NOT_ENG_MODE_OR_RELEASE, resourceHelper.gs(R.string.not_eng_mode_or_release), Notification.URGENT)
-            rxBus.send(EventNewNotification(notification))
-            callback?.result(PumpEnactResult(injector).success(false).enacted(false).comment(R.string.not_eng_mode_or_release)))?.run()
+        if (isThisProfileSet(profile) && repository.getEffectiveProfileSwitchActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing) {
+            aapsLogger.debug(LTag.PUMPQUEUE, "Correct profile already set")
+            callback?.result(PumpEnactResult(injector).success(true).enacted(false))?.run()
             return false
         }
-        */
         // Compare with pump limits
         val basalValues = profile.getBasalValues()
         for (basalValue in basalValues) {
             if (basalValue.value < activePlugin.activePump.pumpDescription.basalMinimumRate) {
-                val notification = Notification(Notification.BASAL_VALUE_BELOW_MINIMUM, resourceHelper.gs(R.string.basalvaluebelowminimum), Notification.URGENT)
+                val notification = Notification(Notification.BASAL_VALUE_BELOW_MINIMUM, rh.gs(R.string.basalvaluebelowminimum), Notification.URGENT)
                 rxBus.send(EventNewNotification(notification))
                 callback?.result(PumpEnactResult(injector).success(false).enacted(false).comment(R.string.basalvaluebelowminimum))?.run()
                 return false
@@ -585,14 +590,16 @@ class CommandQueue @Inject constructor(
         return result
     }
 
-    private fun showBolusProgressDialog(insulin: Double, ctx: Context?) {
-        if (ctx != null) {
+    private fun showBolusProgressDialog(detailedBolusInfo: DetailedBolusInfo) {
+        if (detailedBolusInfo.context != null) {
             val bolusProgressDialog = BolusProgressDialog()
-            bolusProgressDialog.setInsulin(insulin)
-            bolusProgressDialog.show((ctx as AppCompatActivity).supportFragmentManager, "BolusProgress")
+            bolusProgressDialog.setInsulin(detailedBolusInfo.insulin)
+            bolusProgressDialog.setTimestamp(detailedBolusInfo.timestamp)
+            bolusProgressDialog.show((detailedBolusInfo.context as AppCompatActivity).supportFragmentManager, "BolusProgress")
         } else {
             val i = Intent()
-            i.putExtra("insulin", insulin)
+            i.putExtra("insulin", detailedBolusInfo.insulin)
+            i.putExtra("timestamp", detailedBolusInfo.timestamp)
             i.setClass(context, BolusProgressHelperActivity::class.java)
             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             context.startActivity(i)
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt
index 6de611c2766..c285b9d3385 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
 import info.nightscout.androidaps.queue.events.EventQueueChanged
 import info.nightscout.androidaps.utils.T
@@ -18,12 +18,12 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 
 class QueueThread internal constructor(
-    private val queue: CommandQueue,
+    private val queue: CommandQueueImplementation,
     context: Context,
     private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val activePlugin: ActivePlugin,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val sp: SP
 ) : Thread() {
 
@@ -32,7 +32,7 @@ class QueueThread internal constructor(
     private var mWakeLock: PowerManager.WakeLock? = null
 
     init {
-        mWakeLock = (context.getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, resourceHelper.gs(R.string.app_name) + ":QueueThread")
+        mWakeLock = (context.getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, rh.gs(R.string.app_name) + ":QueueThread")
     }
 
     override fun run() {
@@ -46,8 +46,8 @@ class QueueThread internal constructor(
                 val secondsElapsed = (System.currentTimeMillis() - connectionStartTime) / 1000
                 val pump = activePlugin.activePump
                 if (!pump.isConnected() && secondsElapsed > Constants.PUMP_MAX_CONNECTION_TIME_IN_SECONDS) {
-                    rxBus.send(EventDismissBolusProgressIfRunning(null))
-                    rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.connectiontimedout)))
+                    rxBus.send(EventDismissBolusProgressIfRunning(null, null))
+                    rxBus.send(EventPumpStatusChanged(rh.gs(R.string.connectiontimedout)))
                     aapsLogger.debug(LTag.PUMPQUEUE, "timed out")
                     pump.stopConnecting()
 
@@ -60,7 +60,6 @@ class QueueThread internal constructor(
                         //write time
                         sp.putLong(R.string.key_btwatchdog_lastbark, System.currentTimeMillis())
                         //toggle BT
-                        pump.stopConnecting()
                         pump.disconnect("watchdog")
                         SystemClock.sleep(1000)
                         val bluetoothAdapter = BluetoothAdapter.getDefaultAdapter()
@@ -112,14 +111,18 @@ class QueueThread internal constructor(
                     // Pickup 1st command and set performing variable
                     if (queue.size() > 0) {
                         queue.pickup()
-                        if (queue.performing() != null) {
-                            aapsLogger.debug(LTag.PUMPQUEUE, "performing " + queue.performing()?.status())
+                        val cont = queue.performing()?.let {
+                            aapsLogger.debug(LTag.PUMPQUEUE, "performing " + it.status())
                             rxBus.send(EventQueueChanged())
-                            queue.performing()?.execute()
+                            rxBus.send(EventPumpStatusChanged(it.status()))
+                            it.execute()
                             queue.resetPerforming()
                             rxBus.send(EventQueueChanged())
                             lastCommandTime = System.currentTimeMillis()
                             SystemClock.sleep(100)
+                            true
+                        } ?: false
+                        if (cont) {
                             continue
                         }
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.kt
index e8d779634e1..0de6850a6df 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.dialogs.BolusProgressDialog
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
 import info.nightscout.androidaps.queue.Callback
 import javax.inject.Inject
@@ -15,22 +15,24 @@ class CommandBolus(
     injector: HasAndroidInjector,
     private val detailedBolusInfo: DetailedBolusInfo,
     callback: Callback?,
-    type: CommandType
+    type: CommandType,
+    private val carbsRunnable: Runnable
 ) : Command(injector, type, callback) {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var activePlugin: ActivePlugin
 
     override fun execute() {
         val r = activePlugin.activePump.deliverTreatment(detailedBolusInfo)
+        if (r.success) carbsRunnable.run()
         BolusProgressDialog.bolusEnded = true
-        rxBus.send(EventDismissBolusProgressIfRunning(r))
+        rxBus.send(EventDismissBolusProgressIfRunning(r, detailedBolusInfo.timestamp))
         aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
         callback?.result(r)?.run()
     }
 
     override fun status(): String {
-        return (if (detailedBolusInfo.insulin > 0) "BOLUS " + resourceHelper.gs(R.string.formatinsulinunits, detailedBolusInfo.insulin) else "") +
-            if (detailedBolusInfo.carbs > 0) "CARBS " + resourceHelper.gs(R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else ""
+        return (if (detailedBolusInfo.insulin > 0) "BOLUS " + rh.gs(R.string.formatinsulinunits, detailedBolusInfo.insulin) else "") +
+            if (detailedBolusInfo.carbs > 0) "CARBS " + rh.gs(R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else ""
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt
index eaac269a714..6fc51058b73 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt
@@ -37,5 +37,5 @@ class CommandSMBBolus(
         callback?.result(r)?.run()
     }
 
-    override fun status(): String = "SMB BOLUS ${resourceHelper.gs(R.string.formatinsulinunits, detailedBolusInfo.insulin)}"
+    override fun status(): String = "SMB BOLUS ${rh.gs(R.string.formatinsulinunits, detailedBolusInfo.insulin)}"
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.kt
index 7759448f6f7..fdf3fb28faa 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.Profile
@@ -25,7 +25,7 @@ class CommandSetProfile constructor(
     @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var dateUtil: DateUtil
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var config: Config
 
     override fun execute() {
@@ -40,8 +40,8 @@ class CommandSetProfile constructor(
         // Send SMS notification if ProfileSwitch is coming from NS
         val profileSwitch = repository.getEffectiveProfileSwitchActiveAt(dateUtil.now()).blockingGet()
         if (profileSwitch is ValueWrapper.Existing && r.enacted && hasNsId && !config.NSCLIENT) {
-            if (smsCommunicatorPlugin.isEnabled(PluginType.GENERAL))
-                smsCommunicatorPlugin.sendNotificationToAllNumbers(resourceHelper.gs(R.string.profile_set_ok))
+            if (smsCommunicatorPlugin.isEnabled())
+                smsCommunicatorPlugin.sendNotificationToAllNumbers(rh.gs(R.string.profile_set_ok))
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalPercent.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalPercent.kt
index 259ae91b5fb..d4b559edd60 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalPercent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalPercent.kt
@@ -21,7 +21,11 @@ class CommandTempBasalPercent(
     @Inject lateinit var activePlugin: ActivePlugin
 
     override fun execute() {
-        val r = activePlugin.activePump.setTempBasalPercent(percent, durationInMinutes, profile, enforceNew, tbrType)
+        val r =
+            if (percent == 100)
+                activePlugin.activePump.cancelTempBasal(enforceNew)
+            else
+                activePlugin.activePump.setTempBasalPercent(percent, durationInMinutes, profile, enforceNew, tbrType)
         aapsLogger.debug(LTag.PUMPQUEUE, "Result percent: $percent durationInMinutes: $durationInMinutes success: ${r.success} enacted: ${r.enacted}")
         callback?.result(r)?.run()
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt
index 63485fce7b4..1a034653fa8 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt
@@ -5,11 +5,11 @@ import android.content.Context
 import android.content.Intent
 import dagger.android.DaggerBroadcastReceiver
 import info.nightscout.androidaps.events.EventBTChange
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import javax.inject.Inject
 
 class BTReceiver : DaggerBroadcastReceiver() {
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
 
     override fun onReceive(context: Context, intent: Intent) {
         super.onReceive(context, intent)
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt
index 674a84b2c8b..bc4d609d6bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/ChargingStateReceiver.kt
@@ -8,12 +8,12 @@ import dagger.android.DaggerBroadcastReceiver
 import info.nightscout.androidaps.events.EventChargingState
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import javax.inject.Inject
 
 class ChargingStateReceiver : DaggerBroadcastReceiver() {
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var receiverStatusStore: ReceiverStatusStore
 
     override fun onReceive(context: Context, intent: Intent) {
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
index 1d475d162df..47460541f04 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
@@ -7,10 +7,8 @@ import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.content.Context
 import android.content.Intent
 import android.os.SystemClock
-import androidx.work.OneTimeWorkRequest
-import androidx.work.WorkManager
-import androidx.work.Worker
-import androidx.work.WorkerParameters
+import androidx.work.*
+import com.google.common.util.concurrent.ListenableFuture
 import dagger.android.DaggerBroadcastReceiver
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
@@ -20,13 +18,13 @@ import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.events.EventProfileSwitchChanged
 import info.nightscout.androidaps.extensions.buildDeviceStatus
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
 import info.nightscout.androidaps.queue.commands.Command
@@ -55,7 +53,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
     }
 
     class KeepAliveWorker(
-        context: Context,
+        private val context: Context,
         params: WorkerParameters
     ) : Worker(context, params) {
 
@@ -70,8 +68,8 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
         @Inject lateinit var profileFunction: ProfileFunction
         @Inject lateinit var runningConfiguration: RunningConfiguration
         @Inject lateinit var receiverStatusStore: ReceiverStatusStore
-        @Inject lateinit var rxBus: RxBusWrapper
-        @Inject lateinit var commandQueue: CommandQueueProvider
+        @Inject lateinit var rxBus: RxBus
+        @Inject lateinit var commandQueue: CommandQueue
         @Inject lateinit var fabricPrivacy: FabricPrivacy
         @Inject lateinit var maintenancePlugin: MaintenancePlugin
 
@@ -96,10 +94,26 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
             checkPump()
             checkAPS()
             maintenancePlugin.deleteLogs(30)
+            workerDbStatus()
 
             return Result.success()
         }
 
+        // When Worker DB grows too much, work operations become slow
+        // Library is cleaning DB every 7 days which may not be sufficient for NSClient full sync
+        private fun workerDbStatus() {
+            val workQuery = WorkQuery.Builder
+                .fromStates(listOf(WorkInfo.State.FAILED, WorkInfo.State.SUCCEEDED))
+                .build()
+
+            val workInfo: ListenableFuture<List<WorkInfo>> = WorkManager.getInstance(context).getWorkInfos(workQuery)
+            aapsLogger.debug(LTag.CORE, "WorkManager size is ${workInfo.get().size}")
+            if (workInfo.get().size > 1000) {
+                WorkManager.getInstance(context).pruneWork()
+                aapsLogger.debug(LTag.CORE, "WorkManager pruning ....")
+            }
+        }
+
         // Usually deviceStatus is uploaded through LoopPlugin after every loop cycle.
         // if there is no BG available, we have to upload anyway to have correct
         // IOB displayed in NS
diff --git a/app/src/main/java/info/nightscout/androidaps/services/Intents.kt b/app/src/main/java/info/nightscout/androidaps/services/Intents.kt
index c52c68e4c6a..bf3a8d3695d 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/Intents.kt
+++ b/app/src/main/java/info/nightscout/androidaps/services/Intents.kt
@@ -7,12 +7,11 @@ interface Intents {
 
         // AAPS -> Xdrip
         const val ACTION_NEW_TREATMENT = "info.nightscout.client.NEW_TREATMENT"
-        const val ACTION_CHANGED_TREATMENT = "info.nightscout.client.CHANGED_TREATMENT"
-        const val ACTION_REMOVED_TREATMENT = "info.nightscout.client.REMOVED_TREATMENT"
         const val ACTION_NEW_PROFILE = "info.nightscout.client.NEW_PROFILE"
         const val ACTION_NEW_SGV = "info.nightscout.client.NEW_SGV"
-        const val ACTION_NEW_MBG = "info.nightscout.client.NEW_MBG"
-        const val ACTION_NEW_CAL = "info.nightscout.client.NEW_CAL"
+
+        // AAPS -> xDrip 640G mode
+        const val XDRIP_PLUS_NS_EMULATOR = "com.eveningoutpost.dexdrip.NS_EMULATOR"
 
         // xDrip -> AAPS
         const val ACTION_NEW_BG_ESTIMATE = "com.eveningoutpost.dexdrip.BgEstimate"
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 8b526b97bd6..e79221c2c51 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
@@ -14,7 +14,7 @@ import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragment
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
@@ -39,14 +39,14 @@ import javax.inject.Singleton
 @Singleton
 class SWDefinition @Inject constructor(
     injector: HasAndroidInjector,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val context: Context,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val sp: SP,
     private val profileFunction: ProfileFunction,
     private val localProfilePlugin: LocalProfilePlugin,
     private val activePlugin: ActivePlugin,
-    private val commandQueue: CommandQueueProvider,
+    private val commandQueue: CommandQueue,
     private val objectivesPlugin: ObjectivesPlugin,
     private val configBuilder: ConfigBuilder,
     private val loopPlugin: LoopPlugin,
@@ -110,7 +110,7 @@ class SWDefinition @Inject constructor(
     private val screenPermissionWindow = SWScreen(injector, R.string.permission)
         .skippable(false)
         .add(SWInfoText(injector)
-            .label(resourceHelper.gs(R.string.needsystemwindowpermission)))
+            .label(rh.gs(R.string.needsystemwindowpermission)))
         .add(SWBreak(injector))
         .add(SWButton(injector)
             .text(R.string.askforpermission)
@@ -121,7 +121,7 @@ class SWDefinition @Inject constructor(
     private val screenPermissionBattery = SWScreen(injector, R.string.permission)
         .skippable(false)
         .add(SWInfoText(injector)
-            .label(resourceHelper.gs(R.string.needwhitelisting, resourceHelper.gs(R.string.app_name))))
+            .label(rh.gs(R.string.needwhitelisting, rh.gs(R.string.app_name))))
         .add(SWBreak(injector))
         .add(SWButton(injector)
             .text(R.string.askforpermission)
@@ -132,7 +132,7 @@ class SWDefinition @Inject constructor(
     private val screenPermissionBt = SWScreen(injector, R.string.permission)
         .skippable(false)
         .add(SWInfoText(injector)
-            .label(resourceHelper.gs(R.string.needlocationpermission)))
+            .label(rh.gs(R.string.needlocationpermission)))
         .add(SWBreak(injector))
         .add(SWButton(injector)
             .text(R.string.askforpermission)
@@ -143,7 +143,7 @@ class SWDefinition @Inject constructor(
     private val screenPermissionStore = SWScreen(injector, R.string.permission)
         .skippable(false)
         .add(SWInfoText(injector)
-            .label(resourceHelper.gs(R.string.needstoragepermission)))
+            .label(rh.gs(R.string.needstoragepermission)))
         .add(SWBreak(injector))
         .add(SWButton(injector)
             .text(R.string.askforpermission)
@@ -170,7 +170,7 @@ class SWDefinition @Inject constructor(
                 configBuilder.performPluginSwitch(nsClientPlugin, true, PluginType.GENERAL)
                 rxBus.send(EventSWUpdate(true))
             }
-            .visibility { !nsClientPlugin.isEnabled(PluginType.GENERAL) })
+            .visibility { !nsClientPlugin.isEnabled() })
         .add(SWEditUrl(injector)
             .preferenceId(R.string.key_nsclientinternal_url)
             .updateDelay(5)
@@ -227,7 +227,7 @@ class SWDefinition @Inject constructor(
             .updateDelay(5)
             .label(R.string.treatmentssafety_maxbolus_title)
             .comment(R.string.common_values))
-        .add(SWEditNumber(injector, 48.0, 1.0, 100.0)
+        .add(SWEditIntNumber(injector, 48, 1, 100)
             .preferenceId(R.string.key_treatmentssafety_maxcarbs)
             .updateDelay(5)
             .label(R.string.treatmentssafety_maxcarbs_title)
@@ -235,7 +235,7 @@ class SWDefinition @Inject constructor(
         .validator {
             sp.contains(R.string.key_age)
                 && sp.getDouble(R.string.key_treatmentssafety_maxbolus, 0.0) > 0
-                && sp.getDouble(R.string.key_treatmentssafety_maxcarbs, 0.0) > 0
+                && sp.getInt(R.string.key_treatmentssafety_maxcarbs, 0) > 0
         }
     private val screenInsulin = SWScreen(injector, R.string.configbuilder_insulin)
         .skippable(false)
@@ -257,7 +257,7 @@ class SWDefinition @Inject constructor(
         .add(SWFragment(injector, this)
             .add(LocalProfileFragment()))
         .validator {
-            localProfilePlugin.profile?.getDefaultProfile()?.let { ProfileSealed.Pure(it).isValid("StartupWizard", activePlugin.activePump, config, resourceHelper, rxBus, hardLimits).isValid }
+            localProfilePlugin.profile?.getDefaultProfile()?.let { ProfileSealed.Pure(it).isValid("StartupWizard", activePlugin.activePump, config, rh, rxBus, hardLimits, false).isValid }
                 ?: false
         }
         .visibility { localProfilePlugin.isEnabled() }
@@ -343,9 +343,9 @@ class SWDefinition @Inject constructor(
                 configBuilder.performPluginSwitch(loopPlugin, true, PluginType.LOOP)
                 rxBus.send(EventSWUpdate(true))
             }
-            .visibility { !loopPlugin.isEnabled(PluginType.LOOP) })
-        .validator { loopPlugin.isEnabled(PluginType.LOOP) }
-        .visibility { !loopPlugin.isEnabled(PluginType.LOOP) && config.APS }
+            .visibility { !loopPlugin.isEnabled() })
+        .validator { loopPlugin.isEnabled() }
+        .visibility { !loopPlugin.isEnabled() && config.APS }
     private val screenSensitivity = SWScreen(injector, R.string.configbuilder_sensitivity)
         .skippable(false)
         .add(SWInfoText(injector)
@@ -431,9 +431,6 @@ class SWDefinition @Inject constructor(
             .add(screenNsClient)
             //.add(screenBgSource)
             .add(screenPatientName)
-            .add(screenAge)
-            .add(screenInsulin)
-            .add(screenSensitivity)
     }
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt
index e0326133f12..2b4d667758e 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt
@@ -30,9 +30,9 @@ class SWEventListener constructor(
             .toObservable(clazz)
             .observeOn(aapsSchedulers.main)
             .subscribe { event: Any ->
-                status = (event as EventStatus).getStatus(resourceHelper)
+                status = (event as EventStatus).getStatus(rh)
                 @SuppressLint("SetTextI18n")
-                textView?.text = (if (textLabel != 0) resourceHelper.gs(textLabel) else "") + " " + status
+                textView?.text = (if (textLabel != 0) rh.gs(textLabel) else "") + " " + status
             }
         )
     }
@@ -57,7 +57,7 @@ class SWEventListener constructor(
         val context = layout.context
         textView = TextView(context)
         textView?.id = View.generateViewId()
-        textView?.text = (if (textLabel != 0) resourceHelper.gs(textLabel) else "") + " " + status
+        textView?.text = (if (textLabel != 0) rh.gs(textLabel) else "") + " " + status
         layout.addView(textView)
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWIntNumberValidator.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWIntNumberValidator.java
new file mode 100644
index 00000000000..039f9e16872
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWIntNumberValidator.java
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.setupwizard;
+
+// keep in java, it's easier
+public interface SWIntNumberValidator {
+    boolean isValid(int value);
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.kt
index 377aedaed48..c840b0c38a3 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.kt
@@ -8,7 +8,7 @@ import javax.inject.Inject
 
 class SWScreen(val injector: HasAndroidInjector, private var header: Int) {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
 
     var items: MutableList<SWItem> = ArrayList()
     var validator: SWValidator? = null
@@ -20,7 +20,7 @@ class SWScreen(val injector: HasAndroidInjector, private var header: Int) {
     }
 
     fun getHeader(): String {
-        return resourceHelper.gs(header)
+        return rh.gs(header)
     }
 
     fun skippable(skippable: Boolean): SWScreen {
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 9d6cd6acac6..22392071839 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.events.EventProfileSwitchChanged
 import info.nightscout.androidaps.events.EventProfileStoreChanged
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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
@@ -34,7 +34,7 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
     @Inject lateinit var swDefinition: SWDefinition
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var aapsSchedulers: AapsSchedulers
@@ -145,13 +145,13 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
     }
 
     override fun onBackPressed() {
-        if (currentWizardPage == 0) OKDialog.showConfirmation(this, resourceHelper.gs(R.string.exitwizard)) { finish() } else showPreviousPage(null)
+        if (currentWizardPage == 0) OKDialog.showConfirmation(this, rh.gs(R.string.exitwizard)) { finish() } else showPreviousPage(null)
     }
 
     @Suppress("UNUSED_PARAMETER")
     fun exitPressed(view: View?) {
         sp.putBoolean(R.string.key_setupwizard_processed, true)
-        OKDialog.showConfirmation(this, resourceHelper.gs(R.string.exitwizard)) { finish() }
+        OKDialog.showConfirmation(this, rh.gs(R.string.exitwizard)) { finish() }
     }
 
     @Suppress("UNUSED_PARAMETER")
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditIntNumber.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditIntNumber.kt
new file mode 100644
index 00000000000..ad471cadd3a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditIntNumber.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.graphics.Typeface
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.setupwizard.SWIntNumberValidator
+import info.nightscout.androidaps.utils.SafeParse
+import info.nightscout.androidaps.utils.ui.NumberPicker
+import java.text.DecimalFormat
+
+class SWEditIntNumber(injector: HasAndroidInjector, private val init: Int, private val min: Int, private val max: Int) : SWItem(injector, Type.NUMBER) {
+
+    private val validator: SWIntNumberValidator = SWIntNumberValidator { value -> value in min..max }
+    private var updateDelay = 0
+
+    override fun generateDialog(layout: LinearLayout) {
+        val context = layout.context
+        val watcher: TextWatcher = object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                if (validator.isValid(SafeParse.stringToInt(s.toString())))
+                    save(s.toString(), updateDelay.toLong())
+            }
+
+            override fun afterTextChanged(s: Editable) {}
+        }
+
+        val l = TextView(context)
+        l.id = View.generateViewId()
+        label?.let { l.setText(it) }
+        l.setTypeface(l.typeface, Typeface.BOLD)
+        layout.addView(l)
+        val initValue = sp.getInt(preferenceId, init)
+        val numberPicker = NumberPicker(context)
+        numberPicker.setParams(initValue.toDouble(), min.toDouble(), max.toDouble(), 1.0, DecimalFormat("0"), false, null, watcher)
+
+        layout.addView(numberPicker)
+        val c = TextView(context)
+        c.id = View.generateViewId()
+        comment?.let { c.setText(it) }
+        c.setTypeface(c.typeface, Typeface.ITALIC)
+        layout.addView(c)
+        super.generateDialog(layout)
+    }
+
+    fun preferenceId(preferenceId: Int): SWEditIntNumber {
+        this.preferenceId = preferenceId
+        return this
+    }
+
+    fun updateDelay(updateDelay: Int): SWEditIntNumber {
+        this.updateDelay = updateDelay
+        return this
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.kt
index 90647b51cf3..1f3d938bbb3 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.kt
@@ -38,7 +38,7 @@ class SWEditUrl(injector: HasAndroidInjector) : SWItem(injector, Type.URL) {
         editText.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-                if (Patterns.WEB_URL.matcher(s).matches()) save(s.toString(), updateDelay) else rxBus.send(EventSWLabel(resourceHelper.gs(R.string.error_url_not_valid)))
+                if (Patterns.WEB_URL.matcher(s).matches()) save(s.toString(), updateDelay) else rxBus.send(EventSWLabel(rh.gs(R.string.error_url_not_valid)))
             }
 
             override fun afterTextChanged(s: Editable) {}
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt
index a23619d2efa..f2d7a42affd 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt
@@ -10,7 +10,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -23,8 +23,8 @@ import javax.inject.Inject
 open class SWItem(val injector: HasAndroidInjector, var type: Type) {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var sp: SP
     @Inject lateinit var passwordCheck: PasswordCheck
 
@@ -75,7 +75,7 @@ open class SWItem(val injector: HasAndroidInjector, var type: Type) {
 
             override fun run() {
                 aapsLogger.debug(LTag.CORE, "Firing EventPreferenceChange")
-                rxBus.send(EventPreferenceChange(resourceHelper, preferenceId))
+                rxBus.send(EventPreferenceChange(rh, preferenceId))
                 rxBus.send(EventSWUpdate(false))
                 scheduledEventPost = null
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.kt
index 979bfe52fc7..7a8113a435e 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.kt
@@ -20,11 +20,11 @@ class SWRadioButton(injector: HasAndroidInjector) : SWItem(injector, Type.RADIOB
     }
 
     private fun labels(): Array<String> {
-        return resourceHelper.gsa(labelsArray)
+        return rh.gsa(labelsArray)
     }
 
     fun values(): Array<String> {
-        return resourceHelper.gsa(valuesArray)
+        return rh.gsa(valuesArray)
     }
 
     override fun generateDialog(layout: LinearLayout) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt b/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt
index 8f45f00b98e..52f7f9a20fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt
@@ -15,7 +15,7 @@ import javax.inject.Singleton
 @Singleton
 class ActivityMonitor @Inject constructor(
     private var aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val sp: SP,
     private val dateUtil: DateUtil
 ) : Application.ActivityLifecycleCallbacks {
@@ -64,16 +64,16 @@ class ActivityMonitor @Inject constructor(
             if (key.startsWith("Monitor") && key.endsWith("total")) {
                 val v = if (value is Long) value else SafeParse.stringToLong(value as String)
                 val activity = key.split("_")[1].replace("Activity", "")
-                val duration = dateUtil.niceTimeScalar(v as Long, resourceHelper)
+                val duration = dateUtil.niceTimeScalar(v as Long, rh)
                 val start = sp.getLong(key.replace("total", "start"), 0)
                 val days = T.msecs(dateUtil.now() - start).days()
-                result += resourceHelper.gs(R.string.activitymonitorformat, activity, duration, days)
+                result += rh.gs(R.string.activitymonitorformat, activity, duration, days)
             }
         return result
     }
 
     fun stats(): Spanned {
-        return HtmlHelper.fromHtml("<br><b>" + resourceHelper.gs(R.string.activitymonitor) + ":</b><br>" + toText())
+        return HtmlHelper.fromHtml("<br><b>" + rh.gs(R.string.activitymonitor) + ":</b><br>" + toText())
     }
 
     fun reset() {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt
index 2c9ea35652c..90f9af31c19 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt
@@ -16,7 +16,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.DaggerAppCompatActivityWithResult
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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
@@ -29,8 +29,8 @@ import javax.inject.Singleton
 
 @Singleton
 class AndroidPermission @Inject constructor(
-    val resourceHelper: ResourceHelper,
-    val rxBus: RxBusWrapper,
+    val rh: ResourceHelper,
+    val rxBus: RxBus,
     val injector: HasAndroidInjector
 ) {
 
@@ -58,7 +58,7 @@ class AndroidPermission @Inject constructor(
                     activity.callForBatteryOptimization.launch(null)
             } catch (e: ActivityNotFoundException) {
                 permissionBatteryOptimizationFailed = true
-                OKDialog.show(activity, resourceHelper.gs(R.string.permission), resourceHelper.gs(R.string.alert_dialog_permission_battery_optimization_failed), Runnable { activity.recreate() })
+                OKDialog.show(activity, rh.gs(R.string.permission), rh.gs(R.string.alert_dialog_permission_battery_optimization_failed)) { activity.recreate() }
             }
         }
     }
@@ -79,9 +79,9 @@ class AndroidPermission @Inject constructor(
 
     @Synchronized
     fun notifyForSMSPermissions(activity: FragmentActivity, smsCommunicatorPlugin: SmsCommunicatorPlugin) {
-        if (smsCommunicatorPlugin.isEnabled(PluginType.GENERAL)) {
+        if (smsCommunicatorPlugin.isEnabled()) {
             if (permissionNotGranted(activity, Manifest.permission.RECEIVE_SMS)) {
-                val notification = NotificationWithAction(injector, Notification.PERMISSION_SMS, resourceHelper.gs(R.string.smscommunicator_missingsmspermission), Notification.URGENT)
+                val notification = NotificationWithAction(injector, Notification.PERMISSION_SMS, rh.gs(R.string.smscommunicator_missingsmspermission), Notification.URGENT)
                 notification.action(R.string.request) {
                     askForPermission(activity, arrayOf(Manifest.permission.RECEIVE_SMS,
                         Manifest.permission.SEND_SMS,
@@ -91,7 +91,7 @@ class AndroidPermission @Inject constructor(
             } else rxBus.send(EventDismissNotification(Notification.PERMISSION_SMS))
             // Following is a bug in Android 8
             if (permissionNotGranted(activity, Manifest.permission.READ_PHONE_STATE)) {
-                val notification = NotificationWithAction(injector, Notification.PERMISSION_PHONE_STATE, resourceHelper.gs(R.string.smscommunicator_missingphonestatepermission), Notification.URGENT)
+                val notification = NotificationWithAction(injector, Notification.PERMISSION_PHONE_STATE, rh.gs(R.string.smscommunicator_missingphonestatepermission), Notification.URGENT)
                 notification.action(R.string.request) { askForPermission(activity, arrayOf(Manifest.permission.READ_PHONE_STATE)) }
                 rxBus.send(EventNewNotification(notification))
             } else rxBus.send(EventDismissNotification(Notification.PERMISSION_PHONE_STATE))
@@ -101,7 +101,7 @@ class AndroidPermission @Inject constructor(
     @Synchronized
     fun notifyForBatteryOptimizationPermission(activity: FragmentActivity) {
         if (permissionNotGranted(activity, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)) {
-            val notification = NotificationWithAction(injector, Notification.PERMISSION_BATTERY, String.format(resourceHelper.gs(R.string.needwhitelisting), resourceHelper.gs(R.string.app_name)), Notification.URGENT)
+            val notification = NotificationWithAction(injector, Notification.PERMISSION_BATTERY, String.format(rh.gs(R.string.needwhitelisting), rh.gs(R.string.app_name)), Notification.URGENT)
             notification.action(R.string.request) { askForPermission(activity, arrayOf(Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)) }
             rxBus.send(EventNewNotification(notification))
         } else rxBus.send(EventDismissNotification(Notification.PERMISSION_BATTERY))
@@ -109,7 +109,7 @@ class AndroidPermission @Inject constructor(
 
     @Synchronized fun notifyForStoragePermission(activity: FragmentActivity) {
         if (permissionNotGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-            val notification = NotificationWithAction(injector, Notification.PERMISSION_STORAGE, resourceHelper.gs(R.string.needstoragepermission), Notification.URGENT)
+            val notification = NotificationWithAction(injector, Notification.PERMISSION_STORAGE, rh.gs(R.string.needstoragepermission), Notification.URGENT)
             notification.action(R.string.request) {
                 askForPermission(activity, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE,
                     Manifest.permission.WRITE_EXTERNAL_STORAGE))
@@ -120,7 +120,7 @@ class AndroidPermission @Inject constructor(
 
     @Synchronized fun notifyForLocationPermissions(activity: FragmentActivity) {
         if (permissionNotGranted(activity, Manifest.permission.ACCESS_FINE_LOCATION)) {
-            val notification = NotificationWithAction(injector, Notification.PERMISSION_LOCATION, resourceHelper.gs(R.string.needlocationpermission), Notification.URGENT)
+            val notification = NotificationWithAction(injector, Notification.PERMISSION_LOCATION, rh.gs(R.string.needlocationpermission), Notification.URGENT)
             notification.action(R.string.request) { askForPermission(activity, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION)) }
             rxBus.send(EventNewNotification(notification))
         } else rxBus.send(EventDismissNotification(Notification.PERMISSION_LOCATION))
@@ -130,7 +130,7 @@ class AndroidPermission @Inject constructor(
         // Check if Android Q or higher
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
             if (!Settings.canDrawOverlays(activity)) {
-                val notification = NotificationWithAction(injector, Notification.PERMISSION_SYSTEM_WINDOW, resourceHelper.gs(R.string.needsystemwindowpermission), Notification.URGENT)
+                val notification = NotificationWithAction(injector, Notification.PERMISSION_SYSTEM_WINDOW, rh.gs(R.string.needsystemwindowpermission), Notification.URGENT)
                 notification.action(R.string.request) {
                     // Check if Android Q or higher
                     if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/BolusTimer.kt b/app/src/main/java/info/nightscout/androidaps/utils/BolusTimer.kt
new file mode 100644
index 00000000000..3d8f75f2ab8
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/BolusTimer.kt
@@ -0,0 +1,55 @@
+package info.nightscout.androidaps.utils
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.androidaps.plugins.general.automation.AutomationEvent
+import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
+import info.nightscout.androidaps.plugins.general.automation.actions.ActionAlarm
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBg
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDelta
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.text.DecimalFormat
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BolusTimer @Inject constructor(
+    private val injector: HasAndroidInjector,
+    private val rh: ResourceHelper,
+    private val automationPlugin: AutomationPlugin,
+) {
+
+    fun scheduleBolusReminder() {
+        val event = AutomationEvent(injector).apply {
+            title = rh.gs(R.string.bolusreminder)
+            readOnly = true
+            systemAction = true
+            autoRemove = true
+            trigger = TriggerConnector(injector, TriggerConnector.Type.AND).apply {
+
+                // Bg above 70 mgdl and delta positive mgdl
+                list.add(TriggerBg(injector, 70.0, GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_GREATER))
+                list.add(
+                    TriggerDelta(
+                        injector, InputDelta(rh, 0.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.DELTA), GlucoseUnit.MGDL, Comparator.Compare
+                            .IS_GREATER
+                    )
+                )
+            }
+            actions.add(ActionAlarm(injector, rh.gs(R.string.time_to_bolus)))
+        }
+
+        automationPlugin.addIfNotExists(event)
+    }
+
+    fun removeBolusReminder() {
+        val event = AutomationEvent(injector).apply {
+            title = rh.gs(R.string.bolusreminder)
+        }
+        automationPlugin.removeIfExists(event)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/CarbTimer.kt b/app/src/main/java/info/nightscout/androidaps/utils/CarbTimer.kt
index 3509e820df9..8d2229c74a0 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/CarbTimer.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/CarbTimer.kt
@@ -19,17 +19,17 @@ import javax.inject.Singleton
 @Singleton
 class CarbTimer @Inject constructor(
     private val injector: HasAndroidInjector,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val automationPlugin: AutomationPlugin,
     private val timerUtil: TimerUtil
 ) {
 
     fun scheduleReminder(time: Long, text: String? = null) =
-        timerUtil.scheduleReminder(time, text ?: resourceHelper.gs(R.string.timetoeat))
+        timerUtil.scheduleReminder(time, text ?: rh.gs(R.string.timetoeat))
 
     fun scheduleEatReminder() {
         val event = AutomationEvent(injector).apply {
-            title = resourceHelper.gs(R.string.bolusadvisor)
+            title = rh.gs(R.string.bolusadvisor)
             readOnly = true
             systemAction = true
             autoRemove = true
@@ -38,26 +38,32 @@ class CarbTimer @Inject constructor(
                 // Bg under 180 mgdl and dropping by 15 mgdl
                 list.add(TriggerConnector(injector, TriggerConnector.Type.AND).apply {
                     list.add(TriggerBg(injector, 180.0, GlucoseUnit.MGDL, Comparator.Compare.IS_LESSER))
-                    list.add(TriggerDelta(injector, InputDelta(resourceHelper, -15.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.DELTA), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
-                    list.add(TriggerDelta(injector, InputDelta(resourceHelper, -8.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.SHORT_AVERAGE), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(rh, -15.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.DELTA), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(rh, -8.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.SHORT_AVERAGE), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
                 })
                 // Bg under 160 mgdl and dropping by 9 mgdl
                 list.add(TriggerConnector(injector, TriggerConnector.Type.AND).apply {
                     list.add(TriggerBg(injector, 160.0, GlucoseUnit.MGDL, Comparator.Compare.IS_LESSER))
-                    list.add(TriggerDelta(injector, InputDelta(resourceHelper, -9.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.DELTA), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
-                    list.add(TriggerDelta(injector, InputDelta(resourceHelper, -5.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.SHORT_AVERAGE), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(rh, -9.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.DELTA), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(rh, -5.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.SHORT_AVERAGE), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
                 })
                 // Bg under 145 mgdl and dropping
                 list.add(TriggerConnector(injector, TriggerConnector.Type.AND).apply {
                     list.add(TriggerBg(injector, 145.0, GlucoseUnit.MGDL, Comparator.Compare.IS_LESSER))
-                    list.add(TriggerDelta(injector, InputDelta(resourceHelper, 0.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.DELTA), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
-                    list.add(TriggerDelta(injector, InputDelta(resourceHelper, 0.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.SHORT_AVERAGE), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(rh, 0.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.DELTA), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
+                    list.add(TriggerDelta(injector, InputDelta(rh, 0.0, -360.0, 360.0, 1.0, DecimalFormat("0"), InputDelta.DeltaType.SHORT_AVERAGE), GlucoseUnit.MGDL, Comparator.Compare.IS_EQUAL_OR_LESSER))
                 })
             }
-            actions.add(ActionAlarm(injector, resourceHelper.gs(R.string.time_to_eat)))
+            actions.add(ActionAlarm(injector, rh.gs(R.string.time_to_eat)))
         }
 
         automationPlugin.addIfNotExists(event)
     }
 
+    fun removeEatReminder() {
+        val event = AutomationEvent(injector).apply {
+            title = rh.gs(R.string.bolusadvisor)
+        }
+        automationPlugin.removeIfExists(event)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
index 32775e91214..1e8cf7d3b45 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
@@ -1,21 +1,21 @@
 package info.nightscout.androidaps.utils
 
-import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.database.entities.TherapyEvent
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.IobCobCalculator
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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
@@ -35,11 +35,10 @@ import kotlin.math.min
 class LocalAlertUtils @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val sp: SP,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
+    private val rxBus: RxBus,
+    private val rh: ResourceHelper,
     private val activePlugin: ActivePlugin,
     private val profileFunction: ProfileFunction,
-    private val iobCobCalculator: IobCobCalculator,
     private val smsCommunicatorPlugin: SmsCommunicatorPlugin,
     private val config: Config,
     private val repository: AppRepository,
@@ -64,13 +63,13 @@ class LocalAlertUtils @Inject constructor(
             if (sp.getBoolean(R.string.key_enable_pump_unreachable_alert, true)) {
                 aapsLogger.debug(LTag.CORE, "Generating pump unreachable alarm. lastConnection: " + dateUtil.dateAndTimeString(lastConnection) + " isStatusOutdated: " + isStatusOutdated)
                 sp.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold())
-                rxBus.send(EventNewNotification(Notification(Notification.PUMP_UNREACHABLE, resourceHelper.gs(R.string.pump_unreachable), Notification.URGENT).also { it.soundId = R.raw.alarm }))
-                uel.log(Action.CAREPORTAL, Sources.Aaps, resourceHelper.gs(R.string.pump_unreachable), ValueWithUnit.TherapyEventType(TherapyEvent.Type.ANNOUNCEMENT))
+                rxBus.send(EventNewNotification(Notification(Notification.PUMP_UNREACHABLE, rh.gs(R.string.pump_unreachable), Notification.URGENT).also { it.soundId = R.raw.alarm }))
+                uel.log(Action.CAREPORTAL, Sources.Aaps, rh.gs(R.string.pump_unreachable), ValueWithUnit.TherapyEventType(TherapyEvent.Type.ANNOUNCEMENT))
                 if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true))
-                    disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(resourceHelper.gs(R.string.pump_unreachable))).subscribe()
+                    disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(rh.gs(R.string.pump_unreachable))).subscribe()
             }
             if (sp.getBoolean(R.string.key_smscommunicator_report_pump_ureachable, true))
-                smsCommunicatorPlugin.sendNotificationToAllNumbers(resourceHelper.gs(R.string.pump_unreachable))
+                smsCommunicatorPlugin.sendNotificationToAllNumbers(rh.gs(R.string.pump_unreachable))
         }
         if (!isStatusOutdated && !alarmTimeoutExpired) rxBus.send(EventDismissNotification(Notification.PUMP_UNREACHABLE))
     }
@@ -117,17 +116,22 @@ class LocalAlertUtils @Inject constructor(
     }
 
     fun checkStaleBGAlert() {
-        val bgReading = iobCobCalculator.ads.lastBg()
+        val bgReadingWrapped = repository.getLastGlucoseValueWrapped().blockingGet()
+        val bgReading = if (bgReadingWrapped is ValueWrapper.Existing) bgReadingWrapped.value else return
         if (sp.getBoolean(R.string.key_enable_missed_bg_readings_alert, false)
-            && bgReading != null && bgReading.timestamp + missedReadingsThreshold() < System.currentTimeMillis() && sp.getLong("nextMissedReadingsAlarm", 0L) < System.currentTimeMillis()) {
-            val n = Notification(Notification.BG_READINGS_MISSED, resourceHelper.gs(R.string.missed_bg_readings), Notification.URGENT)
+            && bgReading.timestamp + missedReadingsThreshold() < System.currentTimeMillis()
+            && sp.getLong("nextMissedReadingsAlarm", 0L) < System.currentTimeMillis()
+        ) {
+            val n = Notification(Notification.BG_READINGS_MISSED, rh.gs(R.string.missed_bg_readings), Notification.URGENT)
             n.soundId = R.raw.alarm
             sp.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + missedReadingsThreshold())
             rxBus.send(EventNewNotification(n))
-            uel.log(Action.CAREPORTAL, Sources.Aaps, resourceHelper.gs(R.string.missed_bg_readings), ValueWithUnit.TherapyEventType(TherapyEvent.Type.ANNOUNCEMENT))
+            uel.log(Action.CAREPORTAL, Sources.Aaps, rh.gs(R.string.missed_bg_readings), ValueWithUnit.TherapyEventType(TherapyEvent.Type.ANNOUNCEMENT))
             if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
                 n.text?.let { disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(it)).subscribe() }
             }
+        } else if (dateUtil.isOlderThan(bgReading.timestamp, 5).not()) {
+            rxBus.send(EventDismissNotification(Notification.BG_READINGS_MISSED))
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/Profiler.kt b/app/src/main/java/info/nightscout/androidaps/utils/Profiler.kt
index b5a5ba16976..f2d8ada8225 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/Profiler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/Profiler.kt
@@ -11,7 +11,7 @@ import javax.inject.Singleton
 class Profiler @Inject constructor(val aapsLogger: AAPSLogger) {
 
     fun log(lTag: LTag, function: String, start: Long) {
-        val msec = System.currentTimeMillis() - start
-        aapsLogger.debug(lTag, ">>> $function <<< executed in $msec miliseconds")
+        val milliseconds = System.currentTimeMillis() - start
+        aapsLogger.debug(lTag, ">>> $function <<< executed in $milliseconds milliseconds")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.kt b/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.kt
index bf3a4a55160..e93a757beb0 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.utils
 import android.app.backup.BackupAgentHelper
 import android.app.backup.SharedPreferencesBackupHelper
 
-@Suppress("LocalVariableName")
+@Suppress("LocalVariableName", "unused")
 class SPBackupAgent : BackupAgentHelper() {
 
     override fun onCreate() {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/XDripBroadcast.kt b/app/src/main/java/info/nightscout/androidaps/utils/XDripBroadcast.kt
index e814e954224..98cf2c90f9a 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/XDripBroadcast.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/XDripBroadcast.kt
@@ -7,6 +7,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.services.Intents
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONArray
 import org.json.JSONException
@@ -14,14 +15,18 @@ import org.json.JSONObject
 import java.text.SimpleDateFormat
 import java.util.*
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Suppress("SpellCheckingInspection")
+@Singleton
 class XDripBroadcast @Inject constructor(
     private val context: Context,
     private val aapsLogger: AAPSLogger,
     private val sp: SP
 ) {
 
-    operator fun invoke(glucoseValue: GlucoseValue) {
+    // sent in 640G mode
+    fun send(glucoseValue: GlucoseValue) {
         if (sp.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
             val format = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US)
             try {
@@ -38,7 +43,7 @@ class XDripBroadcast @Inject constructor(
                 bundle.putString("action", "add")
                 bundle.putString("collection", "entries")
                 bundle.putString("data", entriesBody.toString())
-                val intent = Intent(XDRIP_PLUS_NS_EMULATOR)
+                val intent = Intent(Intents.XDRIP_PLUS_NS_EMULATOR)
                 intent.putExtras(bundle).addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
                 context.sendBroadcast(intent)
                 val receivers = context.packageManager.queryBroadcastReceivers(intent, 0)
@@ -54,7 +59,75 @@ class XDripBroadcast @Inject constructor(
         }
     }
 
-    companion object {
-        const val XDRIP_PLUS_NS_EMULATOR = "com.eveningoutpost.dexdrip.NS_EMULATOR"
+    // sent in NSClient dbaccess mode
+    fun sendProfile(profileStoreJson: JSONObject) {
+        if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false))
+            broadcast(
+                Intent(Intents.ACTION_NEW_PROFILE).apply {
+                    addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                    putExtras(Bundle().apply { putString("profile", profileStoreJson.toString()) })
+                }
+            )
+
+    }
+
+    // sent in NSClient dbaccess mode
+    fun sendTreatments(addedOrUpdatedTreatments: JSONArray) {
+        if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false))
+            splitArray(addedOrUpdatedTreatments).forEach { part ->
+                broadcast(
+                    Intent(Intents.ACTION_NEW_TREATMENT).apply {
+                        addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                        putExtras(Bundle().apply { putString("treatments", part.toString()) })
+                    }
+                )
+            }
+    }
+
+    // sent in NSClient dbaccess mode
+    fun sendSgvs(sgvs: JSONArray) {
+        if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false))
+            splitArray(sgvs).forEach { part ->
+                broadcast(
+                    Intent(Intents.ACTION_NEW_SGV).apply {
+                        addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                        putExtras(Bundle().apply { putString("sgvs", part.toString()) })
+                    }
+                )
+            }
+    }
+
+    private fun splitArray(array: JSONArray): List<JSONArray> {
+        var ret: MutableList<JSONArray> = ArrayList()
+        try {
+            val size = array.length()
+            var count = 0
+            var newarr: JSONArray? = null
+            for (i in 0 until size) {
+                if (count == 0) {
+                    if (newarr != null) ret.add(newarr)
+                    newarr = JSONArray()
+                    count = 20
+                }
+                newarr?.put(array[i])
+                --count
+            }
+            if (newarr != null && newarr.length() > 0) ret.add(newarr)
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+            ret = ArrayList()
+            ret.add(array)
+        }
+        return ret
+    }
+
+    private fun broadcast(intent: Intent) {
+        context.packageManager.queryBroadcastReceivers(intent, 0).forEach { resolveInfo ->
+            resolveInfo.activityInfo.packageName?.let {
+                intent.setPackage(it)
+                context.sendBroadcast(intent)
+                aapsLogger.debug(LTag.CORE, "Sending broadcast " + intent.action + " to: " + it)
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt
index 133a03187a5..a0b9d0af1c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt
@@ -17,7 +17,7 @@ import javax.inject.Singleton
 @Singleton
 class XdripCalibrations @Inject constructor(
     private val aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val context: Context,
     private val profileFunction: ProfileFunction
 ) {
@@ -33,12 +33,12 @@ class XdripCalibrations @Inject constructor(
         context.sendBroadcast(intent)
         val q = context.packageManager.queryBroadcastReceivers(intent, 0)
         return if (q.size < 1) {
-            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.xdripnotinstalled))
-            aapsLogger.debug(resourceHelper.gs(R.string.xdripnotinstalled))
+            ToastUtils.showToastInUiThread(context, rh.gs(R.string.xdripnotinstalled))
+            aapsLogger.debug(rh.gs(R.string.xdripnotinstalled))
             false
         } else {
-            ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.calibrationsent))
-            aapsLogger.debug(resourceHelper.gs(R.string.calibrationsent))
+            ToastUtils.showToastInUiThread(context, rh.gs(R.string.calibrationsent))
+            aapsLogger.debug(rh.gs(R.string.calibrationsent))
             true
         }
     }
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 7a2aa6f513b..b51e5960e62 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
@@ -17,10 +17,10 @@ import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import androidx.appcompat.view.ContextThemeWrapper
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.extensions.runOnUiThread
 import info.nightscout.androidaps.plugins.general.maintenance.formats.Prefs
 import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsStatus
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.extensions.runOnUiThread
 import java.util.*
 
 object PrefImportSummaryDialog {
@@ -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)
                     }
@@ -83,17 +83,24 @@ object PrefImportSummaryDialog {
             detailsBtn.visibility = View.VISIBLE
             detailsBtn.setOnClickListener {
                 val detailsLayout = LayoutInflater.from(context).inflate(R.layout.import_summary_details, null)
-                val wview = detailsLayout.findViewById<View>(R.id.details_webview) as WebView
-                wview.loadData("<!doctype html><html><head><meta charset=\"utf-8\"><style>body { color: white; }</style></head><body>" + details.joinToString("<hr>"), "text/html; charset=utf-8", "utf-8")
-                wview.setBackgroundColor(Color.TRANSPARENT)
-                wview.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null)
+                val webView = detailsLayout.findViewById<View>(R.id.details_webview) as WebView
+                webView.loadData(
+                    "<!doctype html><html><head><meta charset=\"utf-8\"><style>body { color: white; }</style></head><body>" + details.joinToString("<hr>"),
+                    "text/html; charset=utf-8",
+                    "utf-8"
+                )
+                webView.setBackgroundColor(Color.TRANSPARENT)
+                webView.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null)
 
                 AlertDialogHelper.Builder(context, R.style.AppTheme)
-                    .setCustomTitle(AlertDialogHelper.buildCustomTitle(
-                        context,
-                        context.getString(R.string.check_preferences_details_title),
-                        R.drawable.ic_header_log,
-                        R.style.AppTheme))
+                    .setCustomTitle(
+                        AlertDialogHelper.buildCustomTitle(
+                            context,
+                            context.getString(R.string.check_preferences_details_title),
+                            R.drawable.ic_header_log,
+                            R.style.AppTheme
+                        )
+                    )
                     .setView(detailsLayout)
                     .setPositiveButton(android.R.string.ok) { dialogInner: DialogInterface, _: Int ->
                         dialogInner.dismiss()
@@ -110,11 +117,7 @@ object PrefImportSummaryDialog {
             .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int ->
                 dialog.dismiss()
                 SystemClock.sleep(100)
-                if (cancel != null) {
-                    runOnUiThread(Runnable {
-                        cancel()
-                    })
-                }
+                if (cancel != null) runOnUiThread { cancel() }
             }
 
         if (importPossible) {
@@ -123,18 +126,14 @@ object PrefImportSummaryDialog {
             ) { dialog: DialogInterface, _: Int ->
                 dialog.dismiss()
                 SystemClock.sleep(100)
-                if (ok != null) {
-                    runOnUiThread(Runnable {
-                        ok()
-                    })
-                }
+                if (ok != null) runOnUiThread { ok() }
             }
         }
 
         val dialog = builder.show()
         val textView = dialog.findViewById<View>(android.R.id.message) as TextView?
         textView?.textSize = 12f
-        textView?.setPadding(10,0,0,0)
+        textView?.setPadding(10, 0, 0, 0)
         dialog.setCanceledOnTouchOutside(false)
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt
index b8bc6466a2a..a2c4e78e2ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt
@@ -21,26 +21,23 @@ object TwoMessagesAlertDialog {
 
         val dialog = AlertDialogHelper.Builder(context)
             .setMessage(message)
-            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, title, icon
-                ?: R.drawable.ic_check_while_48dp))
+            .setCustomTitle(
+                AlertDialogHelper.buildCustomTitle(
+                    context, title, icon
+                        ?: R.drawable.ic_check_while_48dp
+                )
+            )
             .setView(secondMessageLayout)
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _: Int ->
                 dialog.dismiss()
                 SystemClock.sleep(100)
-                if (ok != null) {
-                    runOnUiThread(Runnable {
-                        ok()
-                    })
-                }
+                if (ok != null) runOnUiThread { ok() }
+
             }
             .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int ->
                 dialog.dismiss()
                 SystemClock.sleep(100)
-                if (cancel != null) {
-                    runOnUiThread(Runnable {
-                        cancel()
-                    })
-                }
+                if (cancel != null) runOnUiThread { cancel() }
             }
             .show()
         dialog.setCanceledOnTouchOutside(false)
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt b/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt
index 4fda9e5fd86..1599cddb79b 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt
@@ -17,7 +17,7 @@ import javax.inject.Singleton
 
 @Singleton
 class NotificationHolderImpl @Inject constructor(
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     context: Context,
     iconsProvider: IconsProvider
 ) : NotificationHolder {
@@ -29,8 +29,8 @@ class NotificationHolderImpl @Inject constructor(
         .setOnlyAlertOnce(true)
         .setCategory(NotificationCompat.CATEGORY_STATUS)
         .setSmallIcon(iconsProvider.getNotificationIcon())
-        .setLargeIcon(resourceHelper.decodeResource(iconsProvider.getIcon()))
-        .setContentTitle(resourceHelper.gs(R.string.loading))
+        .setLargeIcon(rh.decodeResource(iconsProvider.getIcon()))
+        .setContentTitle(rh.gs(R.string.loading))
         .setContentIntent(openAppIntent(context))
         .build()
         .also {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt
index c37fedb8a42..b2bb3d99db5 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.utils.buildHelper
 
 import info.nightscout.androidaps.BuildConfig
-import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
 import java.io.File
diff --git a/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/app/src/main/java/info/nightscout/androidaps/utils/defaultProfile/DefaultProfile.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
rename to app/src/main/java/info/nightscout/androidaps/utils/defaultProfile/DefaultProfile.kt
index 88066767bdd..c69b454bc89 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/defaultProfile/DefaultProfile.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.data.defaultProfile
+package info.nightscout.androidaps.utils.defaultProfile
 
 import info.nightscout.androidaps.data.PureProfile
 import info.nightscout.androidaps.extensions.pureProfileFromJson
diff --git a/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileDPV.kt b/app/src/main/java/info/nightscout/androidaps/utils/defaultProfile/DefaultProfileDPV.kt
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileDPV.kt
rename to app/src/main/java/info/nightscout/androidaps/utils/defaultProfile/DefaultProfileDPV.kt
index 78ed97b3350..d339cda45e6 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileDPV.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/defaultProfile/DefaultProfileDPV.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.data.defaultProfile
+package info.nightscout.androidaps.utils.defaultProfile
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PureProfile
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/stats/TIR.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TIR.kt
index b59d4a40e38..6b688c15cb0 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/stats/TIR.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TIR.kt
@@ -17,11 +17,11 @@ class TIR(val date: Long, val lowThreshold: Double, val highThreshold: Double) {
     fun inRange() = run { inRange++; count++ }
     fun above() = run { above++; count++ }
 
-    fun belowPct() = if (count > 0) (below.toDouble() / count * 100.0).roundToInt() else 0
-    fun inRangePct() = if (count > 0) 100 - belowPct() - abovePct() else 0
-    fun abovePct() = if (count > 0) (above.toDouble() / count * 100.0).roundToInt() else 0
+    private fun belowPct() = if (count > 0) (below.toDouble() / count * 100.0).roundToInt() else 0
+    private fun inRangePct() = if (count > 0) 100 - belowPct() - abovePct() else 0
+    private fun abovePct() = if (count > 0) (above.toDouble() / count * 100.0).roundToInt() else 0
 
-    fun toText(resourceHelper: ResourceHelper, dateUtil: DateUtil): String = resourceHelper.gs(R.string.tirformat, dateUtil.dateStringShort(date), belowPct(), inRangePct(), abovePct())
+    fun toText(rh: ResourceHelper, dateUtil: DateUtil): String = rh.gs(R.string.tirformat, dateUtil.dateStringShort(date), belowPct(), inRangePct(), abovePct())
 
-    fun toText(resourceHelper: ResourceHelper, days: Int): String = resourceHelper.gs(R.string.tirformat, "%02d".format(days) + " " + resourceHelper.gs(R.string.days), belowPct(), inRangePct(), abovePct())
+    fun toText(rh: ResourceHelper, days: Int): String = rh.gs(R.string.tirformat, "%02d".format(days) + " " + rh.gs(R.string.days), belowPct(), inRangePct(), abovePct())
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
index f00d3910260..cfe0eeeaece 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
@@ -22,7 +22,7 @@ import javax.inject.Inject
 
 class TddCalculator @Inject constructor(
     private val aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val activePlugin: ActivePlugin,
     private val profileFunction: ProfileFunction,
     private val dateUtil: DateUtil,
@@ -50,10 +50,12 @@ class TddCalculator @Inject constructor(
             result.put(midnight, tdd)
         }
 
-        for (t in startTime until endTime step T.mins(5).msecs()) {
+        val calculationStep = T.mins(5).msecs()
+        val tempBasals = iobCobCalculator.getTempBasalIncludingConvertedExtendedForRange(startTime, endTime, calculationStep)
+        for (t in startTime until endTime step calculationStep) {
             val midnight = MidnightTime.calc(t)
             val tdd = result[midnight] ?: TotalDailyDose(timestamp = midnight)
-            val tbr = iobCobCalculator.getTempBasalIncludingConvertedExtended(t)
+            val tbr = tempBasals[t]
             val profile = profileFunction.getProfile(t) ?: continue
             val absoluteRate = tbr?.convertedToAbsolute(t, profile) ?: profile.getBasal(t)
             tdd.basalAmount += absoluteRate / 60.0 * 5.0
@@ -94,10 +96,10 @@ class TddCalculator @Inject constructor(
         val tdds = calculate(7)
         val averageTdd = averageTDD(tdds)
         return HtmlHelper.fromHtml(
-            "<b>" + resourceHelper.gs(R.string.tdd) + ":</b><br>" +
+            "<b>" + rh.gs(R.string.tdd) + ":</b><br>" +
                 toText(tdds, true) +
-                "<b>" + resourceHelper.gs(R.string.average) + ":</b><br>" +
-                averageTdd.toText(resourceHelper, tdds.size(), true)
+                "<b>" + rh.gs(R.string.average) + ":</b><br>" +
+                averageTdd.toText(rh, tdds.size(), true)
         )
     }
 
@@ -105,7 +107,7 @@ class TddCalculator @Inject constructor(
     private fun toText(tdds: LongSparseArray<TotalDailyDose>, includeCarbs: Boolean): String {
         var t = ""
         for (i in 0 until tdds.size()) {
-            t += "${tdds.valueAt(i).toText(resourceHelper, dateUtil, includeCarbs)}<br>"
+            t += "${tdds.valueAt(i).toText(rh, dateUtil, includeCarbs)}<br>"
         }
         return t
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt
index 6e890bfacb0..58ec13ab541 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt
@@ -17,7 +17,7 @@ import javax.inject.Singleton
 
 @Singleton
 class TirCalculator @Inject constructor(
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val dateUtil: DateUtil,
     private val repository: AppRepository
@@ -46,7 +46,7 @@ class TirCalculator @Inject constructor(
         return result
     }
 
-    fun averageTIR(tirs: LongSparseArray<TIR>): TIR {
+    private fun averageTIR(tirs: LongSparseArray<TIR>): TIR {
         val totalTir = if (tirs.size() > 0) {
             TIR(tirs.valueAt(0).date, tirs.valueAt(0).lowThreshold, tirs.valueAt(0).highThreshold)
         } else {
@@ -78,21 +78,21 @@ class TirCalculator @Inject constructor(
         val tit30 = calculate(30, lowTitMgdl, highTitMgdl)
         val averageTit30 = averageTIR(tit30)
         return HtmlHelper.fromHtml(
-            "<br><b>" + resourceHelper.gs(R.string.tir) + " (" + Profile.toCurrentUnitsString(profileFunction, lowTirMgdl) + "-" + Profile.toCurrentUnitsString(profileFunction, highTirMgdl) + "):</b><br>" +
-                toText(resourceHelper, tir7) +
-                "<br><b>" + resourceHelper.gs(R.string.average) + " (" + Profile.toCurrentUnitsString(profileFunction, lowTirMgdl) + "-" + Profile.toCurrentUnitsString(profileFunction, highTirMgdl) + "):</b><br>" +
-                averageTir7.toText(resourceHelper, tir7.size()) + "<br>" +
-                averageTir30.toText(resourceHelper, tir30.size()) +
-                "<br><b>" + resourceHelper.gs(R.string.average) + " (" + Profile.toCurrentUnitsString(profileFunction, lowTitMgdl) + "-" + Profile.toCurrentUnitsString(profileFunction, highTitMgdl) + "):</b><br>" +
-                averageTit7.toText(resourceHelper, tit7.size()) + "<br>" +
-                averageTit30.toText(resourceHelper, tit30.size())
+            "<br><b>" + rh.gs(R.string.tir) + " (" + Profile.toCurrentUnitsString(profileFunction, lowTirMgdl) + "-" + Profile.toCurrentUnitsString(profileFunction, highTirMgdl) + "):</b><br>" +
+                toText(rh, tir7) +
+                "<br><b>" + rh.gs(R.string.average) + " (" + Profile.toCurrentUnitsString(profileFunction, lowTirMgdl) + "-" + Profile.toCurrentUnitsString(profileFunction, highTirMgdl) + "):</b><br>" +
+                averageTir7.toText(rh, tir7.size()) + "<br>" +
+                averageTir30.toText(rh, tir30.size()) +
+                "<br><b>" + rh.gs(R.string.average) + " (" + Profile.toCurrentUnitsString(profileFunction, lowTitMgdl) + "-" + Profile.toCurrentUnitsString(profileFunction, highTitMgdl) + "):</b><br>" +
+                averageTit7.toText(rh, tit7.size()) + "<br>" +
+                averageTit30.toText(rh, tit30.size())
         )
     }
 
-    fun toText(resourceHelper: ResourceHelper, tirs: LongSparseArray<TIR>): String {
+    fun toText(rh: ResourceHelper, tirs: LongSparseArray<TIR>): String {
         var t = ""
         for (i in 0 until tirs.size()) {
-            t += "${tirs.valueAt(i).toText(resourceHelper, dateUtil)}<br>"
+            t += "${tirs.valueAt(i).toText(rh, dateUtil)}<br>"
         }
         return t
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/ui/SpinnerHelper.java b/app/src/main/java/info/nightscout/androidaps/utils/ui/SpinnerHelper.java
deleted file mode 100644
index 191f5396809..00000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/ui/SpinnerHelper.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package info.nightscout.androidaps.utils.ui;
-
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-
-/**
- * Spinner Helper class that works around some common issues
- * with the stock Android Spinner
- *
- * A Spinner will normally call it's OnItemSelectedListener
- * when you use setSelection(...) in your initialization code.
- * This is usually unwanted behavior, and a common work-around
- * is to use spinner.post(...) with a Runnable to assign the
- * OnItemSelectedListener after layout.
- *
- * If you do not call setSelection(...) manually, the callback
- * may be called with the first item in the adapter you have
- * set. The common work-around for that is to count callbacks.
- *
- * While these workarounds usually *seem* to work, the callback
- * may still be called repeatedly for other reasons while the
- * selection hasn't actually changed. This will happen for
- * example, if the user has accessibility options enabled -
- * which is more common than you might think as several apps
- * use this for different purposes, like detecting which
- * notifications are active.
- *
- * Ideally, your OnItemSelectedListener callback should be
- * coded defensively so that no problem would occur even
- * if the callback was called repeatedly with the same values
- * without any user interaction, so no workarounds are needed.
- *
- * This class does that for you. It keeps track of the values
- * you have set with the setSelection(...) methods, and
- * proxies the OnItemSelectedListener callback so your callback
- * only gets called if the selected item's position differs
- * from the one you have set by code, or the first item if you
- * did not set it.
- *
- * This also means that if the user actually clicks the item
- * that was previously selected by code (or the first item
- * if you didn't set a selection by code), the callback will
- * not fire.
- *
- * To implement, replace current occurrences of:
- *
- *     Spinner spinner =
- *         (Spinner)findViewById(R.id.xxx);
- *
- * with:
- *
- *     SpinnerHelper spinner =
- *         new SpinnerHelper(findViewById(R.id.xxx))
- *
- * SpinnerHelper proxies the (my) most used calls to Spinner
- * but not all of them. Should a method not be available, use:
- *
- *      spinner.getSpinner().someMethod(...)
- *
- * Or just add the proxy method yourself :)
- *
- * (Quickly) Tested on devices from 2.3.6 through 4.2.2
- *
- * @author Jorrit "Chainfire" Jongma
- * @license WTFPL (do whatever you want with this, nobody cares)
- */
-public class SpinnerHelper implements OnItemSelectedListener {
-    private final Spinner spinner;
-    private boolean userTouched;
-
-    private int lastPosition = -1;
-    private OnItemSelectedListener proxiedItemSelectedListener = null;
-
-    public SpinnerHelper(Object spinner) {
-        this.spinner = (spinner != null) ? (Spinner)spinner : null;
-    }
-
-    public Spinner getSpinner() {
-        return spinner;
-    }
-
-    public void setSelection(int position) {
-        lastPosition = Math.max(-1, position);
-        spinner.setSelection(position);
-    }
-
-    public void setSelection(int position, boolean animate) {
-        lastPosition = Math.max(-1, position);
-        spinner.setSelection(position, animate);
-    }
-
-    public void setOnItemSelectedListener(OnItemSelectedListener listener) {
-        proxiedItemSelectedListener = listener;
-        setTouchListener();
-        spinner.setOnItemSelectedListener(listener == null ? null : this);
-    }
-
-    public void setTouchListener() {
-        spinner.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                userTouched = true;
-                return false;
-            }
-        });
-    }
-
-    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        if (position != lastPosition && userTouched) {
-            lastPosition = position;
-            if (proxiedItemSelectedListener != null) {
-                proxiedItemSelectedListener.onItemSelected(
-                        parent, view, position, id
-                );
-            }
-        }
-    }
-
-    public void onNothingSelected(AdapterView<?> parent) {
-        if (-1 != lastPosition) {
-            lastPosition = -1;
-            if (proxiedItemSelectedListener != null) {
-                proxiedItemSelectedListener.onNothingSelected(
-                        parent
-                );
-            }
-        }
-    }
-
-    public void setAdapter(SpinnerAdapter adapter) {
-        if (adapter.getCount() > 0) {
-            lastPosition = 0;
-        }
-        spinner.setAdapter(adapter);
-    }
-
-    public SpinnerAdapter getAdapter() { return spinner.getAdapter(); }
-    public int getCount() { return spinner.getCount(); }
-    public Object getItemAtPosition(int position) { return spinner.getItemAtPosition(position); }
-    public long getItemIdAtPosition(int position) { return spinner.getItemIdAtPosition(position); }
-    public Object getSelectedItem() { return spinner.getSelectedItem(); }
-    public long getSelectedItemId() { return spinner.getSelectedItemId(); }
-    public int getSelectedItemPosition() { return spinner.getSelectedItemPosition(); }
-    public void setEnabled(boolean enabled) { spinner.setEnabled(enabled); }
-    public boolean isEnabled() { return spinner.isEnabled(); }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/ui/SpinnerHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/ui/SpinnerHelper.kt
new file mode 100644
index 00000000000..c101b0c34d2
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/ui/SpinnerHelper.kt
@@ -0,0 +1,148 @@
+@file:Suppress("SpellCheckingInspection")
+
+package info.nightscout.androidaps.utils.ui
+
+import android.view.MotionEvent
+import android.view.View
+import android.widget.AdapterView
+import android.widget.Spinner
+import android.widget.SpinnerAdapter
+import kotlin.math.max
+
+/**
+ * Spinner Helper class that works around some common issues
+ * with the stock Android Spinner
+ *
+ * A Spinner will normally call it's OnItemSelectedListener
+ * when you use setSelection(...) in your initialization code.
+ * This is usually unwanted behavior, and a common work-around
+ * is to use spinner.post(...) with a Runnable to assign the
+ * OnItemSelectedListener after layout.
+ *
+ * If you do not call setSelection(...) manually, the callback
+ * may be called with the first item in the adapter you have
+ * set. The common work-around for that is to count callbacks.
+ *
+ * While these workarounds usually *seem* to work, the callback
+ * may still be called repeatedly for other reasons while the
+ * selection hasn't actually changed. This will happen for
+ * example, if the user has accessibility options enabled -
+ * which is more common than you might think as several apps
+ * use this for different purposes, like detecting which
+ * notifications are active.
+ *
+ * Ideally, your OnItemSelectedListener callback should be
+ * coded defensively so that no problem would occur even
+ * if the callback was called repeatedly with the same values
+ * without any user interaction, so no workarounds are needed.
+ *
+ * This class does that for you. It keeps track of the values
+ * you have set with the setSelection(...) methods, and
+ * proxies the OnItemSelectedListener callback so your callback
+ * only gets called if the selected item's position differs
+ * from the one you have set by code, or the first item if you
+ * did not set it.
+ *
+ * This also means that if the user actually clicks the item
+ * that was previously selected by code (or the first item
+ * if you didn't set a selection by code), the callback will
+ * not fire.
+ *
+ * To implement, replace current occurrences of:
+ *
+ * Spinner spinner =
+ * (Spinner)findViewById(R.id.xxx);
+ *
+ * with:
+ *
+ * SpinnerHelper spinner =
+ * new SpinnerHelper(findViewById(R.id.xxx))
+ *
+ * SpinnerHelper proxies the (my) most used calls to Spinner
+ * but not all of them. Should a method not be available, use:
+ *
+ * spinner.getSpinner().someMethod(...)
+ *
+ * Or just add the proxy method yourself :)
+ *
+ * (Quickly) Tested on devices from 2.3.6 through 4.2.2
+ *
+ * @author Jorrit "Chainfire" Jongma
+ * @license WTFPL (do whatever you want with this, nobody cares)
+ */
+@Suppress("unused")
+class SpinnerHelper(val spinner: Spinner) : AdapterView.OnItemSelectedListener {
+
+    private var userTouched = false
+    private var lastPosition = -1
+    private var proxiedItemSelectedListener: AdapterView.OnItemSelectedListener? = null
+    fun setSelection(position: Int) {
+        lastPosition = max(-1, position)
+        spinner.setSelection(position)
+    }
+
+    fun setSelection(position: Int, animate: Boolean) {
+        lastPosition = max(-1, position)
+        spinner.setSelection(position, animate)
+    }
+
+    fun setOnItemSelectedListener(listener: AdapterView.OnItemSelectedListener?) {
+        proxiedItemSelectedListener = listener
+        setTouchListener()
+        spinner.onItemSelectedListener = if (listener == null) null else this
+    }
+
+    private fun setTouchListener() {
+        spinner.setOnTouchListener { v: View, _: MotionEvent? ->
+            v.performClick()
+            userTouched = true
+            false
+        }
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        if (position != lastPosition && userTouched) {
+            lastPosition = position
+            proxiedItemSelectedListener?.onItemSelected(parent, view, position, id)
+        }
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        if (lastPosition != -1) {
+            lastPosition = -1
+            proxiedItemSelectedListener?.onNothingSelected(parent)
+        }
+    }
+
+    var adapter: SpinnerAdapter
+        get() = spinner.adapter
+        set(adapter) {
+            if (adapter.count > 0) {
+                lastPosition = 0
+            }
+            spinner.adapter = adapter
+        }
+
+    val count: Int
+        get() = spinner.count
+
+    fun getItemAtPosition(position: Int): Any = spinner.getItemAtPosition(position)
+
+    fun getItemIdAtPosition(position: Int): Long = spinner.getItemIdAtPosition(position)
+
+    val selectedItem: Any
+        get() = try {
+            spinner.selectedItem
+        } catch (e: IndexOutOfBoundsException) {
+            adapter.getItem(adapter.count - 1)
+        }
+    val selectedItemId: Long
+        get() = spinner.selectedItemId
+    val selectedItemPosition: Int
+        get() = spinner.selectedItemPosition
+    var isEnabled: Boolean
+        get() = spinner.isEnabled
+        set(enabled) {
+            spinner.isEnabled = enabled
+        }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/ui/TimeListEdit.java b/app/src/main/java/info/nightscout/androidaps/utils/ui/TimeListEdit.java
index 591da73eaa3..1a19937aa93 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/ui/TimeListEdit.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/ui/TimeListEdit.java
@@ -28,8 +28,6 @@
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.SafeParse;
-import info.nightscout.androidaps.utils.ui.NumberPicker;
-import info.nightscout.androidaps.utils.ui.SpinnerHelper;
 
 /**
  * Created by mike on 29.12.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
index 29de9c82666..ccdef22e95a 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
@@ -24,18 +24,14 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.queue.Callback
-import info.nightscout.androidaps.utils.CarbTimer
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.HtmlHelper
-import info.nightscout.androidaps.utils.Round
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.extensions.formatColor
+import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
@@ -49,19 +45,20 @@ class BolusWizard @Inject constructor(
 ) {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rh: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var loopPlugin: LoopPlugin
     @Inject lateinit var iobCobCalculator: IobCobCalculator
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var config: Config
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var carbTimer: CarbTimer
+    @Inject lateinit var bolusTimer: BolusTimer
     @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
     @Inject lateinit var repository: AppRepository
 
@@ -286,31 +283,31 @@ class BolusWizard @Inject constructor(
         val actions: LinkedList<String> = LinkedList()
         if (insulinAfterConstraints > 0) {
             val pct = if (percentageCorrection != 100) " ($percentageCorrection%)" else ""
-            actions.add(resourceHelper.gs(R.string.bolus) + ": " + resourceHelper.gs(R.string.formatinsulinunits, insulinAfterConstraints).formatColor(resourceHelper, R.color.bolus) + pct)
+            actions.add(rh.gs(R.string.bolus) + ": " + rh.gs(R.string.formatinsulinunits, insulinAfterConstraints).formatColor(rh, R.color.bolus) + pct)
         }
         if (carbs > 0 && !advisor) {
             var timeShift = ""
             if (carbTime > 0) {
-                timeShift += " (+" + resourceHelper.gs(R.string.mins, carbTime) + ")"
+                timeShift += " (+" + rh.gs(R.string.mins, carbTime) + ")"
             } else if (carbTime < 0) {
-                timeShift += " (" + resourceHelper.gs(R.string.mins, carbTime) + ")"
+                timeShift += " (" + rh.gs(R.string.mins, carbTime) + ")"
             }
-            actions.add(resourceHelper.gs(R.string.carbs) + ": " + resourceHelper.gs(R.string.format_carbs, carbs).formatColor(resourceHelper, R.color.carbs) + timeShift)
+            actions.add(rh.gs(R.string.carbs) + ": " + rh.gs(R.string.format_carbs, carbs).formatColor(rh, R.color.carbs) + timeShift)
         }
         if (insulinFromCOB > 0) {
-            actions.add(resourceHelper.gs(R.string.cobvsiob) + ": " + resourceHelper.gs(R.string.formatsignedinsulinunits, insulinFromBolusIOB + insulinFromBasalIOB + insulinFromCOB + insulinFromBG).formatColor(resourceHelper, R.color.cobAlert))
+            actions.add(rh.gs(R.string.cobvsiob) + ": " + rh.gs(R.string.formatsignedinsulinunits, insulinFromBolusIOB + insulinFromBasalIOB + insulinFromCOB + insulinFromBG).formatColor(rh, R.color.cobAlert))
             val absorptionRate = iobCobCalculator.ads.slowAbsorptionPercentage(60)
             if (absorptionRate > .25)
-                actions.add(resourceHelper.gs(R.string.slowabsorptiondetected, resourceHelper.gc(R.color.cobAlert), (absorptionRate * 100).toInt()))
+                actions.add(rh.gs(R.string.slowabsorptiondetected, rh.gc(R.color.cobAlert), (absorptionRate * 100).toInt()))
         }
         if (abs(insulinAfterConstraints - calculatedTotalInsulin) > activePlugin.activePump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
-            actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarn, calculatedTotalInsulin, insulinAfterConstraints).formatColor(resourceHelper, R.color.warning))
+            actions.add(rh.gs(R.string.bolusconstraintappliedwarn, calculatedTotalInsulin, insulinAfterConstraints).formatColor(rh, R.color.warning))
         if (config.NSCLIENT && insulinAfterConstraints > 0)
-            actions.add(resourceHelper.gs(R.string.bolusrecordedonly).formatColor(resourceHelper, R.color.warning))
+            actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(rh, R.color.warning))
         if (useAlarm && !advisor && carbs > 0 && carbTime > 0)
-            actions.add(resourceHelper.gs(R.string.alarminxmin, carbTime).formatColor(resourceHelper, R.color.info))
+            actions.add(rh.gs(R.string.alarminxmin, carbTime).formatColor(rh, R.color.info))
         if (advisor)
-            actions.add(resourceHelper.gs(R.string.advisoralarm).formatColor(resourceHelper, R.color.info))
+            actions.add(rh.gs(R.string.advisoralarm).formatColor(rh, R.color.info))
 
         return HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions))
     }
@@ -322,9 +319,12 @@ class BolusWizard @Inject constructor(
                 return
             }
             accepted = true
-
+            if (calculatedTotalInsulin > 0.0)
+                bolusTimer.removeBolusReminder()
+            if (carbs > 0.0)
+                carbTimer.removeEatReminder()
             if (sp.getBoolean(R.string.key_usebolusadvisor, false) && Profile.toMgdl(bg, profile.units) > 180 && carbs > 0 && carbTime >= 0)
-                OKDialog.showYesNoCancel(ctx, resourceHelper.gs(R.string.bolusadvisor), resourceHelper.gs(R.string.bolusadvisormessage),
+                OKDialog.showYesNoCancel(ctx, rh.gs(R.string.bolusadvisor), rh.gs(R.string.bolusadvisormessage),
                     { bolusAdvisorProcessing(ctx) },
                     { commonProcessing(ctx) }
                 )
@@ -335,7 +335,7 @@ class BolusWizard @Inject constructor(
 
     private fun bolusAdvisorProcessing(ctx: Context) {
         val confirmMessage = confirmMessageAfterConstraints(advisor = true)
-        OKDialog.showConfirmation(ctx, resourceHelper.gs(R.string.boluswizard), confirmMessage, {
+        OKDialog.showConfirmation(ctx, rh.gs(R.string.boluswizard), confirmMessage, {
             DetailedBolusInfo().apply {
                 eventType = DetailedBolusInfo.EventType.CORRECTION_BOLUS
                 insulin = insulinAfterConstraints
@@ -354,7 +354,7 @@ class BolusWizard @Inject constructor(
                     commandQueue.bolus(this, object : Callback() {
                         override fun run() {
                             if (!result.success) {
-                                ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
+                                ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                             } else
                                 carbTimer.scheduleEatReminder()
                         }
@@ -369,11 +369,11 @@ class BolusWizard @Inject constructor(
         val pump = activePlugin.activePump
 
         val confirmMessage = confirmMessageAfterConstraints(advisor = false)
-        OKDialog.showConfirmation(ctx, resourceHelper.gs(R.string.boluswizard), confirmMessage, {
+        OKDialog.showConfirmation(ctx, rh.gs(R.string.boluswizard), confirmMessage, {
             if (insulinAfterConstraints > 0 || carbs > 0) {
                 if (useSuperBolus) {
                     uel.log(Action.SUPERBOLUS_TBR, Sources.WizardDialog)
-                    if (loopPlugin.isEnabled(PluginType.LOOP)) {
+                    if (loopPlugin.isEnabled()) {
                         loopPlugin.goToZeroTemp(2 * 60, profile, OfflineEvent.Reason.SUPER_BOLUS)
                         rxBus.send(EventRefreshOverview("WizardDialog"))
                     }
@@ -382,7 +382,7 @@ class BolusWizard @Inject constructor(
                         commandQueue.tempBasalAbsolute(0.0, 120, true, profile, PumpSync.TemporaryBasalType.NORMAL, object : Callback() {
                             override fun run() {
                                 if (!result.success) {
-                                    ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
+                                    ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                                 }
                             }
                         })
@@ -393,7 +393,7 @@ class BolusWizard @Inject constructor(
                                     val i = Intent(ctx, ErrorHelperActivity::class.java)
                                     i.putExtra(ErrorHelperActivity.SOUND_ID, R.raw.boluserror)
                                     i.putExtra(ErrorHelperActivity.STATUS, result.comment)
-                                    i.putExtra(ErrorHelperActivity.TITLE, resourceHelper.gs(R.string.tempbasaldeliveryerror))
+                                    i.putExtra(ErrorHelperActivity.TITLE, rh.gs(R.string.tempbasaldeliveryerror))
                                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                                     ctx.startActivity(i)
                                 }
@@ -426,7 +426,7 @@ class BolusWizard @Inject constructor(
                         commandQueue.bolus(this, object : Callback() {
                             override fun run() {
                                 if (!result.success) {
-                                    ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
+                                    ErrorHelperActivity.runAlarm(ctx, result.comment, rh.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                                 }
                             }
                         })
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
index c1784ca4fff..f2217d20ad5 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
@@ -132,7 +132,7 @@ class QuickWizardEntry @Inject constructor(private val injector: HasAndroidInjec
 
     fun validFrom(): Int = safeGetInt(storage, "validFrom")
 
-    private fun validTo(): Int = safeGetInt(storage, "validTo")
+    fun validTo(): Int = safeGetInt(storage, "validTo")
 
     fun useBG(): Int = safeGetInt(storage, "useBG", YES)
 
diff --git a/app/src/main/res/drawable/ic_baseline_warning_24_red.xml b/app/src/main/res/drawable/ic_baseline_warning_24_red.xml
new file mode 100644
index 00000000000..f01f6df79da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_warning_24_red.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FF0000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_warning_24_yellow.xml b/app/src/main/res/drawable/ic_baseline_warning_24_yellow.xml
new file mode 100644
index 00000000000..2eededf7fc4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_warning_24_yellow.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFF00"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_loop_reconnect.xml b/app/src/main/res/drawable/ic_loop_reconnect.xml
index d90927a0815..f61d0f97b1e 100644
--- a/app/src/main/res/drawable/ic_loop_reconnect.xml
+++ b/app/src/main/res/drawable/ic_loop_reconnect.xml
@@ -5,8 +5,8 @@
     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.156c-3.952,0 -7.156,-3.204 -7.156,-7.156c0,-3.952 3.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.937,4.449 -9.937,9.938c0,5.488 4.449,9.937 9.937,9.937C17.551,22 22,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="@color/loopDisconnected"/>
+      android:fillColor="@color/loopClosed"/>
   <path
       android:pathData="M14.868,22.154c0.794,0 1.49,-0.418 1.973,-1.054l-0.001,-3.926c-0.482,-0.634 -1.177,-1.052 -1.969,-1.052l-5.612,-0.001c-0.793,0 -1.487,0.416 -1.97,1.05l-0.004,3.926c0.482,0.636 1.178,1.055 1.972,1.055"
-      android:fillColor="@color/loopDisconnected"/>
+      android:fillColor="@color/loopClosed"/>
 </vector>
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index 6e485a0edbb..3d2663e23b3 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -234,6 +234,40 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/bolusReminder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:visibility="gone"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/bolus_reminder"
+                android:gravity="center_vertical"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textStyle="bold" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:src="@drawable/ic_access_alarm_24dp" />
+
+            <CheckBox
+                android:id="@+id/bolusReminderCheckBox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:checked="false"
+                android:padding="2dp" />
+        </LinearLayout>
+
         <include
             android:id="@+id/notes_layout"
             layout="@layout/notes" />
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index aa5bdf6b992..e563f7b0fef 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -75,36 +75,17 @@
             android:id="@+id/reuselayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
             android:orientation="horizontal"
             android:visibility="gone">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:width="120dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:text=""
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textStyle="bold" />
-
-            <Button
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/reusebutton"
+                style="?android:attr/buttonStyle"
+                android:drawablePadding="10dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/reuse_profile_pct_hours" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="start"
-                android:minWidth="45dp"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:text=" "
-                android:textAppearance="?android:attr/textAppearanceSmall" />
+                android:drawableStart="@drawable/ic_clone" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/ns_client_fragment.xml b/app/src/main/res/layout/ns_client_fragment.xml
index e10791bb52b..6b41c455d5b 100644
--- a/app/src/main/res/layout/ns_client_fragment.xml
+++ b/app/src/main/res/layout/ns_client_fragment.xml
@@ -5,141 +5,159 @@
     android:orientation="vertical"
     tools:context=".plugins.general.nsclient.NSClientFragment">
 
-        <LinearLayout
-            android:layout_width="match_parent"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginBottom="5dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:orientation="horizontal"
-            android:gravity="center_horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/nsclientinternal_url" />
-
-            <TextView
-                android:id="@+id/url"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:autoLink="web"
-                tools:ignore="RtlHardcoded" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
+            android:text="@string/nsclientinternal_url" />
+
+        <TextView
+            android:id="@+id/url"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
             android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:orientation="horizontal"
-            android:gravity="center_horizontal">
-
-            <CheckBox
-                android:id="@+id/paused"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/paused" />
-
-            <CheckBox
-                android:id="@+id/autoscroll"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="10dp"
-                android:text="@string/nsclientinternal_autoscroll"
-                tools:ignore="RtlHardcoded" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
+            android:autoLink="web"
+            tools:ignore="RtlHardcoded" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginBottom="5dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+
+        <CheckBox
+            android:id="@+id/paused"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/paused" />
+
+        <CheckBox
+            android:id="@+id/autoscroll"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="10dp"
+            android:text="@string/nsclientinternal_autoscroll"
+            tools:ignore="RtlHardcoded" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
-            android:orientation="horizontal">
+            android:text="@string/status"
+            tools:ignore="RtlHardcoded" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="5dp"
-                android:text="@string/status"
-                tools:ignore="RtlHardcoded" />
+        <TextView
+            android:id="@+id/status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="normal|bold" />
 
-            <TextView
-                android:id="@+id/status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textStyle="normal|bold" />
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
 
-        </LinearLayout>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/queue" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/queue"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:orientation="horizontal"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp">
-
-            <TextView
-                android:id="@+id/clear_log"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/clearlog"
-                android:textAlignment="center"
-                android:textColor="@android:color/holo_orange_light"
-                android:textStyle="normal|bold" />
-
-            <TextView
-                android:id="@+id/restart"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/restart"
-                android:textAlignment="center"
-                android:textColor="@android:color/holo_orange_light"
-                android:textStyle="normal|bold" />
-
-            <TextView
-                android:id="@+id/deliver_now"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/deliver_now"
-                android:textAlignment="center"
-                android:textColor="@android:color/holo_orange_light"
-                android:textStyle="normal|bold" />
-
-            <TextView
-                android:id="@+id/full_sync"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/full_sync"
-                android:textAlignment="center"
-                android:textColor="@android:color/holo_orange_light"
-                android:textStyle="normal|bold" />
-
-        </LinearLayout>
-
-        <ScrollView
-            android:id="@+id/log_scrollview"
+            android:layout_marginRight="5dp" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginBottom="10dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/clear_log"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/clearlog"
+            android:textAlignment="center"
+            android:textColor="@android:color/holo_orange_light"
+            android:textStyle="normal|bold" />
+
+        <TextView
+            android:id="@+id/restart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/restart"
+            android:textAlignment="center"
+            android:textColor="@android:color/holo_orange_light"
+            android:textStyle="normal|bold" />
+
+        <TextView
+            android:id="@+id/deliver_now"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/deliver_now"
+            android:textAlignment="center"
+            android:textColor="@android:color/holo_orange_light"
+            android:textStyle="normal|bold" />
+
+        <TextView
+            android:id="@+id/full_sync"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/full_sync"
+            android:textAlignment="center"
+            android:textColor="@android:color/holo_orange_light"
+            android:textStyle="normal|bold" />
+
+    </LinearLayout>
+
+    <ScrollView
+        android:id="@+id/log_scrollview"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp">
+
+        <TextView
+            android:id="@+id/log"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp">
-
-            <TextView
-                android:id="@+id/log"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="" />
-        </ScrollView>
+            android:layout_height="wrap_content"
+            android:text="" />
+    </ScrollView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/overview_buttons_layout.xml b/app/src/main/res/layout/overview_buttons_layout.xml
index 29eba5f0074..c8c761c3d27 100644
--- a/app/src/main/res/layout/overview_buttons_layout.xml
+++ b/app/src/main/res/layout/overview_buttons_layout.xml
@@ -18,6 +18,16 @@
         android:textColor="@color/colorAcceptTempButton"
         android:visibility="gone" />
 
+    <LinearLayout
+        android:id="@+id/user_buttons_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="0dp"
+        android:paddingEnd="5dp" >
+
+    </LinearLayout>
+
     <LinearLayout
         android:id="@+id/buttons_layout"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index f37998f4e3d..22f3cd77cfb 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -52,7 +52,7 @@
                     android:gravity="center_vertical|center_horizontal"
                     android:paddingTop="6dp"
                     android:paddingBottom="6dp"
-                    android:text="TempTarget"
+                    android:text="@string/notavailable"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/mdtp_white"
                     tools:ignore="HardcodedText" />
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 8d41ca17009..20f5e775de2 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -19,6 +19,14 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="HardcodedText" />
 
+    <ImageView
+        android:id="@+id/bg_quality"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="Blood glucose quality icon"
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/delta_large"
@@ -240,7 +248,6 @@
         android:layout_marginStart="5dp"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/cob_layout"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/bg"
@@ -272,7 +279,6 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/basal_layout"
         app:layout_constraintStart_toEndOf="@+id/iob_layout"
         app:layout_constraintTop_toTopOf="@+id/iob_layout"
@@ -305,7 +311,6 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/extended_layout"
         app:layout_constraintStart_toEndOf="@+id/cob_layout"
         app:layout_constraintTop_toTopOf="@+id/iob_layout"
@@ -338,7 +343,6 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/as_layout"
         app:layout_constraintStart_toEndOf="@+id/basal_layout"
         app:layout_constraintTop_toTopOf="@+id/iob_layout"
@@ -370,7 +374,6 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/extended_layout"
         app:layout_constraintTop_toTopOf="@+id/iob_layout"
diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index 45d66600667..900a8732c5d 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -72,7 +72,6 @@
     <string name="overview">Oorsig</string>
     <string name="treatments">Behandelings</string>
     <string name="virtualpump">Virtuele Pomp</string>
-    <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pomp</string>
     <string name="configbuilder_pump_description">Watter pomp wil jy gebruik met AndroidAPS?</string>
     <string name="configbuilder_profile">Profiel</string>
@@ -196,7 +195,6 @@
     <string name="ongoingnotificaction">Voortgesette kennisgewing</string>
     <string name="old_data">OU DATA</string>
     <string name="sms_minago">%1$d min terug</string>
-    <string name="localprofile">Plaaslike profiel</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Matriks van %1$d elemente. \nWerklike waarde:</string>
     <string name="openapsma_autosensdata_label">Autosens data</string>
@@ -585,4 +583,6 @@
     <string name="format_percent">%1$d%%</string>
     <string name="unit_minute_short">min</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="overview_show_predictions">Projeksies</string>
+    <string name="prime">Prima</string>
 </resources>
diff --git a/app/src/main/res/values-bg-rBG/exam.xml b/app/src/main/res/values-bg-rBG/exam.xml
index 708e0883326..209c22f182f 100644
--- a/app/src/main/res/values-bg-rBG/exam.xml
+++ b/app/src/main/res/values-bg-rBG/exam.xml
@@ -1,22 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="dia_whatmeansdia">Какво е вярно за DIA?</string>
+    <string name="dia_label_exam">Продължителност на действие на инсулина (DIA)</string>
+    <string name="dia_profile">Трябва да зададете стойността за DIA в профила си.</string>
+    <string name="dia_minimumis5h">Минималната стойност е 5 часа.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
+    <string name="dia_meaningisequaltodiapump">Ако сте били доволни от зададената стойност за DIA, която е използвал вашата помпа преди да започнете да ползвате AndroidAPS, няма нужда да я сменяте когато затворите цикъла.</string>
+    <string name="dia_valuemustbedetermined">Вие трябва сами за себе си да установите правилната стойност за DIA.</string>
+    <string name="hypott_label">Хипо врменна цел</string>
+    <string name="hypott_whenhypott">Каква е основната причина за задаване на хипо временна цел?</string>
+    <string name="hypott_wrongbasal">За да коригирате хипо предизвикано от грешни базални настройки.</string>
+    <string name="hypott_preventoversmb">За да предотвратите AndroidAPS да коригира прекалено повишение на КЗ предизвикано от бързи въглехидрати използвани против хипо.</string>
+    <string name="hypott_exercise">За да коригирате хипо предизвикано от физическа дейност.</string>
+    <string name="hypott_0basal">За да предотвратите понижаване на КЗ ако вече е активен 0% временен базал.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
+    <string name="offlineprofile_whatprofile">Кой профил може да бъде използван и конфигуриран без интернет?</string>
+    <string name="offlineprofile_label">Тема: Offline профил</string>
+    <string name="offlineprofile_nsprofile">NS профил може да бъде използван, но не и да бъде конфигуриран.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">Причини да се използва Разкачане на Помпа в Andoird APS</string>
+    <string name="pumpdisconnect_whattodo">Какво трябва да се направи когато се разкача помпата?</string>
+    <string name="pumpdisconnect_unnecessary">Това не е нужно, инсулин няма да бъде доставен, тъй като помпата е физически разкачена.</string>
+    <string name="pumpdisconnect_missinginsulin">AndoirdAPS да игнорира инсулина, който не е доставен докато попата е била физически разкачена</string>
+    <string name="pumpdisconnect_notstop">Доставянето на инсулин няма да спре докато помпата е свързана.</string>
+    <string name="pumpdisconnect_openloop">Ще вкара AndoirdAPS в отворен цикъл.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</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_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="whatistrue">Отбележете всички правилни отговори.</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_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_fiasp">Fiasp®</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_which">Отбележете всички правилни отговори.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</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>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index a453bfac594..9d60fcda5e4 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -78,7 +78,6 @@
     <string name="overview">Общ</string>
     <string name="treatments">Лечения</string>
     <string name="virtualpump">Виртуална помпа</string>
-    <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Помпа</string>
     <string name="configbuilder_pump_description">Каква помпа използвате с AndroidAPS?</string>
     <string name="configbuilder_profile">Профил</string>
@@ -133,6 +132,7 @@
     <string name="configbuilder_nightscoutversion_label">Nightscout версия:</string>
     <string name="missing_carbs">Нужни %1$d гр</string>
     <string name="exported">Настройките са експортирани</string>
+    <string name="ue_exported">Потребителските настройки икспортирани</string>
     <string name="export_to">Експортирай настройките в </string>
     <string name="import_from">Импорт на настройки от</string>
     <string name="setting_imported">Настройките са импортирани</string>
@@ -256,12 +256,13 @@
     <string name="ongoingnotificaction">Текущи известия</string>
     <string name="old_data">СТАРИ ДАННИ</string>
     <string name="sms_minago">преди %1$d мин</string>
-    <string name="localprofile">Локален профил</string>
+    <string name="localprofile">Профил</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Общо %1$d елемента.\nАктуална стойност:</string>
     <string name="openapsma_autosensdata_label">Autosens данни</string>
     <string name="openapsma_scriptdebugdata_label">От скрипта</string>
     <string name="openapsama_useautosens">Използвайте функцията за Autosens</string>
+    <string name="refresheventsfromnightscout">Презареди от NS</string>
     <string name="deletefuturetreatments">Изтрий записите в бъдещето</string>
     <string name="actions_shortname">ДЕЙСТВ</string>
     <string name="configbuilder_shortname">КОНФ</string>
@@ -491,6 +492,7 @@
     <string name="dexcomg5_xdripupload_title">Изпращай данни за КЗ към xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">В xDrip+ изберете 640g/Eversense за източник на данни</string>
     <string name="nsclientbg">КЗ от NS</string>
+    <string name="nsclientbgshort">NS КЗ</string>
     <string name="overview_editquickwizard_usebg">Калкулиране на КЗ</string>
     <string name="overview_editquickwizard_usebolusiob">Калкулиране на Болус IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Калкулиране на базален IOB</string>
@@ -552,6 +554,7 @@
     <string name="bolusrecordedonly">Болус само ще се запише (няма да се стартира в помпа)</string>
     <string name="loop_smbsetbypump_label">SMB в помпата</string>
     <string name="overview_show_activity">Активност</string>
+    <string name="overview_show_bgi">Въздействие на Кръвна Захар</string>
     <string name="overview_show_sensitivity">Чувствителност</string>
     <string name="overview_show_deviations">Отклонения</string>
     <string name="overview_show_cob">Активни въглехидрати</string>
@@ -661,7 +664,6 @@
     <string name="error_adding_treatment_title">Данните за лечението не са пълни</string>
     <string name="maintenance_settings">Настройки за поддръжка</string>
     <string name="maintenance_email">Имейл</string>
-    <string name="maintenance_encrypt_exported_prefs">Криптиране на експортирани настройки</string>
     <string name="maintenance_amount">Брой логове за изпращане</string>
     <string name="maintenance">Поддръжка</string>
     <string name="maintenance_shortname">ПОДДР</string>
@@ -675,6 +677,7 @@
     <string name="resettodefaults">Възстанови настройките по подразбиране</string>
     <string name="nsmalfunction">Грешка в NSClient. Рестартирайте Nightscout и NSClient</string>
     <string name="time_offset">времево отместване</string>
+    <string name="bolus_reminder">Напомни за болус по-късно</string>
     <string name="setupwizard_preferred_aps_mode">Предпочитаният режим на APS</string>
     <string name="treatments_wizard_total_label">Общо</string>
     <string name="calculation_short">Калк</string>
@@ -713,6 +716,7 @@
     <string name="versionChecker">Проверка на версията</string>
     <string name="old_version">стара версия</string>
     <string name="very_old_version">много стара версия</string>
+    <string name="application_expired">Прилагането изтече</string>
     <string name="new_version_warning">Има нова версия от най-малко %1$d дни! Ще спре подаването на инсулин след %2$d дни, цикълът ще бъде изключен след %3$d дни</string>
     <string name="twohours">2ч</string>
     <string name="dexcom_app_patched">Dexcom приложение (модифицирано)</string>
@@ -746,7 +750,7 @@
     <string name="clone_label">Клонирай</string>
     <string name="saveorresetchangesfirst">Първо запазете или се откажете от промените</string>
     <string name="deletecurrentprofile">Изтриване на текущия профил?</string>
-    <string name="copytolocalprofile">Желаете ли да създадете нов локален профил от този профил?</string>
+    <string name="copytolocalprofile">Създай нов профил копирайки този?</string>
     <string name="profilenamecontainsdot">Името на профила съдържа точка.\nТова не се поддържа от НС.\nПрофилът не е качен в НС.</string>
     <string name="low_mark_comment">Ниската граница на диапазона (графика)</string>
     <string name="high_mark_comment">Високата граница на диапазона (графика)</string>
@@ -770,6 +774,7 @@
     <string name="randombg_short">КЗ</string>
     <string name="tools">Инструменти</string>
     <string name="show_calculation">Покажи изчисленията</string>
+    <string name="show_removed">Покажи премахнатите</string>
     <string name="clearqueueconfirm">Изтрий опашка? Всички данни ще се загубят!</string>
     <string name="ebstopsloop">Използване на удължен болус ще спре режим затворен цикъл за времето на болуса. Сигурни ли сте?</string>
     <string name="closed_loop_disabled_with_eb">Затворен цикъл е недостъпен поради стартиран Удължен болус</string>
@@ -827,7 +832,7 @@
     <string name="dpvdefaultprofile">Профил по подразбиране</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink статус:</string>
     <string name="filter">Филтър</string>
-    <string name="copytolocalprofile_invalid">Не може да се създаде локален профил. Профилът е невалиден.</string>
+    <string name="copytolocalprofile_invalid">Създаването на профила невъзможно. Профилът е невалиден.</string>
     <string name="cta_dont_kill_my_app_info">Не убивай приложението?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Изпращане на SMS, ако помпата е недостъпна</string>
     <string name="smscommunicator_pump_ureachable">Докладвай недостъпна помпа</string>
@@ -839,11 +844,49 @@
     <string name="enablebolusadvisor_summary">Използвай напомняне за старт на хранене вместо съветника по време на висока гликемия (\"пре-болус\")</string>
     <string name="time_to_eat">Време за ядене!\nИзпълнете болус съветника и направете изчисления отново.</string>
     <string name="timetoeat">Време е за ядене</string>
+    <string name="bolusreminder">Болус подсещане</string>
+    <string name="enablebolusreminder">Включи подсещането за болус</string>
+    <string name="enablebolusreminder_summary">Използвай подсещане за болус по-късно със съветник (\"след-болус\")</string>
+    <string name="time_to_bolus">Време е за болус!\nВключи болус съветника и направи изчисление отново.</string>
     <string name="fabric_upload_disabled">Качването на данни за проблеми е забранено!(Fabric)</string>
     <string name="graph_menu_divider_header">Графика</string>
     <string name="chart_menu">Меню на графиката</string>
     <string name="clear_filter">Премахни филтъра</string>
     <string name="trend_arrow">Стрелка тенденция</string>
     <string name="cannula">Канюла</string>
-    <string name="ns_receive_profile_store_summary">Синхронизирай NS профила с локалния</string>
+    <string name="userentry">Потербителска настройка</string>
+    <string name="common_values">Използвай стойностите от вашето най-голямо хранен, с което обикновено се храните</string>
+    <string name="summary_email_for_crash_report">Тази електронна поща ще бъде добавена към репорта за да можем да се свържем с вас в случай на нужда. Не е задължително.</string>
+    <string name="email_address">Електронна поща</string>
+    <string name="privacy_settings">Настройки за поверителност</string>
+    <string name="privacy_summary">Можете да посочите електронна поща, ако искате да бъдете уведомени за системни проблеми. Това не е автоматичен процес. Разработчиците ще се свържат с вас в случай на опасна ситуация.</string>
+    <string name="full_sync">Пълна синхронизация</string>
+    <string name="full_sync_comment">Пълна синхронизация? Може да отнеме много часове и докато не приключи вие няма да виждате нови данни в NS.</string>
+    <string name="prime">Пълнене</string>
+    <string name="ns_sync_options">Синхронизация</string>
+    <string name="ns_upload_summary">Профили, болуси, въглехидрати, и временни базали се изпращат към NS</string>
+    <string name="ns_upload">Изпратете данните към NS</string>
+    <string name="ns_receive_profile_store_summary">Синхорнизирай профили от NS профилния едитор</string>
+    <string name="ns_receive_temp_target">Получаване на временни цели</string>
+    <string name="ns_receive_temp_target_summary">Приеми временни цели зададени през NS или NS клиент</string>
+    <string name="ns_receive_profile_switch">Получаване на смяна на профили</string>
+    <string name="ns_receive_profile_switch_summary">Приеми смяна на профили от NS или NS клиент</string>
+    <string name="ns_receive_offline_event">Приеми изключване на APS</string>
+    <string name="ns_receive_offline_event_summary">Приеми изключвания на APS през NS или NS Клиент</string>
+    <string name="ns_receive_insulin">Получавай инсулин</string>
+    <string name="ns_receive_insulin_summary">Приеми инсулин зададен през NS или NS Клиент (не се инжектира, само се калкулира във формулата за IOB)</string>
+    <string name="ns_receive_carbs">Приемай въглехидрати</string>
+    <string name="ns_receive_carbs_summary">Приемай въглехидрати зададени през NS или NS Клиент</string>
+    <string name="ns_receive_therapy_events">Приемай смени (канула, инсулин, батерия и др.)</string>
+    <string name="ns_receive_therapy_events_summary">Приемай смени (канула, инсулин, батерия и др.) зададени от NS или NS Клиент</string>
+    <string name="ns_receive_cgm">Приеми история от данни от сензора</string>
+    <string name="ns_receive_cgm_summary">Приемай постояни данни от сензора идващи от NS</string>
+    <string name="sms_timeout_while_wating">Изтичане на времето на предишна комуникация с помпата</string>
+    <string name="smscommunicator_another_bolus_in_queue">В момента се обработва друг болус. Моля опитай по-късни.</string>
+    <string name="calculation_in_progress">Калкулация в прогресс</string>
+    <string name="missing_profile_name">Липсва име на профила</string>
+    <string name="error_in_ic_values">Грешка в стойността на ВЧ (IC)</string>
+    <string name="error_in_basal_values">Грешка в базалните стойности</string>
+    <string name="error_in_target_values">Грешка в стойностите за цел</string>
+    <string name="error_in_isf_values">Грешка в стойностите за чувствителност (ISF)</string>
 </resources>
diff --git a/app/src/main/res/values-ca-rES/exam.xml b/app/src/main/res/values-ca-rES/exam.xml
index 3ea04e700df..0250b67387a 100644
--- a/app/src/main/res/values-ca-rES/exam.xml
+++ b/app/src/main/res/values-ca-rES/exam.xml
@@ -1,2 +1,178 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="dia_whatmeansdia">Què és cert sobre la DIA (Durada de l\'Acció de la Insulina)?</string>
+    <string name="dia_label_exam">Durada de l\'Acció de la Insulina (DIA)</string>
+    <string name="dia_profile">Heu de configurar el valor de la DIA al vostre perfil.</string>
+    <string name="dia_minimumis5h">El mínim permès son 5 hores.</string>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
+    <string name="dia_meaningisequaltodiapump">Si esteu satisfets amb el valor de la DIA que fèieu servir a la bomba abans d\'utilitzar AndroidAPS, no cal canviar-la quan comenceu amb el llaç.</string>
+    <string name="dia_valuemustbedetermined">Heu de determinar vosaltres mateixos el valor apropiat per la DIA.</string>
+    <string name="hypott_label">Objectiu temporal hipo</string>
+    <string name="hypott_whenhypott">Quin seria el motiu principal per fixar un objectiu temporal hipo?</string>
+    <string name="hypott_wrongbasal">Corregir hipos causades per configuracions incorrectes de la ràtio basal.</string>
+    <string name="hypott_preventoversmb">Evitar que AndroidAPS corregeixi excessivament quan hi ha un augment de glucèmia provocat pels carbohidrats d\'absorció ràpida consumits per tractar una hipo.</string>
+    <string name="hypott_exercise">Corregir una hipo provocada per fer esport.</string>
+    <string name="hypott_0basal">Evitar que la glucèmia baixi més del compte quan ja hi ha una basal temporal activa del 0%.</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
+    <string name="offlineprofile_whatprofile">Quin perfil pot ser utilitzat i configurat sense connexió a Internet?</string>
+    <string name="offlineprofile_label">Tema: Perfil fora de línia</string>
+    <string name="offlineprofile_nsprofile">El perfil NS es pot fer servir, però no configurar.</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">Motius per aplicar \"Desconnectar bomba\" a AndroidAPS</string>
+    <string name="pumpdisconnect_whattodo">Què cal fer al desconnectar la bomba?</string>
+    <string name="pumpdisconnect_unnecessary">No cal fer res, ja que a l\'estar la bomba físicament desconnectada, no es lliurarà insulina.</string>
+    <string name="pumpdisconnect_missinginsulin">Evita que AndroidAPS tingui en compte la insulina que no es lliura mentre la bomba està físicament desconnectada.</string>
+    <string name="pumpdisconnect_notstop">Si la bomba continua connectada, no deixarà de lliurar insulina.</string>
+    <string name="pumpdisconnect_openloop">Posarà AndroidAPS en mode llaç obert.</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">Configuració AndroidAPS</string>
+    <string name="objectives2_label">Configuració AndroidAPS</string>
+    <string name="objectives_howtosave">Quines son les bones pràctiques respecte a fer còpia de seguretat de la configuració?</string>
+    <string name="objectives_notesettings">No cal exportar la configuració si la teniu anotada a algun lloc.</string>
+    <string name="objectives_afterobjective">Exporteu la configuració cada vegada que completeu un objectiu.</string>
+    <string name="objectives_afterchange">Exporteu la configuració cada vegada que canvieu algun paràmetre.</string>
+    <string name="objectives_afterinitialsetup">Exporteu la configuració un cop feta la configuració inicial i haver establert les vostres preferències.</string>
+    <string name="objectives2_maintenance">Exporteu la configuració localment des del menú de manteniment.</string>
+    <string name="objectives2_internalstorage">El fitxer de configuració es troba a la carpeta Internal Storage/AAPS/preferences del vostre telèfon.</string>
+    <string name="objectives2_cloud">Copieu el fitxer de configuració a una ubicació segura fora del telèfon (p.ex. al núvol, connectant un cable a un ordinador, correu electrònic, etc.)</string>
+    <string name="objectives2_easyrestore">Si el vostre telèfon està avariat o perdut, és fàcil recuperar la vostra configuració remotament sense una còpia de seguretat.</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">Lectures CGM sorolloses</string>
+    <string name="noisycgm_whattodo">Què cal fer si les dades del CGM son sorolloses?</string>
+    <string name="noisycgm_nothing">No cal fer res, AndroidAPS se n\'encarregarà.</string>
+    <string name="noisycgm_pause">Desactivar el llaç tancat per evitar dosi massa altes o baixes.</string>
+    <string name="noisycgm_replacesensor">Substituir els sensors constantment sorollosos o inexactes.</string>
+    <string name="noisycgm_checksmoothing">Comprovar que la vostra app de CGM proporciona dades suavitzades.</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="exerciseprofile_label">Esport i perfils</string>
+    <string name="exerciseprofile_whattodo">Com es poden utilitzar els perfils per ajudar el sistema a gestionar l\'esport aeròbic?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Fer un canvi de perfil a menys del 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Fer un canvi de perfil a més del 100%.</string>
+    <string name="exerciseprofile_leaveat100">Deixar el perfil al 100%.</string>
+    <string name="exerciseprofile_suspendloop">Aturar el llaç.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">Esport i objectius temporals</string>
+    <string name="exercise_whattodo">Com es poden utilitzar els objectius temporals per ajudar el sistema a gestionar l\'esport aeròbic?</string>
+    <string name="exercise_settt">Establir un objectiu glucèmic d\'activitat, prou temps abans de començar l\'esport.</string>
+    <string name="exercise_setfinished">Establir un objectiu glucèmic d\'activitat un cop acabat l\'esport.</string>
+    <string name="exercise_setunchanged">Deixar l\'objectiu glucèmic com està.</string>
+    <string name="exercise_15g">Esperar que la glucèmia baixi per sota del vostre objectiu temporal d\'hipoglucèmia i llavors prendre 15g de carbohidrats d\'acció ràpida.</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">Llaç desactivat/aturat</string>
+    <string name="suspendloop_doigetinsulin">Rebo insulina quan el llaç està desactivat/aturat?</string>
+    <string name="suspendloop_yes">Sí, la insulina basal es continua lliurant.</string>
+    <string name="suspendloop_no">No, s\'atura el lliurament d\'insulina.</string>
+    <string name="basaltest_label">Basal, ISF (Factor Sensibilitat Insulina) i proves I:C (ràtio insulina/carbohidrats)</string>
+    <string name="basaltest_when">Quan s\'haurien de validar aquests valors?</string>
+    <string name="basaltest_beforeloop">Abans de començar amb el llaç.</string>
+    <string name="basaltest_havingregularhighlow">Quan es produeixen sovint glucèmies altes i baixes.</string>
+    <string name="basaltest_weekly">Almenys un cop per setmana.</string>
+    <string name="basaltest_fixed">Un cop configurats i validats, aquests valors no haurien de canviar amb el temps.</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">Prerequisits</string>
+    <string name="prerequisites_what">Què seria essencial per configurar i utilitzar AndroidAPS?</string>
+    <string name="prerequisites_determinedcorrectprofile">Informació del perfil validada (basal, ràtio I:C, ISF, DIA).</string>
+    <string name="prerequisites_computer">Un ordinador amb Android Studio instal·lat i configurat.</string>
+    <string name="prerequisites_phone">Un telèfon compatible.</string>
+    <string name="prerequisites_pump">Una bomba d\'insulina compatible, si és que voleu acabar fent servir un llaç tancat.</string>
+    <string name="prerequisites_nightscout">Nightscout, per tenir un registre amb totes els dades i poder revisar la configuració.</string>
+    <string name="prerequisites_tidepoolaccount">Un compte Tidepool.</string>
+    <string name="prerequisites_googleaccount">Un compte Google.</string>
+    <string name="prerequisites_githubaccount">Un compte Github.</string>
+    <string name="prerequisites_beanandroiddeveloper">Experiència en programació o edició de codi.</string>
+    <string name="prerequisites_own670g">Una bomba MiniMed 670G.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="prerequisites_smartwatch">Un smartwatch (rellotge intel·ligent).</string>
+    <string name="prerequisites_supportedcgm">Un CGM (Monitor Continu de Glucosa) compatible.</string>
+    <string name="prerequisites2_label">Requisits previs</string>
+    <string name="prerequisites2_what">Què seria essencial per configurar i utilitzar AndroidAPS?</string>
+    <string name="prerequisites2_profile">Informació validada per poder configurar un perfil (ISF, ràtio I:C, basals, DIA, etc.).</string>
+    <string name="prerequisites2_device">Un dispositiu Android compatible (p.ex. telèfon mòbil, rellotge Android o tauleta).</string>
+    <string name="prerequisites2_internet">AndroidAPS necessita una connexió a internet per poder funcionar en mode llaç tancat.</string>
+    <string name="prerequisites2_supportedcgm">Un CGM (monitor continu de glucosa) compatible i l\'app adequada per rebre al telèfon/dispositiu els valors de glucèmia que proporciona.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">Actualitzant AndroidAPS</string>
+    <string name="whatistrue">Marqueu totes les respostes correctes.</string>
+    <string name="update_git">Cal tenir Git instal·lat i configurat al vostre ordinador.</string>
+    <string name="update_asap">Quan es lliuren versions actualitzades d\'AndroidAPS, les versions anteriors poden ser limitades remotament al cap d\'un temps, en una data determinada.</string>
+    <string name="update_keys">Haurieu de desar i anotar la ubicació del vostre \"keystore\" i utilitzar la mateixa clau de signatura per la instal·lació anterior que per les noves actualitzacions.</string>
+    <string name="update_neverupdate">No actualitzeu mai si el sistema està funcionant correctament.</string>
+    <string name="update_askfriend">Si teniu problemes en compilar l\'apk (aplicació), podeu instal·lar una apk que hagi estat compilada per una amiga.</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">Resolució de problemes</string>
+    <string name="troubleshooting_wheretoask">A on es pot cercar ajuda relacionada amb AndroidAPS?</string>
+    <string name="troubleshooting_fb">Demanant consell al grup de Facebook d\'usuaris d\'AndroidAPS.</string>
+    <string name="troubleshooting_wiki">Llegint (i rellegint) la documentació d\'AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Demanant consell i enregistrant problemes tècnics o errors de funcionament a la sala AndroidAPS de Gitter.</string>
+    <string name="troubleshooting_yourendo">Preguntant a la clínica on us porten la diabetis o a la vostra endocrinòloga.</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">Plugins d\'insulina</string>
+    <string name="insulin_ultrarapid">Quina insulina s\'ha de fer servir amb el plugin Ultra-Rapid Oref?</string>
+    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
+    <string name="insulin_humalog">Humalog®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin R®/insulina humana \"estàndard\".</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">Plugins de sensibilitat</string>
+    <string name="sensitivity_which">Marqueu totes les respostes correctes.</string>
+    <string name="sensitivity_adjust">Els plugins de sensibilitat permeten AndroidAPS ajustar-se davant de canvis temporals o breus de sensibilitat a l\'insulina (per exemple canvis hormonals o problemes d\'absorció al lloc d\'infusió).</string>
+    <string name="sensitivity_edit">Els plugins de sensibilitat ofereixen l\'usuari suggeriments de canvi de les basals, ràtios I:C (insulina:carbohidrats) i ISF (factor de sensibilitat a l\'insulina) que poden ser utilitzats per editar el perfil.</string>
+    <string name="sensitivity_cannula">L\'enregistrament d\'un canvi de cànula restableix la ràtio Autosens, deixant-lo de nou a un 100%.</string>
+    <string name="sensitivity_time">Algunes de les opcions de plugins es poden configurar segons rangs horaris que poden ser definits per l\'usuari.</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="wrongcarbs_label">Errors d\'entrada de carbohidrats</string>
+    <string name="wrongcarbs_whattodo">Què cal fer si feu una entrada incorrecta de carbohidrats?</string>
+    <string name="wrongcarbs_treatmentstab">Elimineu la entrada incorrecta a Tractaments i introduïu el valor correcte de carbohidrats.</string>
+    <string name="wrongcarbs_addinsulin">Bolus amb insulina utilitzant el menú d\'encebat del set d\'infusió.</string>
+    <string name="wrongcarbs_donothing">Res - AndroidAPS ja farà els ajustos apropiats.</string>
+    <string name="wrongcarbs_bolus">Bolus amb insulina utilitzant el botó d\'Insulina (bolus) de la pantalla \"Inici\".</string>
+    <string name="wronginsulin_label">Errors de lliurament/registre d\'insulina</string>
+    <string name="wronginsulin_whattodo">Què cal fer si rebeu menys insulina de la que suggereix l\'historial de la bomba, p.ex. degut a una oclusió, a una cànula que no funciona o un oblit de reconnexió de la bomba després d\'una dutxa?</string>
+    <string name="wronginsulin_careportal">Eliminar dades d\'insulina del portal de cures Nightscout per eliminar-les de l\'historial de la bomba.</string>
+    <string name="wronginsulin_compare">Compara els valors entre AndroidAps i l’historial de la bomba (si la bomba ho admet).</string>
+    <string name="wronginsulin_prime">Lliurar un bolus amb part de la insulina que falta utilitzant una jeringa/ploma o el menú d\'encebat.</string>
+    <string name="wronginsulin_donothing">No fer res i permetre que AndroidAPS corregeixi els possibles valors alts de glucèmia que es produeixin.</string>
+    <string name="iob_label">Insulina \"a bord\" (IOB)</string>
+    <string name="iob_which">Marqueu totes les respostes correctes.</string>
+    <string name="iob_value">El valor d\'IOB es veu afectat per les basals temporals lliurades.</string>
+    <string name="iob_hightemp">Una basal temporal alta no serà lliurada si la glucèmia està per sota de l\'objectiu.</string>
+    <string name="iob_posiob">Un valor d\'IOB positiu durant un període de temps important suggereix resistència a la insulina o àpats no anunciats.</string>
+    <string name="breadgrams_label">Entrada de carbohidrats i bolus</string>
+    <string name="breadgrams_grams">A l\'hora d\'estimar i registrar els carbohidrats consumits, només s\'han de fer servir grams.</string>
+    <string name="breadgrams_exchange">Els carbohidrats consumits poden registrar-se utilitzant un sistema d\'intercanvi apropiat (p.ex. intercanvis DAFNE \"CHO\" o les \"Unitats de pa\" europees).</string>
+    <string name="breadgrams_decay">AndroidAPS fa servir un model dinàmic per estimar com \"decauen\" els carbohidrats i calcular els COB.</string>
+    <string name="breadgrams_calc">Si els valors de glucèmia estan fora dels valors acceptats (massa alts o massa baixos) la calculadora de bolus es pot fer servir per obtenir suggeriments de carbohidrats o correccions amb insulina.</string>
+    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
+    <string name="extendedcarbs_label">e-carbs</string>
+    <string name="extendedcarbs_handling">Per a què poden ser utilitzats els e-carbs (carbohidrats estesos)?</string>
+    <string name="extendedcarbs_future">Per programar carbs del futur, possiblement distribuïts durant un interval de temps (similar a un bolus estès distribuint insulina durant un interval).</string>
+    <string name="extendedcarbs_free">Per registrar carbohidrats d\'esport \"lliures\" que volgueu ocultar a AndroidAPS.</string>
+    <string name="extendedcarbs_fat">els e-carbs (distribuïts en el futur) poden ajudar AndroidAPS a gestionar àpats rics en greix/proteïnes.</string>
+    <string name="extendedcarbs_rescue">Per registrar els carbohidrats de rescat que s\'utilitzen per tractar hipoglucèmies.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">Monitorització a distància</string>
+    <string name="nsclient_howcanyou">Com podeu monitoritzar AndroidAPS (per exemple per la vostra filla) a distància?</string>
+    <string name="nsclient_nightscout">Les aplicacions NS Client i Nightscout, així com la web Nightscout us permeten fer un seguiment d\'AndroidAPS a distància.</string>
+    <string name="nsclient_dexcomfollow">Altres aplicacions (p.ex. Dexcom follow, xDrip en mode seguiment) us permeten monitoritzar alguns paràmetres (p.ex. glucèmia/valors sensor) de forma remota, però fan servir algoritmes diferents, per tant poden tenir valors d\'IOB o COB inexactes.</string>
+    <string name="nsclient_data">Per seguir AndroidAPS a distància, ambdos dispositius han de tenir accés a internet (p.ex. via Wi-Fi o dades de la xarxa mòbil).</string>
+    <string name="nsclient_fullcontrol">L\'NS Client utilitzat com a seguidor remot, permet tant monitoritzar AndroidAPS com controlar-lo totalment.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">Factor de Sensibilitat a la Insulina (ISF)</string>
+    <string name="isf_noeffect">Augmentar o disminuir l\'ISF no afecta la quantitat d\'insulina a lliurar quan els valors de glucèmia estan per sota de l\'objectiu.</string>
+    <string name="isf_preferences">Cal introduir l\'ISF a la configuració d\'AndroidAPS.</string>
+    <string name="isf_profile">Modificar el valor d\'ISF al perfil és suficient per aplicar el canvi.</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_multiple">Podeu fer servir més d\'un valor per la relació I:C al vostre perfil.</string>
+    <string name="ic_isf">Si modifiqueu l\'ISF al vostre perfil haureu de modificar també sempre el vostre ràtio I:C.</string>
+    <string name="ic_label_exam">Ràtio Insulina:Carbohidrats (I:C ràtio)</string>
+    <string name="ic_increasingvalue">Ràtios I:C elevades fan que es lliuri menys insulina per una quantitat de carbohidrats determinada.</string>
+    <string name="ic_decreasingvalue">Ràtios I:C baixes fan que es lliuri menys insulina per una quantitat de carbohidrats determinada.</string>
+    <string name="ic_noeffect">Si teniu 0 COB, modificar la ràtio I: C farà que es lliuri una quantitat d\'insulina diferent per corregir un valor de glucèmia determinat.</string>
+    <string name="ic_different">La ràtio I:C serà diferent si compteu una unitat de carbohidrats com 10g o 12g.</string>
+    <string name="ic_meaning">Significat d\'I:C: Quantes unitats d\'hidrats de carboni estan cobertes amb 1U d\'insulina.</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+</resources>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 718d414505e..fb327fd66d8 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -3,5 +3,160 @@
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <string name="treatmentssafety_title">Seguretat tractaments</string>
+    <string name="treatmentssafety_maxbolus_title">Max bolus permès [U]</string>
+    <string name="treatmentssafety_maxcarbs_title">Max carbs permesos [g]</string>
+    <string name="nav_preferences_plugin">%1$s configuració</string>
+    <string name="nav_preferences">Configuració</string>
+    <string name="nav_refreshtreatments">Actualitzar tractaments des de NS</string>
+    <string name="nav_resetdb">Restablir bases de dades</string>
+    <string name="reset_db_confirm">Esteu segurs que voleu restablir les bases de dades?</string>
+    <string name="nav_exit">Sortir</string>
+    <string name="alert_dialog_permission_battery_optimization_failed">Sembla que aquest dispositiu no permet optimitzar la bateria amb llistes blanques, això pot provocar problemes de rendiment.</string>
+    <string name="description_actions">Alguns botons per accedir ràpid a funcions habituals</string>
+    <string name="description_config_builder">Utilitzat per configurar plugins actius</string>
+    <string name="description_objectives">Programa d\'aprenentatge</string>
+    <string name="description_food">Mostra els valors preestablerts per alimentació definits a Nightscout</string>
+    <string name="description_insulin_rapid">Configuració preestablerta per insulina Humalog i NovoRapid/NovoLog</string>
+    <string name="description_insulin_ultra_rapid">Configuració preestablerta per insulina Fiasp</string>
+    <string name="description_insulin_lyumjev">Configuració preestablerta per insulina Lyumjev</string>
+    <string name="description_insulin_free_peak">Permet definir el pic d\'activitat de la insulina. A utilitzar només per usuaris avançats</string>
+    <string name="description_loop">Activar o desactivar la implementació que activa el llaç.</string>
+    <string name="description_ns_client">Sincronitza les vostres dades amb Nightscout</string>
+    <string name="description_ama">Estat de l\'algoritme el 2017</string>
+    <string name="description_smb">Algoritme més nou per usuaris avançats</string>
+    <string name="description_overview">Mostra l\'estat actual del llaç i botons per les accions més habituals</string>
+    <string name="description_persistent_notification">Va mostrant avisos amb un petit resum del que el llaç està fent</string>
+    <string name="description_profile_local">Definir un perfil disponible fora de línia.</string>
+    <string name="description_pump_mdi">Integració de bomba d\'insulina per persones que fan servir teràpia amb múltiples injeccions</string>
+    <string name="description_pump_virtual">Integració de bombes d\'insulina per les quals encara no existeix driver/controlador (Llaç obert)</string>
+    <string name="description_sensitivity_aaps">Sensibilitat calculada com amb Oref0, però podent especificar un rang de temps en el passat. L\'absorció mínima dels carbohidrats es calcula a partir del temps màxim d\'absorció de carbohidrats indicat a la configuració.</string>
+    <string name="description_sensitivity_oref1">Sensibilitat calculada amb dades de 8 o 24 hores en el passat (s\'agafa el cas més \"sensible\"). Els carbohidrats (els no absorbits), es desestimen un cop passat el temps indicat a la configuració. El plugin també calcula les UAM.</string>
+    <string name="description_sensitivity_weighted_average">Sensibilitat calculada com una mitja ponderada a partir de les desviacions. Les noves desviacions tenen un pes més gran. L\'absorció mínima dels carbohidrats es calcula a partir del temps màxim d\'absorció de carbohidrats indicat a la configuració. Aquest algoritme és el més ràpid en seguir els canvis de sensibilitat.</string>
+    <string name="description_source_eversense">Rebre valors de glucèmia de l\'app Eversense \"parxejada\".</string>
+    <string name="description_source_glimp">Rebre valors de glucèmia de Glimp.</string>
+    <string name="description_source_mm640g">Rebre valors de glucèmia del 600SeriesAndroidUploader.</string>
+    <string name="description_source_ns_client">Descarrega dades de glucèmia des de Nightscout</string>
+    <string name="description_source_xdrip">Rebre valors de glucèmia de xDrip+.</string>
+    <string name="description_treatments">Desa tots els tractaments realitzats</string>
+    <string name="description_wear">Monitoritzar i controlar AndroidAPS des del vostre rellotge WearOS.</string>
+    <string name="description_xdrip_status_line">Mostrar informació del llaç a la vostra esfera xDrip+.</string>
+    <string name="description_sms_communicator">Controlar remotament AndroidAPS amb ordres SMS.</string>
+    <string name="treatments_insulin_label_string">Insulina:</string>
+    <string name="treatments_carbs_label_string">Carbs:</string>
+    <string name="treatments_iob_label_string">IOB:</string>
+    <string name="sms_iob">IOB:</string>
+    <string name="treatments_iobtotal_label_string">IOB total:</string>
+    <string name="treatments_iobactivitytotal_label_string">Activitat total IOB:</string>
+    <string name="tempbasals_realduration_label_string">Durada:</string>
+    <string name="tempbasals_netratio_label_string">Ràtio:</string>
+    <string name="tempbasals_netinsulin_label_string">Ins:</string>
+    <string name="tempbasals_iob_label_string">IOB:</string>
+    <string name="tempbasals_iobtotal_label_string">IOB total:</string>
+    <string name="treatments_wizard_bg_label">Glucèmia</string>
+    <string name="treatments_wizard_tt_label">OT</string>
+    <string name="treatments_wizard_carbs_label">Carbs</string>
+    <string name="treatments_wizard_correction_label">Corr</string>
+    <string name="treatments_wizard_bolusiob_label">IOB Bolus</string>
+    <string name="openapsma_run">Executar ara</string>
+    <string name="vitualpump_label">BOMBA VIRTUAL</string>
+    <string name="openapsma_lastrun_label">Última execució</string>
+    <string name="openapsma_inputparameters_label">Paràmetres d\'entrada</string>
+    <string name="openapsma_glucosestatus_label">Estat glucèmia</string>
+    <string name="openapsma_currenttemp_label">Temp actual</string>
+    <string name="openapsma_iobdata_label">Dades d\'IOB</string>
+    <string name="openapsma_profile_label">Perfil</string>
+    <string name="openapsma_mealdata_label">Dades àpat</string>
+    <string name="result">Resultat</string>
+    <string name="result_insulin_carbs">Resultat: %1$s %2$s</string>
+    <string name="openapsma_noglucosedata">Dades de glucèmia no disponibles</string>
+    <string name="openapsma_request_label">Petició</string>
+    <string name="delta">Delta</string>
+    <string name="sms_delta">Delta:</string>
+    <string name="configbuilder">Configurador</string>
+    <string name="overview">Inici</string>
+    <string name="treatments">Tractaments</string>
+    <string name="virtualpump">Bomba virtual</string>
+    <string name="configbuilder_pump">Bomba</string>
+    <string name="configbuilder_pump_description">Quina bomba voleu utilitzar amb AndroidAPS?</string>
+    <string name="configbuilder_profile">Perfil</string>
+    <string name="configbuilder_profile_description">Quin perfil ha d\'utilitzar AndroidAPS?</string>
+    <string name="configbuilder_aps">APS</string>
+    <string name="configbuilder_aps_description">Quin algoritme APS ha d\'anar fent ajustos de teràpia?</string>
+    <string name="configbuilder_general">General</string>
+    <string name="configbuilder_general_description">Plugins diversos que us poden ser útils.</string>
+    <string name="configbuilder_constraints_description">Quines restriccions s\'estan aplicant?</string>
+    <string name="constraints">Restriccions</string>
+    <string name="configbuilder_loop">Llaços</string>
+    <string name="configbuilder_loop_description">Fes-ho servir per activar la integració del llaç d\'AndroidAPS.</string>
+    <string name="loop_aps_label">APS</string>
+    <string name="loop_tbrsetbypump_label">Basal temporal definida per la bomba</string>
+    <string name="noapsselected">CAP APS SELECCIONAT O RESULTAT ENTREGAT</string>
+    <string name="safety">Seguretat</string>
+    <string name="openapsma_disabled">Plugin desactivat</string>
+    <string name="constraints_violation">Violació de restriccions</string>
+    <string name="treatmentdeliveryerror">Error en lliurar el bolus</string>
+    <string name="setbasalquestion">Acceptar nova basal temporal:</string>
+    <string name="overview_treatment_label">Tractament</string>
+    <string name="overview_calculator_label">Calculadora</string>
+    <string name="constraintapllied">Restricció aplicada!</string>
+    <string name="sms_bolus">Bolus:</string>
+    <string name="basal">Basal</string>
+    <string name="sms_basal">Basal:</string>
+    <string name="changeyourinput">Modifiqueu les dades!</string>
+    <string name="configbuilder_bgsource">Origen glucèmia</string>
+    <string name="configbuilder_bgsource_description">D\'on ha d\'obtenir AndroidAPS les seves dades?</string>
+    <string name="xdrip">xDrip+</string>
+    <string name="apsmode_title">Mode APS</string>
+    <string name="closedloop">Llaç tancat</string>
+    <string name="openloop">Llaç obert</string>
+    <string name="lowglucosesuspend">Suspensió per glucèmia baixa (LGS)</string>
+    <string name="disabledloop">Llaç desactivat</string>
+    <string name="openloop_newsuggestion">Nova proposta disponible</string>
+    <string name="carbssuggestion">Proposta de carbs</string>
+    <string name="unsupportednsversion">Versió no compatible de Nightscout</string>
+    <string name="treatments_wizard_basaliob_label">IOB Basal</string>
+    <string name="bolusconstraintapplied">Restricció de bolus aplicada</string>
+    <string name="carbsconstraintapplied">Restricció de carbs. aplicada</string>
+    <string name="careportal_newnstreatment_other">Altres</string>
+    <string name="careportal_newnstreatment_meter">Glucòmetre</string>
+    <string name="careportal_newnstreatment_sensor">Sensor</string>
+    <string name="careportal_newnstreatment_carbtime_label">Temps d\'absorció</string>
+    <string name="careportal_newnstreatment_duration_label">Durada</string>
+    <string name="careportal_newnstreatment_profile_label">Perfil</string>
+    <string name="careportal_newnstreatment_glucosetype">Tipus de glucèmia</string>
+    <string name="overview_tempbasal_button">BasalTemp</string>
+    <string name="overview_extendedbolus_button">Bolus estès</string>
+    <string name="configbuilder_nightscoutversion_label">Versió de Nightscout:</string>
+    <string name="missing_carbs">Falten %1$d g</string>
+    <string name="exported">Configuració exportada</string>
+    <string name="ue_exported">Entrades d\'usuari exportades</string>
+    <string name="export_to">Exportar configuració a</string>
+    <string name="import_from">Importar configuració de</string>
+    <string name="setting_imported">Configuració importada</string>
+    <string name="filenotfound">Arxiu no trobat</string>
+    <string name="nav_export">Exportar configuració</string>
+    <string name="nav_import">Importar configuració</string>
+    <string name="openapsma_maxbasal_title">Max U/h per una basal temporal</string>
+    <string name="openapsma_maxbasal_summary">A OpenAPS d\'aquest valor se\'n diu basal màxima</string>
+    <string name="openapsma_maxiob_title">Màxima basal IOB que OpenAPS pot suministrar [U]</string>
+    <string name="openapsma_maxiob_summary">A OpenAPS d\'aquest valor se\'n diu Màx IOB\nÉs la màxima quantitat d\'insulina en [U] que APS pot suministrar d\'una vegada.</string>
+    <string name="password_preferences_encrypt_prompt">Se us demanarà una clau mestra, es farà servir per encriptar la configuració exportada.</string>
+    <string name="password_preferences_decrypt_prompt">Se us demanarà una clau mestra, es necessita per desencriptar la configuració importada.</string>
+    <string name="preferences_export_canceled">Exportació cancel·lada! Configuració NO exportada!</string>
+    <string name="preferences_import_canceled">Importació cancel·lada! Configuració NO importada!</string>
+    <string name="preferences_import_impossible">No s\'ha pogut importar la configuració!</string>
+    <string name="goto_main_try_again">Si us plau, torneu a la pantalla principal i torneu-ho a intentar.</string>
+    <string name="old_master_password">Clau mestra antiga</string>
+    <string name="master_password_will_be_replaced">Com a resultat de la correcta importació, la clau mestra SERÀ SUBSTITUÏDA per l\'antiga!</string>
+    <string name="check_preferences_cannot_import">La configuració no pot ser importada!</string>
+    <string name="check_preferences_dangerous_import">La configuració no s\'hauria d\'importar!</string>
+    <string name="check_preferences_details_btn">Expliqueu problemes d\'importació…</string>
+    <string name="check_preferences_details_title">Detall problemes d\'importació</string>
+    <string name="check_preferences_import_btn">Importar</string>
+    <string name="check_preferences_import_anyway_btn">Importar en qualsevol cas (PERILLÓS!)</string>
+    <string name="end_user_license_agreement">Acord de llicència per a l\'usuari final</string>
+    <string name="smscommunicator_remotecommandnotallowed">Ordre remota no permesa</string>
+    <string name="smscommunicator_remotebolusnotallowed">Bolus remot no disponible. Torneu-ho a intentar més tard.</string>
     <!-- SMS Communicator & OTP Authenticator -->
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index f4263041b41..d1dc1b6dd8c 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -78,7 +78,6 @@
     <string name="overview">Přehled</string>
     <string name="treatments">Ošetření</string>
     <string name="virtualpump">Virtuální pumpa</string>
-    <string name="careportal">Péče</string>
     <string name="configbuilder_pump">Pumpa</string>
     <string name="configbuilder_pump_description">Jakou pumpu chcete používat s AndroidAPS?</string>
     <string name="configbuilder_profile">Profil</string>
@@ -257,7 +256,7 @@
     <string name="ongoingnotificaction">Průběžné oznámení</string>
     <string name="old_data">ZASTARALÉ</string>
     <string name="sms_minago">před %1$d min</string>
-    <string name="localprofile">Místní profil</string>
+    <string name="localprofile">Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Pole %1$d prvků.\nAktuální hodnota:</string>
     <string name="openapsma_autosensdata_label">Data detekce senzitivity</string>
@@ -666,7 +665,6 @@
     <string name="error_adding_treatment_title">Data ošetření neúplná</string>
     <string name="maintenance_settings">Nastavení údržby</string>
     <string name="maintenance_email">Příjemce e-mailu</string>
-    <string name="maintenance_encrypt_exported_prefs">Šifrovat exportované nastavení</string>
     <string name="maintenance_amount">Počet logů k odeslání</string>
     <string name="maintenance">Údržba</string>
     <string name="maintenance_shortname">ÚDRŽBA</string>
@@ -680,6 +678,7 @@
     <string name="resettodefaults">Obnovit výchozí</string>
     <string name="nsmalfunction">Chyba NSClienta. Zvažte restart NS a NSClienta.</string>
     <string name="time_offset">Časový posun</string>
+    <string name="bolus_reminder">Upozornit později na bolus</string>
     <string name="setupwizard_preferred_aps_mode">Preferovaný režim APS</string>
     <string name="treatments_wizard_total_label">Výsledek</string>
     <string name="calculation_short">Kalk</string>
@@ -718,6 +717,7 @@
     <string name="versionChecker">Kontrola verze</string>
     <string name="old_version">stará verze</string>
     <string name="very_old_version">velmi stará verze</string>
+    <string name="application_expired">Platnost aplikace vypršela</string>
     <string name="new_version_warning">Nová verze je dostupná minimálně %1$d dní! Přepnutí na ochranu před nízkou glykémií po %2$d dnech, vypnutí smyčky po %3$d dnech</string>
     <string name="twohours">2h</string>
     <string name="dexcom_app_patched">Aplikace Dexcom (upravená)</string>
@@ -751,7 +751,7 @@
     <string name="clone_label">Klonovat</string>
     <string name="saveorresetchangesfirst">Nejprve uložte nebo resetujte aktuální změny</string>
     <string name="deletecurrentprofile">Odstranit aktuální profil?</string>
-    <string name="copytolocalprofile">Vytvořit z tohoto profilu nový místní profil?</string>
+    <string name="copytolocalprofile">Vytvořit z tohoto profilu nový profil?</string>
     <string name="profilenamecontainsdot">Název profilu obsahuje tečky.\nToto není v NS podporováno.\nProfil není přenesen do NS.</string>
     <string name="low_mark_comment">Spodní hodnota oblasti v rozsahu (pouze zobrazování)</string>
     <string name="high_mark_comment">Horní hodnota oblasti v rozsahu (pouze zobrazování)</string>
@@ -833,7 +833,7 @@
     <string name="dpvdefaultprofile">Výchozí profil DPV</string>
     <string name="setupwizard_pump_riley_link_status">Status RileyLink:</string>
     <string name="filter">Filtr</string>
-    <string name="copytolocalprofile_invalid">Nelze vytvořit lokální profil. Profil je neplatný.</string>
+    <string name="copytolocalprofile_invalid">Nelze vytvořit profil. Profil je neplatný.</string>
     <string name="cta_dont_kill_my_app_info">Nezabíjet mou aplikaci?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Odeslat SMS, pokud je detekována nedostupná pumpa</string>
     <string name="smscommunicator_pump_ureachable">Nahlásit nedostupnou pumpu</string>
@@ -845,6 +845,11 @@
     <string name="enablebolusadvisor_summary">Při vysoké glykémii použijte připomenutí, abyste začali jíst později, namísto výsledku z kalkulátoru („prebolus“)</string>
     <string name="time_to_eat">Čas k jídlu!\nSpusťte Bolusovou kalkulačku a proveďte výpočet znovu.</string>
     <string name="timetoeat">Čas k jídlu</string>
+    <string name="bolusreminder">Připomenutí bolusu</string>
+    <string name="enablebolusreminder">Povolit připomínání bolusu</string>
+    <string name="enablebolusreminder_summary">Použijte připomenutí pro pozdější bolus s kalkulátorem
+        (\"zpožděný bolus\")</string>
+    <string name="time_to_bolus">Čas na bolus!\nSpusťte Bolusovou kalkulačku a proveďte výpočet znovu.</string>
     <string name="fabric_upload_disabled">Nahrávání protokolů o pádech zakázáno!</string>
     <string name="graph_menu_divider_header">Graf</string>
     <string name="chart_menu">Možnosti grafu</string>
@@ -857,13 +862,14 @@
     <string name="email_address">E-mailová adresa</string>
     <string name="privacy_settings">Nastavení soukromí</string>
     <string name="privacy_summary">Pokud chcete být upozorněni na selhání aplikace, můžete zadat volitelně e-mailovou adresu. Toto není automatizovaná služba. Vývojáři vás budou kontaktovat v nebezpečných situacích.</string>
-    <string name="full_sync">Úplná synchronizace</string>
+    <string name="full_sync">Plná synchronizace</string>
+    <string name="full_sync_comment">Úplná synchronizace? Může to trvat mnoho hodin a dokud neskončíte, nová data v NS neuvidíte.</string>
     <string name="prime">Doplňování</string>
     <string name="ns_sync_options">Synchronizace</string>
     <string name="ns_upload_summary">Profily, bolusy, sacharidy, dočasné bazály jsou nahrány do NS</string>
     <string name="ns_upload">Nahrávat data do NS</string>
     <string name="ns_receive_profile_store">Přijímat úložiště profilu</string>
-    <string name="ns_receive_profile_store_summary">Synchronizovat profily z NS do místního profilu</string>
+    <string name="ns_receive_profile_store_summary">Synchronizovat profily z editoru profilu v NS</string>
     <string name="ns_receive_temp_target">Přijímat dočasné cíle</string>
     <string name="ns_receive_temp_target_summary">Přijmout dočasné cíle zadané prostřednictvím NS nebo NSClienta</string>
     <string name="ns_receive_profile_switch">Přijímat přepnutí profilu</string>
@@ -881,4 +887,14 @@
     <string name="sms_timeout_while_wating">Vypršel časový limit při čekání na dokončení předchozí komunikace s pumpou</string>
     <string name="smscommunicator_another_bolus_in_queue">Ve frontě je další bolus. Zkuste to znovu později.</string>
     <string name="calculation_in_progress">Probíhá výpočet</string>
+    <string name="missing_profile_name">Chybí název profilu</string>
+    <string name="error_in_ic_values">Chyba v hodnotách sach. poměru</string>
+    <string name="error_in_basal_values">Chyba v hodnotách bazálu</string>
+    <string name="error_in_target_values">Chyba v hodnotách cílové gl.</string>
+    <string name="error_in_isf_values">Chyba v hodnotách inz. citlivosti</string>
+    <string name="run_question">Spustit %s?</string>
+    <string name="invalid_profile_not_accepted">Neplatný profil %1$s nebyl přijat z NS</string>
+    <string name="view">Zobrazit</string>
+    <string name="errors">Chyby</string>
+    <string name="ns_sync_slow">Zpomalit odesílání</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 2375b013bdf..cd76811d088 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -12,7 +12,6 @@
     <string name="nav_resetdb">Datenbanken zurücksetzen</string>
     <string name="reset_db_confirm">Möchtest du die Datenbank wirklich zurücksetzen?</string>
     <string name="nav_exit">Schließen</string>
-    <string name="ns_sync_use_absolute_title">Verwende absolute statt prozentuale Basalwerte beim Upload zu NightScout.</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Dieses Gerät scheint keine Deaktivierung der Energieoptimierung zu unterstützen - das könnte zu Leistungsproblemen führen.</string>
     <string name="description_actions">Einige Schaltflächen, um auf häufig verwendete Funktionen zugreifen zu können.</string>
     <string name="description_config_builder">Dient zum Konfigurieren der aktiven Plugins</string>
@@ -78,7 +77,6 @@
     <string name="overview">Übersicht</string>
     <string name="treatments">Behandlungen</string>
     <string name="virtualpump">Virtuelle Pumpe</string>
-    <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pumpe</string>
     <string name="configbuilder_pump_description">Welche Pumpe möchtest Du mit AndroidAPS nutzen?</string>
     <string name="configbuilder_profile">Profil</string>
@@ -257,7 +255,7 @@
     <string name="ongoingnotificaction">Anhaltende Benachrichtigung</string>
     <string name="old_data">VERALTETE DATEN</string>
     <string name="sms_minago">%1$d\' her</string>
-    <string name="localprofile">Lokales Profil</string>
+    <string name="localprofile">Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Array mit %1$d Elementen.\nWert:</string>
     <string name="openapsma_autosensdata_label">Autosens-Daten</string>
@@ -651,6 +649,8 @@
     <string name="time_elapsed">Verstrichene Zeit</string>
     <string name="poctech">Poctech</string>
     <string name="description_source_poctech">Empfange Blutzucker-Werte von der Poctech-App.</string>
+    <string name="glunovo">Glunovo</string>
+    <string name="description_source_glunovo">Werte von der Glunovo App erhalten</string>
     <string name="description_source_tomato">Empfange Blutzucker-Werte von der Tomato-App (MiaoMiao-Geräte)</string>
     <string name="high_temptarget_raises_sensitivity_title">Hohe temporäre Ziele erhöhen die Sensitivität</string>
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Erhöhe die Sensitivität für temporäre Ziele >= 100.]]></string>
@@ -666,7 +666,6 @@
     <string name="error_adding_treatment_title">Behandlungsdaten unvollständig</string>
     <string name="maintenance_settings">Wartungseinstellungen</string>
     <string name="maintenance_email">E-Mail</string>
-    <string name="maintenance_encrypt_exported_prefs">Exportierte Einstellungen verschlüsseln</string>
     <string name="maintenance_amount">Anzahl der zu sendenden Logs</string>
     <string name="maintenance">Wartung</string>
     <string name="maintenance_shortname">WRTNG</string>
@@ -719,6 +718,7 @@ Unerwartetes Verhalten.</string>
     <string name="versionChecker">Versionsprüfer</string>
     <string name="old_version">Vorherige Version</string>
     <string name="very_old_version">sehr alte Version</string>
+    <string name="application_expired">Anwendung abgelaufen</string>
     <string name="new_version_warning">Neue Version seit mindestens %1$d Tagen verfügbar! Rückfall zur sensorunterstützten Pumpentherapie nach %2$d Tagen, Loop wird nach  %3$d Tagen deaktiviert.</string>
     <string name="twohours">2h</string>
     <string name="dexcom_app_patched">gepatchte Dexcom App</string>
@@ -752,7 +752,7 @@ Unerwartetes Verhalten.</string>
     <string name="clone_label">Klonen</string>
     <string name="saveorresetchangesfirst">Speichere oder verwerfe die aktuellen Änderungen zuerst</string>
     <string name="deletecurrentprofile">Aktuelles Profil löschen?</string>
-    <string name="copytolocalprofile">Neues lokales Profil auf Basis dieses Profils erstellen?</string>
+    <string name="copytolocalprofile">Neues Profil auf Basis dieses Profils erstellen?</string>
     <string name="profilenamecontainsdot">Profilname enthält Punkte.\nDies wird von NS nicht unterstützt.\nProfil wird nicht zu NS hochgeladen.</string>
     <string name="low_mark_comment">Unterer Wert des Zielbereichs (nur Anzeige)</string>
     <string name="high_mark_comment">Oberer Wert des Zielbereichs (nur Anzeige)</string>
@@ -834,7 +834,7 @@ Unerwartetes Verhalten.</string>
     <string name="dpvdefaultprofile">DPV-Standard-Profil</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink Status:</string>
     <string name="filter">Filter</string>
-    <string name="copytolocalprofile_invalid">Lokales Profil kann nicht erstellt werden. Profil ist ungültig.</string>
+    <string name="copytolocalprofile_invalid">Profil kann nicht erstellt werden. Profil ist ungültig.</string>
     <string name="cta_dont_kill_my_app_info">Don\'t kill my app?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">SMS senden, wenn Pumpe nicht erreichbar</string>
     <string name="smscommunicator_pump_ureachable">Hinweis Pumpe nicht erreichbar</string>
@@ -858,13 +858,14 @@ Unerwartetes Verhalten.</string>
     <string name="email_address">E‐Mail‐Adresse</string>
     <string name="privacy_settings">Privatsphäre-Einstellungen</string>
     <string name="privacy_summary">Du kannst optional eine E-Mail-Adresse angeben, wenn Du bei Absturzberichten kontaktiert werden möchtest. Dies ist keine Automatik, Du wirst von den Entwicklern in gefährlichen Situationen kontaktiert. </string>
-    <string name="full_sync">Vollständige Sync</string>
+    <string name="full_sync">Vollständige Synchronisierung</string>
+    <string name="full_sync_comment">Vollständige Synchronisierung? Es kann viele Stunden dauern und bis zur Fertigstellung wirst du keine neuen Daten in NS sehen.</string>
     <string name="prime">Füllen</string>
     <string name="ns_sync_options">Synchronisierung</string>
     <string name="ns_upload_summary">Profile, Boli, Kohlenhydrate und temporäre Basalraten werden zu NS hochgeladen</string>
     <string name="ns_upload">Daten zu NS hochladen</string>
     <string name="ns_receive_profile_store">Gespeicherte Profile abrufen</string>
-    <string name="ns_receive_profile_store_summary">Profile vom NS-Profil-Editors zu lokalen Profil synchronisieren</string>
+    <string name="ns_receive_profile_store_summary">Profile mit NS Profil-Editor synchronisieren</string>
     <string name="ns_receive_temp_target">Temporäre Ziele abrufen</string>
     <string name="ns_receive_temp_target_summary">Temp. Ziele akzeptieren, die in NS oder NSClient eingegeben wurden</string>
     <string name="ns_receive_profile_switch">Profilwechsel abrufen</string>
@@ -882,4 +883,13 @@ Unerwartetes Verhalten.</string>
     <string name="sms_timeout_while_wating">Zeitüberschreitung beim Warten auf das Ende der vorherigen Kommunikation mit der Pumpe</string>
     <string name="smscommunicator_another_bolus_in_queue">In der Warteschlange befindet sich ein weiterer Bolus. Bitte später erneut versuchen.</string>
     <string name="calculation_in_progress">Kalkulation wird gerade durchgeführt</string>
+    <string name="missing_profile_name">Fehlender Profilname</string>
+    <string name="error_in_ic_values">Fehler in IC-Werten</string>
+    <string name="error_in_basal_values">Fehler in den Basalwerten</string>
+    <string name="error_in_target_values">Fehler in den Zielwerten</string>
+    <string name="error_in_isf_values">Fehler in ISF-Werten</string>
+    <string name="ns_sync_slow">Hochladen verlangsamen</string>
+    <string name="data_status">Status BZ-Daten</string>
+    <string name="recalculated_data_used">Verwendete Daten neu berechnet</string>
+    <string name="bg_too_close">BZ zu nah:\n%1$s\n%2$s</string>
 </resources>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index e19e0259aba..4f590ba2b3b 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -74,7 +74,6 @@
     <string name="overview">Επισκόπηση</string>
     <string name="treatments">Θεραπείες</string>
     <string name="virtualpump">Εικονική Αντλία</string>
-    <string name="careportal">Φροντίδα</string>
     <string name="configbuilder_pump">Αντλία</string>
     <string name="configbuilder_pump_description">Ποια αντλία θα θέλατε να χρησιμοποιήσετε με το AndroidAPS;</string>
     <string name="configbuilder_profile">Προφίλ</string>
@@ -198,7 +197,6 @@
     <string name="ongoingnotificaction">Συνεχής Ειδοποίηση</string>
     <string name="old_data">Παλιά Δεδομένα</string>
     <string name="sms_minago">πριν από %1$d λεπτά</string>
-    <string name="localprofile">Τοπικό Προφίλ</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Πεδίο %1$d Στοιχεία.\nΤρέχουσα τιμή:</string>
     <string name="openapsma_autosensdata_label">Δεδομένα Autosens</string>
diff --git a/app/src/main/res/values-es-rES/exam.xml b/app/src/main/res/values-es-rES/exam.xml
index be9e506253d..881f8576c68 100644
--- a/app/src/main/res/values-es-rES/exam.xml
+++ b/app/src/main/res/values-es-rES/exam.xml
@@ -132,6 +132,7 @@
     <string name="wronginsulin_label">Errores de entrega/entrada de insulina</string>
     <string name="wronginsulin_whattodo">¿Qué debes hacer si recibiste menos insulina de la que sugiere la historia de la bomba p.ej. debido a una oclusión, una cánula fallida o olvidarse de reponer la bomba después de una ducha?</string>
     <string name="wronginsulin_careportal">Elimina los datos de insulina del portal de Nightscout Careportal para eliminarlos del historial de la bomba.</string>
+    <string name="wronginsulin_compare">Comparar valores en AndroidAPS con el historial de la bomba (si la bomba lo soporta).</string>
     <string name="wronginsulin_prime">Bolo una proporción de la insulina calculada “perdida” por jeringa/pluma o usando menú de llenado.</string>
     <string name="wronginsulin_donothing">No haga nada y permite que AndroidAPS corrija cualquier nivel alto de glucosa en la sangre resultante.</string>
     <string name="iob_label">Insulina a bordo (IOB)</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 54d825a9cbd..a939f23e588 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -45,14 +45,14 @@
     <string name="description_sms_communicator">Control remoto de AndroidAPS mediante comandos SMS.</string>
     <string name="treatments_insulin_label_string">Insulina:</string>
     <string name="treatments_carbs_label_string">Carbohidratos:</string>
-    <string name="treatments_iob_label_string">IOB (Insulina Activa):</string>
-    <string name="sms_iob">IOB (Insulina Activa):</string>
+    <string name="treatments_iob_label_string">IOB:</string>
+    <string name="sms_iob">IOB:</string>
     <string name="treatments_iobtotal_label_string">IOB total:</string>
     <string name="treatments_iobactivitytotal_label_string">Actividad total IOB:</string>
     <string name="tempbasals_realduration_label_string">Dur:</string>
     <string name="tempbasals_netratio_label_string">Relación:</string>
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
-    <string name="tempbasals_iob_label_string">IOB (Insulina Activa):</string>
+    <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">IOB Total:</string>
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">OT</string>
@@ -78,7 +78,6 @@
     <string name="overview">Inicio</string>
     <string name="treatments">Tratamientos</string>
     <string name="virtualpump">Bomba virtual</string>
-    <string name="careportal">Portal de Tratamientos</string>
     <string name="configbuilder_pump">Bomba</string>
     <string name="configbuilder_pump_description">¿Qué bomba quieres utilizar con AndroidAPS?</string>
     <string name="configbuilder_profile">Perfil</string>
@@ -133,6 +132,7 @@
     <string name="configbuilder_nightscoutversion_label">Nightscout versión:</string>
     <string name="missing_carbs">Falta %1$d g</string>
     <string name="exported">Preferencias exportadas</string>
+    <string name="ue_exported">Entradas de usuario exportadas</string>
     <string name="export_to">Exportar ajustes a</string>
     <string name="import_from">Importar configuración de</string>
     <string name="setting_imported">Ajustes importados</string>
@@ -256,12 +256,13 @@
     <string name="ongoingnotificaction">Avisos permanentes</string>
     <string name="old_data">DATOS CADUCADOS</string>
     <string name="sms_minago">hace %1$d min</string>
-    <string name="localprofile">Perfil Local</string>
+    <string name="localprofile">Perfil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Matriz de %1$d elementos.\nValor actual:</string>
     <string name="openapsma_autosensdata_label">Datos Autosens</string>
     <string name="openapsma_scriptdebugdata_label">Depurar script</string>
     <string name="openapsama_useautosens">Usar función Autosens</string>
+    <string name="refresheventsfromnightscout">Actualizar desde NS</string>
     <string name="deletefuturetreatments">Borrar tratamientos en el futuro</string>
     <string name="actions_shortname">ACC</string>
     <string name="configbuilder_shortname">CONF</string>
@@ -385,6 +386,7 @@
     <string name="basal_shortname">BAS</string>
     <string name="deviation_shortname">DEV</string>
     <string name="activity_shortname">ACT</string>
+    <string name="bgi_shortname">-BGI</string>
     <string name="abs_insulin_shortname">ABS</string>
     <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">Acerca de</string>
@@ -400,8 +402,8 @@
     <string name="careportal_sensor_label">Sensor</string>
     <string name="careportal_insulin_label">Insulina</string>
     <string name="careportal_pb_label">Batería de la bomba</string>
-    <string name="careportal_age_label">edad:</string>
-    <string name="careportal_level_label">nivel:</string>
+    <string name="careportal_age_label">Edad:</string>
+    <string name="careportal_level_label">Nivel:</string>
     <string name="ns_alarmoptions">Opciones alarma</string>
     <string name="ns_alarms">Crear notificaciones de alarmas NS</string>
     <string name="ns_announcements">Crear notificaciones de avisos de NS</string>
@@ -450,7 +452,7 @@
     <string name="careportal_newnstreatment_timeshift_label">Cambio de tiempo</string>
     <string name="default_temptargets">Objetivo temporal por defecto</string>
     <string name="eatingsoon_duration">duración comiendopronto</string>
-    <string name="eatingsoon_target">objectivo comiendopronto</string>
+    <string name="eatingsoon_target">objetivo ComiendoPronto</string>
     <string name="activity_duration">duración actividad</string>
     <string name="activity_target">objetivo actividad</string>
     <string name="hypo_duration">Duración Hipo</string>
@@ -491,6 +493,7 @@
     <string name="dexcomg5_xdripupload_title">Mandar datos BG a xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">En xDrip+ elige 640g/Eversense como fuente de datos</string>
     <string name="nsclientbg">NSClient BG</string>
+    <string name="nsclientbgshort">NS BG</string>
     <string name="overview_editquickwizard_usebg">Cálculo BG</string>
     <string name="overview_editquickwizard_usebolusiob">Cálculo bolo IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Cálculo basal IOB</string>
@@ -514,7 +517,6 @@
     <string name="enablesmbwithcob">Habilitar SMB con COB</string>
     <string name="enablesmbwithcob_summary">Habilitar SMB cuando hay Carbohidratos Activo COB.</string>
     <string name="enablesmbwithtemptarget">Habilitar SMB con Objetivos Temporales</string>
-    <string name="enablesmbwithtemptarget_summary">Habilitar SMB cuando hay un Objetivo Temporal (TT) activo (ComerPronto, Actividad)</string>
     <string name="enablesmbwithhightemptarget">Habilitar SMB con Objetivo Temporal Alto</string>
     <string name="enablesmbwithhightemptarget_summary">Habilitar SMB cuando hay un objetivo temporal alto activo (ejercicio, superior a 100 mg/dl o 5.5 mmol/l)</string>
     <string name="overview_insulin_label">Insulina</string>
@@ -544,7 +546,6 @@
     <string name="g5appnotdetected">Actualice su aplicación Dexcom a una versión compatible</string>
     <string name="dexcom_app_not_installed">La aplicación Dexcom no está instalada.</string>
     <string name="start_activity_tt">Inicio OT Actividad</string>
-    <string name="start_eating_soon_tt">Inicio OT ComiendoPronto</string>
     <string name="temptargetshort">OT</string>
     <string name="do_not_bolus_record_only">No administrar Bolo, solo anotar</string>
     <string name="category">Categoría</string>
@@ -552,10 +553,11 @@
     <string name="bolusrecordedonly">Bolo sólo se registrará (no será entregado por la bomba)</string>
     <string name="loop_smbsetbypump_label">SMB administrado por bomba</string>
     <string name="overview_show_activity">Actividad</string>
+    <string name="overview_show_bgi">Impacto de glucosa en sangre</string>
     <string name="overview_show_sensitivity">Sensibilidad</string>
     <string name="overview_show_deviations">Desviaciones</string>
     <string name="overview_show_cob">Carbohidratos activos COB</string>
-    <string name="overview_show_iob">Insulina activa IOB</string>
+    <string name="overview_show_iob">Insulina activa</string>
     <string name="overview_show_basals">Basales</string>
     <string name="no_action_selected">Ninguna acción seleccionada, nada sucederá</string>
     <string name="start_hypo_tt">Inicio OT Hipo</string>
@@ -661,7 +663,6 @@
     <string name="error_adding_treatment_title">Datos de tratamiento incompletos</string>
     <string name="maintenance_settings">Ajustes de mantenimiento</string>
     <string name="maintenance_email">Email</string>
-    <string name="maintenance_encrypt_exported_prefs">Cifrar valores exportados</string>
     <string name="maintenance_amount">Ningún registro para enviar</string>
     <string name="maintenance">Mantenimiento</string>
     <string name="maintenance_shortname">MANT</string>
@@ -713,6 +714,7 @@
     <string name="versionChecker">Verificador de versión</string>
     <string name="old_version">versión antigua</string>
     <string name="very_old_version">versión muy antigua</string>
+    <string name="application_expired">Aplicación caducada</string>
     <string name="new_version_warning">Nueva versión desde al menos %1$d dias disponible! Respaldo a LGS después de %2$d días, se deshabilitará el lazo después de %3$d días</string>
     <string name="twohours">2h</string>
     <string name="dexcom_app_patched">DexcomG App (parcheada)</string>
@@ -739,14 +741,14 @@
     <string name="objectives_button_unstart">Limpieza iniciada</string>
     <string name="doyouwantresetstart">¿Desea reiniciar el objetivo? Puedes perder tu progreso.</string>
     <string name="setupwizard_units_prompt">Seleccione las unidades en las que desea visualizar los valores</string>
-    <string name="dia_short">DIA (Duración Insulina Activa)</string>
+    <string name="dia_short">DIA</string>
     <string name="ic_short">IC</string>
     <string name="isf_short">ISF</string>
     <string name="target_short">TARG</string>
     <string name="clone_label">Clonar</string>
     <string name="saveorresetchangesfirst">Guardar o restablecer los cambios actuales primero</string>
     <string name="deletecurrentprofile">¿Eliminar el perfil actual?</string>
-    <string name="copytolocalprofile">¿Crear un perfil local nuevo a partir de este perfil?</string>
+    <string name="copytolocalprofile">¿Crear nuevo perfil a partir de este perfil?</string>
     <string name="profilenamecontainsdot">El nombre de perfil contiene puntos.\nEsto no está soportado por NS.\nEl perfil no se carga en NS.</string>
     <string name="low_mark_comment">Valor inferior del área de rango (sólo visualización)</string>
     <string name="high_mark_comment">Valor superior al área de rango (sólo visualización)</string>
@@ -770,6 +772,7 @@
     <string name="randombg_short">BG</string>
     <string name="tools">Herramientas</string>
     <string name="show_calculation">Mostrar cálculo</string>
+    <string name="show_removed">Mostrar borrados</string>
     <string name="clearqueueconfirm">¿Borrar cola? ¡Se perderán todos los datos de la cola!</string>
     <string name="ebstopsloop">El uso de la función de bolo extendido detendrá el modo de bucle cerrado durante el tiempo de ejecución del bolo extendido. ¿Realmente quieres esto?</string>
     <string name="closed_loop_disabled_with_eb">Bucle cerrado inhabilitado debido a la ejecución del bolo extendido</string>
@@ -827,7 +830,7 @@
     <string name="dpvdefaultprofile">Perfil DPV por defecto</string>
     <string name="setupwizard_pump_riley_link_status">Estado de RileyLink:</string>
     <string name="filter">Filtro</string>
-    <string name="copytolocalprofile_invalid">No se puede crear el perfil local. El perfil no es válido.</string>
+    <string name="copytolocalprofile_invalid">No se puede crear el perfil. El perfil no es válido.</string>
     <string name="cta_dont_kill_my_app_info">¿No matar mi aplicación?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Enviar SMS si se activa un evento de bomba inaccesible</string>
     <string name="smscommunicator_pump_ureachable">Reportar bomba inalcanzable</string>
@@ -839,8 +842,44 @@
     <string name="enablebolusadvisor_summary">Utilice un recordatorio para empezar a comer más tarde en lugar del resultado del asistente durante la glicemia alta (\"pre-bolo\")</string>
     <string name="time_to_eat">¡Hora de comer!\nEjecutar el asistente de bolo y cálcular de nuevo.</string>
     <string name="timetoeat">Hora de comer</string>
+    <string name="bolusreminder">Recordatorio de bolo</string>
     <string name="fabric_upload_disabled">¡Carga de registros de errores desactivada!</string>
     <string name="graph_menu_divider_header">Gráfico</string>
     <string name="chart_menu">Menú gráfico</string>
     <string name="clear_filter">Borrar filtro</string>
+    <string name="trend_arrow">Flecha de tendencia</string>
+    <string name="cannula">Cánula</string>
+    <string name="userentry">Entrada usuario</string>
+    <string name="common_values">Usa los valores de tu comida más grande que comes normalmente\n</string>
+    <string name="summary_email_for_crash_report">Esta dirección de correo electrónico se adjuntará a los informes de errores para que podamos contactarte en casos urgentes. Es opcional.</string>
+    <string name="email_address">Dirección de Correo Electrónico</string>
+    <string name="privacy_settings">Ajustes de privacidad</string>
+    <string name="privacy_summary">Puedes proporcionar una dirección de correo electrónico opcional si quieres ser notificado sobre fallos de la aplicación. Este no es un servicio automatizado. Los desarrolladores se comunicarán contigo en situaciones peligrosas.</string>
+    <string name="full_sync">Sincronización completa</string>
+    <string name="full_sync_comment">¿Sincronización completa? Puede tardar muchas horas y hasta que termine no verás nuevos datos en NS.</string>
+    <string name="prime">Llenado</string>
+    <string name="ns_sync_options">Sincronización</string>
+    <string name="ns_upload_summary">Perfiles, bolos, carbohidratos, basales temporales se suben a NS</string>
+    <string name="ns_upload">Subir datos a NS</string>
+    <string name="ns_receive_profile_store">Recibir perfil almacenado</string>
+    <string name="ns_receive_profile_store_summary">Sincronizar perfiles del editor de perfiles de NS</string>
+    <string name="ns_receive_temp_target">Recibir objetivos temporales</string>
+    <string name="ns_receive_temp_target_summary">Aceptar objetivos temporales registrados mediante NS o NSClient</string>
+    <string name="ns_receive_profile_switch">Recibir cambios de perfil</string>
+    <string name="ns_receive_profile_switch_summary">Aceptar cambios de perfil registrados mediante NS o NSClient</string>
+    <string name="ns_receive_offline_event">Recibir eventos de desconexión de APS</string>
+    <string name="ns_receive_offline_event_summary">Aceptar eventos de desconexión de APS registrados mediante NS o NSClient</string>
+    <string name="ns_receive_insulin">Recibir insulina</string>
+    <string name="ns_receive_insulin_summary">Aceptar insulina registrada mediante NS o NSClient (no se entrega, sólo se calcula para IOB)</string>
+    <string name="ns_receive_carbs">Recibir carbohidratos</string>
+    <string name="ns_receive_carbs_summary">Aceptar carbohidratos añadidos mediante NS o NSClient</string>
+    <string name="ns_receive_therapy_events">Recibir eventos de tratamientos</string>
+    <string name="ns_receive_therapy_events_summary">Aceptar registros de tratamientos (cánula, insulina, cambios de batería, etc.) añadidos mediante NS o NSClient</string>
+    <string name="ns_receive_cgm">Recibir/Rellenar datos del MCG</string>
+    <string name="ns_receive_cgm_summary">Aceptar valores MCG desde NS</string>
+    <string name="sms_timeout_while_wating">Tiempo de espera agotado mientras finalizaba la comunicación anterior con la bomba</string>
+    <string name="smscommunicator_another_bolus_in_queue">Hay otro bolo en cola. Inténtalo de nuevo más tarde.</string>
+    <string name="calculation_in_progress">Cálculo en curso</string>
+    <string name="error_in_ic_values">Error en valores IC</string>
+    <string name="ns_sync_slow">Ralentizar subidas</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index e9e2d67f847..0a31a3d8e59 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -78,7 +78,6 @@
     <string name="overview">Aperçu</string>
     <string name="treatments">Traitements</string>
     <string name="virtualpump">Pompe virtuelle</string>
-    <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pompe</string>
     <string name="configbuilder_pump_description">Quelle pompe souhaitez-vous utiliser avec AndroidAPS ?</string>
     <string name="configbuilder_profile">Profil</string>
@@ -258,7 +257,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="ongoingnotificaction">Notification en cours</string>
     <string name="old_data">DONNÉES ANCIENNES</string>
     <string name="sms_minago">il y a %1$d min</string>
-    <string name="localprofile">Profil Local</string>
+    <string name="localprofile">Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Tableau de %1$d éléments.\nValeur Actuelle :</string>
     <string name="openapsma_autosensdata_label">Données Autosens</string>
@@ -495,6 +494,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="dexcomg5_xdripupload_title">Transmettre les Gly vers xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Dans xDrip+ veuillez séléctionner 640g/Eversense comme source de données</string>
     <string name="nsclientbg">Glycémie NSClient</string>
+    <string name="nsclientbgshort">Gly NS</string>
     <string name="overview_editquickwizard_usebg">Calcul de Glycémie</string>
     <string name="overview_editquickwizard_usebolusiob">Calcul IA du Bolus</string>
     <string name="overview_editquickwizard_usebasaliob">Calcul IA du Basal</string>
@@ -666,7 +666,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="error_adding_treatment_title">Données de traitement incomplètes</string>
     <string name="maintenance_settings">Paramètres de maintenance</string>
     <string name="maintenance_email">E-mail</string>
-    <string name="maintenance_encrypt_exported_prefs">Crypter les paramètres exportés</string>
     <string name="maintenance_amount">Nombre de journaux (Logs) à envoyer</string>
     <string name="maintenance">Maintenance</string>
     <string name="maintenance_shortname">MAINT</string>
@@ -680,6 +679,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="resettodefaults">Réinitialiser les valeurs par défaut</string>
     <string name="nsmalfunction">Dysfonctionnement NSClient. Faites une réinitialisation de NS et de NSClient.</string>
     <string name="time_offset">Décalage horaire</string>
+    <string name="bolus_reminder">Rappel du bolus plus tard</string>
     <string name="setupwizard_preferred_aps_mode">Mode APS préféré</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Calc</string>
@@ -718,6 +718,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="versionChecker">Vérificateur de version</string>
     <string name="old_version">ancienne version</string>
     <string name="very_old_version">très ancienne version</string>
+    <string name="application_expired">Application expirée</string>
     <string name="new_version_warning">Nouvelle version disponible depuis %1$d jours ! Retour à Arrêt Glycémie Basse (AGB) dans %2$d jours, la boucle sera désactivée dans %3$d jours</string>
     <string name="twohours">2 h</string>
     <string name="dexcom_app_patched">App Dexcom (patchée)</string>
@@ -751,7 +752,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="clone_label">Dupliquer</string>
     <string name="saveorresetchangesfirst">Sauver ou réinitialiser les modifications actuelles en premier</string>
     <string name="deletecurrentprofile">Supprimer le profil actuel ?</string>
-    <string name="copytolocalprofile">Créer un nouveau profil local à partir de ce profil ?</string>
+    <string name="copytolocalprofile">Créer un nouveau profil à partir de ce profil ?</string>
     <string name="profilenamecontainsdot">Le nom du profil contient des points.\nCe n\'est pas pris en charge par NS.\nLe profil n\'est pas remonté dans NS.</string>
     <string name="low_mark_comment">Valeur inférieure dans la plage (affichage uniquement)</string>
     <string name="high_mark_comment">Valeur supérieure dans la plage (affichage uniquement)</string>
@@ -833,7 +834,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="dpvdefaultprofile">Profil par défaut DPV</string>
     <string name="setupwizard_pump_riley_link_status">État du RileyLink :</string>
     <string name="filter">Filtrer</string>
-    <string name="copytolocalprofile_invalid">Impossible de créer le profil local. Le profil est invalide.</string>
+    <string name="copytolocalprofile_invalid">Impossible de créer le profil. Le profil est invalide.</string>
     <string name="cta_dont_kill_my_app_info">Garder l\'appli en arrière plan ?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Envoyer un SMS si l\'événement Pompe hors de portée est déclenché</string>
     <string name="smscommunicator_pump_ureachable">Signaler Pompe hors de portée</string>
@@ -845,6 +846,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="enablebolusadvisor_summary">Utiliser un rappel pour commencer le repas à la place du résultat de l\'assistant quand la glycémie est élevée (\"pré-bolus\")</string>
     <string name="time_to_eat">Il est temps de manger !\nExécutez l\'assistant Bolus et refaites le calcul.</string>
     <string name="timetoeat">Il est temps de manger</string>
+    <string name="bolusreminder">Rappel bolus</string>
+    <string name="enablebolusreminder">Activer le rappel bolus</string>
+    <string name="enablebolusreminder_summary">Utiliser un rappel pour faire le bolus plus tard avec l\'Assistant (\"post-bolus\")</string>
+    <string name="time_to_bolus">Il est temps de faire le bolus !\nExécutez l\'Assistant et faites de nouveau le calcul.</string>
     <string name="fabric_upload_disabled">Téléchargement logs crashs désactivé!</string>
     <string name="graph_menu_divider_header">Graph</string>
     <string name="chart_menu">Menu graphique</string>
@@ -857,13 +862,14 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="email_address">Adresse e-mail</string>
     <string name="privacy_settings">Paramètres de confidentialité</string>
     <string name="privacy_summary">Vous pouvez fournir une adresse e-mail facultative si vous voulez être informé des plantages de l\'application. Ce n\'est pas un service automatisé. Vous serez contacté par les développeurs dans des situations dangereuses.</string>
-    <string name="full_sync">Synchro. complète</string>
+    <string name="full_sync">Synchronisation complète</string>
+    <string name="full_sync_comment">Synchronisation complète ? Cela peut prendre plusieurs heures et jusqu\'à la fin, vous ne verrez pas de nouvelles données sur NS.</string>
     <string name="prime">Amorcer</string>
     <string name="ns_sync_options">Synchronisation</string>
     <string name="ns_upload_summary">Profils, boluses, glucides, basals temporaires sont téléchargés vers NS</string>
     <string name="ns_upload">Télécharger des données vers NS</string>
     <string name="ns_receive_profile_store">Recevoir les profils sauvegardés</string>
-    <string name="ns_receive_profile_store_summary">Synchroniser les profils à partir de l\'éditeur de profil NS vers le profil local</string>
+    <string name="ns_receive_profile_store_summary">Synchroniser les profils à partir de l\'éditeur de profil NS</string>
     <string name="ns_receive_temp_target">Recevoir les cibles temporaires</string>
     <string name="ns_receive_temp_target_summary">Accepter les cibles temporaires entrées via NS ou NSClient</string>
     <string name="ns_receive_profile_switch">Recevoir les changements de profil</string>
@@ -881,4 +887,13 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="sms_timeout_while_wating">Délai d\'attente pour finir la communication précédente avec la pompe</string>
     <string name="smscommunicator_another_bolus_in_queue">Un autre bolus est en file d\'attente. Réessayez plus tard.</string>
     <string name="calculation_in_progress">Calcul en cours</string>
+    <string name="missing_profile_name">Nom de profil manquant</string>
+    <string name="error_in_ic_values">Erreur dans les valeurs de G/I</string>
+    <string name="error_in_basal_values">Erreur dans les valeurs de basal</string>
+    <string name="error_in_target_values">Erreur dans les valeurs cibles</string>
+    <string name="error_in_isf_values">Erreur dans les valeurs de SI</string>
+    <string name="run_question">Exécuter %s?</string>
+    <string name="invalid_profile_not_accepted">Profil %1$s non valide, refusé par NS</string>
+    <string name="view">Vue</string>
+    <string name="errors">Erreurs</string>
 </resources>
diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml
index ed0ea2a53c7..da072b77024 100644
--- a/app/src/main/res/values-ga-rIE/strings.xml
+++ b/app/src/main/res/values-ga-rIE/strings.xml
@@ -86,7 +86,6 @@
     <string name="mdi">MDI</string>
     <string name="MM640g">MM640g</string>
     <string name="sms_minago">%1$dnóim ó shin</string>
-    <string name="localprofile">Próifíl áitiúil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="actions_shortname">GNÍ</string>
     <string name="loop_shortname">LÚB</string>
diff --git a/app/src/main/res/values-hu-rHU/exam.xml b/app/src/main/res/values-hu-rHU/exam.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/app/src/main/res/values-hu-rHU/exam.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-hu-rHU/objectives.xml b/app/src/main/res/values-hu-rHU/objectives.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/app/src/main/res/values-hu-rHU/objectives.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..718d414505e
--- /dev/null
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
+    <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
+    <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <!-- SMS Communicator & OTP Authenticator -->
+</resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 5bf1259491b..15c6082fd3b 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -78,7 +78,6 @@
     <string name="overview">Panoramica</string>
     <string name="treatments">Trattamenti</string>
     <string name="virtualpump">Micro virtuale</string>
-    <string name="careportal">Portale</string>
     <string name="configbuilder_pump">Micro</string>
     <string name="configbuilder_pump_description">Quale microinfusore desideri usare con AndroidAPS?</string>
     <string name="configbuilder_profile">Profilo</string>
@@ -257,7 +256,7 @@
     <string name="ongoingnotificaction">Notifica persistente</string>
     <string name="old_data">DATI VECCHI</string>
     <string name="sms_minago">%1$dmin fa</string>
-    <string name="localprofile">Profilo locale</string>
+    <string name="localprofile">Profilo</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Matrice di %1$d elementi.\nValore attuale:</string>
     <string name="openapsma_autosensdata_label">Dati autosens</string>
@@ -494,6 +493,7 @@
     <string name="dexcomg5_xdripupload_title">Invia dati BG a xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">In xDrip+ seleziona origine dati 640g/Eversense</string>
     <string name="nsclientbg">BG NSClient</string>
+    <string name="nsclientbgshort">BG NS</string>
     <string name="overview_editquickwizard_usebg">Calcolo BG</string>
     <string name="overview_editquickwizard_usebolusiob">Calcolo IOB da bolo</string>
     <string name="overview_editquickwizard_usebasaliob">Calcolo IOB da basale</string>
@@ -665,7 +665,6 @@
     <string name="error_adding_treatment_title">Dati trattamento incompleti</string>
     <string name="maintenance_settings">Impostazioni manutenzione</string>
     <string name="maintenance_email">Destinatario email</string>
-    <string name="maintenance_encrypt_exported_prefs">Crittografa impostazioni esportate</string>
     <string name="maintenance_amount">Numero di log da inviare</string>
     <string name="maintenance">Manutenzione</string>
     <string name="maintenance_shortname">MANUT</string>
@@ -679,6 +678,7 @@
     <string name="resettodefaults">Ripristina valori predefiniti</string>
     <string name="nsmalfunction">Malfunzionamento NSClient. Considera il riavvio di NS e NSClient.</string>
     <string name="time_offset">Offset</string>
+    <string name="bolus_reminder">Ricorda di fare il bolo</string>
     <string name="setupwizard_preferred_aps_mode">Modalità APS preferita</string>
     <string name="treatments_wizard_total_label">Totale</string>
     <string name="calculation_short">Calc</string>
@@ -717,6 +717,7 @@
     <string name="versionChecker">Controllo versione</string>
     <string name="old_version">versione datata</string>
     <string name="very_old_version">versione molto datata</string>
+    <string name="application_expired">Applicazione scaduta</string>
     <string name="new_version_warning">Nuova versione disponibile da almeno %1$d giorni! Ritorno a LGS dopo %2$d giorni, disattivazione del loop dopo %3$d giorni</string>
     <string name="twohours">2h</string>
     <string name="dexcom_app_patched">Dexcom app (modificata)</string>
@@ -750,7 +751,7 @@
     <string name="clone_label">Clona</string>
     <string name="saveorresetchangesfirst">Salva o resetta prima le modifiche correnti</string>
     <string name="deletecurrentprofile">Rimuovere il profilo corrente?</string>
-    <string name="copytolocalprofile">Creare un nuovo profilo locale da questo profilo?</string>
+    <string name="copytolocalprofile">Creare un nuovo profilo da questo profilo?</string>
     <string name="profilenamecontainsdot">Il nome profilo contiene dei punti.\nQuesto non è supportato da NS.\nIl profilo non viene caricato in NS.</string>
     <string name="low_mark_comment">Valore più basso per l\'intervallo di visualizzazione dell\'area \"in range\"</string>
     <string name="high_mark_comment">Valore più alto per l\'intervallo di visualizzazione dell\'area \"in range\"</string>
@@ -832,7 +833,7 @@
     <string name="dpvdefaultprofile">Profilo DPV predefinito</string>
     <string name="setupwizard_pump_riley_link_status">Stato RileyLink:</string>
     <string name="filter">Filtro</string>
-    <string name="copytolocalprofile_invalid">Impossibile creare il profilo locale. Il profilo non è valido.</string>
+    <string name="copytolocalprofile_invalid">Impossibile creare il profilo. Il profilo non è valido.</string>
     <string name="cta_dont_kill_my_app_info">Non terminare l\'app?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Invia SMS se si verifica l\'evento \"micro irraggiungibile\"</string>
     <string name="smscommunicator_pump_ureachable">Segnala micro irraggiungibile</string>
@@ -844,6 +845,11 @@
     <string name="enablebolusadvisor_summary">Usa un promemoria per iniziare a mangiare invece del risultato del calcolatore durante la glicemia alta (\"pre-bolo\")</string>
     <string name="time_to_eat">Tempo di mangiare!\nEsegui il calcolatore e fai di nuovi i calcoli.</string>
     <string name="timetoeat">Tempo di mangiare</string>
+    <string name="bolusreminder">Promemoria bolo</string>
+    <string name="enablebolusreminder">Abilita promemoria bolo</string>
+    <string name="enablebolusreminder_summary">Usa promemoria bolo con calcolatore
+        (\"post-bolo\")</string>
+    <string name="time_to_bolus">Tempo di fare un bolo!\nEsegui il calcolatore e fai di nuovi i calcoli.</string>
     <string name="fabric_upload_disabled">Caricamento log dei crash disabilitato!</string>
     <string name="graph_menu_divider_header">Grafico</string>
     <string name="chart_menu">Menu grafico</string>
@@ -857,12 +863,13 @@
     <string name="privacy_settings">Impostazioni privacy</string>
     <string name="privacy_summary">Puoi fornire un indirizzo e-mail opzionale se desideri essere avvisato in caso di arresti anomali dell\'app. Questo non è un servizio automatizzato. Sarai contattato dagli sviluppatori in situazioni pericolose.</string>
     <string name="full_sync">Sincronizzazione completa</string>
+    <string name="full_sync_comment">Sincronizzazione completa? Potrebbe richiedere molte ore e fino alla fine del processo non vedrai nuovi dati in NS.</string>
     <string name="prime">Caricamento</string>
     <string name="ns_sync_options">Sincronizzazione</string>
     <string name="ns_upload_summary">Profili, boli, CHO, basali temporanee vengono caricati su NS</string>
     <string name="ns_upload">Carica dati su NS</string>
     <string name="ns_receive_profile_store">Ricevi \"store\" profilo</string>
-    <string name="ns_receive_profile_store_summary">Sincronizza i profili da NS al profilo locale</string>
+    <string name="ns_receive_profile_store_summary">Sincronizza i profili dall\'editor profilo di NS</string>
     <string name="ns_receive_temp_target">Ricevi target temporanei</string>
     <string name="ns_receive_temp_target_summary">Accetta target temporanei inseriti tramite NS o NSClient</string>
     <string name="ns_receive_profile_switch">Ricevi cambi profilo</string>
@@ -880,4 +887,14 @@
     <string name="sms_timeout_while_wating">Timeout nell\'attesa della fine della precedente comunicazione col micro.</string>
     <string name="smscommunicator_another_bolus_in_queue">C\'è un altro bolo in coda. Riprova più tardi.</string>
     <string name="calculation_in_progress">Calcolo in corso</string>
+    <string name="missing_profile_name">Nome profilo mancante</string>
+    <string name="error_in_ic_values">Errore nei valori IC</string>
+    <string name="error_in_basal_values">Errore nei valori della basale</string>
+    <string name="error_in_target_values">Errore nei valori del target</string>
+    <string name="error_in_isf_values">Errore nei valori ISF</string>
+    <string name="run_question">Eseguire %s?</string>
+    <string name="invalid_profile_not_accepted">Profilo %1$s non valido - non accettato da NS</string>
+    <string name="view">Vista</string>
+    <string name="errors">Errori</string>
+    <string name="ns_sync_slow">Rallenta caricamenti</string>
 </resources>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 5b7d0981f80..9dba64ee690 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -62,7 +62,7 @@
     <string name="openapsma_run">בצע כעת</string>
     <string name="vitualpump_label">משאבה וירטואלית</string>
     <string name="openapsma_lastrun_label">ההפעלה האחרונה</string>
-    <string name="openapsma_inputparameters_label">טעינת פרמטרים</string>
+    <string name="openapsma_inputparameters_label">טוען פרמטרים</string>
     <string name="openapsma_glucosestatus_label">מצב סוכר</string>
     <string name="openapsma_currenttemp_label">בזאלי זמני נוכחי</string>
     <string name="openapsma_iobdata_label">נתוני אינסולין פעיל</string>
@@ -78,7 +78,6 @@
     <string name="overview">סקירה כללית</string>
     <string name="treatments">טיפולים</string>
     <string name="virtualpump">משאבה וירטואלית</string>
-    <string name="careportal">פורטל טיפולים</string>
     <string name="configbuilder_pump">משאבה</string>
     <string name="configbuilder_pump_description">עם איזו משאבה אתם מעוניינים להשתמש ב-AndroidAPS?</string>
     <string name="configbuilder_profile">פרופיל</string>
@@ -87,22 +86,22 @@
     <string name="configbuilder_aps_description">איזה אלגוריתם של APS יבצע התאמות טיפול?</string>
     <string name="configbuilder_general">כללי</string>
     <string name="configbuilder_general_description">מס\' תוספים כלליים שעשויים להיות יעילים.</string>
-    <string name="configbuilder_constraints_description">אילו הגבלות פעילות?</string>
+    <string name="configbuilder_constraints_description">אילו מגבלות פעילות?</string>
     <string name="constraints">מגבלות</string>
     <string name="configbuilder_loop">לולאה</string>
     <string name="configbuilder_loop_description">השתמשו באפשרות זו כדי להפעיל את לולאת AndroidAPS.</string>
     <string name="loop_aps_label">אלגוריתם APS</string>
-    <string name="loop_constraintsprocessed_label">הגבלות לאחר עיבוד</string>
+    <string name="loop_constraintsprocessed_label">מגבלות לאחר עיבוד</string>
     <string name="loop_tbrsetbypump_label">מינון בזאלי זמני שהוגדר במשאבה</string>
     <string name="noapsselected">לא נבחרה או סופקה תוצאה ע\"י APS</string>
     <string name="safety">בטיחות</string>
     <string name="openapsma_disabled">התוסף אינו זמין</string>
-    <string name="constraints_violation">הפרת הגבלות</string>
+    <string name="constraints_violation">הפרת מגבלות</string>
     <string name="treatmentdeliveryerror">שגיאה במתן בולוס</string>
     <string name="setbasalquestion">אשר בזאלי זמני חדש:</string>
     <string name="overview_treatment_label">טיפול</string>
     <string name="overview_calculator_label">מחשבון</string>
-    <string name="constraintapllied">ההגבלה הוחלה!</string>
+    <string name="constraintapllied">מגבלה הוחלה!</string>
     <string name="sms_bolus">בולוס:</string>
     <string name="basal">אינסולין בזאלי</string>
     <string name="sms_basal">אינסולין בזאלי:</string>
@@ -248,7 +247,7 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">שלח מחדש את כל הנתונים</string>
     <string name="open_settings_on_wear">פתיחת הגדרות Wear</string>
-    <string name="basal_rate">ערכים בזאליים:</string>
+    <string name="basal_rate">מינונים בזאליים:</string>
     <string name="basalvaluebelowminimum">ערך הבסיס מתחת למינימום. פרופיל אינו מוגדר!</string>
     <string name="sms_actualbg">ערכי סוכר בדם:</string>
     <string name="sms_lastbg">ערכי סוכר אחרונים:</string>
@@ -257,7 +256,7 @@
     <string name="ongoingnotificaction">התראה מתמשכת</string>
     <string name="old_data">נתונים ישנים</string>
     <string name="sms_minago">לפני %1$d דקות</string>
-    <string name="localprofile">פרופיל מקומי</string>
+    <string name="localprofile">פרופיל</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">מערך של %1$d אלמנטים. \n ערך נוכחי:</string>
     <string name="openapsma_autosensdata_label">נתוני חישוב רגישות אוטו\'</string>
@@ -298,7 +297,7 @@
     <string name="pumpsuspended">משאבה מושהית</string>
     <string name="executing">מבצע</string>
     <string name="virtualpump_settings">הגדרות משאבה וירטואלית</string>
-    <string name="virtualpump_uploadstatus_title">טעינת מצב ל-Nightscout</string>
+    <string name="virtualpump_uploadstatus_title">טוען מצב ל-Nightscout</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">כתובת URL:</string>
@@ -361,7 +360,7 @@
     <string name="treatments_wizard_cob_label">פחמ\' פעילות</string>
     <string name="superbolus">סופר בולוס</string>
     <string name="ns_logappstartedevent">רשום הפעלת AAPS ב-Nightscout</string>
-    <string name="restartingapp">יציאה מ-AAPS כדי להחיל הגדרות.</string>
+    <string name="restartingapp">יוצא מ-AAPS כדי להחיל הגדרות.</string>
     <string name="configbuilder_insulin_description">באיזה סוג של אינסולין אתה משתמש?</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
@@ -481,7 +480,7 @@
     <string name="urgent_alarm">התראה דחופה</string>
     <string name="info">מידע</string>
     <string name="eversense">אפליקלציית Eversense (עם פאץ\')</string>
-    <string name="dexcomg5_nsupload_title">טעינת נתוני סוכר ל-Nightscout</string>
+    <string name="dexcomg5_nsupload_title">טוען נתוני סוכר ל-Nightscout</string>
     <string name="bgsource_upload">הגדרות העלאת ערכי סוכר בדם</string>
     <string name="wear_detailed_delta_title">הצגת דלתא מפורטת</string>
     <string name="wear_detailed_delta_summary">הצגת דלתא עם עוד נק\' עשרונית אחת</string>
@@ -493,7 +492,7 @@
     <string name="carbsReqThreshold_summary">כמות הפחמ\' המינימלית (גר\') הדרושה כדי שתוצג התראה על הצעת פחמימות. לא תוצגנה התראות על הצעות הנמוכות מכמות זו.</string>
     <string name="dexcomg5_xdripupload_title">שליחת נתוני סוכר אל xDrip</string>
     <string name="dexcomg5_xdripupload_summary">ב-xDrip בחרו 640g/Eversense כמקור נתונים</string>
-    <string name="nsclientbg">רמת סוכר מ-NSClient</string>
+    <string name="nsclientbg">נתוני סוכר מ-NSClient</string>
     <string name="nsclientbgshort">סוכר NS</string>
     <string name="overview_editquickwizard_usebg">חישוב רמת הסוכר</string>
     <string name="overview_editquickwizard_usebolusiob">חישוב IOB של בולוס</string>
@@ -666,7 +665,6 @@
     <string name="error_adding_treatment_title">נתוני טיפול לא שלמים</string>
     <string name="maintenance_settings">הגדרות תחזוקה</string>
     <string name="maintenance_email">נמען דוא\"ל</string>
-    <string name="maintenance_encrypt_exported_prefs">הצפנת הגדרות מיוצאות</string>
     <string name="maintenance_amount">מספר הרשומות למשלוח</string>
     <string name="maintenance">תחזוקה</string>
     <string name="maintenance_shortname">תחזוקה</string>
@@ -680,6 +678,7 @@
     <string name="resettodefaults">אפס לברירת המחדל</string>
     <string name="nsmalfunction">תקלה ב-NSClient. שקלו להפעיל את Nightscout ו-NSClient מחדש.</string>
     <string name="time_offset">היסט זמן</string>
+    <string name="bolus_reminder">תזכורת להזרקת בולוס אח\"כ</string>
     <string name="setupwizard_preferred_aps_mode">מצב APS מועדף</string>
     <string name="treatments_wizard_total_label">סה\"כ</string>
     <string name="calculation_short">חישוב</string>
@@ -718,6 +717,7 @@
     <string name="versionChecker">בודק גרסה</string>
     <string name="old_version">גרסה ישנה</string>
     <string name="very_old_version">גרסה ישנה מאוד</string>
+    <string name="application_expired">תוקף האפליקציה פג</string>
     <string name="new_version_warning">גרסה חדשה זמינה כבר %1$d ימים! הגבלה להשהיה עקב סוכר נמוך תחל אחרי %2$d ימים, הלולאה תושבת אחרי %3$d ימים</string>
     <string name="twohours">שעתיים</string>
     <string name="dexcom_app_patched">אפליקציית Dexcom עם פאץ\'</string>
@@ -770,7 +770,7 @@
     <string name="activitymonitor">מוניטור פעילות</string>
     <string name="doyouwantresetstats">האם ברצונכם לאפס את הסטטיסטיקות הפעילות?</string>
     <string name="statistics">סטטיסטיקה</string>
-    <string name="randombg">רמת גלוקוז אקראית</string>
+    <string name="randombg">נתוני סוכר אקראיים</string>
     <string name="description_source_randombg">הפקת נתוני גלוקוז אקראיים (מצב הדגמה בלבד)</string>
     <string name="randombg_short">ערכי גלוקוז בדם</string>
     <string name="tools">כלים</string>
@@ -821,7 +821,7 @@
     <string name="largedisplay_description">תצוגה גדולה</string>
     <string name="skin">סקין</string>
     <string name="comapareprofile">השוואת פרופילים</string>
-    <string name="nav_profilehelper">עוזר פרופילים</string>
+    <string name="nav_profilehelper">עוזר הפרופילים</string>
     <string name="motoldefaultprofile">פרופיל ברירת מחדל</string>
     <string name="currentprofile">פרופיל נוכחי</string>
     <string name="availableprofile">פרופיל זמין</string>
@@ -830,7 +830,7 @@
     <string name="formatwittddandpct">גיל: %1$.0f יח\' מינון יומי כולל: %2$.0f יח\' %3$d%%</string>
     <string name="formatwithweight">גיל: %1$.0f יח\' משקל: %2$.0f ק\"ג</string>
     <string name="basalpctfromtdd_label">% של הבזאלי</string>
-    <string name="dpvdefaultprofile">פרופיל ברירת מחדל</string>
+    <string name="dpvdefaultprofile">פרופיל ברירת מחדל DPV</string>
     <string name="setupwizard_pump_riley_link_status">מצב ריילילינק:</string>
     <string name="filter">סינון</string>
     <string name="copytolocalprofile_invalid">לא ניתן ליצור פרופיל מקומי. הפרופיל אינו חוקי.</string>
@@ -845,6 +845,11 @@
     <string name="enablebolusadvisor_summary">מציג תזכורת לאכול אחר כך במקום להזריק את המינון שהומלץ ע\"י האשף בעת היפרגליקמיה (\"בולוס מקדים\")</string>
     <string name="time_to_eat">זמן לאכול!\nהפעילו את אשף הבולוסים וחשבו בולוס חדש.</string>
     <string name="timetoeat">זמן לאכול</string>
+    <string name="bolusreminder">תזכורת בולוס</string>
+    <string name="enablebolusreminder">אפשר את תזכורת בולוס</string>
+    <string name="enablebolusreminder_summary">השתמש בתזכורת כדי להזריק בולוס מאוחר יותר במחשבון
+        (\"פוסט-בולוס\")</string>
+    <string name="time_to_bolus">זמן להזריק בולוס!\nהשתמשו במחשבון וחשבו מחדש.</string>
     <string name="fabric_upload_disabled">העלאת רשומות קריסה מושבתת!</string>
     <string name="graph_menu_divider_header">גרף</string>
     <string name="chart_menu">תפריט הגרף</string>
@@ -858,10 +863,11 @@
     <string name="privacy_settings">הגדרות פרטיות</string>
     <string name="privacy_summary">אם תרצו, תוכלו לספק כתובת דוא\"ל כדי לקבל דיווח על קריסות יישום. שירות זה אינו אוטומטי. המפתחים יצרו איתכם קשר במצבים מסוכנים.</string>
     <string name="full_sync">סינכרון מלא</string>
+    <string name="full_sync_comment">סנכרון מלא? זה ייקח שעות מרובות ולא תוכלו לראות נתונים חדשים בנייטסקאוט.</string>
     <string name="prime">תיחול</string>
     <string name="ns_sync_options">סינכרון</string>
     <string name="ns_upload_summary">פרופילים, בולוסים, פחמימות ומינונים בזאליים זמניים נטענים לנייטסקאוט</string>
-    <string name="ns_upload">טעינת נתוני סוכר לנייטסקאוט</string>
+    <string name="ns_upload">טוען נתוני סוכר לנייטסקאוט</string>
     <string name="ns_receive_profile_store">אחזר פרופילים שמורים</string>
     <string name="ns_receive_profile_store_summary">סינכרון פרופילים מעורך הפרופיל של נייטסקאוט לפרופיל מקומי</string>
     <string name="ns_receive_temp_target">קבלת ערכי מטרה זמניים</string>
@@ -881,4 +887,14 @@
     <string name="sms_timeout_while_wating">בהמתנה עד לסיום תקשורת קודמת עם המשאבה</string>
     <string name="smscommunicator_another_bolus_in_queue">ישנו בולוס נוסף בתור. נסו שוב מאוחר יותר.</string>
     <string name="calculation_in_progress">מבצע חישוב</string>
+    <string name="missing_profile_name">חסר שם לפרופיל</string>
+    <string name="error_in_ic_values">שגיאה בערכי יחס הפחמימות</string>
+    <string name="error_in_basal_values">שגיאה בערכי המינון הבזאלי</string>
+    <string name="error_in_target_values">שגיאה בערכי המטרה</string>
+    <string name="error_in_isf_values">שגיאה בערכי יחס התיקון</string>
+    <string name="run_question">להפעיל %s?</string>
+    <string name="invalid_profile_not_accepted">הפרופיל הבלתי חוקי %1$s מ-Nightscout לא מאושר</string>
+    <string name="view">תצוגה</string>
+    <string name="errors">שגיאות</string>
+    <string name="ns_sync_slow">האט העלאות</string>
 </resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 2aefb9877c5..f3de7045a8b 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -78,7 +78,6 @@
     <string name="overview">홈</string>
     <string name="treatments">관리</string>
     <string name="virtualpump">가상펌프</string>
-    <string name="careportal">케어포털</string>
     <string name="configbuilder_pump">펌프</string>
     <string name="configbuilder_pump_description">어떤 펌프를 AndroidAPS에서 사용하시겠습니까?</string>
     <string name="configbuilder_profile">프로파일</string>
@@ -257,7 +256,6 @@
     <string name="ongoingnotificaction">연속 알림</string>
     <string name="old_data">오래된 데이터</string>
     <string name="sms_minago">%dmin ago</string>
-    <string name="localprofile">로컬 프로파일</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">%1$d 요소의 배열.\n실제 값:</string>
     <string name="openapsma_autosensdata_label">Autosens 정보</string>
@@ -665,7 +663,6 @@
     <string name="error_adding_treatment_title">관리 데이터가 불완전합니다</string>
     <string name="maintenance_settings">정비 설정</string>
     <string name="maintenance_email">Email</string>
-    <string name="maintenance_encrypt_exported_prefs">내보내는 설정을 암호화하기</string>
     <string name="maintenance_amount">전송할 로그 수</string>
     <string name="maintenance">정비</string>
     <string name="maintenance_shortname">MAINT</string>
@@ -750,7 +747,6 @@
     <string name="clone_label">복사</string>
     <string name="saveorresetchangesfirst">우선 현재 변경사항을을 저장하거나 재설정하세요</string>
     <string name="deletecurrentprofile">현재 프로파일을 삭제 하시겠습니까?</string>
-    <string name="copytolocalprofile">프로파일에서 새로운 로컬 프로파일을 만드시겠습니까?</string>
     <string name="profilenamecontainsdot">프로파일명에 점을 포함하고 있습니다.\n이는 NS에서 지원하지 않습니다.\n프로파일이 NS에 업로드되지 않습니다.</string>
     <string name="low_mark_comment">혈당 정상범위의 하한값(표시 전용)</string>
     <string name="high_mark_comment">혈당 정상범위의 상한값(표시 전용)</string>
@@ -832,7 +828,6 @@
     <string name="dpvdefaultprofile">DPV 기본 프로파일</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink 상태:</string>
     <string name="filter">필터</string>
-    <string name="copytolocalprofile_invalid">로컬 프로파일 생성 불가능. 프로파일이 유효하지 않습니다.</string>
     <string name="cta_dont_kill_my_app_info">앱이 종료되지 않도록 합니다?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">허용되지 않는 펌프 이벤트가 발생하면 SMS를 보내기</string>
     <string name="smscommunicator_pump_ureachable">허용되지 않는 펌프 기록</string>
@@ -856,13 +851,11 @@
     <string name="email_address">이메일 주소</string>
     <string name="privacy_settings">개인정보 설정</string>
     <string name="privacy_summary">어플의 충돌에 대해 통지를 받기 원하는 경우 선택적으로 이메일 주소를 제공할 수 있습니다. 이는 자동 지원 서비스는 아닙니다. 위험 상황에서 개발자들에게 연락이 올 것입니다.</string>
-    <string name="full_sync">전체 동기화 됨</string>
     <string name="prime">교체</string>
     <string name="ns_sync_options">동기화</string>
     <string name="ns_upload_summary">프로파일, bolus, 탄수화물, 임시 basal이 NS에 업로드 됨</string>
     <string name="ns_upload">NS에 데이터 업로드하기</string>
     <string name="ns_receive_profile_store">프로파일 목록 받기</string>
-    <string name="ns_receive_profile_store_summary">NS 프로파일 편집기에서 로컬 프로파일로 프로파일들 동기화하기</string>
     <string name="ns_receive_temp_target">임시 목표들 받기</string>
     <string name="ns_receive_temp_target_summary">NS 또는 NSClient에서 입력한 임시 목표 수락하기</string>
     <string name="ns_receive_profile_switch">프로파일 변경 받기</string>
diff --git a/app/src/main/res/values-lt-rLT/exam.xml b/app/src/main/res/values-lt-rLT/exam.xml
index ce9e59dbf1d..68ce419b798 100644
--- a/app/src/main/res/values-lt-rLT/exam.xml
+++ b/app/src/main/res/values-lt-rLT/exam.xml
@@ -132,6 +132,7 @@
     <string name="wronginsulin_label">Insulino suleidimo / įrašų klaidos</string>
     <string name="wronginsulin_whattodo">Ką turėtumėte daryti, jei buvo suleista mažiau insulino nei rodo pompos istorija, pvz. dėl užsikimšimo, neveikiančios kaniulės ar pamiršus po dušo vėl pritvirtinti pompą? </string>
     <string name="wronginsulin_careportal">Ištrinti insulino suleidimo įrašą per Nightscout Careportal, kad pašalintumėte jį iš pompos istorijos.</string>
+    <string name="wronginsulin_compare">Palyginti įrašus AndroidAPS ir pompos istorijoje (jei tai palaikoma pompoje).</string>
     <string name="wronginsulin_prime">Susileisti trūkstamą insulino kiekį švirkštu ar naudojantis infuzinės sistemos užpildymo funkcija.</string>
     <string name="wronginsulin_donothing">Nieko nedaryti ir leisti AndroidAPS koreguoti padidėjusį gliukozės kiekį kraujyje.</string>
     <string name="iob_label">Aktyvus insulinas organizme (AIO)</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index c79ed269666..353fd2a7618 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -38,6 +38,7 @@
     <string name="description_source_glimp">Gauti kraujo gliukozės vertes iš Glimp.</string>
     <string name="description_source_mm640g">Gauti kraujo gliukozės vertes iš 600SeriesAndroidUploader.</string>
     <string name="description_source_ns_client">Gauti kraujo gliukozės vertes iš Nightscout</string>
+    <string name="description_source_xdrip">Gauti kraujo gliukozės reikšmes iš xDrip+.</string>
     <string name="description_treatments">Išsaugoti visus terapijos pakeitimus</string>
     <string name="description_wear">Stebėti ir kontroliuoti AndroidAPS naudojant WearOS laikrodį.</string>
     <string name="description_xdrip_status_line">Rodyti Ciklo informaciją laikrodyje, xDrip+ pradžios ekrane.</string>
@@ -77,7 +78,6 @@
     <string name="overview">Apžvalga</string>
     <string name="treatments">Terapija</string>
     <string name="virtualpump">Virtuali pompa</string>
-    <string name="careportal">Priežiūra</string>
     <string name="configbuilder_pump">Pompa</string>
     <string name="configbuilder_pump_description">Kokią pompą naudosite su AndroidAPS?</string>
     <string name="configbuilder_profile">Profilis</string>
@@ -108,6 +108,7 @@
     <string name="changeyourinput">Pakeiskite įvestus duomenis!</string>
     <string name="configbuilder_bgsource">Glikemijos šaltinis</string>
     <string name="configbuilder_bgsource_description">Iš kur AndroidAPS gaus duomenis?</string>
+    <string name="xdrip">xDrip+</string>
     <string name="apsmode_title">DKS režimas</string>
     <string name="closedloop">Uždaras Ciklas</string>
     <string name="openloop">Atviras Ciklas</string>
@@ -131,6 +132,7 @@
     <string name="configbuilder_nightscoutversion_label">Nightscout versija:</string>
     <string name="missing_carbs">Trūksta %1$d g</string>
     <string name="exported">Nustatymai eksportuoti</string>
+    <string name="ue_exported">Vartotojo įrašai eksportuoti</string>
     <string name="export_to">Eksportuoti nustatymus</string>
     <string name="import_from">Importuoti nustatymus iš</string>
     <string name="setting_imported">Nustatymai importuoti</string>
@@ -226,6 +228,8 @@
     <string name="mealbolus">Maistas</string>
     <string name="correctionbous">Korekcija</string>
     <string name="actions">Veiksmai</string>
+    <string name="ns_upload_only">(PAVOJINGA IŠJUNGTI) Tik įkeliama į NS</string>
+    <string name="ns_upload_only_summary">Tik įkelti į Nightscout (be sinchronizavimo). Netaikoma NGJ reikšmėms, nebent pasirinktas vietinis duomenų šaltinis, pvz., xDrip+. Taip pat netaikoma profilio duomenims, jei naudojamas NS profilis.\n!!! ĮSPĖJIMAS !!! Išjungus šią parinktį, galimas insulino perdozavimas, jei bet kuris iš komponentų (AAPS, NS, xDrip+) sukonfigūruotas neteisingai. Atidžiai stebėkite, ar AAPS rodomi duomenys atitinka pompos duomenis!</string>
     <string name="pumpNotInitialized">Pompa neprijungta!</string>
     <string name="primefill">Užpildymas</string>
     <string name="fillwarning">Įsitikinkite, kad nurodytas kiekis atitinka Jūsų infuzijos rinkinio specifikaciją!</string>
@@ -252,12 +256,13 @@
     <string name="ongoingnotificaction">Nuolatinis pranešimas</string>
     <string name="old_data">SENI DUOMENYS</string>
     <string name="sms_minago">prieš %1$dmin</string>
-    <string name="localprofile">Vietinis profilis</string>
+    <string name="localprofile">Profilis</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">%1$d elementų masyvas. \naktuali vertė:</string>
     <string name="openapsma_autosensdata_label">Autosens duomenys</string>
     <string name="openapsma_scriptdebugdata_label">Scenarijų derinimas</string>
     <string name="openapsama_useautosens">Naudoti Autosens funkciją</string>
+    <string name="refresheventsfromnightscout">Atnaujinti iš NS</string>
     <string name="deletefuturetreatments">Ištrinti ateities įrašus</string>
     <string name="actions_shortname">VEIKS</string>
     <string name="configbuilder_shortname">KONF</string>
@@ -272,6 +277,7 @@
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Naudoti sutrumpintus skirtukų pavadinimus</string>
     <string name="always_use_shortavg">Visada naudoti trumpo laikotarpio vidutinį pokyti vietoj paprasto pokyčio</string>
+    <string name="always_use_shortavg_summary">Naudinga, kai duomenys, gaunami iš nefiltruoto šaltinio, tokio kaip xDrip+, tampa nestabilūs.</string>
     <string name="profile">Profilis</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Numatytoji reikšmė: 3 tai pagrindinis OpenAPS saugiklis. Jis apriboja Jūsų valandinę bazę iki trigubos maksimalios valandinės bazės (standartiniu atveju). Jums greičiausiai neprireiks šios reikšmės keisti, tačiau turėtumėte žinoti, kad ji naudojama kaip saugiklis apskaičiuojant \"3x maksimali dienos bazė; 4x dabartinė valandinė bazė\".</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Numatytoji reikšmė: 4 tai antras pagrindinis OpenAPS saugiklis, apskaičiuojant \"3x maksimali dienos bazė; 4x dabartinė valandinė bazė\". Jis reiškia, kad jūsų valandinė bazė, nepriklausomai nuo to, kokia maksimali valandinė bazė suprogramuota pompoje, negali būti didesnė, nei keturguba dabartinė valandinė bazė. Tai apsaugo Jus nuo pavojingų situacijų, kai nustatoma pernelyg didelė valandinė bazė, pilnai nesuprantant, kaip veikia algoritmas. Numatytoji reikšmė yra 4x; daugumai vartotojų niekada neprireikia šio skaičiaus keisti, o pajutus, kad \"atsitrenkiama\" į saugiklį, rekomenduojama peržiūrėti kitus nustatymus.</string>
@@ -285,6 +291,9 @@
     <string name="smscommunicator_invalidphonennumber">Neteisingas SMS telefono numeris</string>
     <string name="overview_calibration">Kalibravimas</string>
     <string name="xdripnotinstalled">xDrip+ neįdiegta</string>
+    <string name="calibrationsent">Kalibracija nusiųsta į xDrip+</string>
+    <string name="smscommunicator_calibrationsent">Kalibracija išsiųsta. xDrip+ programoje turi būti įgalintas gavimas.</string>
+    <string name="smscommunicator_calibrationfailed">xDrip+ negauna kalibracijų</string>
     <string name="pumpsuspended">Pompa sustabdyta</string>
     <string name="executing">Vykdoma</string>
     <string name="virtualpump_settings">Virtualios pompos nustatymai</string>
@@ -367,17 +376,24 @@
     <string name="statuslights_sage_critical">Jutiklio kritinio laiko įspėjimas [h]</string>
     <string name="statuslights_sbat_warning">Įspėjimo apie žemą sensoriaus baterijos lygį riba [%]</string>
     <string name="statuslights_sbat_critical">Įspėjimo apie kritiškai žemą sensoriaus baterijos lygį riba [%]</string>
+    <string name="statuslights_bage_warning">Pompos baterijos ribinio laiko įspėjimas [h]</string>
+    <string name="statuslights_bage_critical">Pompos baterijos kritinio laiko įspėjimas [h]</string>
     <string name="statuslights_res_warning">Įspėjimo apie žemą rezervuaro lygį riba [U]</string>
     <string name="statuslights_res_critical">Įspėjimo apie kritiškai žemą rezervuaro lygį riba [U]</string>
+    <string name="statuslights_bat_warning">Pompos baterijos ribinio įkrovimo lygio įspėjimas [%]</string>
+    <string name="statuslights_bat_critical">Pompos baterijos kritinio įkrovimo lygio įspėjimas [%]</string>
     <string name="prediction_shortname">PROGN</string>
     <string name="basal_shortname">VB</string>
     <string name="deviation_shortname">DEV</string>
     <string name="activity_shortname">VEIKS</string>
+    <string name="bgi_shortname">-KGS</string>
     <string name="abs_insulin_shortname">ABS</string>
     <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">Apie</string>
     <string name="smscommunicator_missingsmspermission">Trūksta leidimo SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Trūksta telefono būsenos leidimo</string>
+    <string name="xdripstatus_settings">xDrip+ statusas (laikrodyje)</string>
+    <string name="xdripstatus">xDrip+ būsenos juosta (laikrodyje)</string>
     <string name="xdripstatus_shortname">xds</string>
     <string name="wear_showbgi_title">Rodyti KG</string>
     <string name="wear_showbgi_summary">Pridėti KG prie statuso linijos</string>
@@ -416,6 +432,7 @@
     <string name="mdtp_cancel">Atšaukti</string>
     <string name="notloadedplugins">Ne visi profiliai įkelti!</string>
     <string name="valuesnotstored">Reikšmės neišsaugotos!</string>
+    <string name="ns_localbroadcasts">Įgalinti perdavimą į kitas programas (pvz., xDrip+). Neįgalinkite, jei įdiegta daugiau nei vienas AAPS arba NSClient egzempliorius!</string>
     <string name="ns_localbroadcasts_title">Įgalinti lokalų duomenų perdavimą.</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="enableuam">Įjungti NDM</string>
@@ -440,6 +457,7 @@
     <string name="activity_target">\"Aktyvumas\" tikslas</string>
     <string name="hypo_duration">\"Hipo\" trukmė</string>
     <string name="hypo_target">\"Hipo\" tikslas</string>
+    <string name="reuse_profile_pct_hours">Pakartotinai naudoti %1$d%% %2$dh</string>
     <string name="wearcontrol_title">Laikrodžio valdikliai</string>
     <string name="wearcontrol_summary">Nustatyti Laikinus Tikslus ir įvesti terapinius įrašus iš laikrodžio.</string>
     <string name="food">Maistas</string>
@@ -475,6 +493,7 @@
     <string name="dexcomg5_xdripupload_title">Siųsti KG duomenis į xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Xdrip+ pasirinkite 640g/Eversense duomenų šaltinį</string>
     <string name="nsclientbg">NSClient KG</string>
+    <string name="nsclientbgshort">NS KG</string>
     <string name="overview_editquickwizard_usebg">KG apskaičiavimas</string>
     <string name="overview_editquickwizard_usebolusiob">Bolusų AIO apskaičiavimas</string>
     <string name="overview_editquickwizard_usebasaliob">Bazės AIO apskaičiavimas</string>
@@ -536,6 +555,7 @@
     <string name="bolusrecordedonly">Bolusai bus tik įrašyti (nebus suleisti iš pompos)</string>
     <string name="loop_smbsetbypump_label">SMB nustatyta iš pompos</string>
     <string name="overview_show_activity">Aktyvumas</string>
+    <string name="overview_show_bgi">KG įtaka</string>
     <string name="overview_show_sensitivity">Jautrumas insulinui</string>
     <string name="overview_show_deviations">Nuokrypiai</string>
     <string name="overview_show_cob">Aktyvūs angliavandeniai</string>
@@ -645,7 +665,6 @@
     <string name="error_adding_treatment_title">Terapijos duomenys nepilni</string>
     <string name="maintenance_settings">Serviso nustatymai</string>
     <string name="maintenance_email">Gavėjo el. paštas</string>
-    <string name="maintenance_encrypt_exported_prefs">Užšifruoti eksportuotus parametrus</string>
     <string name="maintenance_amount">Siunčiamų įrašų skaičius</string>
     <string name="maintenance">Servisas</string>
     <string name="maintenance_shortname">Serv</string>
@@ -697,6 +716,7 @@
     <string name="versionChecker">Versijos tikrintuvas</string>
     <string name="old_version">sena versija</string>
     <string name="very_old_version">labai sena versija</string>
+    <string name="application_expired">Aplikacijos laikas baigėsi</string>
     <string name="new_version_warning">Nauja versija pasiekiama mažiausiai %1$d d.! Po %2$d grįšite prie stabdymo prie žemo, po %3$d ciklas bus išjungtas</string>
     <string name="twohours">2 val</string>
     <string name="dexcom_app_patched">Dexcom programėlė (modifikuota)</string>
@@ -730,7 +750,7 @@
     <string name="clone_label">Klonuoti</string>
     <string name="saveorresetchangesfirst">Pirmiausia išsaugoti arba anuliuoti dabartinius pokyčius</string>
     <string name="deletecurrentprofile">Ištrinti esamą profilį?</string>
-    <string name="copytolocalprofile">Kurti naują vietinį profilį iš šito?</string>
+    <string name="copytolocalprofile">Kurti naują profilį iš šito profilio?</string>
     <string name="profilenamecontainsdot">Profilio pavadinime yra taškų.\nŠios funkcijos NS nepalaiko.\nProfilis neįkeltas į NS.</string>
     <string name="low_mark_comment">Mažiausia tikslinės srities vertė (tik rodymui)</string>
     <string name="high_mark_comment">Didžiausia tikslinės srities vertė (tik rodymui)</string>
@@ -754,6 +774,7 @@
     <string name="randombg_short">KG</string>
     <string name="tools">Įrankiai</string>
     <string name="show_calculation">Rodyti skaičiavimą</string>
+    <string name="show_removed">Parodyti pašalintus</string>
     <string name="clearqueueconfirm">Išvalyti eilę? Visi eilės duomenys bus prarasti!</string>
     <string name="ebstopsloop">Ištęsto boluso funkcija sustabdys uždaro ciklo režimą ištęsto boluso veikimo metu. Ar tikrai norite patvirtinti savo pasirinkimą?</string>
     <string name="closed_loop_disabled_with_eb">Uždara ciklas išjungtas dėl ištęsto boluso veikimo</string>
@@ -811,9 +832,10 @@
     <string name="dpvdefaultprofile">Numatytasis profilis</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink statusas:</string>
     <string name="filter">Filtruoti</string>
-    <string name="copytolocalprofile_invalid">Nepavyksta sukurti vietinio profilio. Profilis neteisingas.</string>
+    <string name="copytolocalprofile_invalid">Nepavyksta sukurti profilio. Profilis neteisingas.</string>
     <string name="cta_dont_kill_my_app_info">Don\'t kill my app?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Siųsti SMS, jei aptinkamas įrašas apie nepasiekiamą pompą</string>
+    <string name="smscommunicator_pump_ureachable">Pranešti apie nepasiekiamą pompą</string>
     <string name="advisoralarm">Pranešti apie laiką valgyti</string>
     <string name="alarminxmin">Pranešti po %1$d min</string>
     <string name="bolusadvisor">Boluso patarėjas</string>
@@ -822,4 +844,41 @@
     <string name="enablebolusadvisor_summary">Galimybė priminti jums valgyti vėliau (pvz., esant aukštai glikemijai) boliuso vedlyje („po susileidimo palaukti ir valgyti vėliau“)</string>
     <string name="time_to_eat">Laikas valgyti!\nĮjunkite Boluso patarėją ir atlikite skaičiavimą dar kartą.</string>
     <string name="timetoeat">Laikas valgyti</string>
+    <string name="fabric_upload_disabled">Sutrikimų žurnalo įrašų įkėlimas išjungtas!</string>
+    <string name="graph_menu_divider_header">Grafikas</string>
+    <string name="chart_menu">Grafiko meniu</string>
+    <string name="clear_filter">Valyti filtrą</string>
+    <string name="trend_arrow">Tendencijos kryptis</string>
+    <string name="cannula">Kaniulė</string>
+    <string name="userentry">Naudotojo įrašas</string>
+    <string name="common_values">Naudokite gausiausio patiekalo, kurį paprastai valgote, reikšmes\n</string>
+    <string name="summary_email_for_crash_report">Šis el. pašto adresas bus pridėtas prie gedimų ataskaitų, kad skubiais atvejais galėtume su jumis susisiekti. Jis neprivalomas.</string>
+    <string name="email_address">El. pašto adresas</string>
+    <string name="privacy_settings">Privatumo nuostatos</string>
+    <string name="privacy_summary">Nurodykite el. pašto adresą (neprivaloma), jei norite gauti informaciją apie programos strigimus. Tai nėra automatizuota paslauga. Kūrėjai susisieks esant pavojingoms situacijoms.</string>
+    <string name="full_sync">Pilna sinchronizacija</string>
+    <string name="full_sync_comment">Vykdyti pilną sinchronizaciją? Tai gali užtrukti nemažai valandų ir kol ji nebus užbaigta, nematysite atnaujintų NS duomenų.</string>
+    <string name="prime">Užpildyti sistemą</string>
+    <string name="ns_sync_options">Sinchronizacija</string>
+    <string name="ns_upload_summary">Profiliai, bolusai, angliavandeniai, laikinos bazės įkeltos į NS</string>
+    <string name="ns_upload">Įkelti duomenis į NS</string>
+    <string name="ns_receive_profile_store">Priimti profilių saugyklą</string>
+    <string name="ns_receive_profile_store_summary">Sinchronizuoti profilius iš NS</string>
+    <string name="ns_receive_temp_target">Gauti laikinus tikslus</string>
+    <string name="ns_receive_temp_target_summary">Priimti laikinus tikslus, įvestus per NS arba NSClient</string>
+    <string name="ns_receive_profile_switch">Gauti profilio keitimus</string>
+    <string name="ns_receive_profile_switch_summary">Priimti profilio keitimus, įvestus per NS arba NSClient</string>
+    <string name="ns_receive_offline_event">Gauti APS įvykius neprisijungus</string>
+    <string name="ns_receive_offline_event_summary">Priimti APS įvykius neprisijungus, įvestus per NS arba NSClient</string>
+    <string name="ns_receive_insulin">Gauti insulino duomenis</string>
+    <string name="ns_receive_insulin_summary">Priimti insulino duomenis, įvestus per NS arba NSClient (jis nėra suleidžiamas, tik įskaičiuojamas į AIO)</string>
+    <string name="ns_receive_carbs">Gauti angliavandenių duomenis</string>
+    <string name="ns_receive_carbs_summary">Priimti angliavandenių duomenis, įvestus per NS arba NSClient</string>
+    <string name="ns_receive_therapy_events">Gauti terapijos įvykius</string>
+    <string name="ns_receive_therapy_events_summary">Priimti terapijos įvykius (kaniulės, insulino, baterijos keitimą ir pan.), įvestus per NS arba NSClient</string>
+    <string name="ns_receive_cgm">Gauti/užpildyti atgaline data NGJ duomenis</string>
+    <string name="ns_receive_cgm_summary">Priimti NGJ duomenis iš NS</string>
+    <string name="sms_timeout_while_wating">Baigėsi laikas kol buvo laukiama, kada baigsis ankstesnis susijungimas su pompa</string>
+    <string name="smscommunicator_another_bolus_in_queue">Kitas bolusas laukia eilėje. Bandykite dar kartą vėliau.</string>
+    <string name="calculation_in_progress">Skaičiuojama</string>
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/exam.xml b/app/src/main/res/values-nl-rNL/exam.xml
index 3eb44eda07e..835bf19b1c2 100644
--- a/app/src/main/res/values-nl-rNL/exam.xml
+++ b/app/src/main/res/values-nl-rNL/exam.xml
@@ -132,6 +132,7 @@
     <string name="wronginsulin_label">Insulinetoediening/-invoerfouten</string>
     <string name="wronginsulin_whattodo">Wat moet je doen wanneer je minder insuline toegediend hebt gekregen dan de geschiedenis van de pomp suggereert, bijvoorbeeld vanwege een verstopping, een lekkende canule of door het vergeten de pomp opnieuw aan te koppelen na een douche? </string>
     <string name="wronginsulin_careportal">Verwijder de insulinegegevens uit het Nightscout Careportal om deze uit de pompgeschiedenis te verwijderen.</string>
+    <string name="wronginsulin_compare">Vergelijk de waarden in AndroidAPS en pompgeschiedenis (als de pomp dit ondersteunt).</string>
     <string name="wronginsulin_prime">Bolus een deel van je berekende \'gemiste\' insuline door een injectiespuit/pen of door de uitvulfunctie te gebruiken.</string>
     <string name="wronginsulin_donothing">Doe niets en laat AndroidAPS de resulterende hoge bloedglucosespiegel corrigeren.</string>
     <string name="iob_label">Insuline aan boord (IOB)</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 0ac1a956d4c..ee604c3bf25 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -78,7 +78,6 @@
     <string name="overview">Overzicht</string>
     <string name="treatments">Behandelingen</string>
     <string name="virtualpump">Virtuele Pomp</string>
-    <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pomp</string>
     <string name="configbuilder_pump_description">Welke pomp wil je gaan gebruiken met AndroidAPS?</string>
     <string name="configbuilder_profile">Profiel</string>
@@ -257,7 +256,7 @@
     <string name="ongoingnotificaction">Permanent bericht</string>
     <string name="old_data">Oude gegevens</string>
     <string name="sms_minago">%1$dmin geleden</string>
-    <string name="localprofile">Lokaal profiel</string>
+    <string name="localprofile">Profiel</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Array van %1$d elementen. \nActuele waarde:</string>
     <string name="openapsma_autosensdata_label">Autosens gegevens</string>
@@ -433,7 +432,7 @@
     <string name="mdtp_cancel">Afbreken</string>
     <string name="notloadedplugins">Niet alle profielen zijn geladen!</string>
     <string name="valuesnotstored">Waarden niet opgeslagen!</string>
-    <string name="ns_localbroadcasts">Schakel lokaal data delen naar andere apps (zoals xDrip) in. Schakel dit niet in als je NSClient of meer dan één installatie van AAPS op je telefoon hebt staan!</string>
+    <string name="ns_localbroadcasts">Schakel lokaal data delen met andere apps (zoals xDrip) in. Schakel dit niet in als er meer dan één installatie van AAPS of NSClient zijn geinstalleerd!</string>
     <string name="ns_localbroadcasts_title">Activeer locaal delen.</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="enableuam">Activeer UAM</string>
@@ -494,6 +493,7 @@
     <string name="dexcomg5_xdripupload_title">Stuur BG data naar xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">In xDrip+ kies 640g/Eversense data bron</string>
     <string name="nsclientbg">NSClient BG</string>
+    <string name="nsclientbgshort">NS BG</string>
     <string name="overview_editquickwizard_usebg">BG berekening</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus IOB berekening</string>
     <string name="overview_editquickwizard_usebasaliob">Basaal IOB berekening</string>
@@ -665,7 +665,6 @@
     <string name="error_adding_treatment_title">Behandelingen data incompleet</string>
     <string name="maintenance_settings">Onderhoudsinstellingen</string>
     <string name="maintenance_email">E-mail</string>
-    <string name="maintenance_encrypt_exported_prefs">Geëxporteerde instellingen versleutelen</string>
     <string name="maintenance_amount">Aantal Logs om te verzenden</string>
     <string name="maintenance">Onderhoud</string>
     <string name="maintenance_shortname">ONDH</string>
@@ -679,6 +678,7 @@
     <string name="resettodefaults">Terug naar standaardinstellingen</string>
     <string name="nsmalfunction">NSClient werkt niet goed. Overweg een herstart van NS en NSClient.</string>
     <string name="time_offset">Tijdverschuiving</string>
+    <string name="bolus_reminder">Herinner later te bolussen</string>
     <string name="setupwizard_preferred_aps_mode">Voorkeur APS-modus</string>
     <string name="treatments_wizard_total_label">Totaal</string>
     <string name="calculation_short">Calc</string>
@@ -717,6 +717,7 @@
     <string name="versionChecker">Versie Checker</string>
     <string name="old_version">oude versie</string>
     <string name="very_old_version">zeer oude versie</string>
+    <string name="application_expired">Applicatie is verlopen</string>
     <string name="new_version_warning">Nieuwe versie al zeker %1$d dagen beschikbaar! Terugval LGS na %2$d dagen, loop zal worden uitgeschakeld na %3$d dagen</string>
     <string name="twohours">2u</string>
     <string name="dexcom_app_patched">Dexcom App (patched)</string>
@@ -750,7 +751,7 @@
     <string name="clone_label">Dupliceren</string>
     <string name="saveorresetchangesfirst">Huidige wijzigingen eerst opslaan of ongedaan maken</string>
     <string name="deletecurrentprofile">Huidige profiel verwijderen?</string>
-    <string name="copytolocalprofile">Nieuw lokaal profiel aanmaken van dit profiel?</string>
+    <string name="copytolocalprofile">Nieuw profiel van dit profiel maken?</string>
     <string name="profilenamecontainsdot">Profielnaam bevat punten.\nDit wordt niet ondersteund door NS.\nProfiel is niet geüpload naar NS.</string>
     <string name="low_mark_comment">Laagste waarde in bereik (alleen weergave)</string>
     <string name="high_mark_comment">Hoogste waarde in bereik (alleen weergave)</string>
@@ -804,10 +805,10 @@
     <string name="smscommunicator_otp_step3_test_header">3. Test eenmalig wachtwoord (One Time Password)</string>
     <string name="smscommunicator_otp_reset_header">Reset Authentificatie</string>
     <string name="smscommunicator_otp_install_info">Installeer de Authenticator-app op elke volger telefoon die RFC 6238 TOTP tokens ondersteunt. Populaire gratis apps zijn:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
-    <string name="smscommunicator_otp_reset_warning">Door de Athentificator te resetten, maak je alle Authentificatie-instellingen van reeds verbonden telefoons ongeldig! Je zult ze opnieuw moeten instellen!</string>
+    <string name="smscommunicator_otp_reset_warning">Door de Authentificator te resetten, maak je alle Authentificatie-instellingen van reeds verbonden telefoons ongeldig! Je zult ze opnieuw moeten instellen!</string>
     <string name="overview_show_predictions">Voorspellingen</string>
     <string name="overview_show_deviationslope">Richtingscoëfficiënt afwijking</string>
-    <string name="authorizationfailed">Authorisatie mislukt</string>
+    <string name="authorizationfailed">Autorisatie mislukt</string>
     <string name="overview_show_absinsulin">Absolute insuline</string>
     <string name="master_password_summary">Het masterwachtwoord wordt gebruikt voor het versleutelen van backups en om de app-beveiligingen te kunnen overschrijven. Onthoud het goed of bewaar het op een veilige plaats.</string>
     <string name="current_master_password">Huidig masterwachtwoord</string>
@@ -832,7 +833,7 @@
     <string name="dpvdefaultprofile">DPV Basis profiel</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink Status:</string>
     <string name="filter">Filter</string>
-    <string name="copytolocalprofile_invalid">Lokaal profiel kan niet worden gemaakt. Profiel is ongeldig.</string>
+    <string name="copytolocalprofile_invalid">Kan profiel niet aanmaken. Profiel is ongeldig.</string>
     <string name="cta_dont_kill_my_app_info">Don\'t kill my app?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Stuur SMS wanneer de pomp onbereikbaar is</string>
     <string name="smscommunicator_pump_ureachable">Melding pomp onbereikbaar</string>
@@ -844,6 +845,11 @@
     <string name="enablebolusadvisor_summary">Gebruik bij een hoge bloedglucose niet het resultaat van de wizard, maar een herinnering om later met eten te beginnen (\"pre-bolus\")</string>
     <string name="time_to_eat">Tijd om te eten!\nVoer de boluswizard opnieuw uit.</string>
     <string name="timetoeat">Tijd om te eten</string>
+    <string name="bolusreminder">Bolus herinnering</string>
+    <string name="enablebolusreminder">Bolus herinnering inschakelen</string>
+    <string name="enablebolusreminder_summary">Gebruik herinnering om later te bolussen met de wizard
+        (\"post-bolus\")</string>
+    <string name="time_to_bolus">Tijd om te bolussen!\nVoer de boluswizard uit en maak de berekening opnieuw.</string>
     <string name="fabric_upload_disabled">Upload van crashrapporten is uitgeschakeld!</string>
     <string name="graph_menu_divider_header">Grafiek</string>
     <string name="chart_menu">Grafiek menu</string>
@@ -857,12 +863,33 @@
     <string name="privacy_settings">Privacyinstellingen</string>
     <string name="privacy_summary">U kunt optioneel een e-mailadres opgeven als u op de hoogte wilt worden gebracht van applicatie crashes. Dit is geen geautomatiseerde service. De ontwikkelaars zullen contact met u opnemen bij gevaarlijke situaties.</string>
     <string name="full_sync">Volledige synchronisatie</string>
+    <string name="full_sync_comment">Volledige synchronisatie? Dit kan een aantal uren duren. Je ziet dan geen nieuwe gegevens in Nightscout.</string>
     <string name="prime">Vullen</string>
     <string name="ns_sync_options">Synchronisatie</string>
     <string name="ns_upload_summary">Profielen, bolussen, koolhydraten, tijdelijke basaal standen worden geupload naar NS</string>
     <string name="ns_upload">Upload data naar NS</string>
+    <string name="ns_receive_profile_store">Ontvang profiel opslag</string>
+    <string name="ns_receive_profile_store_summary">Synchroniseer profielen van NS profiel editor</string>
     <string name="ns_receive_temp_target">Ontvang tijdelijke doelen</string>
     <string name="ns_receive_temp_target_summary">Accepteer tijdelijke doelen ingevoerd in NS of NSClient</string>
     <string name="ns_receive_profile_switch">Ontvang profielwissels</string>
     <string name="ns_receive_profile_switch_summary">Accepteer profielwissels zoals ingevoerd in NS of NSClient</string>
+    <string name="ns_receive_offline_event">Ontvang APS offline gebeurtenissen</string>
+    <string name="ns_receive_offline_event_summary">Accepteer APS offline gebeurtenissen die zijn ingevoerd via NS of NSClient</string>
+    <string name="ns_receive_insulin">Ontvang insuline</string>
+    <string name="ns_receive_insulin_summary">Accepteer insuline zoals ingevoerd in NS of NSClient (insuline wordt niet toegediend, het wordt alleen in IOB calculatie meegenomen)</string>
+    <string name="ns_receive_carbs">Ontvang koolhydraten</string>
+    <string name="ns_receive_carbs_summary">Accepteer koolhydraten ingevoerd in NS of NSClient</string>
+    <string name="ns_receive_therapy_events">Accepteer behandelingen</string>
+    <string name="ns_receive_therapy_events_summary">Accepteer behandelingen (cannule, insuline, batterijwissel etc) ingevoerd via NS of NSClient</string>
+    <string name="ns_receive_cgm">Ontvang / backfill CGM gegevens</string>
+    <string name="ns_receive_cgm_summary">Accepteer CGM data van NS</string>
+    <string name="sms_timeout_while_wating">Time-out tijdens het wachten op het voltooien van de vorige pomp communicatie</string>
+    <string name="smscommunicator_another_bolus_in_queue">Er staat een andere bolus in de wachtrij. Probeer het later opnieuw.</string>
+    <string name="calculation_in_progress">Berekening wordt uitgevoerd</string>
+    <string name="missing_profile_name">Profielnaam ontbreekt</string>
+    <string name="error_in_ic_values">Fout in IC waarden</string>
+    <string name="error_in_basal_values">Fout in basaal waarden</string>
+    <string name="error_in_target_values">Fout in streefdoel</string>
+    <string name="error_in_isf_values">Fout in ISF waarden</string>
 </resources>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index f6abab15410..30fc00a237f 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -12,7 +12,6 @@
     <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_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>
@@ -78,7 +77,6 @@
     <string name="overview">Oversikt</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_profile">Profil</string>
@@ -257,7 +255,7 @@
     <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="localprofile">Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Liste med %1$d elementer.\nFaktisk verdi:</string>
     <string name="openapsma_autosensdata_label">Autosens data</string>
@@ -494,6 +492,7 @@
     <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="nsclientbgshort">NS 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>
@@ -650,6 +649,8 @@
     <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="glunovo">Glunovo</string>
+    <string name="description_source_glunovo">Motta BS verdier fra Glunovo 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>
@@ -665,7 +666,6 @@
     <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>
@@ -679,6 +679,7 @@
     <string name="resettodefaults">Gjenopprett standardinnstillinger</string>
     <string name="nsmalfunction">NSClient feil. Vurder omstart av NS og NSClient.</string>
     <string name="time_offset">Tidsforskyvning</string>
+    <string name="bolus_reminder">Påminnelse til å gi bolus senere</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>
@@ -717,6 +718,7 @@
     <string name="versionChecker">Versjonskontroll</string>
     <string name="old_version">gammel versjon</string>
     <string name="very_old_version">veldig gammel versjon</string>
+    <string name="application_expired">Applikasjon utløpt - oppdater</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>
@@ -750,7 +752,7 @@
     <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="copytolocalprofile">Opprett ny 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>
@@ -832,7 +834,7 @@
     <string name="dpvdefaultprofile">DPV standardprofil</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink status:</string>
     <string name="filter">Filter</string>
-    <string name="copytolocalprofile_invalid">Klarte ikke å opprette lokal profil. Profilen er ikke gyldig.</string>
+    <string name="copytolocalprofile_invalid">Klarte ikke å opprette profil. Profilen er ikke gyldig.</string>
     <string name="cta_dont_kill_my_app_info">Avslutte app?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Send SMS hvis det ikke oppnås kontakt med pumpa</string>
     <string name="smscommunicator_pump_ureachable">Rapporter når kontakt med pumpe ikke oppnås</string>
@@ -844,6 +846,11 @@
     <string name="enablebolusadvisor_summary">Bruk en påminnelse om å spise senere enn kalkulator resultatet fra wizard ved høyt blodsukker (\"pre-bolus\")</string>
     <string name="time_to_eat">Nå må du spise!\Bruk bolus veiviseren og beregn på nytt.</string>
     <string name="timetoeat">Nå må du spise</string>
+    <string name="bolusreminder">Bolus påminnelse</string>
+    <string name="enablebolusreminder">Aktiver bolus påminnelse</string>
+    <string name="enablebolusreminder_summary">Bruk påminnelse for å sette bolus dosen senere med veiviseren
+        («post bolus»)</string>
+    <string name="time_to_bolus">Tid for bolus!\nStart bolus-veiviser og gjør beregning på nytt.</string>
     <string name="fabric_upload_disabled">Opplast av krasj logger er deaktivert!</string>
     <string name="graph_menu_divider_header">Graf</string>
     <string name="chart_menu">Diagram meny</string>
@@ -857,12 +864,13 @@
     <string name="privacy_settings">Personverninnstillinger</string>
     <string name="privacy_summary">Du kan oppgi valgfri e-postadresse hvis du ønsker å bli varslet om krasj. Dette er ikke en automatisert tjeneste. Du vil bli kontaktet av utviklere ved farlige hendelser.</string>
     <string name="full_sync">Full synkronisering</string>
+    <string name="full_sync_comment">Full synkronisering? Dette kan ta mange timer og du ser ikke nye data i NS før dette er ferdig.</string>
     <string name="prime">Prime</string>
     <string name="ns_sync_options">Synkronisering</string>
     <string name="ns_upload_summary">Profiler, boluser, karbohydrater, midlertidige basaler lastes opp til NS</string>
     <string name="ns_upload">Last opp data til NS</string>
     <string name="ns_receive_profile_store">Hent lagrede profiler</string>
-    <string name="ns_receive_profile_store_summary">Synkroniser profiler fra NS til lokal profil</string>
+    <string name="ns_receive_profile_store_summary">Synkroniser profiler fra NS profileditor</string>
     <string name="ns_receive_temp_target">Motta midlertidige BS mål</string>
     <string name="ns_receive_temp_target_summary">Aksepter midlertidige mål angitt med NS eller NSClient</string>
     <string name="ns_receive_profile_switch">Motta profilbytter</string>
@@ -880,4 +888,17 @@
     <string name="sms_timeout_while_wating">Tidsavbrudd fordi vi ventet på avslutning av forrige pumpekommunikasjon</string>
     <string name="smscommunicator_another_bolus_in_queue">Det ligger en annen bolus i køen. Prøv igjen senere.</string>
     <string name="calculation_in_progress">Beregning pågår</string>
+    <string name="missing_profile_name">Mangler profilnavn</string>
+    <string name="error_in_ic_values">Feil i IK faktoren</string>
+    <string name="error_in_basal_values">Feil i basalverdiene</string>
+    <string name="error_in_target_values">Feil i BS mål verdiene</string>
+    <string name="error_in_isf_values">Feil i IF verdien</string>
+    <string name="run_question">Kjør %s?</string>
+    <string name="invalid_profile_not_accepted">Ugyldig profil %1$s ikke akseptert fra NS</string>
+    <string name="view">Visning</string>
+    <string name="errors">Feil</string>
+    <string name="ns_sync_slow">Reduser opplastingshastighet</string>
+    <string name="data_status">BS data status</string>
+    <string name="recalculated_data_used">Rekalkulerte siste data</string>
+    <string name="bg_too_close">BS for nær:\n%1$s\n%2$s</string>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/exam.xml b/app/src/main/res/values-pl-rPL/exam.xml
index 486ee32dbfc..7908d6e0c98 100644
--- a/app/src/main/res/values-pl-rPL/exam.xml
+++ b/app/src/main/res/values-pl-rPL/exam.xml
@@ -8,6 +8,7 @@
     <string name="dia_meaningisequaltodiapump">Jeśli jesteś zadowolony z wartości dla DIA, która była użyta w twojej pompie przed wykorzystaniem AndroidAPS, nie ma potrzeby jej zmiany, gdy zaczniesz używać pętli.</string>
     <string name="dia_valuemustbedetermined">Powinieneś określić dla siebie odpowiednią wartość DIA.</string>
     <string name="hypott_label">Cel tymczasowy dla Hipo</string>
+    <string name="hypott_whenhypott">Jaki jest główny powód ustawienia celu tymczasowego Hipo?</string>
     <string name="hypott_wrongbasal">Aby skorygować hipoglikemię spowodowaną nieprawidłowymi ustawieniami dawki podstawowej.</string>
     <string name="hypott_preventoversmb">Aby zapobiec nadmiernemu korygowaniu przez AndroidAPS wzrostu poziomu glukozy we krwi spowodowanego przez szybko działające węglowodany stosowane w leczeniu hipoglikemii.</string>
     <string name="hypott_exercise">Korekta hipoglikemii wywołanej wysiłkiem fizycznym.</string>
@@ -40,12 +41,14 @@
     <string name="noisycgm_label">Szumy w odczytach z CGM</string>
     <string name="noisycgm_whattodo">Co powinno być wykonane gdy dane CGM są zaszumione?</string>
     <string name="noisycgm_nothing">Nic nie rób - AndroidAPS sobie z tym poradzi.</string>
+    <string name="noisycgm_pause">Wyłącz pętlę zamkniętą, aby uniknąć możliwego przedawkowania lub niedoszacowania.</string>
     <string name="noisycgm_replacesensor">Wymieniaj stale zaszumione lub niewłaściwie wskazujące sensory.</string>
     <string name="noisycgm_checksmoothing">Sprawdź, czy aplikacja CGM zapewnia wygładzone dane.</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="exerciseprofile_label">Ćwiczenia fizyczne i profile</string>
     <string name="exerciseprofile_whattodo">Jak wykorzystać profile, aby najlepiej pomóc systemowi radzić sobie z ćwiczeniami aerobowymi?</string>
     <string name="exerciseprofile_switchprofilebelow100">Wykonaj zmianę profilu na poniżej 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Wykonaj zmianę profilu na powyżej 100%.</string>
     <string name="exerciseprofile_leaveat100">Pozostaw profil ustawiony na 100%.</string>
     <string name="exerciseprofile_suspendloop">Wstrzymaj pętle.</string>
     <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
@@ -129,6 +132,7 @@
     <string name="wronginsulin_label">Błędy w dostarczaniu/wpisywaniu insuliny</string>
     <string name="wronginsulin_whattodo">Co należy zrobić, jeśli otrzymano mniej insuliny niż sugeruje historia pompy, np. z powodu niedrożności, uszkodzonej kaniuli lub zapomnienia o ponownym podłączeniu pompy po prysznicu? </string>
     <string name="wronginsulin_careportal">Usuń dane insuliny z portalu Nightscout aby usunąć je z historii pompy.</string>
+    <string name="wronginsulin_compare">Porównaj wartości w AndroidAPS i historii pompy (jeśli pompa ją ma).</string>
     <string name="wronginsulin_prime">Podaj obliczoną dawkę „pominiętej” insuliny za pomocą strzykawki / wstrzykiwacza lub za pomocą pompy funkcji wypełnienia.</string>
     <string name="wronginsulin_donothing">Nie rób nic i pozwól AndroidAPS na skorygowanie każdego uzyskanego wysokiego stężenia glukozy we krwi.</string>
     <string name="iob_label">Aktywna insulina (IOB)</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index f52ab95fe6b..57ca6fe2a08 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -12,7 +12,6 @@
     <string name="nav_resetdb">Zresetuj bazy danych</string>
     <string name="reset_db_confirm">Na pewno chcesz zresetować bazy danych?</string>
     <string name="nav_exit">Wyjście</string>
-    <string name="ns_sync_use_absolute_title">Zawsze używaj wartości bezwzględnych bazy</string>
     <string name="alert_dialog_permission_battery_optimization_failed">To urządzenie nie obsługuje białej listy optymalizacji baterii - mogą wystąpić problemy z wydajnością.</string>
     <string name="description_actions">Niektóre przyciski umożliwiające szybki dostęp do typowych funkcji</string>
     <string name="description_config_builder">Konfiguracja aktywnych modułów systemu</string>
@@ -57,15 +56,15 @@
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Węglow</string>
-    <string name="treatments_wizard_correction_label">Korekta</string>
-    <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
+    <string name="treatments_wizard_correction_label">Poprawka</string>
+    <string name="treatments_wizard_bolusiob_label">IOB z bolusów</string>
     <string name="openapsma_run">Uruchom teraz</string>
     <string name="vitualpump_label">POMPA WIRTUALNA</string>
     <string name="openapsma_lastrun_label">Ostatnie działanie</string>
     <string name="openapsma_inputparameters_label">Parametry wejściowe</string>
     <string name="openapsma_glucosestatus_label">Stan glukozy</string>
     <string name="openapsma_currenttemp_label">Obecna tymczasowa</string>
-    <string name="openapsma_iobdata_label">IOB data</string>
+    <string name="openapsma_iobdata_label">Dane IOB</string>
     <string name="openapsma_profile_label">Profil</string>
     <string name="openapsma_mealdata_label">Dane posiłku</string>
     <string name="result">Rezultat</string>
@@ -78,7 +77,6 @@
     <string name="overview">Przegląd</string>
     <string name="treatments">Terapia</string>
     <string name="virtualpump">Pompa wirtualna</string>
-    <string name="careportal">PortalOpieki</string>
     <string name="configbuilder_pump">Pompa</string>
     <string name="configbuilder_pump_description">Którą pompę chcesz wykorzystać do AndroidAPS?</string>
     <string name="configbuilder_profile">Profil</string>
@@ -118,7 +116,7 @@
     <string name="openloop_newsuggestion">Dostępna nowa sugestia</string>
     <string name="carbssuggestion">Sugestia węglowodanów</string>
     <string name="unsupportednsversion">Niewspierana wersja Nightscout</string>
-    <string name="treatments_wizard_basaliob_label">Bazowa IOB</string>
+    <string name="treatments_wizard_basaliob_label">IOB z bazy</string>
     <string name="bolusconstraintapplied">Ograniczenia bolusa wprowadzone</string>
     <string name="carbsconstraintapplied">Ograniczenie stosowania węglowodanów</string>
     <string name="careportal_newnstreatment_other">Inne</string>
@@ -133,6 +131,7 @@
     <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="ue_exported">Wyeksportowano wpisy użytkownika</string>
     <string name="export_to">Eksportuj ustawienia do</string>
     <string name="import_from">Importuj ustawienia z</string>
     <string name="setting_imported">Ustawienia zaimportowane</string>
@@ -256,12 +255,13 @@
     <string name="ongoingnotificaction">Nadchodzące powiadomienia</string>
     <string name="old_data">NIEAKTUALNE DANE</string>
     <string name="sms_minago">%1$dmin temu</string>
-    <string name="localprofile">Lokalny Profil</string>
+    <string name="localprofile">Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Lista %1$d elementów.\n Bieżąca wartość:</string>
     <string name="openapsma_autosensdata_label">Dane Autosens</string>
     <string name="openapsma_scriptdebugdata_label">Debugowanie skryptów</string>
     <string name="openapsama_useautosens">Użyj funkcji Autosens</string>
+    <string name="refresheventsfromnightscout">Odśwież z NS</string>
     <string name="deletefuturetreatments">Usuń zabiegi w przyszłości</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
@@ -385,6 +385,7 @@
     <string name="basal_shortname">BAZ</string>
     <string name="deviation_shortname">ODCH</string>
     <string name="activity_shortname">AKT</string>
+    <string name="bgi_shortname">-BGI</string>
     <string name="abs_insulin_shortname">ABS</string>
     <string name="devslope_shortname">KRZOD</string>
     <string name="nav_about">O programie</string>
@@ -455,6 +456,7 @@
     <string name="activity_target">Ćwiczenia cel</string>
     <string name="hypo_duration">Hipo czas trwania</string>
     <string name="hypo_target">Hipo cel</string>
+    <string name="reuse_profile_pct_hours">Użyj ponownie %1$d%% %2$dh</string>
     <string name="wearcontrol_title">Sterowanie z zegarka</string>
     <string name="wearcontrol_summary">Ustawiaj wartości docelowe i wprowadzaj leczenie z zegarka.</string>
     <string name="food">Posiłek</string>
@@ -490,6 +492,7 @@
     <string name="dexcomg5_xdripupload_title">Prześlij dane BG do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">W xDrip+ wybierz źródło danych 640g/Eversense</string>
     <string name="nsclientbg">NSClient BG</string>
+    <string name="nsclientbgshort">NS BG</string>
     <string name="overview_editquickwizard_usebg">Obliczenia BG</string>
     <string name="overview_editquickwizard_usebolusiob">Obliczenia Bolus IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Obliczenia IOB</string>
@@ -551,6 +554,7 @@
     <string name="bolusrecordedonly">Bolus zostanie jedynie odnotowany (nie będzie podany przez pompę)</string>
     <string name="loop_smbsetbypump_label">SMB ustawiony przez pompę</string>
     <string name="overview_show_activity">Aktywność</string>
+    <string name="overview_show_bgi">Wpływ na glikemię (BGI)</string>
     <string name="overview_show_sensitivity">Wrażliwość</string>
     <string name="overview_show_deviations">Odchylenia</string>
     <string name="overview_show_cob">COB (Aktywne Węglow.)</string>
@@ -660,7 +664,6 @@
     <string name="error_adding_treatment_title">Niekompletne dane leczenie</string>
     <string name="maintenance_settings">Ustawienia Konserwacji</string>
     <string name="maintenance_email">Odbiorca E-maila</string>
-    <string name="maintenance_encrypt_exported_prefs">Zaszyfruj wyeksportowane ustawienia</string>
     <string name="maintenance_amount">Liczba logów do wysłania</string>
     <string name="maintenance">Konserwacja</string>
     <string name="maintenance_shortname">MAINT</string>
@@ -674,6 +677,7 @@
     <string name="resettodefaults">Przywróć ustawienia domyślne</string>
     <string name="nsmalfunction">Usterka NSClient. Spróbuj zrestartować NS i NSClient.</string>
     <string name="time_offset">Przesunięcie czasu</string>
+    <string name="bolus_reminder">Przypomnij o bolusie</string>
     <string name="setupwizard_preferred_aps_mode">Preferowany tryb APS</string>
     <string name="treatments_wizard_total_label">Razem</string>
     <string name="calculation_short">Kalk</string>
@@ -712,6 +716,7 @@
     <string name="versionChecker">Kontroler wersji</string>
     <string name="old_version">stara wersja</string>
     <string name="very_old_version">bardzo stara wersja</string>
+    <string name="application_expired">Aplikacja wygasła</string>
     <string name="new_version_warning">Nowa wersja dostępna co najmniej %1$d dni! Powrót do LGS (zawieszania podawania bazy przy niskim poziomie) po %2$d dniach, pętla zostanie wyłączona po %3$d dniach</string>
     <string name="twohours">2 h</string>
     <string name="dexcom_app_patched">Apka Dexcom (spatchowana)</string>
@@ -745,7 +750,7 @@
     <string name="clone_label">Sklonuj</string>
     <string name="saveorresetchangesfirst">Najpierw zapisz lub wycofaj bieżące zmiany</string>
     <string name="deletecurrentprofile">Skasować bieżący profil?</string>
-    <string name="copytolocalprofile">Utworzyć nowy profil lokalny z wybranego profilu?</string>
+    <string name="copytolocalprofile">Utworzyć nowy profil na bazie wybranego profilu?</string>
     <string name="profilenamecontainsdot">Nazwa profilu zawiera kropki.\nTo nie jest obsługiwane przez NS.\nProfil nie zostanie przesyłany do NS.</string>
     <string name="low_mark_comment">Dolna wartość zakresu docelowego (tylko do wyświetlania)</string>
     <string name="high_mark_comment">Górna wartość zakresu docelowego (tylko do wyświetlania)</string>
@@ -769,6 +774,7 @@
     <string name="randombg_short">BG (poziom cukru)</string>
     <string name="tools">Narzędzia</string>
     <string name="show_calculation">Pokaż obliczenia</string>
+    <string name="show_removed">Pokaż usunięte</string>
     <string name="clearqueueconfirm">Wyczyścić kolejkę? Wszystkie dane w kolejce zostaną utracone!</string>
     <string name="ebstopsloop">Użycie funkcji Extended bolus spowoduje zatrzymanie trybu pętli zamkniętej na czas działania przedłużonego bolusa. Czy na pewno tego chcesz?</string>
     <string name="closed_loop_disabled_with_eb">Zamknięta pętla wyłączona, ponieważ działa Extended Bolus (bolus przedłużony)</string>
@@ -826,7 +832,7 @@
     <string name="dpvdefaultprofile">Domyślny profil DPV</string>
     <string name="setupwizard_pump_riley_link_status">Stan RileyLink:</string>
     <string name="filter">Filtr</string>
-    <string name="copytolocalprofile_invalid">Nie można utworzyć profilu lokalnego. Profil jest niepoprawny.</string>
+    <string name="copytolocalprofile_invalid">Nie można utworzyć profilu. Profil jest nieprawidłowy.</string>
     <string name="cta_dont_kill_my_app_info">Nie zabij mojej aplikacji?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Wyślij SMS, jeśli wyzwolone jest zdarzenie pompy nieosiągalnej</string>
     <string name="smscommunicator_pump_ureachable">Zgłoś nieosiągalną pompę</string>
@@ -838,6 +844,58 @@
     <string name="enablebolusadvisor_summary">Użyj przypomnienia, aby rozpocząć jedzenie później podczas wysokiej glikemii (\"pre-bolus\")</string>
     <string name="time_to_eat">Czas jeść!\nUruchom kreatora bolusa i zrób obliczenia ponownie.</string>
     <string name="timetoeat">Czas na jedzenie</string>
+    <string name="bolusreminder">Przypomnienie bolusa</string>
+    <string name="enablebolusreminder">Włącz przypomnienie bolusa</string>
+    <string name="enablebolusreminder_summary">Użyj przypomnienia o potrzebie obliczenia i podania bolusa kalkulatorem (\"opóźniony bolus\")</string>
+    <string name="time_to_bolus">Czas na bolus!\nUruchom Kalkulator bolusa aby ponownie wykonać obliczenia.</string>
     <string name="fabric_upload_disabled">Przesyłanie dzienników awarii jest wyłączone!</string>
     <string name="graph_menu_divider_header">Wykres</string>
+    <string name="chart_menu">Menu wykresu</string>
+    <string name="clear_filter">Wyczyść filtr</string>
+    <string name="trend_arrow">Strzałka trendu</string>
+    <string name="cannula">Kaniula</string>
+    <string name="userentry">Wpis użytkownika</string>
+    <string name="common_values">Użyj wartości największego jedzenia, które zazwyczaj zjadasz\n</string>
+    <string name="summary_email_for_crash_report">Ten adres e-mail zostanie dołączony do raportów o awariach, abyśmy mogli skontaktować się z Tobą w pilnych przypadkach. Jego podanie jest opcjonalne.</string>
+    <string name="email_address">Adres e-mail</string>
+    <string name="privacy_settings">Ustawienia prywatności</string>
+    <string name="privacy_summary">Możesz opcjonalnie podać adres e-mail, jeśli chcesz otrzymywać powiadomienia o awariach aplikacji. To nie jest usługa zautomatyzowana. W niebezpiecznych sytuacjach deweloperzy skontaktują się z Tobą.</string>
+    <string name="full_sync">Pełna synchronizacja</string>
+    <string name="full_sync_comment">Wykonać pełną synchronizację? Może ona potrwać wiele godzin i aż do jej zakończenia nie zobaczysz nowych danych w NS.</string>
+    <string name="prime">Wypełnianie</string>
+    <string name="ns_sync_options">Synchronizacja</string>
+    <string name="ns_upload_summary">Profile, bolusy, węglowodany, tymczasowe bazy są przesyłane do NS</string>
+    <string name="ns_upload">Prześlij dane do NS</string>
+    <string name="ns_receive_profile_store">Odbieraj zapisane profile</string>
+    <string name="ns_receive_profile_store_summary">Synchronizuj profile z edytorem profilów NS</string>
+    <string name="ns_receive_temp_target">Odbieraj cele tymczasowe</string>
+    <string name="ns_receive_temp_target_summary">Akceptuj cele tymczasowe wprowadzone przez NS lub NSClient</string>
+    <string name="ns_receive_profile_switch">Odbieraj zmiany profilu</string>
+    <string name="ns_receive_profile_switch_summary">Akceptuj zmiany profilu wprowadzone przez NS lub NSClient</string>
+    <string name="ns_receive_offline_event">Odbieraj zdarzenia o rozłączeniu APS</string>
+    <string name="ns_receive_offline_event_summary">Akceptuj zdarzenia o rozłączeniu APS wprowadzone przez NS lub NSClient</string>
+    <string name="ns_receive_insulin">Odbieraj wpisy o insulinie</string>
+    <string name="ns_receive_insulin_summary">Akceptuj wpisy o insulinie wprowadzone przez NS lub NSClient (insulina nie zostanie podana, jedynie obliczona do IOB)</string>
+    <string name="ns_receive_carbs">Odbieraj wpisy o węglowodanach</string>
+    <string name="ns_receive_carbs_summary">Akceptuj węglowodany wprowadzone przez NS lub NSClient</string>
+    <string name="ns_receive_therapy_events">Odbieraj zdarzenia związane z leczeniem</string>
+    <string name="ns_receive_therapy_events_summary">Akceptuj zdarzenia związane z leczeniem (kaniula, insulina, zmiana baterii itp.) wprowadzone przez NS lub NSClient</string>
+    <string name="ns_receive_cgm">Odbieraj/uzupełnij dane CGM</string>
+    <string name="ns_receive_cgm_summary">Akceptuj dane CGM z NS</string>
+    <string name="sms_timeout_while_wating">Przekroczono limit czasu oczekiwania na zakończenie poprzedniej komunikacji z pompą</string>
+    <string name="smscommunicator_another_bolus_in_queue">W kolejce oczekuje inny bolus. Spróbuj ponownie później.</string>
+    <string name="calculation_in_progress">Trwa obliczanie</string>
+    <string name="missing_profile_name">Brak nazwy profilu</string>
+    <string name="error_in_ic_values">Błąd w przelicznikach IC</string>
+    <string name="error_in_basal_values">Błąd w wartościach bazy</string>
+    <string name="error_in_target_values">Błąd w wartościach docelowych</string>
+    <string name="error_in_isf_values">Błąd w wartościach ISF</string>
+    <string name="run_question">Uruchomić %s?</string>
+    <string name="invalid_profile_not_accepted">Błędny profil %1$s nie został zaakceptowany z NS</string>
+    <string name="view">Podgląd</string>
+    <string name="errors">Błędy</string>
+    <string name="ns_sync_slow">Wysyłaj dane wolniej</string>
+    <string name="data_status">Stan danych glikemii</string>
+    <string name="recalculated_data_used">Użyto przeliczonych wartości</string>
+    <string name="bg_too_close">Zbyt bliskie pomiary glikemii:\n%1$s\n%2$s</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b7b9c8c480e..8a89a5f9112 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -75,7 +75,6 @@
     <string name="overview">Visão geral</string>
     <string name="treatments">Tratamentos</string>
     <string name="virtualpump">Bomba virtual</string>
-    <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Bomba</string>
     <string name="configbuilder_pump_description">Qual a bomba que gostaria de usar com AndroidAPS?</string>
     <string name="configbuilder_profile">Perfil</string>
@@ -232,7 +231,6 @@
     <string name="ongoingnotificaction">Notificação em curso</string>
     <string name="old_data">DADOS ANTIGOS</string>
     <string name="sms_minago">%1$dmin atrás</string>
-    <string name="localprofile">Perfil local</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Array de %1$d elementos.\nValor atual:</string>
     <string name="openapsma_autosensdata_label">Dados Autosens</string>
@@ -581,7 +579,6 @@
     <string name="error_adding_treatment_title">Dados tratamento incompletos</string>
     <string name="maintenance_settings">Configurações de manutenção</string>
     <string name="maintenance_email">Email destinatário</string>
-    <string name="maintenance_encrypt_exported_prefs">Encriptar configurações exportadas</string>
     <string name="maintenance_amount">Nr. de registos a enviar</string>
     <string name="maintenance">Manutenção</string>
     <string name="maintenance_shortname">MANU</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 05032c9a19b..ec5fa77da3f 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -78,7 +78,6 @@
     <string name="overview">Visão Geral</string>
     <string name="treatments">Tratamentos</string>
     <string name="virtualpump">Bomba virtual</string>
-    <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Bomba</string>
     <string name="configbuilder_pump_description">Qual a bomba que gostaria de utilizar com AndroidAPS?</string>
     <string name="configbuilder_profile">Perfil</string>
@@ -257,7 +256,6 @@
     <string name="ongoingnotificaction">Notificação em curso</string>
     <string name="old_data">DADOS ANTIGOS</string>
     <string name="sms_minago">%1$dmin atrás</string>
-    <string name="localprofile">Perfil local</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Array de %1$d elementos.\nValor actual:</string>
     <string name="openapsma_autosensdata_label">Dados Autosens</string>
@@ -665,7 +663,6 @@
     <string name="error_adding_treatment_title">Dados tratamento incompletos</string>
     <string name="maintenance_settings">Definições de manutenção</string>
     <string name="maintenance_email">Email destinatário</string>
-    <string name="maintenance_encrypt_exported_prefs">Encriptar definições exportadas</string>
     <string name="maintenance_amount">Nr. de registos a enviar</string>
     <string name="maintenance">Manutenção</string>
     <string name="maintenance_shortname">MANU</string>
@@ -750,7 +747,6 @@
     <string name="clone_label">Clone</string>
     <string name="saveorresetchangesfirst">Guardar ou repor as alterações actuais primeiro</string>
     <string name="deletecurrentprofile">Eliminar perfil actual?</string>
-    <string name="copytolocalprofile">Criar novo perfil local a partir deste perfil?</string>
     <string name="profilenamecontainsdot">Nome do perfil contém pontos.\nIsso não é suportado pelo NS.\nPerfil não é enviado para o NS.</string>
     <string name="low_mark_comment">Valor mais baixo da área de intervalo (apenas exibição)</string>
     <string name="high_mark_comment">Valor mais alto da área de intervalo (apenas exibição)</string>
@@ -831,7 +827,6 @@
     <string name="dpvdefaultprofile">Perfil Padrão DPV</string>
     <string name="setupwizard_pump_riley_link_status">Estado RileyLink:</string>
     <string name="filter">Filtro</string>
-    <string name="copytolocalprofile_invalid">Não é possível criar perfil local. Perfil é inválido.</string>
     <string name="cta_dont_kill_my_app_info">Não encerre minha app?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Enviar SMS se evento de bomba inacessível for acionado</string>
     <string name="smscommunicator_pump_ureachable">Reportar bomba inacessível</string>
diff --git a/app/src/main/res/values-ro-rRO/exam.xml b/app/src/main/res/values-ro-rRO/exam.xml
index 38b0f748721..f8ab40842f4 100644
--- a/app/src/main/res/values-ro-rRO/exam.xml
+++ b/app/src/main/res/values-ro-rRO/exam.xml
@@ -132,6 +132,7 @@
     <string name="wronginsulin_label">Erori de livrare/introducere insulină</string>
     <string name="wronginsulin_whattodo">Ce trebuie să faci dacă ai primit mai putină insulină decât sugerează istoricul pompei, de exemplu datorită unei ocluzii, a unei canule defecte sau pentru ca ai uitat sa reatașezi pompa după un dus? </string>
     <string name="wronginsulin_careportal">Șterge datele despre insulină din Nightscout Careportal pentru a le înlătura din istoricul pompei.</string>
+    <string name="wronginsulin_compare">Compară valorile din AndroidAPS cu cele din istoricul pompei (dacă pompa permite asta).</string>
     <string name="wronginsulin_prime">Bolusati o cantitate parțiala de insulina din insulina calculata ca fiind lipsa utilizând seringa/penul sau amorsarea.</string>
     <string name="wronginsulin_donothing">Nu faceți nimic și permiteți AndroidAPS să corecteze valorile mari ale glicemiei.</string>
     <string name="iob_label">Insulină activă (IOB)</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 48f9e922eeb..0e637b38f1d 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -78,7 +78,6 @@
     <string name="overview">Privire de ansamblu</string>
     <string name="treatments">Tratamente</string>
     <string name="virtualpump">Pompă virtuală</string>
-    <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pompă</string>
     <string name="configbuilder_pump_description">Ce pompă doriți să folosiți cu AndroidAPS?</string>
     <string name="configbuilder_profile">Profil</string>
@@ -133,6 +132,7 @@
     <string name="configbuilder_nightscoutversion_label">Versiune Nightscout:</string>
     <string name="missing_carbs">Lipsă %1$d g</string>
     <string name="exported">Am exportat preferințele</string>
+    <string name="ue_exported">Înregistrările de la Utilizator exportate</string>
     <string name="export_to">Exportă setările către</string>
     <string name="import_from">Importă setările din</string>
     <string name="setting_imported">Setări importate</string>
@@ -256,12 +256,13 @@
     <string name="ongoingnotificaction">Notificare activă</string>
     <string name="old_data">DATE VECHI</string>
     <string name="sms_minago">acum %1$dmin</string>
-    <string name="localprofile">Profil local</string>
+    <string name="localprofile">Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Matrice de %1$d elemente.\nValoarea curentă:</string>
     <string name="openapsma_autosensdata_label">Date Autosens</string>
     <string name="openapsma_scriptdebugdata_label">Depanare script</string>
     <string name="openapsama_useautosens">Folosește opțiunea de autosensibilitate</string>
+    <string name="refresheventsfromnightscout">Actualizează din NS</string>
     <string name="deletefuturetreatments">Ștergerea tratamentelor înregistrate în viitor</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
@@ -492,6 +493,7 @@
     <string name="dexcomg5_xdripupload_title">Trimite date glicemie la xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Selectați 640g/Eversense ca sursă de date în xDrip+</string>
     <string name="nsclientbg">Glicemie NSClient</string>
+    <string name="nsclientbgshort">NS GL</string>
     <string name="overview_editquickwizard_usebg">Calcul glicemie</string>
     <string name="overview_editquickwizard_usebolusiob">Calcul IOB bolus</string>
     <string name="overview_editquickwizard_usebasaliob">Calcul IOB bazală</string>
@@ -663,7 +665,6 @@
     <string name="error_adding_treatment_title">Date incomplete despre tratament</string>
     <string name="maintenance_settings">Setări de întreținere</string>
     <string name="maintenance_email">Destinatar email</string>
-    <string name="maintenance_encrypt_exported_prefs">Criptează setările exportate</string>
     <string name="maintenance_amount">Nr de loguri de trimis</string>
     <string name="maintenance">Mentenanță</string>
     <string name="maintenance_shortname">MENTN</string>
@@ -677,6 +678,7 @@
     <string name="resettodefaults">Resetare la setările implicite</string>
     <string name="nsmalfunction">Funcționare incorectă a NSClient. Aveți în vedere un restart al NS și al NSClient.</string>
     <string name="time_offset">Decalaj</string>
+    <string name="bolus_reminder">Amintește-mi sa fac bolus mai târziu</string>
     <string name="setupwizard_preferred_aps_mode">Modul APS preferat</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Calc</string>
@@ -715,6 +717,7 @@
     <string name="versionChecker">Verificator versiune</string>
     <string name="old_version">versiune veche</string>
     <string name="very_old_version">versiune foarte veche</string>
+    <string name="application_expired">Aplicația a expirat</string>
     <string name="new_version_warning">O versiune nouă este disponibilă de cel puțin %1$d zile! Reveniți la LGS după %2$d zile, bucla închisă va fi dezactivată după %3$d zile</string>
     <string name="twohours">2h</string>
     <string name="dexcom_app_patched">Aplicația Dexcom (modificată)</string>
@@ -748,7 +751,7 @@
     <string name="clone_label">Clonează</string>
     <string name="saveorresetchangesfirst">Salvează sau resetează modificările curente mai întâi</string>
     <string name="deletecurrentprofile">Ştergeţi profilul curent?</string>
-    <string name="copytolocalprofile">Creați un profil local nou pe baza acestui profil?</string>
+    <string name="copytolocalprofile">Creați un profil nou din acest profil?</string>
     <string name="profilenamecontainsdot">Numele profilului conține puncte.\nAcest lucru nu este permis de NS.\nProfilul nu a fost înregistrat în NS.</string>
     <string name="low_mark_comment">Valoarea inferioară a intervalului țintă (doar afișare)</string>
     <string name="high_mark_comment">Valoarea superioară a intervalului țintă (doar afișare)</string>
@@ -772,6 +775,7 @@
     <string name="randombg_short">Gl</string>
     <string name="tools">Instrumente</string>
     <string name="show_calculation">Arată calculul</string>
+    <string name="show_removed">Arată ștergerile</string>
     <string name="clearqueueconfirm">Ștergeți coada? Toate datele din coadă vor fi pierdute!</string>
     <string name="ebstopsloop">Utilizarea unui bolus extins va opri modul buclă închisă pe timpul livrării bolusului extins. Sigur doriți acest lucru?</string>
     <string name="closed_loop_disabled_with_eb">Bucla închisă dezactivată din cauza livrării bolusului extins</string>
@@ -829,7 +833,7 @@
     <string name="dpvdefaultprofile">Profil implicit DPV</string>
     <string name="setupwizard_pump_riley_link_status">Stare RileyLink:</string>
     <string name="filter">Filtru</string>
-    <string name="copytolocalprofile_invalid">Nu se poate crea profilul local. Profilul este invalid.</string>
+    <string name="copytolocalprofile_invalid">Nu se poate crea profilul. Profilul este invalid.</string>
     <string name="cta_dont_kill_my_app_info">Nu-mi opri aplicația?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Trimite SMS dacă este generata o alarma de eroare conexiune pompa</string>
     <string name="smscommunicator_pump_ureachable">Raportează pompa inaccesibilă</string>
@@ -841,6 +845,11 @@
     <string name="enablebolusadvisor_summary">Folosește o alarma de reamintire pentru a începe sa mănânci mai târziu în loc de alerta de la calculatorul de bolus din timpul hiperglicemiei (\"pre-bolus\")</string>
     <string name="time_to_eat">Timpul sa mănânci!\nRuleaza Calculatorul de Bolus pentru a face calculele din nou.</string>
     <string name="timetoeat">Timpul sa mănânci</string>
+    <string name="bolusreminder">Memento bolus</string>
+    <string name="enablebolusreminder">Activează memento bolus</string>
+    <string name="enablebolusreminder_summary">Folosește memento pentru a bolusa mai târziu cu asistentul
+        (\"post-bolus\")</string>
+    <string name="time_to_bolus">Timpul sa faci bolus!\nRuleaza Calculatorul de Bolus pentru a face calculele din nou.</string>
     <string name="fabric_upload_disabled">Încărcarea jurnalelor de erori este dezactivata!</string>
     <string name="graph_menu_divider_header">Grafic</string>
     <string name="chart_menu">Meniu diagramă</string>
@@ -853,4 +862,39 @@
     <string name="email_address">Adresă de e-mail</string>
     <string name="privacy_settings">Setări de confidenţialitate</string>
     <string name="privacy_summary">Puteți furniza o adresă de e-mail opțională dacă doriți să fiți notificat despre erorile aplicației. Acesta nu este un serviciu automat. Veți fi contactat de dezvoltatori în situații periculoase.</string>
+    <string name="full_sync">Sincronizare completă</string>
+    <string name="full_sync_comment">Sincronizare completă? Poate dura multe ore şi până la final nu veţi vedea date noi în NS.</string>
+    <string name="prime">Amorsare</string>
+    <string name="ns_sync_options">Sincronizare</string>
+    <string name="ns_upload_summary">Profilurile, bolusurile, carbohidrații, bazalele temporare sunt încărcate în NS</string>
+    <string name="ns_upload">Încarcă date în NS</string>
+    <string name="ns_receive_profile_store">Primire stocare profile</string>
+    <string name="ns_receive_profile_store_summary">Sincronizează profilurile din editorul de profil NS</string>
+    <string name="ns_receive_temp_target">Primește ținte temporare</string>
+    <string name="ns_receive_temp_target_summary">Acceptați țintele temporare introduse prin NS sau NSClient</string>
+    <string name="ns_receive_profile_switch">Primește schimbări de profil</string>
+    <string name="ns_receive_profile_switch_summary">Acceptați schimbările de profil introduse prin NS sau NSClient</string>
+    <string name="ns_receive_offline_event">Primiți evenimente APS offline</string>
+    <string name="ns_receive_offline_event_summary">Acceptați evenimente offline APS introduse prin NS sau NSClient</string>
+    <string name="ns_receive_insulin">Primiţi date insulina</string>
+    <string name="ns_receive_insulin_summary">Acceptaţi insulina introdusă prin NS sau NSClient (nu este livrată, ci doar calculată in IoB)</string>
+    <string name="ns_receive_carbs">Primește carbohidrați</string>
+    <string name="ns_receive_carbs_summary">Acceptați carbohidrați introduși prin NS sau NSClient</string>
+    <string name="ns_receive_therapy_events">Primește evenimente terapeutice</string>
+    <string name="ns_receive_therapy_events_summary">Acceptaţi evenimentele de tratament (canulă, insulină, modificarea bateriei etc.) introduse prin NS sau NSClient</string>
+    <string name="ns_receive_cgm">Primire/completare date CGM</string>
+    <string name="ns_receive_cgm_summary">Acceptați datele CGM din NS</string>
+    <string name="sms_timeout_while_wating">Timp expirat cat ce se aștepta terminarea comunicării anterioare a pompei</string>
+    <string name="smscommunicator_another_bolus_in_queue">Există un alt bolus în coada de așteptare. Încercați din nou mai târziu.</string>
+    <string name="calculation_in_progress">Calcul în desfășurare</string>
+    <string name="missing_profile_name">Lipsește numele profilului</string>
+    <string name="error_in_ic_values">Eroare in valorile IC</string>
+    <string name="error_in_basal_values">Eroare in valorile ratei bazale</string>
+    <string name="error_in_target_values">Eroare in valorile tinta</string>
+    <string name="error_in_isf_values">Eroare in valorile ISF</string>
+    <string name="run_question">Executați %s?</string>
+    <string name="invalid_profile_not_accepted">Profilul invalid din NS %1$s nu este acceptat</string>
+    <string name="view">Vizualizare</string>
+    <string name="errors">Erori</string>
+    <string name="ns_sync_slow">Încarcă mai lent</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 6804c6672a8..da7505a0c9c 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -78,7 +78,6 @@
     <string name="overview">Начало</string>
     <string name="treatments">Терапия</string>
     <string name="virtualpump">Виртуальная помпа</string>
-    <string name="careportal">Портал лечения / назначений</string>
     <string name="configbuilder_pump">помпа</string>
     <string name="configbuilder_pump_description">Какой помпой вы хотели бы пользоваться с AndroidAPS?</string>
     <string name="configbuilder_profile">профиль</string>
@@ -257,7 +256,7 @@
     <string name="ongoingnotificaction">текущие уведомления</string>
     <string name="old_data">старые данные</string>
     <string name="sms_minago">%1$d мин. назад</string>
-    <string name="localprofile">локальный профиль</string>
+    <string name="localprofile">Профиль</string>
     <string name="openapsama">Помощник болюса OpenAPS AMA</string>
     <string name="array_of_elements">Массив %1$d элементов. \nActual актуальная величина:</string>
     <string name="openapsma_autosensdata_label">данные autosens</string>
@@ -494,6 +493,7 @@
     <string name="dexcomg5_xdripupload_title">Отправить данные СК на xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">В xDrip + выберите источник данных 640g/Eversense</string>
     <string name="nsclientbg">СК с клиента Nightscout</string>
+    <string name="nsclientbgshort">ГК с NS </string>
     <string name="overview_editquickwizard_usebg">Вычисление СК</string>
     <string name="overview_editquickwizard_usebolusiob">Расчет болюсного активного инсулина IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Расчет базального активного инсулина IOB</string>
@@ -667,7 +667,6 @@ Context | Edit Context</string>
     <string name="error_adding_treatment_title">Данные терапии неполные</string>
     <string name="maintenance_settings">Параметры обслуживания</string>
     <string name="maintenance_email">Адрес электронной почты</string>
-    <string name="maintenance_encrypt_exported_prefs">Зашифровать экспортируемые параметры</string>
     <string name="maintenance_amount">Количество логов для отправки</string>
     <string name="maintenance">Обслуживание</string>
     <string name="maintenance_shortname">ОБСЛУЖ</string>
@@ -681,6 +680,7 @@ Context | Edit Context</string>
     <string name="resettodefaults">Восстановить значения по умолчанию</string>
     <string name="nsmalfunction">Некорректная работа NSClient. Возможно следует перезапустить NS и NSClient.</string>
     <string name="time_offset">Смещение по времени</string>
+    <string name="bolus_reminder">Напомнить о болюсе позже</string>
     <string name="setupwizard_preferred_aps_mode">Предпочитаемый режим APS</string>
     <string name="treatments_wizard_total_label">Итого</string>
     <string name="calculation_short">Кальк</string>
@@ -719,6 +719,7 @@ Context | Edit Context</string>
     <string name="versionChecker">Проверка версии</string>
     <string name="old_version">старая версия</string>
     <string name="very_old_version">очень старая версия</string>
+    <string name="application_expired">Истек срок действия приложения</string>
     <string name="new_version_warning">Новая версия доступна уже %1$d дней! По истечении %2$d дн алгоритм переходит в режим работы только с остановкой при низкой гликемии LGS, замкнутый цикл будет отключен через %3$d дн</string>
     <string name="twohours">2ч</string>
     <string name="dexcom_app_patched">Приложение Dexcom (модифицированное)</string>
@@ -746,7 +747,7 @@ Context | Edit Context</string>
     <string name="doyouwantresetstart">Хотите сбросить начатую цель? Можете потерять уже достигнутое.</string>
     <string name="setupwizard_units_prompt">Выберите единицы, в которых вы хотите отображать значения</string>
     <string name="dia_short">Время действия инсулина DIA</string>
-    <string name="ic_short">IC (инсулин/углеводы)</string>
+    <string name="ic_short">IC углкоэф ГУ/инс</string>
     <string name="isf_short">ISF (чувствительность к инсулину)</string>
     <string name="target_short">ЦЕЛЬ</string>
     <string name="clone_label">Клонировать</string>
@@ -846,6 +847,10 @@ Context | Edit Context</string>
     <string name="enablebolusadvisor_summary">Используйте напоминание для того, чтобы начать есть позже, вместо того, чтобы воспользоваться помощником болюса на высоких значениях ГК (\"пре-болюс\")</string>
     <string name="time_to_eat">Пора есть!\nЗапустите помощник болюса снова для подсчета.</string>
     <string name="timetoeat">Пора есть</string>
+    <string name="bolusreminder">Напоминание о болюсе</string>
+    <string name="enablebolusreminder">Включить напоминание о болюсе</string>
+    <string name="enablebolusreminder_summary">Применить напоминание о болюсе с помощью мастера (постболюс)</string>
+    <string name="time_to_bolus">Пора дать болюс!\nЗапустите помощник болюса и повторите расчет.</string>
     <string name="fabric_upload_disabled">Загрузка журналов сбоя на сервер отключена!</string>
     <string name="graph_menu_divider_header">График</string>
     <string name="chart_menu">Меню графика</string>
@@ -859,6 +864,7 @@ Context | Edit Context</string>
     <string name="privacy_settings">Настройки конфиденцальности</string>
     <string name="privacy_summary">Вы можете указать дополнительно адрес электронной почты, если хотите получать уведомления о сбоях приложения; что является не автоматизированной рассылкой, а способом связи с разработчиками в опасных ситуациях.</string>
     <string name="full_sync">Полная синхронизация</string>
+    <string name="full_sync_comment">Полная синхронизация? Это может занять много часов и до завершения вы не увидите новые данные в NS.</string>
     <string name="prime">Заполнение инфузионной системы</string>
     <string name="ns_sync_options">Синхронизация</string>
     <string name="ns_upload_summary">Профили, болюсы, углеводы, временные базалы закачиваются в NS</string>
@@ -882,4 +888,14 @@ Context | Edit Context</string>
     <string name="sms_timeout_while_wating">Таймаут во время ожидания окончания предыдущего соединения с помпой</string>
     <string name="smscommunicator_another_bolus_in_queue">В очереди есть еще один болюс. Повторите попытку позже.</string>
     <string name="calculation_in_progress">Идет подсчет</string>
+    <string name="missing_profile_name">Отсутствует название профиля</string>
+    <string name="error_in_ic_values">Ошибка в значении углеводного коэффициента IC</string>
+    <string name="error_in_basal_values">Ошибка в величине базала</string>
+    <string name="error_in_target_values">Ошибка в целевых значениях</string>
+    <string name="error_in_isf_values">Ошибка в значении фактора чувствительности к инсулину ISF</string>
+    <string name="run_question">Запустить %s?</string>
+    <string name="invalid_profile_not_accepted">Неверный профиль %1$s не принят из NS</string>
+    <string name="view">Вид</string>
+    <string name="errors">Ошибки</string>
+    <string name="ns_sync_slow">Замедлить выгрузку</string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index a935d2f9221..88321f70a58 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -78,7 +78,6 @@
     <string name="overview">Prehľad</string>
     <string name="treatments">Ošetrenia</string>
     <string name="virtualpump">Virtuálna pumpa</string>
-    <string name="careportal">Starostlivosť</string>
     <string name="configbuilder_pump">Pumpa</string>
     <string name="configbuilder_pump_description">Akú pumpu chcete používať s AndroidAPS?</string>
     <string name="configbuilder_profile">Profil</string>
@@ -257,7 +256,7 @@
     <string name="ongoingnotificaction">Priebežné notifikácie</string>
     <string name="old_data">ZASTARALÉ DÁTA</string>
     <string name="sms_minago">pred %1$d min</string>
-    <string name="localprofile">Lokálny profil</string>
+    <string name="localprofile">Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Pole %1$d prvkov.\nAktuálna hodnota:</string>
     <string name="openapsma_autosensdata_label">Dáta detekcie citlivosti</string>
@@ -494,6 +493,7 @@
     <string name="dexcomg5_xdripupload_title">Odosielať glykémie do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dát 640g/Eversense</string>
     <string name="nsclientbg">Glykémie z NS</string>
+    <string name="nsclientbgshort">NS GL</string>
     <string name="overview_editquickwizard_usebg">Výpočet glykémie</string>
     <string name="overview_editquickwizard_usebolusiob">Výpočet bolusového IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Výpočet bazálneho IOB</string>
@@ -665,7 +665,6 @@
     <string name="error_adding_treatment_title">Dáta ošetrení neúplné</string>
     <string name="maintenance_settings">Nastavenie údržby</string>
     <string name="maintenance_email">E-Mail</string>
-    <string name="maintenance_encrypt_exported_prefs">Šifrovať exportované nastavenia</string>
     <string name="maintenance_amount">Počet protokolov na odoslanie</string>
     <string name="maintenance">Údržba</string>
     <string name="maintenance_shortname">Údržba</string>
@@ -679,6 +678,7 @@
     <string name="resettodefaults">Obnoviť predvolené</string>
     <string name="nsmalfunction">Chyba NSClienta. Zvážte reštart NS a NSClienta.</string>
     <string name="time_offset">Časový posun</string>
+    <string name="bolus_reminder">Upozorniť na bolus neskôr</string>
     <string name="setupwizard_preferred_aps_mode">Preferovaný režim APS</string>
     <string name="treatments_wizard_total_label">Spolu</string>
     <string name="calculation_short">Kalk</string>
@@ -717,6 +717,7 @@
     <string name="versionChecker">Kontrola verzie</string>
     <string name="old_version">stará verzia</string>
     <string name="very_old_version">veľmi stará verzia</string>
+    <string name="application_expired">Aplikácia expirovala</string>
     <string name="new_version_warning">Nová verzia je dostupná minimálne %1$d dní! Prepnutie na ochranu pred nízkou glykémiou po %2$d dňoch, vypnutie uzavretého okruhu po %3$d dňoch</string>
     <string name="twohours">2h</string>
     <string name="dexcom_app_patched">Dexcom aplikácia (upravená)</string>
@@ -743,7 +744,7 @@
     <string name="objectives_button_unstart">Vymazanie začaté</string>
     <string name="doyouwantresetstart">Chcete resetovať začiatok cieľa? Môžete prísť o svoj pokrok.</string>
     <string name="setupwizard_units_prompt">Vyberte jednotky, v ktorých chcete zobraziť hodnoty</string>
-    <string name="dia_short">Doba pôsobenia inzulínu</string>
+    <string name="dia_short">DIA</string>
     <string name="ic_short">I:C</string>
     <string name="isf_short">ISF</string>
     <string name="target_short">CIEĽ</string>
@@ -844,6 +845,11 @@
     <string name="enablebolusadvisor_summary">Pri vysokej glykémii spustiť pripomienku namiesto výsledku z kalkulačky, aby ste začali jesť neskôr (tzv. \"prebolus\")</string>
     <string name="time_to_eat">Čas na jedlo!\nSpustite Bolusovú kalkulačku a urobte výpočet znova.</string>
     <string name="timetoeat">Čas na jedlo</string>
+    <string name="bolusreminder">Pripomenutie bolusu</string>
+    <string name="enablebolusreminder">Zapnúť pripomínanie bolusu</string>
+    <string name="enablebolusreminder_summary">Použite pripomenutie pre neskorší bolus s kalkulačkou
+        (\"oneskorený bolus\")</string>
+    <string name="time_to_bolus">Čas na bolus!\nSpustite Bolusovú kalkulačku a urobte výpočet znova.</string>
     <string name="fabric_upload_disabled">Odosielanie protokolov o zlyhaní je zakázané!</string>
     <string name="graph_menu_divider_header">Graf</string>
     <string name="chart_menu">Grafové menu</string>
@@ -857,12 +863,13 @@
     <string name="privacy_settings">Nastavenia súkromia</string>
     <string name="privacy_summary">Pokiaľ chcete byť upozornení na zlyhanie aplikácie, môžete zadať voliteľne e-mailovú adresu. Toto nie je automatizovaná služba. Vývojári vás budú kontaktovať v nebezpečných situáciách.</string>
     <string name="full_sync">Úplná synchronizácia</string>
+    <string name="full_sync_comment">Úplná synchronizácia? Môže to trvať niekoľko hodín a kým skončí, neuvidíte nové dáta v NS.</string>
     <string name="prime">Plnenie</string>
     <string name="ns_sync_options">Synchronizácia</string>
     <string name="ns_upload_summary">Profily, bolusy, sacharidy, dočasné bazály sú nahrávané do NS</string>
     <string name="ns_upload">Nahrávať dáta do NS</string>
     <string name="ns_receive_profile_store">Prijímať úložisko profilov</string>
-    <string name="ns_receive_profile_store_summary">Synchronizovať profily z NS do miestneho profilu</string>
+    <string name="ns_receive_profile_store_summary">Synchronizovať profily z NS editora profilov</string>
     <string name="ns_receive_temp_target">Prijímať dočasné ciele</string>
     <string name="ns_receive_temp_target_summary">Prijať dočasné ciele zadané prostredníctvom NS, alebo NSClienta</string>
     <string name="ns_receive_profile_switch">Prijímať prepnutia profilov</string>
@@ -880,4 +887,14 @@
     <string name="sms_timeout_while_wating">Vypršal časový limit pri čakaní na dokončenie predchádzajúcej komunikácie s pumpou</string>
     <string name="smscommunicator_another_bolus_in_queue">Vo fronte je ďalší bolus. Skúste to znovu neskôr.</string>
     <string name="calculation_in_progress">Prebieha výpočet</string>
+    <string name="missing_profile_name">Chýba názov profilu</string>
+    <string name="error_in_ic_values">Chyba v hodnotách inz./sach. prevodu</string>
+    <string name="error_in_basal_values">Chyba v hodnotách bazálu</string>
+    <string name="error_in_target_values">Chyba v cieľových hodnotách</string>
+    <string name="error_in_isf_values">Chyba v hodnotách citlivosti</string>
+    <string name="run_question">Spustiť %s?</string>
+    <string name="invalid_profile_not_accepted">Neplatný profil %1$s nebol akceptovaný z NS</string>
+    <string name="view">Zobraziť</string>
+    <string name="errors">Chyby</string>
+    <string name="ns_sync_slow">Spomaliť nahrávanie</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/exam.xml b/app/src/main/res/values-sv-rSE/exam.xml
index 8812d30b600..133c9a1368f 100644
--- a/app/src/main/res/values-sv-rSE/exam.xml
+++ b/app/src/main/res/values-sv-rSE/exam.xml
@@ -132,6 +132,7 @@
     <string name="wronginsulin_label">Fel i bolusinmatning</string>
     <string name="wronginsulin_whattodo">Vad ska du göra om du fått mindre insulin än vad pumpens historik visar, t.ex. på grund av en ocklusion, en felaktig kanyl eller om du glömt att sätta fast pumpen efter en dusch? </string>
     <string name="wronginsulin_careportal">Ta bort insulindata från Nightscout för att ta bort den från pumpens historik.</string>
+    <string name="wronginsulin_compare">Jämför värden i AndroidAPS och pumpens historia (om pumpen stöder detta).</string>
     <string name="wronginsulin_prime">Ge en bolus med en del av det insulin du saknar antingen med penna eller genom att använda förfyllningsfunktionen.</string>
     <string name="wronginsulin_donothing">Gör ingenting och låt AndroidAPS korrigera eventuella höga blodglukosnivåer.</string>
     <string name="iob_label">Aktivt Insulin (IOB)</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 3a808d3a306..f6ea5725a76 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -79,7 +79,6 @@ Eversense-appen.</string>
     <string name="overview">Översikt</string>
     <string name="treatments">Behandlingar</string>
     <string name="virtualpump">Virtuell pump</string>
-    <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pump</string>
     <string name="configbuilder_pump_description">Vilken pump vill du använda med AndroidAPS?</string>
     <string name="configbuilder_profile">Profil</string>
@@ -258,7 +257,7 @@ Eversense-appen.</string>
     <string name="ongoingnotificaction">Konstant avisering i telefonen</string>
     <string name="old_data">Aktuellt BG saknas!</string>
     <string name="sms_minago">%1$d min sedan</string>
-    <string name="localprofile">Lokal profil</string>
+    <string name="localprofile">Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">En serie med %1$d tal.\nVärde:</string>
     <string name="openapsma_autosensdata_label">Autosensdata</string>
@@ -495,6 +494,7 @@ Eversense-appen.</string>
     <string name="dexcomg5_xdripupload_title">Skicka BG-data till xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Välj \"640G/Eversense\" som datakälla i xDrip+</string>
     <string name="nsclientbg">NSClient BG</string>
+    <string name="nsclientbgshort">NS BG</string>
     <string name="overview_editquickwizard_usebg">Använd BG</string>
     <string name="overview_editquickwizard_usebolusiob">Använd bolus-IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Använd basal-IOB</string>
@@ -666,7 +666,6 @@ Eversense-appen.</string>
     <string name="error_adding_treatment_title">Behandlingsdata ofullständigt</string>
     <string name="maintenance_settings">Underhållsinställningar</string>
     <string name="maintenance_email">e-postmottagare</string>
-    <string name="maintenance_encrypt_exported_prefs">Kryptera exporterade inställningar</string>
     <string name="maintenance_amount">Antal loggar att skicka</string>
     <string name="maintenance">Underhåll</string>
     <string name="maintenance_shortname">UH</string>
@@ -680,6 +679,7 @@ Eversense-appen.</string>
     <string name="resettodefaults">Återställ standardinställningar</string>
     <string name="nsmalfunction">Fel på NSClient. Överväg att starta om NSClient och Nightscout-webbplatsen.</string>
     <string name="time_offset">KH-tid</string>
+    <string name="bolus_reminder">Påminn om bolus senare</string>
     <string name="setupwizard_preferred_aps_mode">Föredraget APS-läge</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Kalkyl</string>
@@ -718,6 +718,7 @@ Eversense-appen.</string>
     <string name="versionChecker">Versionskontroll</string>
     <string name="old_version">gammal version</string>
     <string name="very_old_version">väldigt gammal version</string>
+    <string name="application_expired">Applikationen inte giltig längre</string>
     <string name="new_version_warning">Ny version tillgänglig för %1$d dagar sedan. Systemet kommer att byta läge till \"stopp innan lågt\" efter %2$d dagar och sluta loopa helt efter %3$d dagar</string>
     <string name="twohours">2 tim</string>
     <string name="dexcom_app_patched">Dexcoms app (modifierad)</string>
@@ -751,7 +752,7 @@ Eversense-appen.</string>
     <string name="clone_label">Kopiera</string>
     <string name="saveorresetchangesfirst">Spara eller återställa aktuella ändringar först</string>
     <string name="deletecurrentprofile">Ta bort aktuell profil?</string>
-    <string name="copytolocalprofile">Skapa ny lokal profil av denna?</string>
+    <string name="copytolocalprofile">Skapa kopia av denna profil?</string>
     <string name="profilenamecontainsdot">Profilnamnet innehåller punkter.\nDetta stöds inte av NS.\nProfil överförs inte till NS.</string>
     <string name="low_mark_comment">Nedre värdet för målområde (endast visning)</string>
     <string name="high_mark_comment">Övre värdet för målområde (endast visning)</string>
@@ -833,7 +834,7 @@ Eversense-appen.</string>
     <string name="dpvdefaultprofile">DPV-standardprofil</string>
     <string name="setupwizard_pump_riley_link_status">Riley Link-status:</string>
     <string name="filter">Filter</string>
-    <string name="copytolocalprofile_invalid">Kan inte att skapa den lokala profilen. Profilen är ogiltig.</string>
+    <string name="copytolocalprofile_invalid">Kan inte att skapa profilen. Profilen är felaktig.</string>
     <string name="cta_dont_kill_my_app_info">Döda inte min app?</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Skicka SMS om pumpen inte kan nås</string>
     <string name="smscommunicator_pump_ureachable">Rapportera om pump inte kan nås</string>
@@ -845,6 +846,11 @@ Eversense-appen.</string>
     <string name="enablebolusadvisor_summary">Få en påminnelse om att börja äta senare (istället för kalkylatorns resultat) om du ligger högt i BG</string>
     <string name="time_to_eat">Dags att äta!\nKör bolusguiden igen för ny beräkning.</string>
     <string name="timetoeat">Dags att äta</string>
+    <string name="bolusreminder">Boluspåminnelse</string>
+    <string name="enablebolusreminder">Aktivera boluspåminnelse</string>
+    <string name="enablebolusreminder_summary">Använd påminnelse för att ge bolus senare
+        (\"post-bolus\")</string>
+    <string name="time_to_bolus">Dags för bolus!\nKör Bolusguiden och gör beräkningar igen.</string>
     <string name="fabric_upload_disabled">Uppladdning av kraschloggar inaktiverad!</string>
     <string name="graph_menu_divider_header">Graf</string>
     <string name="chart_menu">Diagrammeny</string>
@@ -858,12 +864,13 @@ Eversense-appen.</string>
     <string name="privacy_settings">Sekretessinställningar</string>
     <string name="privacy_summary">Du kan ange valfri e-postadress om du vill få meddelanden om appkrascher. Det här är ingen automatiserad tjänst. Du kommer att kontaktas av utvecklare i farliga situationer.</string>
     <string name="full_sync">Full synkronisering</string>
+    <string name="full_sync_comment">Full synkronisering? Det kan ta flera timmar du kommer inte att se nya data i NS förrän den är klar.</string>
     <string name="prime">Förfyllning</string>
     <string name="ns_sync_options">Synkronisering</string>
     <string name="ns_upload_summary">Profiler, bolus, kolhydrater och temp basaler laddas upp till NS</string>
     <string name="ns_upload">Ladda upp data till NS</string>
     <string name="ns_receive_profile_store">Ladda ner profiler</string>
-    <string name="ns_receive_profile_store_summary">Skapa/synka lokala profiler från NS</string>
+    <string name="ns_receive_profile_store_summary">Synkronisera profiler från NS</string>
     <string name="ns_receive_temp_target">Ladda ner temporära mål</string>
     <string name="ns_receive_temp_target_summary">Godkänn temp mål som anges genom NS eller NSClient</string>
     <string name="ns_receive_profile_switch">Ladda ner profilbyten</string>
@@ -881,4 +888,14 @@ Eversense-appen.</string>
     <string name="sms_timeout_while_wating">Föregående pumpkommunikation har inte bekräftats/avslutats i tid</string>
     <string name="smscommunicator_another_bolus_in_queue">Det finns en annan bolus i kö. Försök igen senare.</string>
     <string name="calculation_in_progress">Beräkning pågår</string>
+    <string name="missing_profile_name">Profilnamn saknas</string>
+    <string name="error_in_ic_values">Fel i KH-kvoter</string>
+    <string name="error_in_basal_values">Fel i basaldoser</string>
+    <string name="error_in_target_values">Fel i målvärden</string>
+    <string name="error_in_isf_values">Fel i korrektionskvoter</string>
+    <string name="run_question">Kör %s?</string>
+    <string name="invalid_profile_not_accepted">Ogiltig profil %1$s från NS accepteras inte</string>
+    <string name="view">Visa</string>
+    <string name="errors">Fel</string>
+    <string name="ns_sync_slow">Långsamma uppladdningar</string>
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/exam.xml b/app/src/main/res/values-tr-rTR/exam.xml
index 3ea04e700df..e257adfd901 100644
--- a/app/src/main/res/values-tr-rTR/exam.xml
+++ b/app/src/main/res/values-tr-rTR/exam.xml
@@ -1,2 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="dia_whatmeansdia">İES (DIA) hakkında doğru olan nedir?</string>
+    <string name="dia_label_exam">İnsülin Etki Süresi (İES)</string>
+    <string name="dia_profile">Profilinizde İES değerini ayarlamalısınız.</string>
+    <string name="dia_minimumis5h">İzin verilen minimum değer 5 saattir.</string>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
+    <string name="dia_meaningisequaltodiapump">AndroidAPS\'den önce pompanızda kullandığınız İES değerinin doğru olduğundan eminseniz, döngüye başladığınızda bunu değiştirmenize gerek yoktur.</string>
+    <string name="dia_valuemustbedetermined">İES için uygun değeri kendiniz belirlemelisiniz.</string>
+    <string name="hypott_label">Hipo Geçici-Hedef</string>
+    <string name="hypott_whenhypott">Hipo geçici hedef belirlemenin birincil nedeni nedir?</string>
+    <string name="hypott_wrongbasal">Yanlış bazal oranı ayarlarından kaynaklanan hipoları düzeltmek için.</string>
+    <string name="hypott_preventoversmb">Hipo tedavisinde kullanılan hızlı etkili karbonhidratların neden olduğu kan şekeri artışında, AndroidAPS\'in aşırı düzeltme yapmasını önlemek.</string>
+    <string name="hypott_exercise">Egzersizin bir sonucu olarak tetiklenen hipoyu düzeltmek için.</string>
+    <string name="hypott_0basal">Halihazırda %0 geçici bazal oran çalışıyorsa, kan şekerinin düşmesini önlemek için.</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
+    <string name="offlineprofile_whatprofile">Hangi profil çevrimdışı kullanılabilir ve yapılandırılabilir?</string>
+    <string name="offlineprofile_label">Konu: Çevrimdışı profiller</string>
+    <string name="offlineprofile_nsprofile">NS Profili kullanılabilir ancak yapılandırılamaz.</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">AndroidAPS\'de Pompa bağlantısını kesme nedenleri</string>
+    <string name="pumpdisconnect_whattodo">Pompa bağlantısı kesilirken ne yapılmalı?</string>
+    <string name="pumpdisconnect_unnecessary">Pompanın fiziksel olarak bağlantısı kesilirse insülin iletilmeyeceğinden bu gereksizdir.</string>
+    <string name="pumpdisconnect_missinginsulin">AndroidAPS\'nin, pompa fiziksel olarak bağlı değilken iletilmeyen insülini hesaba katmasını önler. </string>
+    <string name="pumpdisconnect_notstop">Pompa bağlı kalırsa insülin iletimini durdurmaz.</string>
+    <string name="pumpdisconnect_openloop">AndroidAPS\'yi açık döngü moduna gönderir.</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">AndroidAPS Ayarları</string>
+    <string name="objectives2_label">AndroidAPS Ayarları</string>
+    <string name="objectives_howtosave">Ayarlarınızı yedeklemek için en sağlıklı yöntemler nelerdir?</string>
+    <string name="objectives_notesettings">Ayarlarınızı not etmeniz şartıyla ayarları dışa aktarmanıza gerek yoktur.</string>
+    <string name="objectives_afterobjective">Bir görevi tamamlamayı bitirdikten sonra ayarlarınızı dışa aktarın.</string>
+    <string name="objectives_afterchange">Ayarlarınızdan herhangi birini değiştirdikten sonra ayarlarınızı dışa aktarın.</string>
+    <string name="objectives_afterinitialsetup">İlk kurulumunuzu tamamladıktan ve Tercihlerinizi belirledikten sonra ayarlarınızı dışa aktarın.</string>
+    <string name="objectives2_maintenance">Bakım menüsünü kullanarak ayarlarınızı yerel olarak dışa aktarın.</string>
+    <string name="objectives2_internalstorage">Ayar dosyanız, telefonunuzdaki Dahili Depolama/AAPS/tercihler klasöründe bulunur.</string>
+    <string name="objectives2_cloud">Tercihler dosyanızı telefonunuzun dışındaki güvenli bir konuma kopyalayın (ör. bulut sürücüsü kullanarak, bilgisayara kablo bağlayarak, e-posta vb.)</string>
+    <string name="objectives2_easyrestore">Telefonunuz hasar görürse veya kaybolursa, ayarlarınızı yedeklemeden uzaktan kurtarmanın kolay yolları vardır.</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">Gürültülü CGM Okumaları</string>
+    <string name="noisycgm_whattodo">CGM (dexcom, miaomaio vs.) verileri gürültülü ise ne yapılmalı?</string>
+    <string name="noisycgm_nothing">Hiçbir şey yapmayın - AndroidAPS bununla ilgilenecektir.</string>
+    <string name="noisycgm_pause">Olası aşırı veya düşük dozdan kaçınmak için kapalı döngüyü devre dışı bırakın.</string>
+    <string name="noisycgm_replacesensor">Sürekli gürültülü veya hatalı sensörleri değiştirin.</string>
+    <string name="noisycgm_checksmoothing">CGM uygulamanızın sorunsuz veriler sağladığını doğrulayın.</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="exerciseprofile_label">Egzersiz ve Profiller</string>
+    <string name="exerciseprofile_whattodo">Aerobik egzersiz yaparken sistemin size en iyi şekilde yardımcı olması için profilleri nasıl kullanırsınız?</string>
+    <string name="exerciseprofile_switchprofilebelow100">%100\'ün altında bir profil geçişi yapın.</string>
+    <string name="exerciseprofile_switchprofileabove100">%100\'den fazla bir profil geçişi yapın.</string>
+    <string name="exerciseprofile_leaveat100">Profili %100 olarak bırakın.</string>
+    <string name="exerciseprofile_suspendloop">Döngüyü askıya alın.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">Egzersiz ve Geçici Hedefler</string>
+    <string name="exercise_whattodo">Aerobik egzersiz yaparken sistemin size en iyi şekilde yardımcı olması için geçici hedefleri nasıl kullanırsınız?</string>
+    <string name="exercise_settt">Egzersize başlamadan önce uygun bir zamandan başlayarak aktivite kan şekeri hedefi belirleyin.</string>
+    <string name="exercise_setfinished">Egzersizi bitirdikten sonra bir aktivite kan şekeri hedefi belirleyin.</string>
+    <string name="exercise_setunchanged">Kan şekeri hedefinizi değiştirmeden bırakın.</string>
+    <string name="exercise_15g">Kan şekeri, hipo geçici hedefinizin altına düşene kadar bekleyin ve ardından 15 g hızlı etkili karbonhidrat yiyin.</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">Döngüyü Devre Dışı bırakma/Askıya alma</string>
+    <string name="suspendloop_doigetinsulin">Döngü devre dışı bırakıldığında/askıya alındığında insülin alır mıyım?</string>
+    <string name="suspendloop_yes">Evet, bazal insülin verilmeye devam ediyor.</string>
+    <string name="suspendloop_no">Hayır, insülin iletimi durdurulur.</string>
+    <string name="basaltest_label">Bazal, ISF ve I:C Testi</string>
+    <string name="basaltest_when">Bu değerler ne zaman doğrulanmalıdır?</string>
+    <string name="basaltest_beforeloop">Döngüye başlamadan önce.</string>
+    <string name="basaltest_havingregularhighlow">Sık sık yüksek veya düşük kan şekeri yaşarken.</string>
+    <string name="basaltest_weekly">Haftada en az bir kez.</string>
+    <string name="basaltest_fixed">Bir kez ayarlanıp onaylandıktan sonra bu değerler zaman içinde değişmemelidir.</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">Önkoşullar</string>
+    <string name="prerequisites_what">AndroidAPS\'i kurmak ve kullanmak için ne gereklidir?</string>
+    <string name="prerequisites_determinedcorrectprofile">Doğrulanmış profil bilgileri (Basal, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">Android Studio\'nun kurulu ve yapılandırılmış olduğu bir bilgisayar.</string>
+    <string name="prerequisites_phone">Desteklenen bir telefon.</string>
+    <string name="prerequisites_pump">Kapalı devre çalıştırmayı planlıyorsanız uyumlu bir insülin pompası.</string>
+    <string name="prerequisites_nightscout">Tüm verilerin kaydını tutmak ve ayarları gözden geçirmek için Nightscout sitesi</string>
+    <string name="prerequisites_tidepoolaccount">Tidepool hesabı.</string>
+    <string name="prerequisites_googleaccount">Google hesabı.</string>
+    <string name="prerequisites_githubaccount">Github hesabı.</string>
+    <string name="prerequisites_beanandroiddeveloper">Programlama veya kod düzenleme konusunda deneyim.</string>
+    <string name="prerequisites_own670g">MiniMed 670G pompa.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="prerequisites_smartwatch">Akıllı saat.</string>
+    <string name="prerequisites_supportedcgm">Desteklenen bir CGM.</string>
+    <string name="prerequisites2_label">Önkoşullar</string>
+    <string name="prerequisites2_what">AndroidAPS\'yi kurmak ve kullanmak için ne gereklidir?</string>
+    <string name="prerequisites2_profile">Profil oluşturmak için doğrulanmış bilgiler (ISF, I:C oranı, bazal oranlar, DIA vb.).</string>
+    <string name="prerequisites2_device">Uyumlu bir Android cihaz (ör. cep telefonu, Android saat veya tablet).</string>
+    <string name="prerequisites2_internet">AndroidAPS\'in kapalı döngüde çalışması için internet bağlantısı gerekir.</string>
+    <string name="prerequisites2_supportedcgm">Telefonda/cihazda kan şekeri değerlerini almak için desteklenen bir CGM ve uygulama.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">AndroidAPS\'i güncelleme</string>
+    <string name="whatistrue">Tüm doğru cevapları kontrol edin.</string>
+    <string name="update_git">Git\'in bilgisayarınızda kurulu ve yapılandırılmış olması gerekir.</string>
+    <string name="update_asap">AndroidAPS\'nin güncellenmiş sürümleri yayınlandığında, önceki sürümler belirli bir süre sonra uzaktan sınırlandırılabilir.</string>
+    <string name="update_keys">Anahtar deponuzun konumunu kaydetmeli ve not etmeli ve önceki yüklemenizde olduğu gibi güncellemeler için aynı imzalama anahtarını kullanmalısınız.</string>
+    <string name="update_neverupdate">Sistem iyi çalışıyorsa asla güncelleme yapmayın.</string>
+    <string name="update_askfriend">Apk oluşturmakta zorluk çekiyorsanız, bir arkadaşınız tarafından oluşturulmuş bir apk yükleyebilirsiniz.</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">Sorun giderme</string>
+    <string name="troubleshooting_wheretoask">AndroidAPS ile ilgili nereden yardım alabilirsiniz?</string>
+    <string name="troubleshooting_fb">AndroidAPS Kullanıcıları Facebook grubundan tavsiye isteyebilirsiniz.</string>
+    <string name="troubleshooting_wiki">AndroidAPS belgelerini okumalısınız (ve yeniden okumalısınız).</string>
+    <string name="troubleshooting_gitter">AndroidAPS Gitter odasından tavsiye isteyebilir ve teknik problemleri veya sorunları not edebilirsiniz.</string>
+    <string name="troubleshooting_yourendo">Diyabet kliniğinize/endokrinoloğunuza sormalısınız.</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">İnsülin Eklentileri</string>
+    <string name="insulin_ultrarapid">Ultra-Hızlı Oref eklentisi ile hangi insülini kullanmalısınız?</string>
+    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
+    <string name="insulin_humalog">Humalog®</string>
+    <string name="insulin_actrapid">Actrapid®/Humulin R®/ insan insülini.</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">Duyarlılık Eklentileri</string>
+    <string name="sensitivity_which">Tüm doğru cevapları kontrol edin.</string>
+    <string name="sensitivity_adjust">Duyarlılık eklentileri, AndroidAPS\'nin insülin duyarlılığındaki geçici veya kısa süreli değişiklikleri (örneğin hormonal değişiklikler veya infüzyon bölgesinde emilim sorunları) ayarlamasına olanak tanır.</string>
+    <string name="sensitivity_edit">Duyarlılık eklentileri, kullanıcıya profili düzenlemek için kullanılabilecek bazal oranlar, I:C oranları ve ISF için önerilen değişiklikleri sağlar.</string>
+    <string name="sensitivity_cannula">Bir kanül değişikliğinin kaydedilmesi, Otoduyarlılık oranını %100\'e sıfırlayacaktır.</string>
+    <string name="sensitivity_time">Eklenti seçeneklerinden bazıları, kullanıcı tarafından ayarlanabilen yapılandırılabilir zaman aralıklarına sahiptir.</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="wrongcarbs_label">Karbonhidrat Giriş Hataları</string>
+    <string name="wrongcarbs_whattodo">Yanlış bir karbonhidrat girişi yaptıysanız ne yapmalısınız?</string>
+    <string name="wrongcarbs_treatmentstab">Tedavilerdeki yanlış girişi siler ve doğru karbonhidrat değerini girerim.</string>
+    <string name="wrongcarbs_addinsulin">İnfüzyon seti başlatma menüsünü kullanarak insülin gönderme.</string>
+    <string name="wrongcarbs_donothing">Hiçbir şey yapmayın – AndroidAPS uygun ayarlamaları yapacaktır.</string>
+    <string name="wrongcarbs_bolus">Genel Bakış\'ta İnsülin (bolus) düğmesini kullanarak insülin gönderme.</string>
+    <string name="wronginsulin_label">İnsülin gönderme/giriş hataları</string>
+    <string name="wronginsulin_whattodo">Tıkanma, başarısız bir kanül veya duştan sonra pompayı tekrar takmayı unutma v.s. nedeniyle, pompa geçmişinin önerdiğinden daha az insülin aldıysanız ne yapmalısınız?</string>
+    <string name="wronginsulin_careportal">Pompa geçmişinden çıkarmak için insülin verilerini Nightscout Careportal\'dan silerim.</string>
+    <string name="wronginsulin_compare">AndroidAPS ve pompa geçmişindeki değerleri karşılaştırın (pompa bunu destekliyorsa).</string>
+    <string name="wronginsulin_prime">Şırınga/kalem veya başlatma kullanarak hesaplanan \"eksik\" insülininizi bolus olarak karşılayın.</string>
+    <string name="wronginsulin_donothing">Hiçbir şey yapmayın ve AndroidAPS\'in ortaya çıkabilecek yüksek kan şekeri seviyesini düzeltmesine müsade edin.</string>
+    <string name="iob_label">Aktif İnsülin (IOB)</string>
+    <string name="iob_which">Tüm doğru cevapları kontrol edin.</string>
+    <string name="iob_value">IOB değeri, verilen geçici bazallardan etkilenir.</string>
+    <string name="iob_hightemp">Kan şekeriniz hedefin altına düştüğünde yüksek geçici bazal verilmeyecektir.</string>
+    <string name="iob_negiob">Egzersiz yapmadığınız halde uzun bir dönem için negatif IOB, profilinizin çok güçlü olduğunu ve ayarlarınızda daha az insüline ihtiyaç duyulduğunu gösterir.</string>
+    <string name="iob_posiob">Önemli bir süre için pozitif IOB, insülin direncini veya habersiz öğünleri gösterir.</string>
+    <string name="breadgrams_label">Karbonhidrat girişi ve boluslar</string>
+    <string name="breadgrams_grams">Tüketilen karbonhidratları tahmin etmek ve kaydetmek için sadece gram kullanılmalıdır.</string>
+    <string name="breadgrams_exchange">Tüketilen karbonhidratlar uygun bir değişim sistemi kullanılarak kaydedilebilir (örn. DAFNE \"CHO\" değişimleri veya Avrupa \"Ekmek Birimleri\").</string>
+    <string name="breadgrams_decay">AndroidAPS, karbonhidrat \"çözünmesini\" tahmin etmek ve COB\'ı hesaplamak için dinamik bir model kullanır.</string>
+    <string name="breadgrams_calc">Kan şekeri seviyeleri kabul edilebilir değerlerin dışındaysa (çok düşük veya çok yüksek), karbonhidrat veya insülin düzeltmeleri için öneriler sağlamak için bolus hesaplayıcı kullanılabilir.</string>
+    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
+    <string name="extendedcarbs_label">yayma-karbonhidratlar</string>
+    <string name="extendedcarbs_handling">Y-karbonhidratları (yayma karbonhidratlar) ne için kullanabilirsiniz?</string>
+    <string name="extendedcarbs_future">Gelecekte karbonhidratları planlamak için, muhtemelen bir aralığa dağıtılır (bir aralıkta insülin dağıtan yayma bolusa benzer).</string>
+    <string name="extendedcarbs_free">AndroidAPS\'den gizlemek istediğiniz \'ücretsiz\' egzersiz karbonhidratlarını kaydetmek için.</string>
+    <string name="extendedcarbs_fat">y-karbonhidratlar (gelecekte dağıtılacak) AndroidAPS\'nin yüksek yağ/proteinli öğünlerle uğraşmasına yardımcı olabilir.</string>
+    <string name="extendedcarbs_rescue">Düşük kan şekerini tedavi etmede kullandığınız kurtarma karbonhidratlarını kaydetmek için.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">Uzaktan İzleme</string>
+    <string name="nsclient_howcanyou">AndroidAPS\'i (örneğin çocuğunuz için) uzaktan nasıl izleyebilirsiniz?</string>
+    <string name="nsclient_nightscout">NS Client uygulaması, Nightscout uygulaması ve Nightscout web sayfasının tümü, AndroidAPS\'i uzaktan takip etmenize olanak tanır.</string>
+    <string name="nsclient_dexcomfollow">Diğer uygulamalar (ör. Dexcom takip, xDrip) bazı parametreleri (ör. kan şekeri/sensör değerleri) uzaktan takip etmenize izin verir, ancak farklı algoritma kullanımı, hatalı IOB veya COB değerlerine sebep olabilir.</string>
+    <string name="nsclient_data">AndroidAPS\'yi uzaktan takip etmek için her iki cihazın da internet erişimine sahip olması gerekir (ör. Wi-Fi veya mobil/hücresel ağ verileri aracılığıyla).</string>
+    <string name="nsclient_fullcontrol">Uzak takipçi olarak kullanılan NS İstemcisi, AndroidAPS\'i hem izleyecek hem de tam kontrol sağlayacaktır.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">İnsülin Duyarlılık Faktörü (ISF)</string>
+    <string name="isf_increasingvalue">ISF değerlerini yükseltmek, belirli bir karbonhidrat miktarını karşılamak için daha fazla insülin verilmesine yol açacaktır.</string>
+    <string name="isf_decreasingvalue">ISF değerinin düşürülmesi, hedeflenen kan şekerinin üzerinde bir düzeltme için daha fazla insülin verilmesine yol açar.</string>
+    <string name="isf_noeffect">Kan şekeri seviyeleri hedefin altında olduğunda ISF\'yi yükseltmenin veya düşürmenin insülin iletimi üzerinde hiçbir etkisi yoktur.</string>
+    <string name="isf_preferences">ISF, AndroidAPS Tercihlerinize girilmelidir.</string>
+    <string name="isf_profile">Profilinizdeki ISF değerini değiştirmeniz değişikliği uygulamak için yeterlidir.</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_multiple">Profilinizde I:C oranı için birden fazla değer kullanabilirsiniz.</string>
+    <string name="ic_isf">Profilinizde ISF\'nizi değiştirirseniz, her zaman I:C oranınızı da değiştirmelisiniz.</string>
+    <string name="ic_label_exam">İnsülin/Karbonhidrat Oranı (I:C oranı)</string>
+    <string name="ic_increasingvalue">Daha yüksek I:C oranları, belirli bir miktarda karbonhidrat için daha az insülin verilmesine yol açar.</string>
+    <string name="ic_decreasingvalue">Daha düşük I:C oranları, belirli bir miktarda karbonhidrat için daha az insülin verilmesine yol açar.</string>
+    <string name="ic_noeffect">0 COB\'niz varsa, IC oranını değiştirmek, belirli bir KŞ değerini düzeltmek için farklı insülin miktarına sebep olur.</string>
+    <string name="ic_different">Ekmek (değişim) birimini 10g veya 12g olarak sayarsanız IC farklı olacaktır.</string>
+    <string name="ic_meaning">IC anlamı şudur: 1Ü insülin kaç ekmek birimi (değişim) kapsar.</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">Profil Değiştirme</string>
+    <string name="profileswitch_pctwillchange">%90\'lık bir profil değişimi belirlediğinizde hangi yanıtlar doğrudur?</string>
+    <string name="profileswitch_basallower">Bazal oranlar %10 daha düşük olacaktır.</string>
+    <string name="profileswitch_isfhigher">ISF %10 daha yüksek olacaktır.</string>
+    <string name="profileswitch_iclower">I:C oranının değeri %10 daha düşük bir sayı olacaktır.</string>
+    <string name="profileswitch_unchanged">ISF ve I:C oranları değişmeyecektir.</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="profileswitch2_label">Profil Değiştirme</string>
+    <string name="profileswitch2_pctwillchange">%120 profil değişimi belirlediğinizde hangi yanıtlar doğrudur?</string>
+    <string name="profileswitch2_bghigher">Hedef kan şekeri %20 daha yüksek olacaktır.</string>
+    <string name="profileswitch2_basalhigher">Bazal oranlar %20 daha yüksek olacaktır.</string>
+    <string name="profileswitch2_bgunchanged">Hedef kan şekeri değişmeyecektir.</string>
+    <string name="profileswitch2_isfhigher">ISF %20 daha yüksek olacaktır.</string>
+    <string name="profileswitchtime_label">Profil Değiştirme</string>
+    <string name="profileswitchtime_iwant">Normalden 2 saat önce kalkarsanız, zaman değişikliğini AndroidAPS\'e nasıl bildirmelisiniz?</string>
+    <string name="profileswitchtime_2">2 saatlik bir zaman kayması ile bir profil değişikliği başlatın</string>
+    <string name="profileswitchtime__2">-2saatlik bir zaman kayması ile bir profil değişikliği başlatın</string>
+    <string name="profileswitchtime_tt">Yakında yemek geçici hedefi belirleyin.</string>
+    <string name="profileswitchtime_100">%100\'den fazla bir profil değişikliği yapın.</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitch4_label">Profillerdeki değişiklikler</string>
+    <string name="profileswitch4_rates">Profillerde bazal oranlar, ISF, I:C oranları vb. ayarlanmalıdır.</string>
+    <string name="profileswitch4_internet">Nightscout Profilinizdeki değişiklikleri etkinleştirmek, AndroidAPS kurulu telefonunuzun internete bağlı olmasını gerektirir.</string>
+    <string name="profileswitch4_sufficient">Değerleri değiştirmek için profi düzenlemek, yapılan değişiklikleri yürürlüğe koymak için yeterlidir.</string>
+    <string name="profileswitch4_multi">Değişen koşullara (ör. hormonal değişiklikler, vardiyalı çalışma, hafta içi/hafta sonu yaşam tarzı) uyum sağlamak için birden fazla profil ayarlanabilir ve seçilebilir.</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">Bazal oranlarla ilgili yardım</string>
+    <string name="basalhelp_where">Bazal oranlar vb. ile ilgili yardım için nereye gitmeli?</string>
+    <string name="basalhelp_diabetesteam">Diyabet ekibiniz</string>
+    <string name="basalhelp_google">Google</string>
+    <string name="basalhelp_facebook">Facebook</string>
+    <string name="other_medication_label">Diğer ilaçlarla etkileşim. Lütfen aşağıdaki beyanı okuyun ve ardından kabul etmek için kutuyu işaretleyin.</string>
+    <string name="other_medication_text">AndroidAPS, kan şekerini yükseltmek için bazal oranları düşürür veya insülin iletimini askıya alır. SGLT2 inhibitörleri (gliflozinler) sınıfındaki ilaçlar kan şekerindeki artışları önleyebilir ve bu nedenle DKA\'ya (Diyabetik ketoasidoz) yol açan tehlikeli bir insülin eksikliğine yol açabilir.
+\nYaygın marka isimleri şunlardır: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nAndroidAPS kullanırken bu tür ilaçları almayacağıma veya bu tür ilaçları kullanmadan önce döngüyü devre dışı bırakacağıma söz veriyorum.</string>
+</resources>
diff --git a/app/src/main/res/values-tr-rTR/objectives.xml b/app/src/main/res/values-tr-rTR/objectives.xml
index 3ea04e700df..112c5c32861 100644
--- a/app/src/main/res/values-tr-rTR/objectives.xml
+++ b/app/src/main/res/values-tr-rTR/objectives.xml
@@ -1,2 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="objectives_button_start">Başlat</string>
+    <string name="objectives_button_verify">Doğrulayın</string>
+    <string name="nth_objective">Görev %1$d.</string>
+    <string name="objectivenotstarted">Görev %1$d başlanmadı</string>
+    <string name="objectivenotfinished">Görev %1$d tamamlanmadı</string>
+    <string name="objectives_0_objective">Nightscout üzerinden izlemeyi ve görselleştirmeyi yapılandırın, bazalları ve oranlarını analiz edin</string>
+    <string name="objectives_0_gate">Nightscout\'ta KŞ\'nin bulunduğunu ve pompadaki insülin verilerinin yüklenmekte olduğunu doğrulayın</string>
+    <string name="objectives_openloop_objective">Açık Döngü modu başlatılıyor</string>
+    <string name="objectives_openloop_gate">Birkaç gün boyunca Açık Döngü modunda çalıştırın ve birçok geçici bazalı el yordamı ile girin. Geçici ve varsayılan geçici hedefleri düzenleyin ve kullanın (örn. egzersiz ve hipo-tedaviyi desteklemek için)</string>
+    <string name="objectives_maxbasal_objective">Geçici bazal tavsiyeleri de dahil olmak üzere Açık Döngüyü anlamak</string>
+    <string name="objectives_maxbasal_gate">Bu deneyime dayanarak, max bazalın ne olması gerektiğine karar vermeli ve bunu pompa ve tercihlere koymalısınız</string>
+    <string name="objectives_maxiobzero_objective">Kapalı Döngü, (LGS) Düşük Kan Şekerinde Duraklatma modunda başlatılıyor</string>
+    <string name="objectives_maxiobzero_gate">Kapalı Döngüyü, maks IOB = 0 olacak şekilde çok sayıda LGS (düşük KŞ) olmadan birkaç gün boyunca deneyin</string>
+    <string name="objectives_maxiob_objective">Kapalı Döngü\'de ince ayarlar, maks (IOB) Aktif İnsülini 0\'ın üzerine yükseltme ve yavaş yavaş KŞ hedeflerini aşağıya çekme</string>
+    <string name="objectives_maxiob_gate">KŞ hedefini azaltmadan önce birkaç gün ve en az bir gece düşük KŞ (Hipo) alarmı olmadan deneyin</string>
+    <string name="objectives_autosens_objective">Gerekirse, bazal ve oranları ayarlayın ve sonra auto-sens\'i (otoduyarlılık) etkinleştirin</string>
+    <string name="objectives_autosens_gate">Bir hafta boyunca düzenli karbonhidrat girdileri yaparak gün boyunca Kapalı Döngüyü çalıştırın</string>
+    <string name="objectives_smb_objective">SMB (Super Micro Bolus) gibi gündüz kullanımı için ek özelliklerin etkinleştirilmesi</string>
+    <string name="objectives_auto_objective">Otomasyonu etkinleştirme</string>
+    <string name="objectives_smb_gate">(Super Micro Bolus) SMB\'lerın iyi çalışabilmesi için wiki\'yi okumalısınız ve maxIOB\'u yükseltmelisiniz! İyi bir başlangıç için maxIOB = ortalama yemek bolusu + 3 x max günlük bazaldır</string>
+    <string name="objectives_auto_gate">Otomasyonun nasıl çalıştığına dair dokümanları okuyun. İlk basit kurallarınızı belirleyin. Eylem yerine AAPS\'in yalnızca bildirim göndermesine izin verin. Otomasyonun doğru zamanda tetiklendiğinden emin olduğunuzda, bildirimi gerçek eylemle değiştirin. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
+    <string name="objectives_bgavailableinns">KŞ NS\'ta mevcut</string>
+    <string name="objectives_pumpstatusavailableinns">Pompa durumu NS\'ta mevcut</string>
+    <string name="objectives_manualenacts">Manuel eylemler</string>
+    <string name="accomplished">Başarıldı: %1$s</string>
+    <string name="objectives_usage_objective">AndroidAPS\'i nasıl kontrol edeceğinizi öğrenin</string>
+    <string name="objectives_usage_gate">AndroidAPS\'de farklı eylemler gerçekleştirin</string>
+    <string name="objectives_useprofileswitch">Profili 10 dakika boyunca %90 olarak ayarla (Ana sayfada profil adına uzun basın)</string>
+    <string name="objectives_usedisconnectpump">Duşu simüle edin. 1 saat boyunca pompanın bağlantısını kesin (Açık Döngü işaretine Uzun Basın)</string>
+    <string name="objectives_usereconnectpump">... ve aynı şekilde tekrar bağlanın</string>
+    <string name="objectives_usetemptarget">10 dakika süreyle geçici hedef oluşturun (Mevcut hedefinize uzun basın)</string>
+    <string name="objectives_useactions">Konfigürasyon oluşturucuda, Eylemler eklentisini etkinleştirin, görünür yapın ve içeriğini üst menüden görüntüleyin</string>
+    <string name="objectives_useloop">Döngü eklentisinin içeriğini görüntüle</string>
+    <string name="objectives_usescale">KŞ tablosuna uzun basarak ölçeği değiştirebilirsiniz</string>
+    <string name="objectives_button_enter">Giriş</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Diğer sistemlerde en az 3 aylık kapalı döngü deneyiminiz varsa, hedefleri atlamak için bir kod almaya hak kazanabilirsiniz. Ayrıntılar için https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives adresine bakın.</string>
+    <string name="codeaccepted">Kod kabul edildi</string>
+    <string name="codeinvalid">Geçersiz kod</string>
+    <string name="objectives_exam_objective">Bilginizi sınayın</string>
+    <string name="objectives_exam_gate">Sorulara çalışın. Her soru için size dört olası cevap verilir. Birden fazla doğru cevap olabilir. Lütfen doğru olanların hepsini kontrol edin ve DOĞRULA\'yı seçin.</string>
+    <string name="answerdisabledto">Yanıtlama devre dışı bırakıldı: %1$s</string>
+    <string name="wronganswer">Yanlış Cevap!</string>
+    <string name="unfinshed_button">Tamamlanmayan bir sonraki</string>
+    <string name="requestcode">Kod: %1$s</string>
+    <string name="objectives_hint">(tüm doğru cevapları kontrol edin)</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">İnternete bağlı değil</string>
+    <string name="failedretrievetime">Geri almada hata</string>
+    <string name="requirementnotmet">Görev gereksinimleri karşılanmadı</string>
+</resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 2099fdcdc01..34576eefd4e 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -3,48 +3,54 @@
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
-    <string name="treatmentssafety_title">Tedavilerin güvenlik ayarları</string>
-    <string name="treatmentssafety_maxbolus_title">Max izin verilen bolus [U]</string>
-    <string name="treatmentssafety_maxcarbs_title">Max izin verilen karbonhidrat [g]</string>
+    <string name="treatmentssafety_title">Tedavi güvenliği</string>
+    <string name="treatmentssafety_maxbolus_title">Maks izin verilen bolus [U]</string>
+    <string name="treatmentssafety_maxcarbs_title">Maks izin verilen karbonhidrat [g]</string>
+    <string name="nav_preferences_plugin">%1$s Tercihler</string>
     <string name="nav_preferences">Tercihler</string>
     <string name="nav_refreshtreatments">NS\'tan tedavileri güncelle</string>
     <string name="nav_resetdb">Veritabanlarını sıfırla</string>
     <string name="reset_db_confirm">Veritabanlarını gerçekten sıfırlamak istiyor musunuz?</string>
     <string name="nav_exit">Çıkış</string>
-    <string name="ns_sync_use_absolute_title">Her zaman bazal mutlak değerleri kullan</string>
+    <string name="alert_dialog_permission_battery_optimization_failed">Bu cihaz, program için pil optimizasyonunu desteklemiyor gibi görünüyor - performans sorunları yaşayabilirsiniz.</string>
     <string name="description_actions">Ortak özelliklere hızlıca erişmek için bazı düğmeler</string>
-    <string name="description_config_builder">Aktif eklentileri yapılandırmak için kullanılan</string>
+    <string name="description_config_builder">Aktif eklentileri yapılandırmak için kullanılır</string>
     <string name="description_objectives">Eğitim programı</string>
     <string name="description_food">Nightscout\'ta tanımlanan gıda ön ayarlarını gösterir</string>
     <string name="description_insulin_rapid">Humalog ve NovoRapid / NovoLog için İnsülin Profili</string>
-    <string name="description_insulin_ultra_rapid">Fiasp için insülim Profili</string>
-    <string name="description_insulin_free_peak">İnsülin aktivitesinin zirvesini tanımlamanıza ve sadece ileri düzey kullanıcılar tarafından kullanılmasına izin verir</string>
+    <string name="description_insulin_ultra_rapid">Fiasp için insülin Profili</string>
+    <string name="description_insulin_lyumjev">Lyumjev için insülin ayarı</string>
+    <string name="description_insulin_free_peak">İnsülin aktivitesinin zirvesini tanımlamanıza izin verir ve yalnızca ileri düzey kullanıcılar tarafından kullanılmalıdır.</string>
     <string name="description_loop">Döngüyü tetikleyen uygulamayı etkinleştirin veya devre dışı bırakın.</string>
     <string name="description_ns_client">Nightscout ile verilerinizi senkronize eder</string>
     <string name="description_ama">2017\'da algoritmanın durumu</string>
     <string name="description_smb">İleri düzey kullanıcılar için en yeni algoritma</string>
-    <string name="description_overview">En yaygın eylemler için Döngü ve düğmelerinizin geçerli durumunu görüntüler</string>
-    <string name="description_persistent_notification">Döngünün şu anda ne yaptığını hızlıca gözden geçirerek sürekli bir bildirim gösterir</string>
+    <string name="description_overview">Döngünüzün mevcut durumunu ve en yaygın eylemler için düğmeleri görüntüler</string>
+    <string name="description_persistent_notification">Döngü\'ün ne yaptığını kısa bir genel bakışla devam eden bir bildirimi gösterir</string>
+    <string name="description_profile_local">Çevrimdışı kullanılabilen bir profil tanımlayın.</string>
     <string name="description_pump_mdi">Diyabet tedavisi için günde birden fazla enjeksiyon yapan kişiler için pompa entegrasyonu</string>
     <string name="description_pump_virtual">Henüz herhangi bir sürücüye sahip olmayan pompalar için pompa entegrasyonu (Açık Döngü)</string>
-    <string name="description_sensitivity_aaps">Duyarlılık, Oref0 gibi aynı şekilde hesaplanır ancak geçmiş zaman çerçevesi belirtebilirsiniz. Minimal karbonhidrat emilimi, tercihlerden maksimum karbonhidrat emilim süresinden hesaplanır.</string>
-    <string name="description_sensitivity_weighted_average">Duyarlılık, sapmalardan ağırlıklı ortalama olarak hesaplanır. Daha yeni sapmalar daha ağırdır. Minimal karbonhidrat emilimi, tercihlerden maksimum karbon emilim süresinden hesaplanır. Bu algoritma, aşağıdaki duyarlılık değişikliklerinden daha hızlıdır.</string>
+    <string name="description_sensitivity_aaps">Duyarlılık, Oref0 ile aynı şekilde hesaplanır, ancak geçmişe yönelik zaman aralığı belirleyebilirsiniz. Minimum karbonhidrat emilimi, tercihlerden maksimum karbonhidrat emilim süresinden hesaplanır.</string>
+    <string name="description_sensitivity_oref1">Duyarlılık, geçmişteki 8 veya 24 saatlik verilerden (hangisi daha hassas ise) hesaplanır. Karbonhidratlar (emilmemişse) tercihlerde belirtilen süreden sonra kesilir. Eklenti ayrıca UAM\'ı da (bildirilmemiş yemekler) hesaplar.</string>
+    <string name="description_sensitivity_weighted_average">Duyarlılık, sapmalardan ağırlıklı bir ortalama olarak hesaplanır. Daha yeni sapmalar daha yüksek ağırlığa sahiptir. Minimum karbonhidrat emilimi, tercihlerden maksimum karbonhidrat emilim süresinden hesaplanır. Bu algoritma, hassasiyet değişikliklerini takip etmede en hızlı olanıdır.</string>
+    <string name="description_source_eversense">Yamalı Eversense uygulamasından KŞ değerleri alır.</string>
     <string name="description_source_glimp">Glimp\'ten KŞ değerleri alır.</string>
-    <string name="description_source_mm640g">600SeriesAndroidUploader\'dan KŞ değerleri alın.</string>
+    <string name="description_source_mm640g">600SeriesAndroidUploader\'dan KŞ değerleri alır.</string>
     <string name="description_source_ns_client">Nightscout\'tan KŞ verilerini yükler</string>
-    <string name="description_treatments">Yapılan tüm tedavileri kaydet</string>
+    <string name="description_source_xdrip">XDrip+\'ten KŞ değerlerini alır.</string>
+    <string name="description_treatments">Yapılan tüm tedavileri kaydeder</string>
     <string name="description_wear">WearOS saatinizi kullanarak AndroidAPS\'yi izleyin ve kontrol edin.</string>
-    <string name="description_xdrip_status_line">Döngü\'yle ilgili bilgileri xDrip+ watchface\'inizde gösterin.</string>
+    <string name="description_xdrip_status_line">Döngü\'yle ilgili bilgileri xDrip+ saat arayüzünde gösterin.</string>
     <string name="description_sms_communicator">SMS komutlarını kullanarak uzaktan AndroidAPS kontrolü.</string>
     <string name="treatments_insulin_label_string">İnsülin:</string>
     <string name="treatments_carbs_label_string">Karbonhidrat:</string>
     <string name="treatments_iob_label_string">IOB:</string>
     <string name="sms_iob">IOB:</string>
     <string name="treatments_iobtotal_label_string">Toplam IOB:</string>
-    <string name="treatments_iobactivitytotal_label_string">Toplam IOB aktivite:</string>
+    <string name="treatments_iobactivitytotal_label_string">Toplam IOB etkinliği:</string>
     <string name="tempbasals_realduration_label_string">Süre:</string>
     <string name="tempbasals_netratio_label_string">Oran:</string>
-    <string name="tempbasals_netinsulin_label_string">Ins:</string>
+    <string name="tempbasals_netinsulin_label_string">İns:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">Toplam IOB:</string>
     <string name="treatments_wizard_bg_label">KŞ</string>
@@ -57,11 +63,12 @@
     <string name="openapsma_lastrun_label">Son Çalıştırma</string>
     <string name="openapsma_inputparameters_label">Girdi Parametreleri</string>
     <string name="openapsma_glucosestatus_label">Glikoz durumu</string>
-    <string name="openapsma_currenttemp_label">Aktuel Bazal</string>
+    <string name="openapsma_currenttemp_label">Mevcut Geçici Bazal</string>
     <string name="openapsma_iobdata_label">IOB Verisi</string>
     <string name="openapsma_profile_label">Profil</string>
     <string name="openapsma_mealdata_label">Yemek Verisi</string>
     <string name="result">Sonuç</string>
+    <string name="result_insulin_carbs">Sonuç: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Glikoz verisi yok</string>
     <string name="openapsma_request_label">İstek</string>
     <string name="delta">Delta</string>
@@ -70,11 +77,10 @@
     <string name="overview">Genel Bakış</string>
     <string name="treatments">Tedaviler</string>
     <string name="virtualpump">Sanal pompa</string>
-    <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pompa</string>
     <string name="configbuilder_pump_description">Hangi pompa ile AndroidAPS kullanmak istersiniz?</string>
     <string name="configbuilder_profile">Profil</string>
-    <string name="configbuilder_profile_description">Hangi profili AndroidAPS kullanmalı?</string>
+    <string name="configbuilder_profile_description">AndroidAPS Hangi profili kullanmalı?</string>
     <string name="configbuilder_aps">APS (YPS)</string>
     <string name="configbuilder_aps_description">Hangi APS algoritması terapi ayarlamalarını yapsın?</string>
     <string name="configbuilder_general">Genel</string>
@@ -85,7 +91,7 @@
     <string name="configbuilder_loop_description">AndroidAPS döngü entegrasyonunu etkinleştirmek için bunu kullanın.</string>
     <string name="loop_aps_label">APS</string>
     <string name="loop_constraintsprocessed_label">İşlenmiş kısıtlamalardan sonra</string>
-    <string name="loop_tbrsetbypump_label">Geçici bazal pompa tarafından ayarla</string>
+    <string name="loop_tbrsetbypump_label">Pompa tarafından ayarlanan geçici bazal</string>
     <string name="noapsselected">SEÇİLEN VEYA SAĞLANAN SONUCU APS YOK</string>
     <string name="safety">Güvenlik</string>
     <string name="openapsma_disabled">Eklenti devre dışı</string>
@@ -101,11 +107,14 @@
     <string name="changeyourinput">Girişinizi değiştirin!</string>
     <string name="configbuilder_bgsource">KŞ kaynağı</string>
     <string name="configbuilder_bgsource_description">AndroidAPS verilerini nereden alsın?</string>
+    <string name="xdrip">xDrip+</string>
     <string name="apsmode_title">APS modu</string>
     <string name="closedloop">Kapalı Döngü</string>
     <string name="openloop">Açık Döngü</string>
+    <string name="lowglucosesuspend">Düşük Glikoz Askıya alma</string>
     <string name="disabledloop">Döngü devre dışı</string>
     <string name="openloop_newsuggestion">Yeni öneri mevcut</string>
+    <string name="carbssuggestion">Karbonhidrat Önerisi</string>
     <string name="unsupportednsversion">Nightscout\'un desteklenmeyen sürümü</string>
     <string name="treatments_wizard_basaliob_label">Bazal IOB</string>
     <string name="bolusconstraintapplied">Bolus kısıtlaması uygulandı</string>
@@ -113,44 +122,101 @@
     <string name="careportal_newnstreatment_other">Diğer</string>
     <string name="careportal_newnstreatment_meter">Metre</string>
     <string name="careportal_newnstreatment_sensor">Sensör</string>
-    <string name="careportal_newnstreatment_carbtime_label">Karb zaman</string>
+    <string name="careportal_newnstreatment_carbtime_label">Karb. zamanı</string>
     <string name="careportal_newnstreatment_duration_label">Süre</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_glucosetype">Glikoz türü</string>
     <string name="overview_tempbasal_button">Geçici Bazal</string>
-    <string name="overview_extendedbolus_button">Yayım Bolus</string>
+    <string name="overview_extendedbolus_button">Yayma Bolus</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout sürümü:</string>
+    <string name="missing_carbs">%1$d g eksik</string>
     <string name="exported">Tercihler dışa aktarıldı</string>
+    <string name="ue_exported">Kullanıcı Girişleri dışa aktarıldı</string>
     <string name="export_to">Ayarları aktar</string>
     <string name="import_from">Ayarları içe aktar</string>
     <string name="setting_imported">Ayarlar içe aktarıldı</string>
     <string name="filenotfound">Dosya bulunamadı</string>
     <string name="nav_export">Dışarı aktarma ayarları</string>
     <string name="nav_import">İçe aktarma ayarları</string>
-    <string name="openapsma_maxbasal_summary">Bu değer OpenAPS\'te \"max bazal\" olarak adlandırılır</string>
+    <string name="openapsma_maxbasal_title">Max Ü/s geçici Bazal ayarlanabilir</string>
+    <string name="openapsma_maxbasal_summary">Bu değer OpenAPS\'te \"maksimum bazal\" olarak adlandırılır</string>
     <string name="openapsma_maxiob_title">OpenAPS\'nin vermesine izin verilen maksimum bazal IOB (Aktif insülin) [U]</string>
-    <string name="openapsma_maxiob_summary">Bu değere OpenAPS bağlamında Max IOB denir.\nAPS\'de [U] bir kerede verilen maksimum insülin.</string>
+    <string name="openapsma_maxiob_summary">Bu değere OpenAPS bağlamında Max IOB denir.\nAPS\'de bir kerede verilebilen maksimum insülin [U] ü.</string>
+    <string name="password_preferences_encrypt_prompt">Dışa aktarılan tercihleri şifrelemek için kullanılacak ana parola sorulacaktır.</string>
+    <string name="password_preferences_decrypt_prompt">İçe aktarılan tercihlerin şifresini çözmek için gerekli olan ana parola sorulacaktır.</string>
+    <string name="preferences_export_canceled">Aktarım iptal edildi! Tercihler dışa aktarılmadı!</string>
+    <string name="preferences_import_canceled">Aktarım iptal edildi! Tercihler içe aktarılmadı!</string>
+    <string name="preferences_import_impossible">Tercihler içe aktarılamıyor!</string>
+    <string name="goto_main_try_again">Lütfen ana ekrana dönün ve tekrar deneyin.</string>
+    <string name="old_master_password">Eski Ana Parola</string>
+    <string name="different_password_used">Bu dosya dışa aktarılmış ve farklı bir parola ile şifrelenmiş. Dosyanın şifresini çözmek için eski parolayı bulun.</string>
+    <string name="master_password_will_be_replaced">Başarılı içe aktarma işleminin sonucu olarak mevcut ana parola, eski ana parola ile DEĞİŞTİRİLECEKTİR!</string>
+    <string name="check_preferences_before_import">Lütfen içe aktarmadan önce tercihleri kontrol edin:</string>
+    <string name="check_preferences_cannot_import">Tercihler içe aktarılamaz!</string>
+    <string name="check_preferences_dangerous_import">Tercihler içe aktarılmamalıdır!</string>
+    <string name="check_preferences_details_btn">İçe aktarım sorunlarını açıkla…</string>
+    <string name="check_preferences_details_title">İçe aktarım sorun detayları</string>
+    <string name="check_preferences_import_btn">İçe aktarma</string>
+    <string name="check_preferences_import_anyway_btn">Yine de içe aktar (TEHLİKELİ!)</string>
     <string name="end_user_license_agreement">Son Kullanıcı Lisans Sözleşmesi</string>
     <string name="end_user_license_agreement_text">TIBBİ KARAR VERMEK İÇİN KULLANILMAMALIDIR. UYGULANABİLİR YASANIN İZİN VERDİĞİ ÖLÇÜDE, PROGRAM İÇİN GARANTİ YOKTUR. TELİF HAKKI SAHİPLERİNİN VE / VEYA DİĞER TARAFLARIN YAZILI OLMASINA YÖNELİK BAŞKA HİÇBİR ŞEKİLDE BELİRTİLEN VEYA BELİRLİ BİR AMACA UYGUNLUK İLE İLGİLİ ZIMNİ GARANTİLER DE DAHİL OLMAK ÜZERE ANCAK BUNLARLA SINIRLI OLMAMAK ÜZERE AÇIK VEYA ZIMNİ HİÇBİR GARANTİ OLMAKSIZIN “OLDUĞU GİBİ” SAĞLAMAKTADIR. PROGRAMIN KALİTESİ VE PERFORMANSI İLE İLGİLİ TÜM RİSK SİZE AİTTİR. PROGRAMIN HASARLI OLMASI DURUMUNDA, TÜM GEREKLİ SERVİS, ONARIM VEYA DÜZELTME MALİYETİNİ KABUL ETMİŞ OLURSUNUZ.</string>
-    <string name="end_user_license_agreement_i_understand">BEN ANLADIM VE KABUL EDİYORUM</string>
+    <string name="end_user_license_agreement_i_understand">ANLADIM VE KABUL EDİYORUM</string>
     <string name="save">Kaydet</string>
-    <string name="reloadprofile">Dosyayı yeniden yükle</string>
-    <string name="smscommunicator">SMS Kommunikator</string>
+    <string name="reloadprofile">Profili yeniden yükle</string>
+    <string name="smscommunicator">SMS Kominikatör</string>
     <string name="smscommunicator_allowednumbers">İzinli telefon numaraları</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
-    <string name="smscommunicator_bolusreplywithcode">Bolus %1$.2fU gönderilecek, kod ile cevap ver %2$s</string>
-    <string name="smscommunicator_calibrationreplywithcode">Kalibrasyon %1$.2f gönderilecek, kod ile cevap ver %2$s</string>
+    <string name="smscommunicator_bolusreplywithcode">%1$.2fÜ Bolus gönderilecek, kod ile cevap ver %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">%1$.2fU Yemek bolusu göndermek için %2$s koduyla yanıt verin</string>
+    <string name="smscommunicator_temptargetwithcode">Geçici Hedefi %1$s yapmak için %2$s koduyla yanıt verin</string>
+    <string name="smscommunicator_temptargetcancel">Geçici Hedefi iptal etmek için %1$s koduyla yanıt verin</string>
+    <string name="smscommunicator_stopsmswithcode">SMS Uzak Hizmet desteğini devre dışı bırakmak için %1$s koduyla yanıt verin.\n\nBu hizmeti yalnızca AAPS yüklü ana telefondan yeniden etkinleştirebileceğinizi unutmayın.</string>
+    <string name="smscommunicator_stoppedsms">SMS Uzak Hizmeti durduruldu. Yeniden etkinleştirmek için ana telefondaki APPS\'i kullanın.</string>
+    <string name="smscommunicator_calibrationreplywithcode">Kalibrasyon için %1$.2f gönderilecek, kod ile cevap ver %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolus başarısız oldu</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Bir sms bolusu ile bir sonraki bolus arasında geçmesi gereken minimum dakika sayısı</string>
+    <string name="smscommunicator_remotebolusmindistance">Bir sms bolus gönderimi ile bir sonraki bolus arasında en az kaç dakika geçsin?</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">Güvenliğiniz için en az 2 telefon numarası eklemeniz gerekir.</string>
+    <string name="bolusrequested">%1$.2f U gönderilecek</string>
+    <string name="smscommunicator_bolusdelivered">%1$.2f U Bolus başarıyla gönderildi</string>
+    <string name="smscommunicator_mealbolusdelivered">%1$.2f U Yemek Bolusu başarıyla gönderildi</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Hedef %2$d dakika boyunca %1$s</string>
+    <string name="smscommunicator_tt_set">Hedef %2$d dakika boyunca %1$s olarak başarıyla ayarlandı</string>
+    <string name="smscommunicator_tt_canceled">Geçici Hedef başarıyla iptal edildi</string>
     <string name="smscommunicator_remotecommandsallowed">SMS ile uzaktan komutlara izin ver</string>
     <string name="smscommunicator_loophasbeendisabled">Döngü devre dışı bırakıldı</string>
     <string name="smscommunicator_loophasbeenenabled">Döngü etkinleştirildi</string>
     <string name="smscommunicator_loopisenabled">Döngü etkin</string>
+    <string name="smscommunicator_pumpconnectwithcode">Pompaya bağlanmak için %1$s koduyla yanıt verin</string>
+    <string name="smscommunicator_pumpconnectfail">Pompa bağlantısı başarısız</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Pompanın bağlantısını %1$d dakika boyunca kesmek için %2$s koduyla yanıtlayın</string>
+    <string name="smscommunicator_pumpdisconnected">Pompa bağlantısı kesildi</string>
+    <string name="smscommunicator_reconnect">Pompa yeniden bağlandı</string>
     <string name="smscommunicator_remotecommandnotallowed">Uzaktan komuta izin verilmez</string>
-    <string name="smscommunicator_suspendreplywithcode">%1$d dakika için Döngü\'yü askıya almak için %2$s kodunu yanıtla</string>
+    <string name="smscommunicator_remotebolusnotallowed">Uzaktan bolus mevcut değil. Daha sonra tekrar deneyin.</string>
+    <string name="smscommunicator_basalreplywithcode">%2$d dk boyunca bazalı %1$.2f U/h yapmak için %3$s koduyla yanıtlayın</string>
+    <string name="smscommunicator_profilereplywithcode">Profili %1$s %2$d%% olarak değiştirmek için %3$s koduyla yanıtlayın</string>
+    <string name="smscommunicator_extendedreplywithcode">%2$d dakika boyunca %1$.2f U yayma bolus başlatmak için %3$s koduyla yanıtlayın</string>
+    <string name="smscommunicator_carbsreplywithcode">%2$s\'de %1$dg girmek için %3$s koduyla yanıtlayın</string>
+    <string name="smscommunicator_basalpctreplywithcode">%2$d dk boyunca bazal %1$d%% başlatmak için %3$s koduyla yanıtlayın</string>
+    <string name="smscommunicator_suspendreplywithcode">Döngüyü %1$d dakika askıya almak için %2$s koduyla yanıtlayın</string>
+    <string name="smscommunicator_loopresumereplywithcode">Döngüye devam etmek için %1$s koduyla yanıtlayın</string>
+    <string name="smscommunicator_loopenablereplywithcode">Döngüyü etkinleştirmek için %1$s koduyla yanıtlayın</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Döngüyü iptal etmek için %1$s koduyla yanıtlayın</string>
     <string name="smscommunicator_tempbasalset">Geçici bazal %1$.2fÜ/s %2$d dakika için başarıyla başlatıldı</string>
-    <string name="smscommunicator_tempbasalfailed">Temp bazal başlatma başarısız oldu</string>
-    <string name="smscommunicator_tempbasalcanceled">Geçici bazal iptal</string>
-    <string name="smscommunicator_tempbasalcancelfailed">Geçici bazal iptali hata verdi</string>
+    <string name="smscommunicator_extendedset">%1$.2fU yayma bolus %2$d dakika boyunca başarıyla başlatıldı</string>
+    <string name="smscommunicator_carbsset">%1$d g karbonhidrat başarıyla sisteme girildi</string>
+    <string name="smscommunicator_carbsfailed">%1$d g karbonhidrat girilemedi</string>
+    <string name="smscommunicator_tempbasalset_percent">%2$d dakikalık geçici bazal %1$d%% başarıyla başlatıldı</string>
+    <string name="smscommunicator_tempbasalfailed">Geçici bazal başlatma başarısız oldu</string>
+    <string name="smscommunicator_extendedfailed">Yayma bolus başlatma başarısız oldu</string>
+    <string name="smscommunicator_basalstopreplywithcode">Geçici bazalı durdurmak için %1$s kodunu gir</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Yayma bolusu durdurmak için %1$s koduyla yanıtlayın</string>
+    <string name="smscommunicator_tempbasalcanceled">Geçici bazal iptal edildi</string>
+    <string name="smscommunicator_extendedcanceled">Yayma bolus iptal edildi</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Geçici bazal iptal edilemedi</string>
+    <string name="smscommunicator_extendedcancelfailed">Yayma bolus iptal edilemedi</string>
+    <string name="smscommunicator_unknowncommand">Bilinmeyen komut veya yanlış cevap</string>
     <string name="quickwizard">Kurulum Sihirbazı</string>
     <string name="quickwizardsettings">Kurulum Sihirbazı Ayarları</string>
     <string name="overview_editquickwizard_buttontext">Düğme Metni:</string>
@@ -161,12 +227,18 @@
     <string name="mealbolus">Ögün</string>
     <string name="correctionbous">Düzeltme</string>
     <string name="actions">Eylemler</string>
-    <string name="pumpNotInitialized">Pompa başlatılmamış!</string>
+    <string name="ns_upload_only">(DEVRE DIŞI BIRAKILMASI TEHLİKELİ) Yalnızca NS yüklemelerinde</string>
+    <string name="ns_upload_only_summary">Yalnızca NS yüklemesi (senkronizasyon devre dışı). xDrip+ gibi yerel bir kaynak seçilmediği sürece SGV üzerinde etkili değildir. NS-Profili kullanılırken Profiller üzerinde etkili değildir.\n!!! UYARI !!! Bileşenlerinizden herhangi biri (AAPS, NS, xDrip+) yanlış yapılandırılmışsa, bu seçeneğin devre dışı bırakılması arızalara ve aşırı insülin dozuna neden olabilir. AAPS tarafından görüntülenen verilerin pompa durumuyla eşleşip eşleşmediğini dikkatlice izleyin!</string>
+    <string name="pumpNotInitialized">Pompa başlatılamadı!</string>
     <string name="primefill">Hazırla/doldur</string>
     <string name="fillwarning">Lütfen miktarın infüzyon setinizin özelliklerine uygun olduğundan emin olun!</string>
-    <string name="button1">Düğme 1</string>
-    <string name="button2">Düğme 2</string>
-    <string name="button3">Düğme 3</string>
+    <string name="fillbolus_title">Hazırla/doldur standart insülin miktarları</string>
+    <string name="button1">Buton 1</string>
+    <string name="button2">Buton 2</string>
+    <string name="button3">Buton 3</string>
+    <string name="units_colon">Birim:</string>
+    <string name="units">Birim</string>
+    <string name="dia">İES</string>
     <string name="prefs_range_title">Görselleştirme Aralığı</string>
     <string name="prefs_range_summary">Genel bakış ve akıllı saat göstergesi için yüksek ve düşük değerler</string>
     <string name="low_mark">DÜŞÜK işareti</string>
@@ -175,21 +247,23 @@
     <string name="resend_all_data">Tüm verileri yeniden gönderin</string>
     <string name="open_settings_on_wear">Ayarları Wear\'da açın</string>
     <string name="basal_rate">Bazal oranı:</string>
-    <string name="basalvaluebelowminimum">Minimum değerin altında bazal değeri. Profil ayarlanmadı!</string>
+    <string name="basalvaluebelowminimum">Bazal değer minimumun altında. Profil ayarlanmadı!</string>
     <string name="sms_actualbg">KŞ:</string>
     <string name="sms_lastbg">Son KŞ:</string>
-    <string name="mdi">MDI Çoklu dozlu İnsulin Enjeksiyonu</string>
+    <string name="mdi">MDI</string>
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Sürekli Bildirim</string>
     <string name="old_data">ESKİ VERİ</string>
     <string name="sms_minago">%1$ddak önce</string>
-    <string name="localprofile">Yerel profil</string>
+    <string name="localprofile">Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">%1$d öğelerin dizisi.\nGerçek değer:</string>
-    <string name="openapsma_autosensdata_label">Autosens verileri</string>
+    <string name="openapsma_autosensdata_label">Otoduyarlılık verileri</string>
     <string name="openapsma_scriptdebugdata_label">Skriptte hata ayıkla</string>
-    <string name="deletefuturetreatments">Gelecekte tedavileri sil</string>
-    <string name="actions_shortname">ACT</string>
+    <string name="openapsama_useautosens">Otoduyarlılık özelliğini kullan</string>
+    <string name="refresheventsfromnightscout">NS\'tan yenile</string>
+    <string name="deletefuturetreatments">İleri tarihli tedavileri sil</string>
+    <string name="actions_shortname">EYLEM</string>
     <string name="configbuilder_shortname">KONF</string>
     <string name="loop_shortname">DÖNGÜ</string>
     <string name="oaps_shortname">OAPS</string>
@@ -197,23 +271,29 @@
     <string name="overview_shortname">HOME</string>
     <string name="virtualpump_shortname">VPOMP</string>
     <string name="treatments_shortname">TEDAVİ</string>
-    <string name="objectives_shortname">OBJ</string>
+    <string name="objectives_shortname">GRV</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Kısa tab başlıkları</string>
     <string name="always_use_shortavg">Her zaman basit delta yerine kısa ortalama delta kullan</string>
+    <string name="always_use_shortavg_summary">xDrip+ gibi filtrelenmemiş kaynaklardan gelen veriler gürültülü olduğunda kullanışlıdır.</string>
     <string name="profile">Profil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Varsayılan değer: 3 Bu OpenAPS için önemli bir güvenlik ayarıdır. Maksimum bazal Iob\'u, en büyük bazal oranınızın üç katı (varsayılan olarak) ile sınırlar. Genel olarak, bu değeri değiştirmemelisiniz. Ama \"3x max günlük, 4x şuan\" ın bir güvenlik ayarı olarak ne anlama geldiğini bilmelisiniz.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Varsayılan ayar: 4 Bu, OpenAPS güvenlik ayarlarının diğer yarısı ve \"3x max günlük, 4x akım\" güvenlik korumasının diğer yarısıdır. Bu, başlangıç değerinizin, pompada ayarlanan taban maksimum değerinizden bağımsız olarak, mevcut bazal seviyenin bu sayısından daha yüksek olamayacağı anlamına gelir. Bu, insanların, algoritmanın nasıl çalıştığını anlamadan temel çizgiyi büyük ölçüde artırarak kendilerini tehlikeli durumlarda bulmalarını engellemektir. Varsayılan ayar 4x\'dir; Çoğu insan bu ayarları asla değiştirmek zorunda kalmayacak, ancak bu güvenlik sınırına yakınsa diğer terapi ayarlarını ayarlamalıdırlar.</string>
-    <string name="openapsama_autosens_min_summary">Varsayılan değer: 0.7\nBu autosens için diğer güvenlik önlemidir. Bazal oranların ne kadar düştüğünü ve İnsülin Duyarlılık Faktörü ve KŞ hedeflerini ne kadar yüksek tutabileceğini gösterir.</string>
-    <string name="openapsama_autosens_adjusttargets_summary">Varsayılan değer: true\nBu autosens in İnsülin Duyarlılık Faktörü ve bazallara ek olarak KŞ hedeflerinin ayarlanmasında kullanılır.</string>
-    <string name="openapsama_bolussnooze_dia_divisor_summary">Varsayılan değer: 2\nEğer sadece öğününüzü yerseniz, öğün bolusu alındıktan sonra bolus ertelemesi devreye girer, bu şekilde Döngü karşı bir tetbir olarak geçici bazal oranını azaltmasın diye. Buaradaki örnekte olduğu gibi varsayılan 2; 3 saat DIA olacak şekilde bolus ertelemesi kademeli olarak 1,5 saat üzeri (3DIA/2=1,5).</string>
+    <string name="openapsama_autosens_max_summary">Varsayılan değer: 1.2\nOtoduyarlılık (yakında otoayar) çarpanı. Varsayılan değere %20 maksimum limit atamak, otoduyarlılığın bazalları ne kadar yüksek ayarlayabileceğini, ISF ve KŞ hedefini de ne kadar düşük ayarlayabileceğini belirler.</string>
+    <string name="openapsama_autosens_min_summary">Varsayılan değer: 0.7\nBu otoduyarlılık için diğer güvenlik önlemidir. Otoduyarlılığın bazal oranlarını ne kadar düşürebileceğini ve İnsülin Duyarlılık Faktörü ve KŞ hedeflerini ne kadar yüksek tutabileceğini gösterir.</string>
+    <string name="openapsama_autosens_adjusttargets">Otoduyarlılık, hedefleri de ayarlar</string>
+    <string name="openapsama_autosens_adjusttargets_summary">Varsayılan değer: true\nBu otoduyarlılığın İnsülin Duyarlılık Faktörü ve bazallara ek olarak KŞ hedeflerinin ayarlanmasında kullanılır.</string>
+    <string name="openapsama_bolussnooze_dia_divisor_summary">Varsayılan değer: 2\nYemek bolusu yaptıktan sonra bolus erteleme devreye girer, bu nedenle döngü, yeni yemek yediğinizde düşük geçici bazallar-hedefler ile etkileşime girmez. Buradaki örnek ve varsayılan 2\'dir; bu nedenle 3 saatlik bir DIA, bolus ertelemenin kademeli olarak 1,5 saat (3DIA/2) üzerinden aşamalı olarak sonlandırılacağı anlamına gelir.</string>
     <string name="openapsama_min_5m_carbimpact_summary">Varsayılan değer: 3.0 (AMA) Gelişmiş Yemek Asistanı veya 8.0 (SMB) Super Micro Bolus. Bu 5 dakika başına varsayılan karbonhidrat emilimi için bir ayardır. Standart değer AMA için 3mg/dl/5dk aynı şekilde SMB 8mg/dl/5dk dir.
 Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden daha fazla düştüğü veya beklenildiği kadar yükselmediği zamanlarda gelecekte yapılacak tahminlerde KŞ\'nin hesaplanmasında ne kadar karbonhidrat emilimi gerçekleşeceğini öngörür.</string>
     <string name="openapsama_link_to_preferncejson_doc_txt">Dikkat!\nNormalde aşağıdaki bu değerleri değiştirmek zorunda değilsiniz. Lütfen burayı TIKLAYIN ve metni OKUYUN ve bu değerlerden herhangi birini değiştirmeden önce ANLADIĞINIZDAN emin olun.</string>
     <string name="smscommunicator_invalidphonennumber">Geçersiz SMS telefon numarası</string>
     <string name="overview_calibration">Kalibrasyon</string>
     <string name="xdripnotinstalled">xDrip+ uygulaması yüklenmemiş</string>
+    <string name="calibrationsent">Kalibrasyon xDrip+ a gönderildi</string>
+    <string name="smscommunicator_calibrationsent">Kalibrasyon gönderildi. Alma xDrip+\'ta etkinleştirilmelidir.</string>
+    <string name="smscommunicator_calibrationfailed">xDrip+ kalibrasyonları almıyor</string>
     <string name="pumpsuspended">Pompa durduldu</string>
     <string name="executing">Yürütülüyor</string>
     <string name="virtualpump_settings">Sanal pompa ayarları</string>
@@ -227,65 +307,112 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="nsclientinternal_url_title">Nightscout URL</string>
     <string name="nsclientinternal_url_dialogmessage">Nightscout URL adresinizi girin</string>
     <string name="nsclientinternal_secret_title">Nightscout API Key</string>
-    <string name="nsclientinternal_secret_dialogtitle">Nightscout API-Key</string>
-    <string name="nsclientinternal_secret_dialogmessage">Nightscout API-Key girin (min. 12 Karekter)</string>
-    <string name="deliver_now">Simdi ver</string>
+    <string name="nsclientinternal_secret_dialogtitle">Nightscout API Anahtarı</string>
+    <string name="nsclientinternal_secret_dialogmessage">Nightscout API anahtarını girin (min. 12 Karekter)</string>
+    <string name="deliver_now">Simdi ilet</string>
     <string name="clear_queue">Sırayı temizle</string>
-    <string name="show_queue">Sıra göster</string>
-    <string name="queue">Kuyruk:</string>
+    <string name="show_queue">Sırayı göster</string>
+    <string name="queue">Sıra:</string>
     <string name="status">Durum:</string>
-    <string name="clearlog">Log Kayıtlarını Sil</string>
-    <string name="nowritepermission">NSCLIENT yazma izni yok. Yanlış API Key ?</string>
+    <string name="clearlog">Günlüğü temizle</string>
+    <string name="nowritepermission">NSCLIENT yazma izni yok. Yanlış API Anahtarı?</string>
     <string name="wear_settings">Wear ayarları</string>
     <string name="wear_detailedIOB_title">Ayrıntılı IOB göster</string>
-    <string name="wear_detailedIOB_summary">Watchface üzerinde IOB\'yi bolus ve bazal IOB\'ye ayırın</string>
+    <string name="wear_detailedIOB_summary">Saat arayüzü üzerinde IOB\'yi bolus ve bazal olarak ayırın</string>
     <string name="nosuccess">başarısız - lütfen telefonu kontrol edin</string>
+    <string name="notavailable">n/a</string>
+    <string name="patientage">Hasta tipi</string>
     <string name="child">Çocuk</string>
     <string name="teenage">Ergen</string>
     <string name="adult">Yetişkin</string>
     <string name="resistantadult">Yetişkin İnsülin direnci</string>
+    <string name="pregnant">Hamile</string>
+    <string name="patientage_summary">Güvenlik limitlerini ayarlamak için lütfen hasta tipini seçin</string>
+    <string name="patient_name">Hasta Adı</string>
+    <string name="patient_name_summary">Lütfen çoklu kurulumlar arasında ayrım yapmak için hasta adı veya takma ad belirleyin</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Kullanıcı</string>
     <string name="Glimp">Glimp</string>
-    <string name="loopsuspended">Döngü durduldu</string>
-    <string name="loopsuspendedfor">Askıya alındı (%1$d m)</string>
-    <string name="suspendloopfor1h">Döngü 1s\'liğine askıya alındı</string>
-    <string name="suspendloopfor2h">Döngü 2s\'liğine askıya alındı</string>
-    <string name="suspendloopfor3h">Döngü 3s\'liğine askıya alındı</string>
-    <string name="suspendloopfor10h">Döngü 10s\'liğine askıya alındı</string>
+    <string name="needwhitelisting">%1$s, düzgün bir şekilde çalışması için pil optimizasyonu yapılmalıdır</string>
+    <string name="loopsuspended">Döngü duraklatıldı</string>
+    <string name="loopsuspendedfor">(%1$d dk) Duraklatıldı</string>
+    <string name="suspendloopfor1h">Döngüyü 1saat duraklat</string>
+    <string name="suspendloopfor2h">Döngüyü 2saat duraklat</string>
+    <string name="suspendloopfor3h">Döngüyü 3saat duraklat</string>
+    <string name="suspendloopfor10h">Döngüyü 10saat duraklat</string>
+    <string name="disconnectpump">Pompayı ayırın</string>
     <string name="disconnectpumpfor15m">15 dakika boyunca pompayı ayırın</string>
     <string name="disconnectpumpfor30m">30 dakika boyunca pompayı ayırın</string>
     <string name="disconnectpumpfor1h">1 saat boyunca pompayı ayırın</string>
     <string name="disconnectpumpfor2h">2 saat boyunca pompayı ayırın</string>
     <string name="disconnectpumpfor3h">3 saat boyunca pompayı ayırın</string>
+    <string name="duration15m">15 Dk.</string>
+    <string name="duration30m">30 Dk.</string>
+    <string name="duration1h">1 Saat</string>
+    <string name="duration2h">2 Saat</string>
+    <string name="duration3h">3 Saat</string>
+    <string name="duration10h">10 Saat</string>
     <string name="resume">Devam et</string>
     <string name="reconnect">Pompayı tekrar bağla</string>
     <string name="smscommunicator_wrongduration">Yanlış süre</string>
-    <string name="smscommunicator_loopsuspended">Döngü askıya alındı</string>
-    <string name="smscommunicator_loopresumed">Döngü devam etti</string>
+    <string name="smscommunicator_loopsuspended">Döngü duraklatıldı</string>
+    <string name="smscommunicator_loopresumed">Döngü devam ettirildi</string>
     <string name="treatments_wizard_bgtrend_label">15 dk eğilim</string>
     <string name="treatments_wizard_cob_label">COB</string>
     <string name="superbolus">Superbolus</string>
-    <string name="ns_logappstartedevent">Log uygulaması NightScout\'a başlar</string>
+    <string name="ns_logappstartedevent">NS\'a uygulama başlangıcını kaydet</string>
     <string name="restartingapp">Ayarları uygulamak için uygulamadan çıkılıyor.</string>
     <string name="configbuilder_insulin_description">Hangi tür insülin kullanıyorsunuz?</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
-    <string name="insulin_shortname">INS</string>
-    <string name="enablesuperbolus">SuperBolus sihirbazını etkinleştir</string>
-    <string name="enablesuperbolus_summary">Kurulum sihirbazında superbolus işlevselliğini etkinleştirin. Gerçekten ne yaptığınızı öğrenene kadar etkinleştirmeyin. BİLİNÇSİZ KULLANILDIĞINDA AŞIRI DOS İNSÜLIN VERİLEBİLİR!</string>
+    <string name="insulin_shortname">İNS</string>
+    <string name="enablesuperbolus">Sihirbazda superbolusu etkinleştir</string>
+    <string name="enablesuperbolus_summary">Bolus sihirbazında superbolus işlevselliğini etkinleştirin. Gerçekten ne yaptığınızı öğrenene kadar etkinleştirmeyin. BİLİNÇSİZ KULLANILDIĞINDA AŞIRI DOZ İNSÜLIN VERİLEBİLİR!</string>
+    <string name="show_statuslights">Ana ekranda durum ışıklarını göster</string>
+    <string name="statuslights_cage_warning">Kanül ömrü uyarısı belirle (saat) [h]</string>
+    <string name="statuslights_cage_critical">Kritik kanül ömrü (saat) [h]</string>
+    <string name="statuslights_iage_warning">İnsülin ömrü uyarısı belirle (saat) [h]</string>
+    <string name="statuslights_iage_critical">Kritik insülin ömrü (saat) [h]</string>
+    <string name="statuslights_sage_warning">Sensör ömrü uyarısı (saat) [h]</string>
+    <string name="statuslights_sage_critical">Kritik sensör ömrü (saat) [h]</string>
+    <string name="statuslights_sbat_warning">Sensör pili seviye uyarısı [%]</string>
+    <string name="statuslights_sbat_critical">Kritik sensör pili [%]</string>
+    <string name="statuslights_bage_warning">Pompa pil ömrü uyarısı (saat) [h]</string>
+    <string name="statuslights_bage_critical">Kritik pompa pili (saat) [h]</string>
+    <string name="statuslights_res_warning">Rezervuar seviye uyarısı (ünite) [U]</string>
+    <string name="statuslights_res_critical">Kritik rezervuar seviyesi (ünite) [U]</string>
+    <string name="statuslights_bat_warning">Pompa pil seviye uyarısı [%]</string>
+    <string name="statuslights_bat_critical">Kritik pompa pili seviyesi [%]</string>
+    <string name="prediction_shortname">TAHMİN</string>
+    <string name="basal_shortname">BAZAL</string>
+    <string name="deviation_shortname">SAPMA</string>
+    <string name="activity_shortname">EYLEM</string>
+    <string name="bgi_shortname">KŞE</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">EĞİMSAPMA</string>
     <string name="nav_about">Hakkında</string>
     <string name="smscommunicator_missingsmspermission">SMS izni eksik</string>
-    <string name="smscommunicator_missingphonestatepermission">Kayıp telefon durum yetkilendirmesi</string>
-    <string name="xdripstatus_shortname">xds</string>
+    <string name="smscommunicator_missingphonestatepermission">Telefon durumu izni eksik</string>
+    <string name="xdripstatus_settings">xDrip+ Durumu (saat)</string>
+    <string name="xdripstatus">xDrip+ Durum Çizgisi (saat)</string>
+    <string name="xdripstatus_shortname">xd+</string>
     <string name="wear_showbgi_title">BGI göster</string>
     <string name="wear_showbgi_summary">BGI\'yı durum satırına ekle</string>
     <string name="overview_extendedbolus_cancel_button">Yayma Bolusu iptal et</string>
+    <string name="doprofileswitch">Profil Değişimi Yap</string>
+    <string name="careportal_sensor_label">Sensör</string>
+    <string name="careportal_insulin_label">İnsülin</string>
+    <string name="careportal_pb_label">Pompa pili</string>
+    <string name="careportal_age_label">ömür:</string>
+    <string name="careportal_level_label">seviye:</string>
     <string name="ns_alarmoptions">Alarm türleri</string>
+    <string name="ns_alarms">NS alarmlarından bildirimler oluşturun</string>
+    <string name="ns_announcements">NS duyurularından bildirimler oluşturun</string>
     <string name="nsalarm_staledatavalue_label">Eski veri eşiği [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Acil durum verileri eşiği [min]</string>
-    <string name="openapsama_autosens_period">Autosens [h] için aralık</string>
-    <string name="openapsama_autosens_period_summary">Duyarlılık tespiti için geçmişte geçen saat miktarı (karbonhidrat emilim süresi hariç)</string>
+    <string name="openapsama_autosens_period">Otoduyarlılık süresi [h]</string>
+    <string name="openapsama_autosens_period_summary">Duyarlılık tespiti için geçmesi gereken süre (saat) miktarı (karbonhidrat emilim süresi hariç)</string>
     <string name="openaps">OpenAPS</string>
-    <string name="uploader">Aktar</string>
+    <string name="uploader">Yükleyici</string>
     <string name="configbuilder_sensitivity">Duyarlılık algılaması</string>
     <string name="configbuilder_sensitivity_description">Hangi duyarlılık algoritması kullanılmalıdır?</string>
     <string name="sensitivity_shortname">SENS</string>
@@ -293,41 +420,44 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="sensitivityaaps">AAPS duyarlılık</string>
     <string name="absorptionsettings_title">Emilim ayarları</string>
     <string name="absorption_maxtime_title">Besinin maksimum emilim süresi [h]</string>
-    <string name="absorption_maxtime_summary">Tüm karbonhidratların emileceği beklenen saat cinsinden süre</string>
+    <string name="absorption_maxtime_summary">Yemekteki tüm karbonhidratların emilmesinin beklendiği saat cinsinden süre</string>
     <string name="openaps_short">OAPS</string>
     <string name="uploader_short">UPLD</string>
     <string name="basal_short">BAZ</string>
     <string name="keep_screen_on_title">Ekranı açık tut</string>
     <string name="keep_screen_on_summary">Android\'in ekranı kapatmasını önleyin. Prize takılı değilken çok fazla enerji tüketir.</string>
-    <string name="sensitivity_warning">Autosense özelliğini açarsanız tüm yenen karbonhidratları girmeyi unutmayın. Aksi halde, karbonhidrat sapmaları duyarlılık değiştikçe yanlış tanımlanacaktır!!</string>
-    <string name="sensitivityweightedaverage">Ortalama duyarlılık</string>
+    <string name="sensitivity_warning">Otoduyarlılık özelliğini açarsanız tüm yenen karbonhidratları girmeyi unutmayın. Aksi halde, karbonhidrat sapmaları duyarlılık değiştikçe yanlış tanımlanacaktır!!</string>
+    <string name="sensitivityweightedaverage">Ağırlıklı ortalama duyarlılık</string>
     <string name="mdtp_ok">Tamam</string>
     <string name="mdtp_cancel">Vazgeç</string>
     <string name="notloadedplugins">Tüm profiller yüklenmedi!</string>
-    <string name="valuesnotstored">Değerler saklanmadı!</string>
+    <string name="valuesnotstored">Değerler kaydedilmedi!</string>
+    <string name="ns_localbroadcasts">Diğer uygulamalara (xDrip+ gibi) yayınları etkinleştirin. Yüklü birden fazla APPS veya NSClient örneğiniz varsa etkinleştirmeyin!</string>
     <string name="ns_localbroadcasts_title">Yerel yayınları etkinleştirin.</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="enableuam">UAM etkinleştir</string>
     <string name="enablesmb">SMB (Super Micro Bolus) etkinleştir</string>
-    <string name="enablesmb_summary">Daha hızlı bir etki için temp bazal yerine Super Micro Bolus kullanın</string>
+    <string name="enablesmb_summary">Daha hızlı bir etki için geçici bazal yerine Super Micro Bolus kullanın</string>
     <string name="enableuam_summary">(Uam) Habersiz yemeklerin tespiti</string>
     <string name="insulin_oref_peak">IOB Eğrisi Tepe Zamanı</string>
-    <string name="insulin_peak_time">Etki yüksekliği [min]</string>
-    <string name="free_peak_oref">Free-Peak Oref</string>
+    <string name="insulin_peak_time">Tepe zamanı [min]</string>
+    <string name="free_peak_oref">Serbest tepe Oref</string>
     <string name="rapid_acting_oref">Hızlı etkili Oref</string>
-    <string name="ultrarapid_oref">Hızlı Oref</string>
+    <string name="ultrarapid_oref">Ultra Hızlı Oref</string>
+    <string name="lyumjev">Lyumjev</string>
     <string name="dia_too_short">DIA %1$f çok kısa - bunun yerine %2$f kullanıyor!</string>
     <string name="activate_profile">Profili etkinleştir</string>
     <string name="invalid">GEÇERSİZ</string>
-    <string name="careportal_newnstreatment_percentage_label">Yüzdesi</string>
-    <string name="careportal_newnstreatment_timeshift_label">Zaman kaydır</string>
+    <string name="careportal_newnstreatment_percentage_label">Yüzde</string>
+    <string name="careportal_newnstreatment_timeshift_label">Zaman kaydırma</string>
     <string name="default_temptargets">Varsayılan Geçici hedefler</string>
     <string name="eatingsoon_duration">yakında ye süresi</string>
     <string name="eatingsoon_target">yakında ye hedefi</string>
-    <string name="activity_duration">eğzersiz süresi</string>
-    <string name="activity_target">eğzersiz hedefi</string>
+    <string name="activity_duration">aktivite süresi</string>
+    <string name="activity_target">aktivite hedefi</string>
     <string name="hypo_duration">hipo süresi</string>
     <string name="hypo_target">hipo hedefi</string>
+    <string name="reuse_profile_pct_hours">%1$d%% %2$dh\'yi yeniden kullan</string>
     <string name="wearcontrol_title">Saat tarafından kontrol</string>
     <string name="wearcontrol_summary">Tedavileri ve Geçici hedefleri saat tarafından girin.</string>
     <string name="food">Yiyecek</string>
@@ -335,28 +465,38 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="none"><![CDATA[<yok>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
-    <string name="shortprotein">Prot</string>
+    <string name="shortprotein">Pr</string>
     <string name="shortfat">Yağ</string>
     <string name="active"><![CDATA[<Aktif>]]></string>
     <string name="executingrightnow">Komut şu anda çalıştırıldı</string>
     <string name="missed_bg_readings">Kaçırılan KŞ Okumaları</string>
     <string name="raise_notifications_as_android_notifications">Uyarılar ve bildirimler için sistem bildirimlerini kullan</string>
+    <string name="gradually_increase_notification_volume">Uyarılar ve bildirimler için ses seviyesini kademeli olarak artırın</string>
     <string name="localalertsettings_title">Yerel uyarıları</string>
     <string name="enable_missed_bg_readings_alert">KŞ bilgisi alınmadığında uyar</string>
     <string name="enable_pump_unreachable_alert">Pompa ulaşılamıyorsa uyar</string>
-    <string name="pump_unreachable_threshold">Kritik eşik pompaya erişilemiyor [min]</string>
+    <string name="pump_unreachable_threshold">Pompa ulaşılamaz eşiği [min]</string>
+    <string name="enable_carbs_req_alert">Karbonhidrat gerekliyse uyar</string>
     <string name="urgent_alarm">Acil önemli Alarm</string>
-    <string name="info">INFO</string>
+    <string name="info">BİLGİ</string>
+    <string name="eversense">Eversense App (yamalı)</string>
     <string name="dexcomg5_nsupload_title">KŞ verilerini NighScout\'a yükle</string>
+    <string name="bgsource_upload">KŞ yükleme ayarları</string>
     <string name="wear_detailed_delta_title">Ayrıntılı delta göster</string>
-    <string name="wear_detailed_delta_summary">Bir ondalık basamakla deltayı göster</string>
+    <string name="wear_detailed_delta_summary">Deltayı bir ondalık basamakla daha göster</string>
+    <string name="smbinterval_summary">Kaç dakikada bir SMB verilebilecek</string>
     <string name="smbmaxminutes_summary">SMB\'yi sınırlamak için maksimum bazal dakika</string>
+    <string name="uamsmbmaxminutes">UAM SMB maks. dakika ayarı</string>
+    <string name="uamsmbmaxminutes_summary">UAM da SMB\'yi sınırlamak için maksimum bazal dakika</string>
+    <string name="carbsReqThreshold">Gerekli Minimum Karbonhidrat Önerisi</string>
+    <string name="carbsReqThreshold_summary">Bir karbonhidrat öneri uyarısı görüntülemek için minimum karbonhidrat gramı. Bu sayının altındaki karbonhidrat önerileri bildirilmeyecektir.</string>
     <string name="dexcomg5_xdripupload_title">XDrip+\'a KŞ verilerini gönder</string>
     <string name="dexcomg5_xdripupload_summary">Xdrip+ içerisinde 640g/Eversense veri kaynağı seç</string>
     <string name="nsclientbg">Nightscout Client KŞ</string>
+    <string name="nsclientbgshort">NS KŞ</string>
     <string name="overview_editquickwizard_usebg">KŞ Hesaplaması</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus IOB (Aktif İnsülin) hesaplaması</string>
-    <string name="overview_editquickwizard_usebasaliob">Bazal IOB hesaplaması</string>
+    <string name="overview_editquickwizard_usebasaliob">Bazal IOB (Aktif İnsülin) hesaplaması</string>
     <string name="overview_editquickwizard_usetrend">Trend hesapla</string>
     <string name="overview_editquickwizard_usesuperbolus">Super Bolus hesapla</string>
     <string name="positiveonly">Sadece pozitif</string>
@@ -364,76 +504,88 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="overview_editquickwizard_usecob">COB (Aktif Karbonhidrat) hesaplaması</string>
     <string name="overview_editquickwizard_usetemptarget">Geçici hedef hesaplaması</string>
     <string name="loopenabled">Döngü etkin</string>
-    <string name="apsselected">Seçili APS</string>
+    <string name="apsselected">APS Seçildi</string>
     <string name="nsclienthaswritepermission">NSClient\'in yazma izni var</string>
-    <string name="closedmodeenabled">Kapalı Döngü etkinleştirildi</string>
+    <string name="closedmodeenabled">Kapalı mod etkin</string>
     <string name="maxiobset">Maksimal IOB doğru şekilde ayarlandı</string>
     <string name="hasbgdata">Seçili kaynaktan KŞ kullanılabilir</string>
-    <string name="extendedbolusdeliveryerror">Yayım bolus gönderme hatası</string>
+    <string name="extendedbolusdeliveryerror">Yayma bolus iletim hatası</string>
     <string name="enablesmbalways">SMB\'yi her zaman etkinleştir</string>
     <string name="enablesmbalways_summary">SMB\'yi her zaman bağımsız olarak boluslarla etkinleştirin. G5 gibi verilerin yalnızca filtrelenmesiyle yalnızca KŞ kaynağıyla mümkündür</string>
-    <string name="enablesmbaftercarbs">Yemeklerden sonra SMB\'yi (Super Micro Bolus) etkinleştir</string>
+    <string name="enablesmbaftercarbs">Yemeklerden sonra SMB\'yi etkinleştir</string>
     <string name="enablesmbaftercarbs_summary">Karbonhidrat alındıktan sonra 6 saat süreyle SMB\'yi (Super Micro Bolus) etkinleştirin.0 COB (Aktif Karbonhidrat) ile de çalışır, Şayet KŞ kaynağıyla kullanılacaksa verilerin iyice filtrelenmesiyle mümkündür.örn. Dexcom G5 gibi</string>
-    <string name="enablesmbwithcob">SMB (Super Micro Bolus) COB (Aktif Karbonhidrat) ile etkinleştir</string>
+    <string name="enablesmbwithcob">SMB\'yi COB ile etkinleştir</string>
     <string name="enablesmbwithcob_summary">COB (Aktif Karbonhidrat) aktif olduğunda SMB\'yi (Super Micro Bolus) etkinleştirin.</string>
-    <string name="enablesmbwithtemptarget">Geçici hedeflerle SMB\'yi (Super Micro Bolus) etkinleştir</string>
+    <string name="enablesmbwithtemptarget">Geçici hedeflerle SMB\'yi etkinleştir</string>
     <string name="enablesmbwithtemptarget_summary">Geçici hedef aktif olduğunda SMB\'yi etkinleştir (yakında yeme, egzersiz)</string>
-    <string name="enablesmbwithhightemptarget">Yüksek geçici bazal oran hedefleriyle SMB\'yi etkinleştir</string>
+    <string name="enablesmbwithhightemptarget">Yüksek geçici hedeflerle SMB\'yi etkinleştir</string>
+    <string name="enablesmbwithhightemptarget_summary">Yüksek geçici hedef aktif olduğunda SMB\'yi etkinleştirin (egzersiz, 100 mg/dl veya 5.5 mmol/l\'nin üzerinde)</string>
     <string name="overview_insulin_label">İnsülin</string>
     <string name="overview_buttons_selection">Tuşlar</string>
     <string name="show_calibration_button_summary">xDrip+ \'ya bir kalibrasyon gönderir veya G5 kalibrasyon iletişim kutusunu açar</string>
-    <string name="show_cgm_button_summary">xDrip+ açık, geri düğmeleri ile AndroidAPS\'ye gerisin geri döner</string>
+    <string name="show_cgm_button_summary">xDrip+\'i açar, geri düğmeleri AAPS\'e döner</string>
     <string name="carb_increment_button_message">Düğmeye basıldığında eklenecek karbonhidrat sayısı</string>
     <string name="insulin_increment_button_message">Düğmeye basıldığında eklenecek insülin miktarı</string>
     <string name="error_starting_cgm">CGM uygulaması başlatılamadı. Yüklendiğinden emin olun.</string>
     <string name="overview_cgm">CGM</string>
-    <string name="nav_historybrowser">Geçmiş</string>
+    <string name="ignore5m">5dk yoksay</string>
+    <string name="ignore15m">15dk yoksay</string>
+    <string name="ignore30m">30dk yoksay</string>
+    <string name="required">iht.</string>
+    <string name="nav_historybrowser">Geçmiş tarayıcısı</string>
     <string name="wear_notifysmb_title">SMB\'ye (Super Micro Bolus) bildir</string>
     <string name="wear_notifysmb_summary">Saatte SMB\'yi (Super Micro Bolus) standart bir bolus gibi göster.</string>
     <string name="ns_create_announcements_from_errors_title">Hatalardan duyurular oluştur</string>
-    <string name="ns_create_announcements_from_errors_summary">Hata diyalogları ve yerel uyarılar için Nightscout anonsu oluşturun (Tedaviler altında Careportal\'da da görüntülenebilir)</string>
-    <string name="wear_predictions_summary">Watchface üzerindeki tahminleri göster.</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Karbonhidrat gerekli uyarılarından duyurular oluşturun</string>
+    <string name="ns_create_announcements_from_errors_summary">Hata diyalogları ve yerel uyarılar için Nightscout anonsu oluşturun (Tedaviler altında Bakım portalında da görüntülenebilir)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Karbonhidrat gerekli uyarılarından Nightscout duyuruları oluşturun</string>
+    <string name="wear_predictions_summary">Saat arayüzü üzerindeki tahminleri göster.</string>
     <string name="wear_predictions_title">Tahminler</string>
     <string name="data_choices">Veri seçenekleri</string>
     <string name="fabric_upload">Fabric Upload</string>
     <string name="allow_automated_crash_reporting">Geliştiricilere, fabric.io hizmeti aracılığıyla otomatik kilitlenme raporlaması ve özellik kullanım verilerinin gönderilmesine izin verir.</string>
-    <string name="start_activity_tt">Eğzersiz başlat TT</string>
+    <string name="g5appnotdetected">Lütfen Dexcom uygulamanızı desteklenen sürüme güncelleyin</string>
+    <string name="dexcom_app_not_installed">Dexcom uygulaması yüklü değil.</string>
+    <string name="start_activity_tt">Egzersiz Başlat TT</string>
     <string name="start_eating_soon_tt">Yakında Yemeğe Başla TT</string>
     <string name="temptargetshort">TT</string>
     <string name="do_not_bolus_record_only">Bolusu sadece kayıt altına al</string>
     <string name="category">Kategori</string>
     <string name="subcategory">Alt kategori</string>
+    <string name="bolusrecordedonly">Bolus yalnızca kaydedilecektir (pompa ile iletilmez)</string>
     <string name="loop_smbsetbypump_label">SMB (Supermicroboluses) pompa tarafından verildi</string>
+    <string name="overview_show_activity">Aktivite</string>
+    <string name="overview_show_bgi">Kan Şekeri Etkisi</string>
     <string name="overview_show_sensitivity">Duyarlılık</string>
     <string name="overview_show_deviations">Sapma</string>
-    <string name="overview_show_cob">Aktiv Karbonhidrat</string>
-    <string name="overview_show_iob">Aktiv İnsülin</string>
+    <string name="overview_show_cob">Aktif Karbonhidrat</string>
+    <string name="overview_show_iob">Aktif İnsülin</string>
     <string name="overview_show_basals">Bazallar</string>
     <string name="no_action_selected">Seçili eylem yok, hiçbir şey olmayacak</string>
-    <string name="start_hypo_tt">Hypo TT başlat</string>
-    <string name="closed_loop_disabled_on_dev_branch">Dev sürümü çalışıyor. Kapalı Döngü devre dışı.</string>
-    <string name="engineering_mode_enabled">Geliştirici modu aktivleşti</string>
-    <string name="profileswitch_ismissing">Profildeğiştir kayıp. Lütfen bir profil değiştir seçin veya YerelPorfil\'de \"Profili Etkinleştir\" düğmesine basın.</string>
-    <string name="pumpisnottempbasalcapable">Pompa geçici bazal yetenekli değil</string>
+    <string name="start_hypo_tt">Hipo TT başlat</string>
+    <string name="closed_loop_disabled_on_dev_branch">Geliştirici sürümü çalışıyor. Kapalı Döngü devre dışı.</string>
+    <string name="engineering_mode_enabled">Geliştirici modu etkinleştirildi</string>
+    <string name="profileswitch_ismissing">Profil geçişi yok. Lütfen Profil Değiştirme ile bir profil geçişi yapın veya Yerel Profil\'de \"Profili Etkinleştir\" düğmesine basın.</string>
+    <string name="pumpisnottempbasalcapable">Pompa geçici bazal özellikli değil</string>
     <string name="closedmodedisabledinpreferences">Kapalı Döngü tercihlerde devre dışı bırakıldı</string>
-    <string name="autosensdisabledinpreferences">Autosens tercihlerde devre dışı bırakıldı</string>
-    <string name="smbdisabledinpreferences">SMB tercihleri devre dışı</string>
-    <string name="uamdisabledinpreferences">UAM (UnAnnounced Meals) tercihlerde devre dışı bırakıldı</string>
+    <string name="autosensdisabledinpreferences">Otoduyarlılık tercihlerde devre dışı bırakıldı</string>
+    <string name="smbdisabledinpreferences">SMB tercihlerde devre dışı bırakıldı</string>
+    <string name="uamdisabledinpreferences">UAM tercihlerde devre dışı bırakıldı</string>
     <string name="uamdisabledoref1notselected">UAM (UnAnnounced Meals), Oref1 duyarlılık eklentisine bağlı olduğu için devre dışı bırakıldı</string>
-    <string name="maxbasalmultiplier">max bazal çarpanı</string>
-    <string name="maxdailybasalmultiplier">max günlük bazal çarpan</string>
+    <string name="maxbasalmultiplier">maks bazal çarpanı</string>
+    <string name="maxdailybasalmultiplier">maks günlük bazal çarpan</string>
     <string name="smb_frequency_exceeded">Son 3 dakika içerisinde bir bolus gönderildi, SMB (Super Micro Bolus) atlandı</string>
-    <string name="basal_set_correctly">Bazal oranı doğru ayarlanmış</string>
-    <string name="limitingextendedbolus">%2$s\'den dolayı yayım bolus %1$.1f U ile sınırlandırılıyor</string>
+    <string name="basal_set_correctly">Bazal doğru ayarlanmış</string>
+    <string name="limitingextendedbolus">%2$s\'den dolayı yayma bolus %1$.1f Ü ile sınırlandırılıyor</string>
     <string name="limitingcarbs">%2$s\'den dolayı karbonhidratlar %1$d g ile sınırlandırılıyor</string>
-    <string name="limitingiob">%2$s\'den dolayı IOB (Aktif İnsülin)%1$.1f U ile sınırlandırılıyor</string>
+    <string name="limitingiob">%2$s\'den dolayı IOB (Aktif İnsülin)%1$.1f Ü ile sınırlandırılıyor</string>
     <string name="maxvalueinpreferences">tercihlerde maksimum değer</string>
-    <string name="hardlimit">sabit sınır</string>
+    <string name="hardlimit">sert sınır</string>
     <string name="readstatusfailed">Durumu okumak başarısız oldu</string>
     <string name="record_pump_site_change">İnfüzyon seti değişimini kaydet</string>
     <string name="record_insulin_cartridge_change">Rezervuar değişimini kaydet</string>
-    <string name="smbalwaysdisabled">Aktif KŞ kaynağı gelişmiş filtrelemeyi desteklemediği için SMB (Super Micro Bolus) her zaman (ve) karbonhidratlardan sonra devre dışı bırakıldı</string>
-    <string name="smbnotallowedinopenloopmode">Açık Döngü modunda Super Micro Bolus\'a izin verilmiyor</string>
+    <string name="smbalwaysdisabled">Aktif KŞ kaynağı gelişmiş filtrelemeyi desteklemediği için SMB (Super Micro Bolus) her zaman ve karbonhidratlardan sonra devre dışı bırakıldı</string>
+    <string name="smbnotallowedinopenloopmode">Açık Döngü modunda SMB\'ye (Super Micro Bolus) izin verilmiyor</string>
     <string name="food_short">Yiyecek</string>
     <string name="reset">sıfırla</string>
     <string name="openapssmb_maxiob_title">OpenAPS tarafından aşılmayacak, maksimum toplam IOB(Aktif İnsülin)[U]</string>
@@ -458,18 +610,18 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="connectionsettings_title">Bağlantı Ayarları</string>
     <string name="ns_wifi_allowedssids">İzin verilen SSID (noktalı virgülle ayrılmış)</string>
     <string name="ns_allowroaming">Roaming bağlantıya izin ver</string>
-    <string name="openapsama_autosens_max">Max autosens oranı</string>
-    <string name="openapsama_autosens_min">Min autosens oranı</string>
+    <string name="openapsama_autosens_max">Maks. otoduyarlılık oranı</string>
+    <string name="openapsama_autosens_min">Min. otoduyarlılık oranı</string>
     <string name="openapsama_bolussnooze_dia_divisor">Bolus erteleme dia bölen</string>
-    <string name="openapsama_max_daily_safety_multiplier">Max günlük güvenlik çarpanı</string>
+    <string name="openapsama_max_daily_safety_multiplier">Maks günlük güvenlik çarpanı</string>
     <string name="openapsama_current_basal_safety_multiplier">Mevcut bazal güvenlik çarpanı</string>
     <string name="value_unavailable_short">n/a</string>
     <string name="virtualpump_type">Sanal pompa tipi</string>
     <string name="virtualpump_definition">Pompa tanımı</string>
-    <string name="virtualpump_pump_def">Bolus: Adım=%1$s\nYayım Bolus: [Step=%2$s, Süre=%3$smin-%4$sh]\nBasal: Adım=%5$s\nTBR: %6$s (ile %7$s), Süre=%8$smin-%9$sh\n%10$s</string>
+    <string name="virtualpump_pump_def">Bolus: Adım=%1$s\nYayma Bolus: [Adım=%2$s, Süre=%3$sdk-%4$ssa]\nBazal: Adım=%5$s\nTBR: %6$s (ile %7$s), Süre=%8$sdk-%9$ssa\n%10$s</string>
     <string name="wear_wizard_settings">Kurulum Sihirbazı Ayarları</string>
     <string name="wear_wizard_settings_summary">Sihirbaz sonucuna dahil edilen hesaplamalar:</string>
-    <string name="wear_display_settings">Ayarları Görüntüle</string>
+    <string name="wear_display_settings">Görüntü Ayarları</string>
     <string name="wear_general_settings">Genel Ayarlar</string>
     <string name="enable_nsclient">NSClient etkinleştir</string>
     <string name="welcometosetupwizard">Kurulum sihirbazına hoş geldiniz. Kurulum işleminde size rehberlik edecektir\n</string>
@@ -478,11 +630,17 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="setupwizard_loop_description">AndroidAPS\'ın bazal değişiklikleri önerme/yapmasını sağlamak için aşağıdaki düğmeye basın</string>
     <string name="setupwizard_sensitivity_description">Duyarlılık eklentisi, duyarlılık tespiti ve COB hesaplaması için kullanılır. Daha fazla bilgi için ziyaret edin:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
+    <string name="nsclientinfotext">NSClient, Nightscout\'a bağlantıyı sağlar. Şimdi bu kısmı atlayabilirsiniz, ancak ayarlamadan görevleri geçemezsiniz.</string>
     <string name="diawarning">Lütfen unutmayın: yeni insülin profilleri en az 5 saat DIA gerektirir. Yeni profildeki DIA 5–6 saat, eski insülin profillerinde DIA 3saat\'e eşittir.</string>
-    <string name="setupwizard_aps_description">Mevcut algoritmalardan birini seçin. En eskiden en yeniye ayrılırlar. Yeni algoritma genellikle daha güçlü ve daha agresiftir. Böylece eğer yeni bir Döngü\'cü iseniz, muhtemelen AMA ile başlayabilirsin, en sonuncusuyla değil. OpenAPS belgelerini okumayı ve kullanmadan önce yapılandırmayı unutmayın.</string>
-    <string name="startobjective">İlk hedefinize başlayın</string>
+    <string name="setupwizard_aps_description">Mevcut algoritmalardan birini seçin. En eskiden en yeniye doğru sıralanırlar. Yeni algoritma genellikle daha güçlü ve daha agresiftir. Bu nedenle, yeni bir kullanıcı iseniz, muhtemelen en sonuncusu ile değil, AMA ile başlayabilirsiniz. OpenAPS belgelerini okumayı ve kullanmadan önce yapılandırmayı unutmayın.</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Lütfen aşağıda RileyLink\'inizi yapılandırın. Bir RileyLink seçtikten sonra, RileyLink durumu \"Bağlandı\" olduğunda kuruluma devam etmek mümkün olacaktır. Bu bir dakika sürebilir.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Not:</b> Pompa kurulduktan sonra kuruluma devam edebilirsiniz.\n</string>
+    <string name="startobjective">İlk görevinize başlayın</string>
     <string name="permission">Yetki</string>
     <string name="askforpermission">İzin için sorunuz</string>
+    <string name="needsystemwindowpermission">Uygulama, bildirimler için sistem iznine ihtiyaç duyuyor</string>
+    <string name="needlocationpermission">Uygulamanın BT taraması ve WiFi tanımlaması için konum iznine ihtiyacı var</string>
+    <string name="needstoragepermission">Uygulamanın, günlük dosyalarını saklayabilmesi ve ayarları dışa aktarabilmesi için depolama iznine ihtiyacı var</string>
     <string name="request">İstek</string>
     <string name="open_navigation">Navigasyonu aç</string>
     <string name="close_navigation">Navigasyonu kapat</string>
@@ -491,37 +649,257 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="not_completed_yet">Henüz tamamlanmadı</string>
     <string name="time_elapsed">Geçen süre</string>
     <string name="poctech">Poctech</string>
-    <string name="description_source_poctech">Poctech app\'ten KŞ değerlerini alır</string>
-    <string name="description_source_tomato">KŞ değerlerini Tomato app (MiaoMiao Cihazından) al</string>
+    <string name="description_source_poctech">Poctech uygulamasından KŞ değerlerini alır</string>
+    <string name="glunovo">Glunovo</string>
+    <string name="description_source_glunovo">Glunovo uygulamasından değerler alır</string>
+    <string name="description_source_tomato">KŞ değerlerini Tomato uygulamasından (MiaoMiao Cihazından) al</string>
     <string name="high_temptarget_raises_sensitivity_title">Yüksek geçici hedefler duyarlılığı artırır</string>
-    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Geçici Hedefleri için duyarlılığı artırın >= 100]]></string>
+    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Geçici Hedefler için duyarlılığı artırın >= 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Düşük geçici hedefler duyarlılığı azaltır</string>
-    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Geçici Hedefi < 100 duyarlılığı düşürün]]></string>
+    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Geçici Hedefler için düşük duyarlılık < 100]]></string>
+    <string name="resistance_lowers_target_title">Direnç hedefi düşürür</string>
+    <string name="resistance_lowers_target_summary">Direnç tespit edildiğinde KŞ hedefini düşürün</string>
+    <string name="sensitivity_raises_target_title">Duyarlılık hedefi yükseltir</string>
+    <string name="sensitivity_raises_target_summary">Hassasiyet tespit edildiğinde, KŞ hedefini yükseltin</string>
     <string name="careportal_removestartedevents">Temiz AndroidAPS başladı</string>
     <string name="storedsettingsfound">Saklanan ayarlar bulundu</string>
     <string name="allow_hardware_pump_text">Dikkat: Eğer bir donanım pompasını etkinleştirir ve bağlarsanız, AndroidAPS, bazal ayarları profilden pompaya aktaracaktır ve pompada kayıtlı mevcut bazal oranlarının üzerine yazacaktır. AndroidAPS\'de doğru ayarların olduğundan emin olun. Emin değilseniz veya pompanızdaki bazal ayarların üzerine yazmak istemiyorsanız, iptal tuşuna basın ve daha sonra tekrar deneyin.</string>
     <string name="error_adding_treatment_title">Tedavi verileri eksik</string>
     <string name="maintenance_settings">Bakım ayarları</string>
-    <string name="maintenance_amount">Gönderilecek loglar Yok</string>
+    <string name="maintenance_email">E-Posta alıcısı</string>
+    <string name="maintenance_amount">Gönderilecek kayıt yok</string>
     <string name="maintenance">Bakım</string>
     <string name="maintenance_shortname">BAKIM</string>
     <string name="description_maintenance">Bakım için çeşitli işlevler sağlar (örn. günlük gönder, günlük sil).</string>
-    <string name="send_all_logs">E-posta ile Logları Gönder</string>
-    <string name="delete_logs">Log Kayıtları Sil</string>
-    <string name="error_adding_treatment_message">Tedaviyi (insülin:%1$.2f, karbonhidrat: %2$d, da: %3$s) tedavilere eklenemedi. Lütfen kontrol edin ve uygun şekilde manuel şekilde kayıt edin.</string>
-    <string name="generated_ecarbs_note">eCarbs: %1$d g (%2$d h), geçikme: %3$d m</string>
-    <string name="openaps_noasdata">Autosens verileri mevcut değil</string>
+    <string name="send_all_logs">Kayıtları E-posta ile Gönder</string>
+    <string name="delete_logs">Kayıtları Sil</string>
+    <string name="error_adding_treatment_message">Tedavilere (insülin: %1$.2f, karbonhidrat: %2$d, %3$s) şeklinde bir tedavi eklenemedi. Lütfen kontrol edin ve uygun şekilde elle bir kayıt ekleyin.</string>
+    <string name="generated_ecarbs_note">yKarb: %1$d g (%2$d sa), gecikme: %3$d dk</string>
+    <string name="openaps_noasdata">Otoduyarlılık verileri mevcut değil</string>
     <string name="nav_logsettings">Günlük ayarları</string>
     <string name="resettodefaults">Varsayılanlara sıfırla</string>
     <string name="nsmalfunction">NSClient arızası. NS ve NSClient yeniden başlatmayı düşünün.</string>
     <string name="time_offset">Saat farkı</string>
+    <string name="bolus_reminder">Bolusu daha sonra hatırlat</string>
     <string name="setupwizard_preferred_aps_mode">Tercih edilen APS modu</string>
     <string name="treatments_wizard_total_label">Toplam</string>
     <string name="calculation_short">Hesap</string>
-    <string name="sendlogfiles">Bu günün log dosyalarını bu zamana göre geliştiricilere gönder. Beklenmedik bir durum.</string>
+    <string name="sendlogfiles">Bu günün kayıt dosyalarını geliştiricilere gönderin. Beklenmedik bir durum.</string>
     <string name="loop_openmode_min_change">Minimum istek değişikliği [%]</string>
-    <string name="profile_total">== ∑  %1$s U</string>
+    <string name="loop_openmode_min_change_summary" formatted="false">Açık Döngü, yalnızca değişiklik % cinsinden bu değerden büyükse yeni değişiklik isteğini açar. Varsayılan değer %20\'dir</string>
+    <string name="profile_total">== ∑  %1$s Ü</string>
+    <string name="dexcom_lognssensorchange_title">Sensör değişimlerini NS\'a kaydet</string>
+    <string name="dexcom_lognssensorchange_summary">Sensör başlangıcında otomatik olarak NS\'de \"Sensör Değişimi\" etkinliği oluştur</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
+    <string name="summary_tidepool_username">Tidepool oturum açma kullanıcı adınız, normalde e-posta adresiniz</string>
+    <string name="title_tidepool_username">Kullanıcı adınınız</string>
+    <string name="summary_tidepool_password">Tidepool şifreniz</string>
+    <string name="title_tidepool_password">Giriş Parolası</string>
+    <string name="title_tidepool_test_login">Tidepool girişini test et</string>
+    <string name="summary_tidepool_dev_servers">Etkinleştirilirse, yüklemeler https://app.tidepool.org/ yerine https://int-app.tidepool.org adresine gider</string>
+    <string name="title_tidepool_dev_servers">Entegrasyon (test) sunucularını kullanın</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Tidepool\'a veri yükler</string>
+    <string name="tidepool_upload_cgm">SGİ (CGM) verilerini yükle</string>
+    <string name="tidepool_upload_bolus">Tedavileri yükleyin (insülin, karbonhidratlar)</string>
+    <string name="tidepool_upload_tbr">Geçici bazalları yükleyin</string>
+    <string name="tidepool_upload_profile">Profil değişimlerini, geçici hedefleri yükleyin</string>
+    <string name="tidepool_upload_bg">KŞ testlerini yükleyin</string>
+    <string name="dst_in_24h_warning">24 saat veya daha kısa süre içinde yaz saati değişikliği</string>
+    <string name="dst_loop_disabled_warning">Yaz Saati Uygulaması 3 saatten daha kısa bir süre önce değişti - Kapalı döngü devre dışı</string>
+    <string name="storage">dahili depolama birimi</string>
+    <string name="diskfull">Dahili depolama biriminden en az %1$d MB yer kaldı! Döngü devre dışı!</string>
+    <string name="wrongformat">Yanlış Format</string>
+    <string name="wrongTbrDuration">Geçici Bazal Oranı süresi %1$d dakikanın katı ve 0\'dan büyük olmalıdır.</string>
+    <string name="sms_wrongcode">Hatalı kod. Komut iptal edildi.</string>
+    <string name="notconfigured">Yapılandırılmadı</string>
+    <string name="profileswitchcreated">Profil değiştirme yapıldı</string>
+    <string name="versionChecker">Sürüm Kontrolcüsü</string>
+    <string name="old_version">eski sürüm</string>
+    <string name="very_old_version">çok eski sürüm</string>
+    <string name="application_expired">Uygulamanın süresi doldu</string>
+    <string name="new_version_warning">En az %1$d gündür yeni sürüm mevcut! %2$d gün sonra LGS\'ye (Düşük Glukoz gönderimine) dönülecek, %3$d gün sonra da döngü devre dışı bırakılacaktır</string>
+    <string name="twohours">2sa</string>
+    <string name="dexcom_app_patched">Dexcom Uygulaması (yamalı)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Yamalı Dexcom uygulamasından KŞ değerleri alır.</string>
+    <string name="cobvsiob">COB vs IOB</string>
+    <string name="bolusconstraintappliedwarn">Bolus kısıtlaması uygulandı: %1$.2f Ü ile %2$.2f Ü</string>
+    <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Yavaş karbonhidrat emilimi tespit edildi: zamanın %2$d%% si. Hesaplamanızı iki kez kontrol edin. Aktif Karbonhidrat (COB) olduğundan fazla tahmin edilebilir, bu nedenle daha fazla insülin verilebilir !!!!!</font>]]></string>
+    <string name="partialboluswizard">Bolus sihirbazı sonucunun bu bölümünü ilet [%]</string>
+    <string name="deliverpartofboluswizard">Bolus sihirbazı hesaplamayı gerçekleştirir ancak hesaplanan insülinin yalnızca bu kısmı iletilir. SMB algoritması ile kullanışlıdır.</string>
+    <string name="snooze">Ertele</string>
+    <string name="increasingmaxbasal">Profilinizdeki maksimum bazal değeriniz düşük olduğu için maksimum bazal değeri artırma</string>
+    <string name="smscommunicator_messagebody">Geçersiz mesaj</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="unit_minute_short">dk.</string>
+    <string name="profile_name">Profil adı:</string>
+    <string name="selected_profile">Seçildi:</string>
+    <string name="unitsnosemicolon">Birim</string>
+    <string name="doyouwantswitchprofile">Profili değiştirmek ve mevcut profilde yapılan değişiklikleri gözardı etmek istiyor musunuz?</string>
+    <string name="objectives_button_unfinish">Silme tamamlandı</string>
+    <string name="objectives_button_unstart">Yeniden Başla</string>
+    <string name="doyouwantresetstart">Görevleri sıfırlamak istiyor musunuz? Tüm yaptıklarınızı kaybedeceksiniz.</string>
+    <string name="setupwizard_units_prompt">Değerleri görüntülemek istediğiniz birimleri seçin</string>
+    <string name="dia_short">İES İnsülin Etki Süresi</string>
+    <string name="ic_short">IC Karbonhidrat İnsülin Oranı</string>
+    <string name="isf_short">IDF İnsülin Duyarlılık Faktörü</string>
+    <string name="target_short">HDF</string>
+    <string name="clone_label">Klon</string>
+    <string name="saveorresetchangesfirst">Önce mevcut değişiklikleri kaydedin veya sıfırlayın</string>
+    <string name="deletecurrentprofile">Mevcut profil silinsin mi?</string>
+    <string name="copytolocalprofile">Bu profilden yeni profil oluşturulsun mu?</string>
+    <string name="profilenamecontainsdot">Profil adı noktalar içeriyor.\nBu NS tarafından desteklenmiyor.\n Profil NS\'a yüklenmez.</string>
+    <string name="low_mark_comment">Aralıktan daha düşük değer (sadece görüntüle)</string>
+    <string name="high_mark_comment">Aralıktan daha yüksek değer (Sadece görüntüle)</string>
+    <string name="age">Yaş:</string>
+    <string name="weight_label">Kilo:</string>
+    <string name="id">Kimlik:</string>
+    <string name="submit">Sunum</string>
+    <string name="mostcommonprofile">En yaygın profil:</string>
+    <string name="survey_comment">Not: Yalnızca bu ekranda görünen veriler anonim olarak yüklenecektir. Bu AndroidAPS kurulumunda kimlik atanır. Ana profiliniz değişirse verileri tekrar gönderebilir, ancak sonuçların zaman içinde görünür olması için en az bir hafta çalışmasına izin verebilirsiniz. Yardımın takdire değer.</string>
+    <string name="invalidage">Geçersiz yaş girişi</string>
+    <string name="invalidweight">Geçersiz ağırlık girişi</string>
+    <string name="invalidpct">Geçersiz % giriş</string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Düşük: <b>%2$02d%%</b> İçinde: <b>%3$02d%%</b> Yüksek: <b>%4$02d%%</b>]]></string>
+    <string name="average">Ortalama</string>
+    <string name="tir">TIR</string>
+    <string name="activitymonitor">Aktivite monitörü</string>
+    <string name="doyouwantresetstats">Etkinlik istatistiklerini sıfırlamak istiyor musunuz?</string>
+    <string name="statistics">İstatistikler</string>
+    <string name="randombg">Rastgele KŞ</string>
+    <string name="description_source_randombg">Rastgele KŞ verileri oluşturun (Yalnızca demo modunda)</string>
+    <string name="randombg_short">KŞ</string>
+    <string name="tools">Araçlar</string>
+    <string name="show_calculation">Hesaplamayı göster</string>
+    <string name="show_removed">Kaldırılanları göster</string>
+    <string name="clearqueueconfirm">Kuyruk temizlensin mi? Kuyruktaki tüm veriler kaybedilecek!</string>
+    <string name="ebstopsloop">Yayma bolus özelliğinin kullanılması, yayma bolus çalıştırıldığı süre boyunca kapalı döngü modunu durduracaktır. Gerçekten istiyor musunuz?</string>
+    <string name="closed_loop_disabled_with_eb">Yayma bolus çalıştığı için kapalı döngü devre dışı bırakıldı</string>
+    <string name="phonechecker">\"Telefon Denetleyicisi\"</string>
+    <string name="chartmenu">Grafik menüsü</string>
+    <string name="loop_smbrequest_time_label">SMB (Super Micro Bolus) zamanı</string>
+    <string name="loop_smbexecution_time_label">SMB (Super Micro Bolus) uygulama süresi</string>
+    <string name="loop_tbrrequest_time_label">Geçici bazal zamanı</string>
+    <string name="loop_tbrexecution_time_label">Geçici bazal uygulama süresi</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">authenticator uygulamasından %1$s için PIN girin</string>
+    <string name="smscommunicator_otp_pin">İlave zorunlu şifre (PIN)</string>
+    <string name="smscommunicator_otp_pin_summary">Oluşturulan Her Tek Kullanımlık Şifrenin sonunda ezberlenmesi ve yapıştırılması gereken ek şifre</string>
+    <string name="smscomunicator_tab_otp_label">Kimlik doğrulayıcı (OTP-Authenticator) kurulumu</string>
+    <string name="smscommunicator_code_verify_label">Kontrol edilecek kod:</string>
+    <string name="smscommunicator_code_verify_hint">OTP + PIN</string>
+    <string name="smscommunicator_code_verify_info">Doğrulama kodu, Authenticator uygulaması (OTP olarak bilinir) tarafından görüntülenen 6 haneden ve ardından 3 veya daha fazla zorunlu PIN hanesinden oluşur.</string>
+    <string name="smscommunicator_otp_reset_btn">Kimlik Doğrulayıcıları (OTP) Sıfırla</string>
+    <string name="smscommunicator_otp_reset_title">Kimlik Doğrulayıcı Anahtarını Sıfırla</string>
+    <string name="smscommunicator_otp_reset_prompt">Kimlik Doğrulayıcı (Authenticator) anahtarını sıfırlamak istediğinizden emin misiniz? Şu anda yapılandırılmış tüm Kimlik Doğrulayıcıları geçersiz kılar ve bunları yeniden ayarlamanız gerekir.</string>
+    <string name="smscommunicator_otp_reset_successful">Yeni Kimlik Doğrulayıcı (Authenticator) Anahtarı oluşturuldu! Kimlik doğrulayıcıları için lütfen güncellenmiş QRCode\'u kullanın.</string>
+    <string name="smscommunicator_otp_export_title">OTP dışa aktarma</string>
+    <string name="smscommunicator_otp_export_prompt">OTP secret panoya kopyalamak istediğinizden emin misiniz?\n\nYalnızca kimlik doğrulama uygulamanızın QRCode\'u tarama sorunları varsa, bunu elle girmek veya uygulamayı kullanarak OTP donanımı yapılandırmak istiyorsanız buna ihtiyacınız olabilir.</string>
+    <string name="smscommunicator_otp_export_successful">OTP secret (Base32 formatında) dışa aktarıldı ve panoya kopyalandı. Doğrulayıcıya veya OTP donanım yazıcısına yapıştırın!</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Doğrulayıcıyı (Authenticator) yükleyin</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. AndroidAPS OTP kod kurulumu için QR kodu tarayın</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Tek Kullanımlık Parolayı (OTP) Test Edin</string>
+    <string name="smscommunicator_otp_reset_header">Doğrulayıcıları (Authenticators) Sıfırla</string>
+    <string name="smscommunicator_otp_install_info">Her takipçi telefonunda, RFC 6238 TOTP belirteçlerini destekleyen Kimlik Doğrulayıcı uygulamasını yükleyin. Popüler ücretsiz uygulamalar şunlardır:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_reset_warning">Doğrulayıcıyı (Authenticator) sıfırlayarak, önceden sağlanmış tüm doğrulayıcıları geçersiz kılarsınız. Onları tekrar kurmanız gerekecek!</string>
+    <string name="overview_show_predictions">Tahminler</string>
+    <string name="overview_show_deviationslope">Sapma eğimi</string>
+    <string name="authorizationfailed">Yetkilendirme başarısız oldu</string>
+    <string name="overview_show_absinsulin">Mutlak insülin</string>
+    <string name="master_password_summary">Ana parola, yedekleme şifrelemesi ve uygulamanın güvenliği için kullanılır. Bu parolayı unutmayın ve güvenli bir yerde saklayın.</string>
+    <string name="current_master_password">Geçerli ana parola</string>
+    <string name="statuslights">Durum ışıkları</string>
+    <string name="statuslights_copy_ns">Ayarları NS\'den kopyala</string>
+    <string name="copyexistingvalues">NS ayarları kopyalansın mı (varsa)?</string>
+    <string name="classic_description">Orjinal tema</string>
+    <string name="lowres_description">Düşük çözünürlüklü tema</string>
+    <string name="buttonson_description">Düğmeler her zaman ekranın altında görüntülenir</string>
+    <string name="largedisplay_description">Büyük ekran</string>
+    <string name="skin">Tema</string>
+    <string name="comapareprofile">Profilleri karşılaştırın</string>
+    <string name="nav_profilehelper">Profil yardımcısı</string>
+    <string name="motoldefaultprofile">Varsayılan profil</string>
+    <string name="currentprofile">Mevcut profil</string>
+    <string name="availableprofile">Kullanılabilir profil</string>
+    <string name="profiletype">Profil tipi</string>
+    <string name="formatwithtdd">Yaş: %1$.0f Top.Gün.Doz: %2$.0f Ü</string>
+    <string name="formatwittddandpct">Yaş: %1$.0f Top.Gün.Doz: %2$.0f Ü %3$d%%</string>
+    <string name="formatwithweight">Yaş: %1$.0f Ağırlık: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% bazalın</string>
+    <string name="dpvdefaultprofile">DPV Varsayılan profil</string>
+    <string name="setupwizard_pump_riley_link_status">RileyLink durumu:</string>
+    <string name="filter">Filtre</string>
+    <string name="copytolocalprofile_invalid">Profil oluşturulamıyor. Profil geçersiz.</string>
+    <string name="cta_dont_kill_my_app_info">Uygulamamı devre dışı bırakma?</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Pompa ulaşılamazsa SMS gönder</string>
+    <string name="smscommunicator_pump_ureachable">Pompaya ulaşılamadığını bildir</string>
+    <string name="advisoralarm">Yemek zamanı alarmı çalıştır</string>
+    <string name="alarminxmin">Alarmı %1$d dakika içinde çalıştır</string>
+    <string name="bolusadvisor">Bolus danışmanı</string>
+    <string name="bolusadvisormessage">Yüksek glisemiksiniz. Şimdi yemek yemek yerine daha iyi glisemi beklemeniz önerilir. Şimdi bir düzeltme bolusu yapmak ve yemek zamanı geldiğinde size hatırlatmak ister misiniz? Bu durumda karbonhidrat kaydı yapılmaz ve size hatırlattığımızda sihirbazı tekrar kullanmanız gerekir.</string>
+    <string name="enablebolusadvisor">Bolus danışmanını etkinleştir</string>
+    <string name="enablebolusadvisor_summary">Yüksek glisemi sırasında sihirbaz sonucu yerine daha sonra yemeye başlamak için hatırlatıcı kullanın (\"pre-bolus\")</string>
+    <string name="time_to_eat">Yemek zamanı!\nBolus sihirbazını çalıştırın ve yeniden hesaplama yapın.</string>
+    <string name="timetoeat">Yemek zamanı</string>
+    <string name="bolusreminder">Bolus hatırlatıcısı</string>
+    <string name="enablebolusreminder">Bolus hatırlatıcıyı etkinleştir</string>
+    <string name="enablebolusreminder_summary">Sihirbazla daha sonra bolus için hatırlatıcı kullanın
+         (\"bolus sonrası\")</string>
+    <string name="time_to_bolus">Bolus zamanı!\nBolus sihirbazını çalıştırın ve yeniden hesaplama yapın.</string>
+    <string name="fabric_upload_disabled">Çökme günlükleri yükleme devre dışı bırakıldı!</string>
+    <string name="graph_menu_divider_header">Grafik</string>
+    <string name="chart_menu">Grafik menüsü</string>
+    <string name="clear_filter">Filtreyi temizle</string>
+    <string name="trend_arrow">Trend oku</string>
+    <string name="cannula">Kanül</string>
+    <string name="userentry">Kullanıcı girişi</string>
+    <string name="common_values">Genellikle yediğiniz en büyük yiyeceğin değerlerini kullanın\n</string>
+    <string name="summary_email_for_crash_report">Bu e-posta adresi, acil durumlarda sizinle iletişim kurabilmemiz için çökme raporlarına eklenecektir. (İsteğe bağlı.)</string>
+    <string name="email_address">E-posta adresi</string>
+    <string name="privacy_settings">Gizlilik ayarı</string>
+    <string name="privacy_summary">Uygulama çökmeleri hakkında bilgilendirilmek istiyorsanız isteğe bağlı e-posta adresi sağlayabilirsiniz. Bu otomatik bir hizmet değildir. Tehlikeli durumlarda geliştiriciler sizinle iletişime geçecektir.</string>
+    <string name="full_sync">Tam senkronizasyon</string>
+    <string name="full_sync_comment">Tam senkronizasyon? Birkaç saat sürebilir ve bitene kadar NS\'ta yeni veriler göremeyeceksiniz.</string>
+    <string name="prime">Doldur</string>
+    <string name="ns_sync_options">Senkronizasyon</string>
+    <string name="ns_upload_summary">Profiller, boluslar, karbonhidratlar, geçici bazallar NS\'a yüklenir</string>
+    <string name="ns_upload">Verileri NS\'a yükleyin</string>
+    <string name="ns_receive_profile_store">Profil deposunu al</string>
+    <string name="ns_receive_profile_store_summary">NS profil düzenleyicisinden profilleri senkronize edin</string>
+    <string name="ns_receive_temp_target">Geçici hedefleri al</string>
+    <string name="ns_receive_temp_target_summary">NS veya NSClient aracılığıyla girilen geçici hedefleri kabul edin</string>
+    <string name="ns_receive_profile_switch">Profil değişimlerini al</string>
+    <string name="ns_receive_profile_switch_summary">NS veya NSClient aracılığıyla girilen profil değişimlerini kabul edin</string>
+    <string name="ns_receive_offline_event">APS çevrimdışı olaylarını alın</string>
+    <string name="ns_receive_offline_event_summary">NS veya NSClient aracılığıyla girilen APS çevrimdışı olaylarını kabul edin</string>
+    <string name="ns_receive_insulin">İnsülinleri alın</string>
+    <string name="ns_receive_insulin_summary">NS veya NSClient aracılığıyla girilen insülini kabul edin (iletilmez, yalnızca aktif insüline göre (IOB) hesaplanır)</string>
+    <string name="ns_receive_carbs">Karbonhidratları alın</string>
+    <string name="ns_receive_carbs_summary">NS veya NSClient aracılığıyla girilen karbonhidratları kabul edin</string>
+    <string name="ns_receive_therapy_events">Terapi etkinlikleri alın</string>
+    <string name="ns_receive_therapy_events_summary">NS veya NSClient aracılığıyla girilen tedavi olaylarını (kanül, insülin, pil değişimi vb.) kabul edin</string>
+    <string name="ns_receive_cgm">SGİ (CGM) verilerini alma/doldurma</string>
+    <string name="ns_receive_cgm_summary">NS\'tan SGİ (CGM) verilerini kabul edin</string>
+    <string name="sms_timeout_while_wating">Önceki pompa iletişiminin bitmesini beklerken zaman aşımı</string>
+    <string name="smscommunicator_another_bolus_in_queue">Sırada başka bir bolus var. Daha sonra tekrar deneyin.</string>
+    <string name="calculation_in_progress">Hesaplanıyor</string>
+    <string name="missing_profile_name">Profil adı eksik</string>
+    <string name="error_in_ic_values">IC değerinde hata</string>
+    <string name="error_in_basal_values">Bazal değerlerde hata</string>
+    <string name="error_in_target_values">Hedef değerlerde hata</string>
+    <string name="error_in_isf_values">ISF değerinde hata</string>
+    <string name="run_question">Yürüt %s?</string>
+    <string name="invalid_profile_not_accepted">Geçersiz profil %1$s NS tarafından kabul edilmiyor</string>
+    <string name="view">Görünüm</string>
+    <string name="errors">Hatalar</string>
+    <string name="ns_sync_slow">Yüklemeleri yavaşlat</string>
+    <string name="data_status">KŞ veri durumu</string>
+    <string name="recalculated_data_used">Kullanılan veriler yeniden hesaplandı</string>
+    <string name="bg_too_close">KŞ çok yakın:\n%1$s\n%2$s</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b82944f1127..285e94067c7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -71,7 +71,6 @@
     <string name="overview">首页概览</string>
     <string name="treatments">治疗</string>
     <string name="virtualpump">虚拟泵</string>
-    <string name="careportal">护理记录</string>
     <string name="configbuilder_pump">胰岛素泵</string>
     <string name="configbuilder_pump_description">你想用 AndroidAPS连接哪个胰岛素泵？</string>
     <string name="configbuilder_profile">配置文件</string>
@@ -195,7 +194,6 @@
     <string name="ongoingnotificaction">持续的的通知</string>
     <string name="old_data">旧数据</string>
     <string name="sms_minago">%1$d分钟前</string>
-    <string name="localprofile">本地配置文件</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">%1$d 元素的数组. \n 实际值:</string>
     <string name="openapsma_autosensdata_label">Autosens 数据</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 015695e7c0d..0453fe87bba 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -92,9 +92,10 @@
 
     <string-array name="virtualPumpTypes">
         <item>Generic AAPS</item>
-        <item>Accu-Chek Spirit</item>
         <item>Accu-Chek Combo</item>
+        <item>Accu-Chek Spirit</item>
         <item>Accu-Chek Insight</item>
+        <item>Accu-Chek Solo</item>
         <item>Animas Ping</item>
         <item>Animas Vibe</item>
         <item>Cellnovo</item>
@@ -102,13 +103,16 @@
         <item>DanaR Korean</item>
         <item>DanaRS</item>
         <item>DanaRv2</item>
-        <item>Insulet Omnipod</item>
+        <item>DanaI</item>
+        <item>Diaconn G8</item>
         <item>Medtronic 512/712</item>
         <item>Medtronic 515/715</item>
         <item>Medtronic 522/722</item>
         <item>Medtronic 523/723 (Revel)</item>
         <item>Medtronic 554/754 (Veo)</item>
         <item>Medtronic 640G</item>
+        <item>Omnipod Dash</item>
+        <item>Omnipod Eros</item>
         <item>Tandem t:slim</item>
         <item>Tandem t:flex</item>
         <item>Tandem t:slim G4</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5f3225f2a13..de7f713d30f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -20,9 +20,6 @@
     <color name="error_background">#66FC0000</color>
     <color name="ok_background">#323232</color>
 
-    <color name="defaultbackground">#424242</color>
-    <color name="defaulttextcolor">#B3FFFFFF</color>
-
     <color name="tempTargetBackground">#77dd77</color>
     <color name="exercise">#67DFE8</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e0fa882c684..db8266abdb9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,7 +33,9 @@
     <string name="key_absorption_category_settings" translatable="false">absorption_category_settings</string>
     <string name="key_insulin_oref_peak_settings" translatable="false">insulin_oref_peak_settings</string>
     <string name="key_ns_temporary_target_last_synced_id" translatable="false">ns_temporary_target_last_sync</string>
+    <string name="key_ns_temporary_target_new_data_id" translatable="false">temporary_target_new_data_id</string>
     <string name="key_ns_glucose_value_last_synced_id" translatable="false">ns_glucose_value_last_sync</string>
+    <string name="key_ns_glucose_value_new_data_id" translatable="false">ns_glucose_value_new_data_id</string>
     <string name="key_ns_food_last_synced_id" translatable="false">ns_food_last_sync</string>
     <string name="key_ns_therapy_event_last_synced_id" translatable="false">ns_therapy_event_last_sync</string>
     <string name="key_smscommunicator_remotebolusmindistance" translatable="false">smscommunicator_remotebolusmindistance</string>
@@ -44,12 +46,15 @@
     <string name="key_ns_bolus_last_synced_id" translatable="false">ns_bolus_last_synced_id</string>
     <string name="key_ns_device_status_last_synced_id" translatable="false">ns_device_status_last_synced_id</string>
     <string name="key_ns_temporary_basal_last_synced_id" translatable="false">ns_temporary_basal_last_synced_id</string>
+    <string name="key_ns_temporary_basal_new_data_id" translatable="false">ns_temporary_basal_new_data_id</string>
     <string name="key_ns_extended_bolus_last_synced_id" translatable="false">ns_extended_bolus_last_synced_id</string>
+    <string name="key_ns_extended_bolus_new_data_id" translatable="false">ns_extended_bolus_new_data_id</string>
     <string name="key_ns_profile_switch_last_synced_id" translatable="false">profile_switch_last_synced_id</string>
     <string name="key_ns_effective_profile_switch_last_synced_id" translatable="false">ns_effective_profile_switch_last_synced_id</string>
     <string name="key_ns_offline_event_last_synced_id" translatable="false">ns_offline_event_last_synced_id</string>
     <string name="key_ns_profile_store_last_synced_timestamp" translatable="false">ns_profile_store_last_synced_timestamp</string>
     <string name="key_local_profile_last_change" translatable="false">local_profile_last_change</string>
+    <string name="key_ns_sync_slow" translatable="false">ns_sync_slow</string>
 
     <string name="treatmentssafety_title">Treatments safety</string>
     <string name="treatmentssafety_maxbolus_title">Max allowed bolus [U]</string>
@@ -61,7 +66,6 @@
     <string name="nav_resetdb">Reset Databases</string>
     <string name="reset_db_confirm">Do you really want to reset the databases?</string>
     <string name="nav_exit">Exit</string>
-    <string name="ns_sync_use_absolute_title">Always use basal absolute values</string>
     <string name="alert_dialog_permission_battery_optimization_failed">This device does not appear to support battery optimization whitelisting - you may experience performance issues.</string>
 
     <string name="description_actions">Some buttons to quickly access common features</string>
@@ -130,7 +134,6 @@
     <string name="overview">Overview</string>
     <string name="treatments">Treatments</string>
     <string name="virtualpump">Virtual Pump</string>
-    <string name="careportal">Careportal</string>
 
 
     <string name="configbuilder_pump">Pump</string>
@@ -153,7 +156,7 @@
     <string name="safety">Safety</string>
     <string name="openapsma_disabled">Plugin is disabled</string>
     <string name="constraints_violation">Constraints violation</string>
-    <string name="treatmentdeliveryerror">Bolus delivery error</string>
+    <string name="treatmentdeliveryerror">Bolus reported an error. Manually check real delivered amount</string>
     <string name="setbasalquestion">Accept new temp basal:</string>
     <string name="overview_treatment_label">Treatment</string>
     <string name="overview_calculator_label">Calculator</string>
@@ -320,7 +323,7 @@
     <string name="ongoingnotificaction">Ongoing Notification</string>
     <string name="old_data">OLD DATA</string>
     <string name="sms_minago">%1$dmin ago</string>
-    <string name="localprofile">Local Profile</string>
+    <string name="localprofile">Profile</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Array of %1$d elements.\nActual value:</string>
     <string name="openapsma_autosensdata_label">Autosens data</string>
@@ -804,6 +807,8 @@
     <string name="time_elapsed">Time elapsed</string>
     <string name="poctech">Poctech</string>
     <string name="description_source_poctech">Receive BG values from Poctech app</string>
+    <string name="glunovo">Glunovo</string>
+    <string name="description_source_glunovo">Receive values from Glunovo app</string>
     <string name="description_source_tomato">Receive BG values from Tomato app (MiaoMiao device)</string>
     <string name="key_high_temptarget_raises_sensitivity" translatable="false">high_temptarget_raises_sensitivity</string>
     <string name="key_low_temptarget_lowers_sensitivity" translatable="false">low_temptarget_lowers_sensitivity</string>
@@ -824,8 +829,6 @@
     <string name="error_adding_treatment_title">Treatment data incomplete</string>
     <string name="maintenance_settings">Maintenance Settings</string>
     <string name="maintenance_email">Email recipient</string>
-    <string name="key_maintenance_encrypt_exported_prefs" translatable="false">maintenance_encrypt_exported_prefs</string>
-    <string name="maintenance_encrypt_exported_prefs">Encrypt exported settings</string>
     <string name="key_maintenance_logs_email" translatable="false">maintenance_logs_email</string>
     <string name="key_maintenance_logs_amount" translatable="false">maintenance_logs_amount</string>
     <string name="key_logshipper_amount" translatable="false">logshipper_amount</string>
@@ -843,6 +846,7 @@
     <string name="resettodefaults">Reset to defaults</string>
     <string name="nsmalfunction">NSClient malfunction. Consider NS and NSClient restart.</string>
     <string name="time_offset">Time offset</string>
+    <string name="bolus_reminder">Remind to bolus later</string>
     <string name="key_aps_mode" translatable="false">aps_mode</string>
     <string name="setupwizard_preferred_aps_mode">Preferred APS mode</string>
     <string name="treatments_wizard_total_label">Total</string>
@@ -903,6 +907,7 @@
 
     <string name="old_version">old version</string>
     <string name="very_old_version">very old version</string>
+    <string name="application_expired">Application expired</string>
     <string name="new_version_warning">New version for at least %1$d days available! Fallback to LGS after %2$d days, loop will be disabled after %3$d days</string>
     <string name="twohours">2h</string>
 
@@ -943,7 +948,7 @@
     <string name="clone_label">Clone</string>
     <string name="saveorresetchangesfirst">Save or reset current changes first</string>
     <string name="deletecurrentprofile">Delete current profile?</string>
-    <string name="copytolocalprofile">Create new local profile from this profile?</string>
+    <string name="copytolocalprofile">Create new profile from this profile?</string>
     <string name="profilenamecontainsdot">Profile name contains dots.\nThis is not supported by NS.\nProfile is not uploaded to NS.</string>
     <string name="low_mark_comment">Lower value of in range area (display only)</string>
     <string name="high_mark_comment">Higher value of in range area (display only)</string>
@@ -1050,7 +1055,7 @@
 
     <string name="setupwizard_pump_riley_link_status">RileyLink status:</string>
     <string name="filter">Filter</string>
-    <string name="copytolocalprofile_invalid">Unable to create local profile. Profile is invalid.</string>
+    <string name="copytolocalprofile_invalid">Unable to create profile. Profile is invalid.</string>
     <string name="cta_dont_kill_my_app_info">Don\'t kill my app?</string>
     <string name="key_smscommunicator_report_pump_ureachable" translatable="false">smscommunicator_report_pump_ureachable</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Send SMS if unreachable pump event is triggered</string>
@@ -1064,6 +1069,12 @@
     <string name="enablebolusadvisor_summary">Use reminder to start eating later instead of wizard result during high glycemia ("pre-bolus")</string>
     <string name="time_to_eat">Time to eat!\nRun Bolus wizard and do calculation again.</string>
     <string name="timetoeat">Time to eat</string>
+    <string name="bolusreminder">Bolus reminder</string>
+    <string name="key_usebolusreminder" translatable="false">use_bolus_reminder</string>
+    <string name="enablebolusreminder">Enable bolus reminder</string>
+    <string name="enablebolusreminder_summary">Use reminder to bolus later with wizard
+        ("post-bolus")</string>
+    <string name="time_to_bolus">Time to bolus!\nRun Bolus wizard and do calculation again.</string>
     <string name="fabric_upload_disabled">Crash logs upload disabled!</string>
     <string name="graph_menu_divider_header">Graph</string>
     <string name="chart_menu">Chart menu</string>
@@ -1076,7 +1087,8 @@
     <string name="email_address">Email address</string>
     <string name="privacy_settings">Privacy setting</string>
     <string name="privacy_summary">You can provide optional email address if you want to be notified about app crashes. This is not an automated service. You will be contacted by developers in dangerous situations.</string>
-    <string name="full_sync">Full sync</string>
+    <string name="full_sync">Full synchronization</string>
+    <string name="full_sync_comment">Full synchronization? It may take many hours and until finish you\'ll not see new data in NS.</string>
     <string name="prime">Prime</string>
     <string name="ns_sync_options">Synchronization</string>
     <string name="key_ns_upload" translatable="false">ns_upload</string>
@@ -1084,7 +1096,7 @@
     <string name="ns_upload">Upload data to NS</string>
     <string name="key_ns_receive_profile_store" translatable="false">ns_receive_profile_store</string>
     <string name="ns_receive_profile_store">Receive profile store</string>
-    <string name="ns_receive_profile_store_summary">Synchronize profiles from NS profile editor to Local profile</string>
+    <string name="ns_receive_profile_store_summary">Synchronize profiles from NS profile editor</string>
     <string name="key_ns_receive_temp_target" translatable="false">ns_receive_temp_target</string>
     <string name="ns_receive_temp_target">Receive temporary targets</string>
     <string name="ns_receive_temp_target_summary">Accept temporary targets entered through NS or NSClient</string>
@@ -1109,5 +1121,19 @@
     <string name="sms_timeout_while_wating">Timeout while waiting for finish of previous pump communication</string>
     <string name="smscommunicator_another_bolus_in_queue">There is another bolus in queue. Try again later.</string>
     <string name="calculation_in_progress">Calculation in progress</string>
+    <string name="missing_profile_name">Missing profile name</string>
+    <string name="error_in_ic_values">Error in IC values</string>
+    <string name="error_in_basal_values">Error in basal values</string>
+    <string name="error_in_target_values">Error in target values</string>
+    <string name="error_in_isf_values">Error in ISF values</string>
+    <string name="run_question">Run %s?</string>
+    <string name="invalid_profile_not_accepted">Invalid profile %1$s not accepted from NS</string>
+    <string name="view">View</string>
+    <string name="errors">Errors</string>
+    <string name="ns_sync_slow">Slow down uploads</string>
+    <string name="data_status">BG data status</string>
+    <string name="recalculated_data_used">Recalculated data used</string>
+    <string name="bg_too_close">BG too close:\n%1$s\n%2$s</string>
+    <string name="key_last_processed_glunovo_timestamp" translatable="false">last_processed_glunovo_timestamp</string>
 
 </resources>
diff --git a/app/src/main/res/xml/pref_maintenance.xml b/app/src/main/res/xml/pref_maintenance.xml
index 633411ed726..7d7a82fbab5 100644
--- a/app/src/main/res/xml/pref_maintenance.xml
+++ b/app/src/main/res/xml/pref_maintenance.xml
@@ -26,11 +26,6 @@
             validate:minNumber="1"
             validate:testType="numericRange"/>
 
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/key_maintenance_encrypt_exported_prefs"
-            android:title="@string/maintenance_encrypt_exported_prefs" />
-
     </PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml
index c9dbe2d1e57..208bb661681 100644
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@@ -156,7 +156,7 @@
         </androidx.preference.PreferenceScreen>
 
         <androidx.preference.PreferenceScreen
-            android:key="absorption_nsclient_advanced"
+            android:key="nsclient_advanced"
             android:title="@string/advancedsettings_title">
 
             <SwitchPreference
@@ -186,8 +186,8 @@
 
             <SwitchPreference
                 android:defaultValue="false"
-                android:key="@string/key_ns_sync_use_absolute"
-                android:title="@string/ns_sync_use_absolute_title" />
+                android:key="@string/key_ns_sync_slow"
+                android:title="@string/ns_sync_slow" />
 
         </androidx.preference.PreferenceScreen>
 
diff --git a/app/src/main/res/xml/pref_overview.xml b/app/src/main/res/xml/pref_overview.xml
index ad2367c9ee6..18c27d2d44f 100644
--- a/app/src/main/res/xml/pref_overview.xml
+++ b/app/src/main/res/xml/pref_overview.xml
@@ -502,6 +502,12 @@
                 android:summary="@string/enablesuperbolus_summary"
                 android:title="@string/enablesuperbolus" />
 
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_usebolusreminder"
+                android:summary="@string/enablebolusreminder_summary"
+                android:title="@string/enablebolusreminder" />
+
         </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
diff --git a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index ccbb41c2ba8..358e9b1299a 100644
--- a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -12,7 +12,7 @@ import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.ProfileStore
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -24,7 +24,7 @@ import org.mockito.Mock
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var iobCobCalculator: IobCobCalculator
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
@@ -32,7 +32,7 @@ open class TestBaseWithProfile : TestBase() {
     @Mock lateinit var context: Context
 
     lateinit var dateUtil: DateUtil
-    val rxBus = RxBusWrapper(aapsSchedulers)
+    val rxBus = RxBus(aapsSchedulers, aapsLogger)
 
     val profileInjector = HasAndroidInjector { AndroidInjector { } }
 
@@ -44,7 +44,9 @@ open class TestBaseWithProfile : TestBase() {
 
     @Before
     fun prepareMock() {
-        validProfileJSON = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+        validProfileJSON = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"3\"}," +
+            "{\"time\":\"2:00\",\"value\":\"3.4\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4.5\"}]," +
+            "\"target_high\":[{\"time\":\"00:00\",\"value\":\"7\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
         dateUtil = DateUtil(context)
         validProfile = ProfileSealed.Pure(pureProfileFromJson(JSONObject(validProfileJSON), dateUtil)!!)
         effectiveProfileSwitch = EffectiveProfileSwitch(
@@ -72,4 +74,4 @@ open class TestBaseWithProfile : TestBase() {
         json.put("store", store)
         return ProfileStore(profileInjector, json, dateUtil)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index 0e086f29570..68dd9ae32cd 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -47,7 +47,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
     @Mock lateinit var sp: SP
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var temporaryBasalStorage: TemporaryBasalStorage
     @Mock lateinit var glimpPlugin: GlimpPlugin
@@ -79,45 +79,45 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
                 it.dateUtil = dateUtil
             }
             if (it is PumpEnactResult) {
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
         }
     }
 
     @Before
     fun prepare() {
-        `when`(resourceHelper.gs(R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
-        `when`(resourceHelper.gs(R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
-        `when`(resourceHelper.gs(R.string.novalidbasalrate)).thenReturn("No valid basal rate read from pump")
-        `when`(resourceHelper.gs(R.string.autosensdisabledinpreferences)).thenReturn("Autosens disabled in preferences")
-        `when`(resourceHelper.gs(R.string.smbdisabledinpreferences)).thenReturn("SMB disabled in preferences")
-        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
-        `when`(resourceHelper.gs(R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
-        `when`(resourceHelper.gs(R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
-        `when`(resourceHelper.gs(R.string.maxbasalmultiplier)).thenReturn("max basal multiplier")
-        `when`(resourceHelper.gs(R.string.maxdailybasalmultiplier)).thenReturn("max daily basal multiplier")
-        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
-        `when`(resourceHelper.gs(R.string.limitingbolus)).thenReturn("Limiting bolus to %.1f U because of %s")
-        `when`(resourceHelper.gs(R.string.hardlimit)).thenReturn("hard limit")
-        `when`(resourceHelper.gs(R.string.key_child)).thenReturn("child")
-        `when`(resourceHelper.gs(R.string.limitingcarbs)).thenReturn("Limiting carbs to %d g because of %s")
-        `when`(resourceHelper.gs(R.string.limitingiob)).thenReturn("Limiting IOB to %.1f U because of %s")
-        `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
-        `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
-        `when`(resourceHelper.gs(R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
-        `when`(resourceHelper.gs(R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
-        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
-        `when`(resourceHelper.gs(R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
-        `when`(resourceHelper.gs(R.string.limitingpercentrate, 0, "it must be positive value")).thenReturn("")
-        `when`(resourceHelper.gs(R.string.limitingbolus, 3.0, "pump limit")).thenReturn("")
-        `when`(resourceHelper.gs(R.string.limitingbolus, 6.0, "pump limit")).thenReturn("")
-        `when`(resourceHelper.gs(R.string.limitingbasalratio, 0.8, "pump limit")).thenReturn("")
-        `when`(resourceHelper.gs(R.string.limitingpercentrate, 200, "pump limit")).thenReturn("")
-        `when`(resourceHelper.gs(R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump")
-        `when`(resourceHelper.gs(R.string.objectivenotstarted, 9)).thenReturn("Objective 9 not started")
-        `when`(resourceHelper.gs(R.string.objectivenotstarted, 8)).thenReturn("Objective 8 not started")
-        `when`(resourceHelper.gs(R.string.objectivenotstarted, 6)).thenReturn("Objective 6 not started")
-        `when`(resourceHelper.gs(R.string.objectivenotstarted, 1)).thenReturn("Objective 1 not started")
+        `when`(rh.gs(R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
+        `when`(rh.gs(R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
+        `when`(rh.gs(R.string.novalidbasalrate)).thenReturn("No valid basal rate read from pump")
+        `when`(rh.gs(R.string.autosensdisabledinpreferences)).thenReturn("Autosens disabled in preferences")
+        `when`(rh.gs(R.string.smbdisabledinpreferences)).thenReturn("SMB disabled in preferences")
+        `when`(rh.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(rh.gs(R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
+        `when`(rh.gs(R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
+        `when`(rh.gs(R.string.maxbasalmultiplier)).thenReturn("max basal multiplier")
+        `when`(rh.gs(R.string.maxdailybasalmultiplier)).thenReturn("max daily basal multiplier")
+        `when`(rh.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(rh.gs(R.string.limitingbolus)).thenReturn("Limiting bolus to %.1f U because of %s")
+        `when`(rh.gs(R.string.hardlimit)).thenReturn("hard limit")
+        `when`(rh.gs(R.string.key_child)).thenReturn("child")
+        `when`(rh.gs(R.string.limitingcarbs)).thenReturn("Limiting carbs to %d g because of %s")
+        `when`(rh.gs(R.string.limitingiob)).thenReturn("Limiting IOB to %.1f U because of %s")
+        `when`(rh.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
+        `when`(rh.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
+        `when`(rh.gs(R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
+        `when`(rh.gs(R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
+        `when`(rh.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(rh.gs(R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
+        `when`(rh.gs(R.string.limitingpercentrate, 0, "it must be positive value")).thenReturn("")
+        `when`(rh.gs(R.string.limitingbolus, 3.0, "pump limit")).thenReturn("")
+        `when`(rh.gs(R.string.limitingbolus, 6.0, "pump limit")).thenReturn("")
+        `when`(rh.gs(R.string.limitingbasalratio, 0.8, "pump limit")).thenReturn("")
+        `when`(rh.gs(R.string.limitingpercentrate, 200, "pump limit")).thenReturn("")
+        `when`(rh.gs(R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump")
+        `when`(rh.gs(R.string.objectivenotstarted, 9)).thenReturn("Objective 9 not started")
+        `when`(rh.gs(R.string.objectivenotstarted, 8)).thenReturn("Objective 8 not started")
+        `when`(rh.gs(R.string.objectivenotstarted, 6)).thenReturn("Objective 6 not started")
+        `when`(rh.gs(R.string.objectivenotstarted, 1)).thenReturn("Objective 1 not started")
 
         // RS constructor
         `when`(sp.getString(R.string.key_danars_address, "")).thenReturn("")
@@ -130,15 +130,15 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
 
         insightDbHelper = InsightDbHelper(insightDatabaseDao)
         danaPump = DanaPump(aapsLogger, sp, dateUtil, injector)
-        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, repository)
-        objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, ConfigImpl(), dateUtil, uel)
-        comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, sp, commandQueue, context, pumpSync, dateUtil)
-        danaRPlugin = DanaRPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, pumpSync)
-        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, profileFunction, sp, commandQueue, danaPump, pumpSync, detailedBolusInfoStorage, temporaryBasalStorage, fabricPrivacy, dateUtil)
-        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, sp, commandQueue, profileFunction, context, ConfigImpl(), dateUtil, insightDbHelper, pumpSync)
-        openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, iobCobCalculator, hardLimits, profiler, sp, dateUtil, repository, glucoseStatusProvider)
-        openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, iobCobCalculator, hardLimits, profiler, fabricPrivacy, dateUtil, repository, glucoseStatusProvider)
-        safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker,
+        hardLimits = HardLimits(aapsLogger, rxBus, sp, rh, context, repository)
+        objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, rh, activePlugin, sp, ConfigImpl(), dateUtil, uel)
+        comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, rh, profileFunction, sp, commandQueue, context, pumpSync, dateUtil)
+        danaRPlugin = DanaRPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, pumpSync)
+        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, profileFunction, sp, commandQueue, danaPump, pumpSync, detailedBolusInfoStorage, temporaryBasalStorage, fabricPrivacy, dateUtil)
+        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, rh, sp, commandQueue, profileFunction, context, ConfigImpl(), dateUtil, insightDbHelper, pumpSync)
+        openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, rh, profileFunction, context, activePlugin, iobCobCalculator, hardLimits, profiler, sp, dateUtil, repository, glucoseStatusProvider)
+        openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, rh, profileFunction, context, activePlugin, iobCobCalculator, hardLimits, profiler, fabricPrivacy, dateUtil, repository, glucoseStatusProvider)
+        safetyPlugin = SafetyPlugin(injector, aapsLogger, rh, sp, rxBus, constraintChecker,
                                     openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin,
                                     hardLimits, BuildHelperImpl(ConfigImpl(), fileListProvider), iobCobCalculator,
                                     ConfigImpl(), dateUtil)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
index 270414aae37..50f7692b8d5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
@@ -28,12 +28,12 @@ import org.mockito.Mockito.`when`
 class LoopPluginTest : TestBase() {
 
     @Mock lateinit var sp: SP
-    private val rxBus: RxBusWrapper = RxBusWrapper(aapsSchedulers)
+    private val rxBus: RxBus = RxBus(aapsSchedulers, aapsLogger)
     @Mock lateinit var constraintChecker: ConstraintChecker
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var context: Context
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
     @Mock lateinit var iobCobCalculator: IobCobCalculator
@@ -50,15 +50,15 @@ class LoopPluginTest : TestBase() {
     val injector = HasAndroidInjector { AndroidInjector { } }
     @Before fun prepareMock() {
 
-        loopPlugin = LoopPlugin(injector, aapsLogger, aapsSchedulers, rxBus, sp, ConfigImpl(), constraintChecker, resourceHelper, profileFunction, context, commandQueue, activePlugin, virtualPumpPlugin, iobCobCalculator, receiverStatusStore, fabricPrivacy, dateUtil, uel, repository, runningConfiguration)
+        loopPlugin = LoopPlugin(injector, aapsLogger, aapsSchedulers, rxBus, sp, ConfigImpl(), constraintChecker, rh, profileFunction, context, commandQueue, activePlugin, virtualPumpPlugin, iobCobCalculator, receiverStatusStore, fabricPrivacy, dateUtil, uel, repository, runningConfiguration)
         `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
         `when`(context.getSystemService(Context.NOTIFICATION_SERVICE)).thenReturn(notificationManager)
     }
 
     @Test
     fun testPluginInterface() {
-        `when`(resourceHelper.gs(R.string.loop)).thenReturn("Loop")
-        `when`(resourceHelper.gs(R.string.loop_shortname)).thenReturn("LOOP")
+        `when`(rh.gs(R.string.loop)).thenReturn("Loop")
+        `when`(rh.gs(R.string.loop_shortname)).thenReturn("LOOP")
         `when`(sp.getString(R.string.key_aps_mode, "open")).thenReturn("closed")
         val pumpDescription = PumpDescription()
         `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
@@ -71,13 +71,13 @@ class LoopPluginTest : TestBase() {
         Assert.assertEquals(R.xml.pref_loop.toLong(), loopPlugin.preferencesId.toLong())
 
         // Plugin is disabled by default
-        Assert.assertEquals(false, loopPlugin.isEnabled(PluginType.LOOP))
+        Assert.assertEquals(false, loopPlugin.isEnabled())
         loopPlugin.setPluginEnabled(PluginType.LOOP, true)
-        Assert.assertEquals(true, loopPlugin.isEnabled(PluginType.LOOP))
+        Assert.assertEquals(true, loopPlugin.isEnabled())
 
         // No temp basal capable pump should disable plugin
         virtualPumpPlugin.pumpDescription.isTempBasalCapable = false
-        Assert.assertEquals(false, loopPlugin.isEnabled(PluginType.LOOP))
+        Assert.assertEquals(false, loopPlugin.isEnabled())
         virtualPumpPlugin.pumpDescription.isTempBasalCapable = true
 
         // Fragment is hidden by default
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt
index 9b6a5fde7dc..4d198b4dd0c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
@@ -16,7 +16,7 @@ import org.mockito.Mock
 class ConfigBuilderPluginTest : TestBase() {
 
     @Mock lateinit var sp: SP
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var uel: UserEntryLogger
     @Mock lateinit var pumpSync: PumpSync
@@ -32,6 +32,6 @@ class ConfigBuilderPluginTest : TestBase() {
 
     @Before
     fun prepareMock() {
-        configBuilderPlugin = ConfigBuilderPlugin(injector, aapsLogger, resourceHelper, sp, RxBusWrapper(aapsSchedulers), activePlugin, uel, pumpSync)
+        configBuilderPlugin = ConfigBuilderPlugin(injector, aapsLogger, rh, sp, RxBus(aapsSchedulers, aapsLogger), activePlugin, uel, pumpSync)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt
new file mode 100644
index 00000000000..5cc254333c8
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt
@@ -0,0 +1,196 @@
+package info.nightscout.androidaps.plugins.constraints.bgQualityCheck
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.database.entities.GlucoseValue
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.IobCobCalculator
+import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito
+import java.util.*
+
+class BgQualityCheckPluginTest : TestBase() {
+
+    @Mock lateinit var rh: ResourceHelper
+    @Mock lateinit var iobCobCalculator: IobCobCalculator
+    @Mock lateinit var fabricPrivacy: FabricPrivacy
+
+    private lateinit var plugin: BgQualityCheckPlugin
+
+    val injector = HasAndroidInjector { AndroidInjector { } }
+    private val autosensDataStore = AutosensDataStore()
+
+    @Before
+    fun mock() {
+        plugin = BgQualityCheckPlugin(injector, aapsLogger, rh, RxBus(aapsSchedulers, aapsLogger), iobCobCalculator, aapsSchedulers, fabricPrivacy)
+        Mockito.`when`(iobCobCalculator.ads).thenReturn(autosensDataStore)
+    }
+
+    @Test
+    fun runTest() {
+        autosensDataStore.lastUsed5minCalculation = null
+        plugin.processBgData()
+        Assert.assertEquals(BgQualityCheckPlugin.State.UNKNOWN, plugin.state)
+        Assert.assertEquals(0, plugin.icon())
+        autosensDataStore.lastUsed5minCalculation = true
+        plugin.processBgData()
+        Assert.assertEquals(BgQualityCheckPlugin.State.FIVE_MIN_DATA, plugin.state)
+        Assert.assertEquals(0, plugin.icon())
+        autosensDataStore.lastUsed5minCalculation = false
+        plugin.processBgData()
+        Assert.assertEquals(BgQualityCheckPlugin.State.RECALCULATED, plugin.state)
+        Assert.assertEquals(R.drawable.ic_baseline_warning_24_yellow, plugin.icon())
+
+        val superData: MutableList<GlucoseValue> = ArrayList()
+        superData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = T.mins(20).msecs(), sourceSensor = GlucoseValue.SourceSensor.UNKNOWN, trendArrow = GlucoseValue.TrendArrow.FLAT))
+        superData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = T.mins(15).msecs(), sourceSensor = GlucoseValue.SourceSensor.UNKNOWN, trendArrow = GlucoseValue.TrendArrow.FLAT))
+        superData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = T.mins(10).msecs(), sourceSensor = GlucoseValue.SourceSensor.UNKNOWN, trendArrow = GlucoseValue.TrendArrow.FLAT))
+        superData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = T.mins(5).msecs(), sourceSensor = GlucoseValue.SourceSensor.UNKNOWN, trendArrow = GlucoseValue.TrendArrow.FLAT))
+        autosensDataStore.bgReadings = superData
+
+        autosensDataStore.lastUsed5minCalculation = true
+        plugin.processBgData()
+        Assert.assertEquals(BgQualityCheckPlugin.State.FIVE_MIN_DATA, plugin.state)
+        autosensDataStore.lastUsed5minCalculation = false
+        plugin.processBgData()
+        Assert.assertEquals(BgQualityCheckPlugin.State.RECALCULATED, plugin.state)
+
+        val duplicatedData: MutableList<GlucoseValue> = ArrayList()
+        duplicatedData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(20).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.UNKNOWN,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        duplicatedData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(20).msecs() + 1,
+                sourceSensor = GlucoseValue.SourceSensor.UNKNOWN,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        duplicatedData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(10).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.UNKNOWN,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        duplicatedData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(15).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.UNKNOWN,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        duplicatedData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(5).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.UNKNOWN,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        autosensDataStore.bgReadings = duplicatedData
+
+        autosensDataStore.lastUsed5minCalculation = true
+        plugin.processBgData()
+        Assert.assertEquals(BgQualityCheckPlugin.State.DOUBLED, plugin.state)
+        Assert.assertEquals(R.drawable.ic_baseline_warning_24_red, plugin.icon())
+
+        val identicalData: MutableList<GlucoseValue> = ArrayList()
+        identicalData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(20).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.UNKNOWN,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        identicalData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(20).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.UNKNOWN,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        identicalData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(10).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.UNKNOWN,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        identicalData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(15).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.UNKNOWN,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        identicalData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(5).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.UNKNOWN,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        autosensDataStore.bgReadings = identicalData
+
+        autosensDataStore.lastUsed5minCalculation = false
+        plugin.processBgData()
+        Assert.assertEquals(BgQualityCheckPlugin.State.DOUBLED, plugin.state)
+    }
+
+    @Test
+    fun isLoopInvocationAllowedTest() {
+        plugin.state = BgQualityCheckPlugin.State.UNKNOWN
+        Assert.assertEquals(true, plugin.isLoopInvocationAllowed(Constraint(true)).value())
+        plugin.state = BgQualityCheckPlugin.State.FIVE_MIN_DATA
+        Assert.assertEquals(true, plugin.isLoopInvocationAllowed(Constraint(true)).value())
+        plugin.state = BgQualityCheckPlugin.State.RECALCULATED
+        Assert.assertEquals(true, plugin.isLoopInvocationAllowed(Constraint(true)).value())
+        plugin.state = BgQualityCheckPlugin.State.DOUBLED
+        Assert.assertEquals(false, plugin.isLoopInvocationAllowed(Constraint(true)).value())
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt
index 829ca48d4e4..69a9563dbbb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
@@ -18,7 +18,7 @@ import java.util.*
 
 class DstHelperPluginTest : TestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var sp: SP
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var loopPlugin: LoopPlugin
@@ -29,7 +29,8 @@ class DstHelperPluginTest : TestBase() {
 
     @Before
     fun mock() {
-        plugin = DstHelperPlugin(injector, aapsLogger, RxBusWrapper(aapsSchedulers), resourceHelper, sp, activePlugin, loopPlugin)
+        plugin = DstHelperPlugin(injector, aapsLogger, RxBus(aapsSchedulers, aapsLogger), rh,
+                                 sp, activePlugin, loopPlugin)
     }
 
     @Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
index 795a6776957..f8a24417d27 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
@@ -20,7 +20,7 @@ import org.mockito.Mockito.`when`
 
 class ObjectivesPluginTest : TestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var sp: SP
     @Mock lateinit var dateUtil: DateUtil
@@ -32,19 +32,19 @@ class ObjectivesPluginTest : TestBase() {
         AndroidInjector {
             if (it is Objective) {
                 it.sp = sp
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.dateUtil = dateUtil
             }
         }
     }
 
     @Before fun prepareMock() {
-        objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, ConfigImpl(), dateUtil, uel)
+        objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, rh, activePlugin, sp, ConfigImpl(), dateUtil, uel)
         objectivesPlugin.onStart()
-        `when`(resourceHelper.gs(R.string.objectivenotstarted, 9)).thenReturn("Objective 9 not started")
-        `when`(resourceHelper.gs(R.string.objectivenotstarted, 8)).thenReturn("Objective 8 not started")
-        `when`(resourceHelper.gs(R.string.objectivenotstarted, 6)).thenReturn("Objective 6 not started")
-        `when`(resourceHelper.gs(R.string.objectivenotstarted, 1)).thenReturn("Objective 1 not started")
+        `when`(rh.gs(R.string.objectivenotstarted, 9)).thenReturn("Objective 9 not started")
+        `when`(rh.gs(R.string.objectivenotstarted, 8)).thenReturn("Objective 8 not started")
+        `when`(rh.gs(R.string.objectivenotstarted, 6)).thenReturn("Objective 6 not started")
+        `when`(rh.gs(R.string.objectivenotstarted, 1)).thenReturn("Objective 1 not started")
     }
 
     @Test fun notStartedObjectivesShouldLimitLoopInvocation() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
index bc54c57e09e..566db83f186 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
@@ -46,30 +46,30 @@ class SafetyPluginTest : TestBaseWithProfile() {
 
     @Before
     fun prepare() {
-        `when`(resourceHelper.gs(R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s")
-        `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
-        `when`(resourceHelper.gs(R.string.limitingiob)).thenReturn("Limiting IOB to %1\$.1f U because of %2\$s")
-        `when`(resourceHelper.gs(R.string.limitingcarbs)).thenReturn("Limiting carbs to %1\$d g because of %2\$s")
-        `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
-        `when`(resourceHelper.gs(R.string.pumpisnottempbasalcapable)).thenReturn("Pump is not temp basal capable")
-        `when`(resourceHelper.gs(R.string.increasingmaxbasal)).thenReturn("Increasing max basal value because setting is lower than your max basal in profile")
-        `when`(resourceHelper.gs(R.string.smbdisabledinpreferences)).thenReturn("SMB disabled in preferences")
-        `when`(resourceHelper.gs(R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
-        `when`(resourceHelper.gs(R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
-        `when`(resourceHelper.gs(R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
-        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
-        `when`(resourceHelper.gs(R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
-        `when`(resourceHelper.gs(R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
-        `when`(resourceHelper.gs(R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
-        `when`(resourceHelper.gs(R.string.maxbasalmultiplier)).thenReturn("max basal multiplier")
-        `when`(resourceHelper.gs(R.string.maxdailybasalmultiplier)).thenReturn("max daily basal multiplier")
-        `when`(resourceHelper.gs(R.string.hardlimit)).thenReturn("hard limit")
-        `when`(resourceHelper.gs(R.string.key_child)).thenReturn("child")
+        `when`(rh.gs(R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s")
+        `when`(rh.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
+        `when`(rh.gs(R.string.limitingiob)).thenReturn("Limiting IOB to %1\$.1f U because of %2\$s")
+        `when`(rh.gs(R.string.limitingcarbs)).thenReturn("Limiting carbs to %1\$d g because of %2\$s")
+        `when`(rh.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
+        `when`(rh.gs(R.string.pumpisnottempbasalcapable)).thenReturn("Pump is not temp basal capable")
+        `when`(rh.gs(R.string.increasingmaxbasal)).thenReturn("Increasing max basal value because setting is lower than your max basal in profile")
+        `when`(rh.gs(R.string.smbdisabledinpreferences)).thenReturn("SMB disabled in preferences")
+        `when`(rh.gs(R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
+        `when`(rh.gs(R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
+        `when`(rh.gs(R.string.itmustbepositivevalue)).thenReturn("it must be positive value")
+        `when`(rh.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(rh.gs(R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
+        `when`(rh.gs(R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode")
+        `when`(rh.gs(R.string.maxvalueinpreferences)).thenReturn("max value in preferences")
+        `when`(rh.gs(R.string.maxbasalmultiplier)).thenReturn("max basal multiplier")
+        `when`(rh.gs(R.string.maxdailybasalmultiplier)).thenReturn("max daily basal multiplier")
+        `when`(rh.gs(R.string.hardlimit)).thenReturn("hard limit")
+        `when`(rh.gs(R.string.key_child)).thenReturn("child")
 
         `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
         `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
-        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, repository)
-        safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, iobCobCalculator, ConfigImpl(), dateUtil)
+        hardLimits = HardLimits(aapsLogger, rxBus, sp, rh, context, repository)
+        safetyPlugin = SafetyPlugin(injector, aapsLogger, rh, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, iobCobCalculator, ConfigImpl(), dateUtil)
     }
 
     @Test fun pumpDescriptionShouldLimitLoopInvocation() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt
index b54fd71efd4..abc82bdbe49 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
@@ -13,16 +13,16 @@ import org.mockito.Mock
 
 class SignatureVerifierPluginTest : TestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var sp: SP
     @Mock lateinit var context: Context
-    private val rxBus = RxBusWrapper(aapsSchedulers)
+    private val rxBus = RxBus(aapsSchedulers, aapsLogger)
 
     val injector = HasAndroidInjector { AndroidInjector { } }
 
     @Test
     fun singleCharUnMapTest() {
-        val plugin = SignatureVerifierPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, context)
+        val plugin = SignatureVerifierPlugin(injector, aapsLogger, rh, sp, rxBus, context)
         val key = "2ΙšÄΠΒϨÒÇeЄtЄЗž-*Ж*ZcHijЊÄœ<|x\"Ε"
         val unmapped = plugin.singleCharUnMap(key)
         Assert.assertEquals("32:99:61:C4:A0:92:E8:D2:C7:65:04:74:04:17:7E:2D:2A:16:2A:5A:63:48:69:6A:0A:C4:53:3C:7C:78:22:95", unmapped)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.kt
index 780fc29a0a9..770cb6153b7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Before
@@ -17,29 +17,29 @@ import org.mockito.Mockito.anyLong
 
 class StorageConstraintPluginTest : TestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    private val rxBusWrapper = RxBusWrapper(aapsSchedulers)
+    @Mock lateinit var rh: ResourceHelper
+    private val rxBusWrapper = RxBus(aapsSchedulers, aapsLogger)
 
     private lateinit var storageConstraintPlugin: StorageConstraintPlugin
 
     @Before fun prepareMock() {
-        storageConstraintPlugin = StorageConstraintPlugin({ AndroidInjector { } }, aapsLogger, resourceHelper, rxBusWrapper)
-        `when`(resourceHelper.gs(anyInt(), anyLong())).thenReturn("")
+        storageConstraintPlugin = StorageConstraintPlugin({ AndroidInjector { } }, aapsLogger, rh, rxBusWrapper)
+        `when`(rh.gs(anyInt(), anyLong())).thenReturn("")
     }
 
     class MockedStorageConstraintPlugin constructor(
         injector: HasAndroidInjector,
         aapsLogger: AAPSLogger,
-        resourceHelper: ResourceHelper,
-        rxBus: RxBusWrapper
-    ) : StorageConstraintPlugin(injector, aapsLogger, resourceHelper, rxBus) {
+        rh: ResourceHelper,
+        rxBus: RxBus
+    ) : StorageConstraintPlugin(injector, aapsLogger, rh, rxBus) {
 
         var memSize = 150L
         override fun availableInternalMemorySize(): Long = memSize
     }
 
     @Test fun isLoopInvocationAllowedTest() {
-        val mocked = MockedStorageConstraintPlugin({ AndroidInjector { } }, aapsLogger, resourceHelper, rxBusWrapper)
+        val mocked = MockedStorageConstraintPlugin({ AndroidInjector { } }, aapsLogger, rh, rxBusWrapper)
         // Set free space under 200(Mb) to disable loop
         mocked.memSize = 150L
         Assert.assertEquals(false, mocked.isClosedLoopAllowed(Constraint(true)).value())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/versionChecker/AllowedVersionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/versionChecker/AllowedVersionsTest.kt
index d472f0ebc2a..1b14ba64d05 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/versionChecker/AllowedVersionsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/versionChecker/AllowedVersionsTest.kt
@@ -1,5 +1,8 @@
 package info.nightscout.androidaps.plugins.constraints.versionChecker
 
+import org.joda.time.DateTime
+import org.joda.time.LocalDate
+import org.junit.Assert
 import org.junit.Assert.*
 import org.junit.Test
 
@@ -17,4 +20,27 @@ class AllowedVersionsTest {
         assertEquals("2.8.2", AllowedVersions().findByApi(definition, 27)?.getString("supported"))
         assertEquals("2.8.2", AllowedVersions().findByApi(definition, 28)?.getString("supported"))
     }
+
+    @Test
+    fun findByVersionTest() {
+        //val definition = AllowedVersions().generateSupportedVersions()
+        val definition = "[{\"minAndroid\":1,\"maxAndroid\":23},{\"minAndroid\":24,\"maxAndroid\":25,\"supported\":\"2.6.2\"},{\"minAndroid\":26,\"maxAndroid\":27,\"supported\":\"2.8.2\"},{\"minAndroid\":28,\"maxAndroid\":99,\"supported\":\"2.8.2\"},{\"endDate\":\"2021-11-07\",\"version\":\"2.9.0-beta1\"},{\"endDate\":\"2021-11-02\",\"version\":\"3.0-beta1\"},{\"endDate\":\"2021-11-04\",\"version\":\"3.0-beta2\"},{\"endDate\":\"2021-11-10\",\"version\":\"3.0-beta3\"},{\"endDate\":\"2021-11-14\",\"version\":\"3.0-beta4\"}\n" +
+            " ,{\"endDate\":\"2021-11-16\",\"version\":\"3.0-beta5\"}\n" +
+            "]"
+        assertNull(AllowedVersions().findByVersion(definition, "2.6.0"))
+        assertTrue(AllowedVersions().findByVersion(definition, "2.9.0-beta1")?.has("endDate") ?: false)
+        assertEquals("2021-11-07", AllowedVersions().findByVersion(definition, "2.9.0-beta1")?.getString("endDate"))
+    }
+
+    @Test
+    fun endDateToMilliseconds() {
+        val definition = AllowedVersions().generateSupportedVersions()
+        val endDate = AllowedVersions().endDateToMilliseconds(AllowedVersions().findByVersion(definition, "2.9.0-beta1")?.getString("endDate") ?: "1000/01/01")
+        val dateTime = LocalDate(endDate)
+        assertEquals(2021, dateTime.year)
+        assertEquals(11, dateTime.monthOfYear)
+        assertEquals(7, dateTime.dayOfMonth)
+
+        assertNull(AllowedVersions().endDateToMilliseconds("abdef"))
+    }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt
index 14ab61d1045..fbf57cd4671 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt
@@ -19,7 +19,7 @@ class MaintenancePluginTest : TestBase() {
 
     @Mock lateinit var injector: HasAndroidInjector
     @Mock lateinit var context: Context
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var sp: SP
     @Mock lateinit var nsSettingsStatus: NSSettingsStatus
     @Mock lateinit var buildHelper: BuildHelper
@@ -30,7 +30,7 @@ class MaintenancePluginTest : TestBase() {
 
     @Before
     fun mock() {
-        sut = MaintenancePlugin(injector, context, resourceHelper, sp, nsSettingsStatus, aapsLogger, buildHelper, ConfigImpl(), fileListProvider, loggerUtils)
+        sut = MaintenancePlugin(injector, context, rh, sp, nsSettingsStatus, aapsLogger, buildHelper, ConfigImpl(), fileListProvider, loggerUtils)
         `when`(loggerUtils.suffix).thenReturn(".log.zip")
         `when`(loggerUtils.logDirectory).thenReturn("src/test/res/logger")
         `when`(fileListProvider.ensureTempDirExists()).thenReturn(File("src/test/res/logger"))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt
index c4ae16c2d79..c9e688baa7d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.events.EventChargingState
 import info.nightscout.androidaps.events.EventNetworkChange
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -23,10 +23,10 @@ class NsClientReceiverDelegateTest : TestBase() {
 
     @Mock lateinit var context: Context
     @Mock lateinit var sp: SP
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
 
     lateinit var receiverStatusStore: ReceiverStatusStore
-    val rxBus = RxBusWrapper(aapsSchedulers)
+    val rxBus = RxBus(aapsSchedulers, aapsLogger)
 
     private var sut: NsClientReceiverDelegate? = null
 
@@ -37,7 +37,7 @@ class NsClientReceiverDelegateTest : TestBase() {
         `when`(sp.getInt(anyInt(), anyInt())).thenReturn(0)
         `when`(sp.getString(anyInt(), anyString())).thenReturn("")
 
-        sut = NsClientReceiverDelegate(rxBus, resourceHelper, sp, receiverStatusStore)
+        sut = NsClientReceiverDelegate(rxBus, rh, sp, receiverStatusStore)
     }
 
     @Test fun testCalculateStatusChargingState() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.kt
index 228c4aa8026..8d44fc66779 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.kt
@@ -22,7 +22,7 @@ import org.mockito.stubbing.Answer
 class AuthRequestTest : TestBase() {
 
     @Mock lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var otp: OneTimePassword
     @Mock lateinit var dateUtil: DateUtil
 
@@ -30,7 +30,7 @@ class AuthRequestTest : TestBase() {
         AndroidInjector {
             if (it is AuthRequest) {
                 it.aapsLogger = aapsLogger
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.smsCommunicatorPlugin = smsCommunicatorPlugin
                 it.otp = otp
                 it.dateUtil = dateUtil
@@ -42,7 +42,7 @@ class AuthRequestTest : TestBase() {
     private var actionCalled = false
 
     @Before fun prepareTests() {
-        `when`(resourceHelper.gs(R.string.sms_wrongcode)).thenReturn("Wrong code. Command cancelled.")
+        `when`(rh.gs(R.string.sms_wrongcode)).thenReturn("Wrong code. Command cancelled.")
         doAnswer(Answer { invocation: InvocationOnMock ->
             sentSms = invocation.getArgument(0)
             null
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
index a56824dd4c3..186c7a4465f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -50,7 +50,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
     @Mock lateinit var sp: SP
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var activePlugin: ActivePlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var loopPlugin: LoopPlugin
     @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
     @Mock lateinit var localProfilePlugin: LocalProfilePlugin
@@ -65,12 +65,12 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
     var injector: HasAndroidInjector = HasAndroidInjector {
         AndroidInjector {
             if (it is PumpEnactResult) {
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
             if (it is AuthRequest) {
                 it.aapsLogger = aapsLogger
                 it.smsCommunicatorPlugin = smsCommunicatorPlugin
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.otp = otp
                 it.dateUtil = dateUtil
                 it.commandQueue = commandQueue
@@ -98,7 +98,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         }))
         val glucoseStatusProvider = GlucoseStatusProvider(aapsLogger = aapsLogger, iobCobCalculator = iobCobCalculator, dateUtil = dateUtilMocked)
 
-        smsCommunicatorPlugin = SmsCommunicatorPlugin(injector, aapsLogger, resourceHelper, smsManager, aapsSchedulers, sp, constraintChecker, rxBus, profileFunction, fabricPrivacy, activePlugin, commandQueue, loopPlugin, iobCobCalculator, xdripCalibrations, otp, ConfigImpl(), dateUtilMocked, uel, glucoseStatusProvider, repository)
+        smsCommunicatorPlugin = SmsCommunicatorPlugin(injector, aapsLogger, rh, smsManager, aapsSchedulers, sp, constraintChecker, rxBus, profileFunction, fabricPrivacy, activePlugin, commandQueue, loopPlugin, iobCobCalculator, xdripCalibrations, otp, ConfigImpl(), dateUtilMocked, uel, glucoseStatusProvider, repository)
         smsCommunicatorPlugin.setPluginEnabled(PluginType.GENERAL, true)
         Mockito.doAnswer { invocation: InvocationOnMock ->
             val callback = invocation.getArgument<Callback>(1)
@@ -160,77 +160,78 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         `when`(otp.name()).thenReturn("User")
         `when`(otp.checkOTP(ArgumentMatchers.anyString())).thenReturn(OneTimePasswordValidationResult.OK)
 
-        `when`(resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)).thenReturn("Remote command is not allowed")
-        `when`(resourceHelper.gs(R.string.sms_wrongcode)).thenReturn("Wrong code. Command cancelled.")
-        `when`(resourceHelper.gs(R.string.sms_iob)).thenReturn("IOB:")
-        `when`(resourceHelper.gs(R.string.sms_lastbg)).thenReturn("Last BG:")
-        `when`(resourceHelper.gs(R.string.sms_minago)).thenReturn("%1\$dmin ago")
-        `when`(resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)).thenReturn("Remote command is not allowed")
-        `when`(resourceHelper.gs(R.string.smscommunicator_stopsmswithcode)).thenReturn("To disable the SMS Remote Service reply with code %1\$s.\\n\\nKeep in mind that you\\'ll able to reactivate it directly from the AAPS master smartphone only.")
-        `when`(resourceHelper.gs(R.string.smscommunicator_mealbolusreplywithcode)).thenReturn("To deliver meal bolus %1$.2fU reply with code %2\$s.")
-        `when`(resourceHelper.gs(R.string.smscommunicator_temptargetwithcode)).thenReturn("To set the Temp Target %1\$s reply with code %2\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_temptargetcancel)).thenReturn("To cancel Temp Target reply with code %1\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_stoppedsms)).thenReturn("SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone.")
-        `when`(resourceHelper.gs(R.string.smscommunicator_tt_set)).thenReturn("Target %1\$s for %2\$d minutes set successfully")
-        `when`(resourceHelper.gs(R.string.smscommunicator_tt_canceled)).thenReturn("Temp Target canceled successfully")
-        `when`(resourceHelper.gs(R.string.loopsuspendedfor)).thenReturn("Suspended (%1\$d m)")
-        `when`(resourceHelper.gs(R.string.loopisdisabled)).thenReturn("Loop is disabled")
-        `when`(resourceHelper.gs(R.string.smscommunicator_loopisenabled)).thenReturn("Loop is enabled")
-        `when`(resourceHelper.gs(R.string.wrongformat)).thenReturn("Wrong format")
-        `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.wrongTbrDuration), ArgumentMatchers.any())).thenAnswer { i: InvocationOnMock -> "TBR duration must be a multiple of " + i.arguments[1] + " minutes and greater than 0." }
-        `when`(resourceHelper.gs(R.string.smscommunicator_loophasbeendisabled)).thenReturn("Loop has been disabled")
-        `when`(resourceHelper.gs(R.string.smscommunicator_loophasbeenenabled)).thenReturn("Loop has been enabled")
-        `when`(resourceHelper.gs(R.string.smscommunicator_tempbasalcanceled)).thenReturn("Temp basal canceled")
-        `when`(resourceHelper.gs(R.string.smscommunicator_loopresumed)).thenReturn("Loop resumed")
-        `when`(resourceHelper.gs(R.string.smscommunicator_wrongduration)).thenReturn("Wrong duration")
-        `when`(resourceHelper.gs(R.string.smscommunicator_suspendreplywithcode)).thenReturn("To suspend loop for %1\$d minutes reply with code %2\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_loopsuspended)).thenReturn("Loop suspended")
-        `when`(resourceHelper.gs(R.string.smscommunicator_unknowncommand)).thenReturn("Unknown command or wrong reply")
-        `when`(resourceHelper.gs(R.string.notconfigured)).thenReturn("Not configured")
-        `when`(resourceHelper.gs(R.string.smscommunicator_profilereplywithcode)).thenReturn("To switch profile to %1\$s %2\$d%% reply with code %3\$s")
-        `when`(resourceHelper.gs(R.string.profileswitchcreated)).thenReturn("Profile switch created")
-        `when`(resourceHelper.gs(R.string.smscommunicator_basalstopreplywithcode)).thenReturn("To stop temp basal reply with code %1\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_basalpctreplywithcode)).thenReturn("To start basal %1\$d%% for %2\$d min reply with code %3\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_tempbasalset_percent)).thenReturn("Temp basal %1\$d%% for %2\$d min started successfully")
-        `when`(resourceHelper.gs(R.string.smscommunicator_basalreplywithcode)).thenReturn("To start basal %1$.2fU/h for %2\$d min reply with code %3\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_tempbasalset)).thenReturn("Temp basal %1$.2fU/h for %2\$d min started successfully")
-        `when`(resourceHelper.gs(R.string.smscommunicator_extendedstopreplywithcode)).thenReturn("To stop extended bolus reply with code %1\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_extendedcanceled)).thenReturn("Extended bolus canceled")
-        `when`(resourceHelper.gs(R.string.smscommunicator_extendedreplywithcode)).thenReturn("To start extended bolus %1$.2fU for %2\$d min reply with code %3\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_extendedset)).thenReturn("Extended bolus %1$.2fU for %2\$d min started successfully")
-        `when`(resourceHelper.gs(R.string.smscommunicator_bolusreplywithcode)).thenReturn("To deliver bolus %1$.2fU reply with code %2\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_bolusdelivered)).thenReturn("Bolus %1$.2fU delivered successfully")
-        `when`(resourceHelper.gs(R.string.smscommunicator_remotebolusnotallowed)).thenReturn("Remote bolus not available. Try again later.")
-        `when`(resourceHelper.gs(R.string.smscommunicator_calibrationreplywithcode)).thenReturn("To send calibration %1$.2f reply with code %2\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_calibrationsent)).thenReturn("Calibration sent. Receiving must be enabled in xDrip.")
-        `when`(resourceHelper.gs(R.string.smscommunicator_carbsreplywithcode)).thenReturn("To enter %1\$dg at %2\$s reply with code %3\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_carbsset)).thenReturn("Carbs %1\$dg entered successfully")
-        `when`(resourceHelper.gs(R.string.noprofile)).thenReturn("No profile loaded from NS yet")
-        `when`(resourceHelper.gs(R.string.pumpsuspended)).thenReturn("Pump suspended")
-        `when`(resourceHelper.gs(R.string.sms_delta)).thenReturn("Delta:")
-        `when`(resourceHelper.gs(R.string.sms_bolus)).thenReturn("Bolus:")
-        `when`(resourceHelper.gs(R.string.sms_basal)).thenReturn("Basal:")
-        `when`(resourceHelper.gs(R.string.cob)).thenReturn("COB")
-        `when`(resourceHelper.gs(R.string.smscommunicator_mealbolusdelivered)).thenReturn("Meal Bolus %1\$.2fU delivered successfully")
-        `when`(resourceHelper.gs(R.string.smscommunicator_mealbolusdelivered_tt)).thenReturn("Target %1\$s for %2\$d minutes")
-        `when`(resourceHelper.gs(R.string.sms_actualbg)).thenReturn("BG:")
-        `when`(resourceHelper.gs(R.string.sms_lastbg)).thenReturn("Last BG:")
-        `when`(resourceHelper.gs(R.string.smscommunicator_loopdisablereplywithcode)).thenReturn("To disable loop reply with code %1\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_loopenablereplywithcode)).thenReturn("To enable loop reply with code %1\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_loopresumereplywithcode)).thenReturn("To resume loop reply with code %1\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_pumpdisconnectwithcode)).thenReturn("To disconnect pump for %1d minutes reply with code %2\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_pumpconnectwithcode)).thenReturn("To connect pump reply with code %1\$s")
-        `when`(resourceHelper.gs(R.string.smscommunicator_reconnect)).thenReturn("Pump reconnected")
-        `when`(resourceHelper.gs(R.string.smscommunicator_pumpconnectfail)).thenReturn("Connection to pump failed")
-        `when`(resourceHelper.gs(R.string.smscommunicator_pumpdisconnected)).thenReturn("Pump disconnected")
-        `when`(resourceHelper.gs(R.string.smscommunicator_code_from_authenticator_for)).thenReturn("from Authenticator app for: %1\$s followed by PIN")
-        `when`(resourceHelper.gs(R.string.patient_name_default)).thenReturn("User")
-        `when`(resourceHelper.gsNotLocalised(R.string.loopsuspended)).thenReturn("Loop suspended")
-        `when`(resourceHelper.gsNotLocalised(R.string.smscommunicator_stoppedsms)).thenReturn("SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone.")
-        `when`(resourceHelper.gsNotLocalised(R.string.profileswitchcreated)).thenReturn("Profile switch created")
-        `when`(resourceHelper.gsNotLocalised(R.string.smscommunicator_tempbasalcanceled)).thenReturn("Temp basal canceled")
-        `when`(resourceHelper.gsNotLocalised(R.string.smscommunicator_calibrationsent)).thenReturn("Calibration sent. Receiving must be enabled in xDrip+.")
-        `when`(resourceHelper.gsNotLocalised(R.string.smscommunicator_tt_canceled)).thenReturn("Temp Target canceled successfully")
+        `when`(rh.gs(R.string.smscommunicator_remotecommandnotallowed)).thenReturn("Remote command is not allowed")
+        `when`(rh.gs(R.string.sms_wrongcode)).thenReturn("Wrong code. Command cancelled.")
+        `when`(rh.gs(R.string.sms_iob)).thenReturn("IOB:")
+        `when`(rh.gs(R.string.sms_lastbg)).thenReturn("Last BG:")
+        `when`(rh.gs(R.string.sms_minago)).thenReturn("%1\$dmin ago")
+        `when`(rh.gs(R.string.smscommunicator_remotecommandnotallowed)).thenReturn("Remote command is not allowed")
+        `when`(rh.gs(R.string.smscommunicator_stopsmswithcode)).thenReturn("To disable the SMS Remote Service reply with code %1\$s.\\n\\nKeep in mind that you\\'ll able to reactivate it directly from the AAPS master smartphone only.")
+        `when`(rh.gs(R.string.smscommunicator_mealbolusreplywithcode)).thenReturn("To deliver meal bolus %1$.2fU reply with code %2\$s.")
+        `when`(rh.gs(R.string.smscommunicator_temptargetwithcode)).thenReturn("To set the Temp Target %1\$s reply with code %2\$s")
+        `when`(rh.gs(R.string.smscommunicator_temptargetcancel)).thenReturn("To cancel Temp Target reply with code %1\$s")
+        `when`(rh.gs(R.string.smscommunicator_stoppedsms)).thenReturn("SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone.")
+        `when`(rh.gs(R.string.smscommunicator_tt_set)).thenReturn("Target %1\$s for %2\$d minutes set successfully")
+        `when`(rh.gs(R.string.smscommunicator_tt_canceled)).thenReturn("Temp Target canceled successfully")
+        `when`(rh.gs(R.string.loopsuspendedfor)).thenReturn("Suspended (%1\$d m)")
+        `when`(rh.gs(R.string.loopisdisabled)).thenReturn("Loop is disabled")
+        `when`(rh.gs(R.string.smscommunicator_loopisenabled)).thenReturn("Loop is enabled")
+        `when`(rh.gs(R.string.wrongformat)).thenReturn("Wrong format")
+        `when`(rh.gs(ArgumentMatchers.eq(R.string.wrongTbrDuration), ArgumentMatchers.any())).thenAnswer { i: InvocationOnMock -> "TBR duration must be a multiple of " + i.arguments[1] + " minutes and greater than 0." }
+        `when`(rh.gs(R.string.smscommunicator_loophasbeendisabled)).thenReturn("Loop has been disabled")
+        `when`(rh.gs(R.string.smscommunicator_loophasbeenenabled)).thenReturn("Loop has been enabled")
+        `when`(rh.gs(R.string.smscommunicator_tempbasalcanceled)).thenReturn("Temp basal canceled")
+        `when`(rh.gs(R.string.smscommunicator_loopresumed)).thenReturn("Loop resumed")
+        `when`(rh.gs(R.string.smscommunicator_wrongduration)).thenReturn("Wrong duration")
+        `when`(rh.gs(R.string.smscommunicator_suspendreplywithcode)).thenReturn("To suspend loop for %1\$d minutes reply with code %2\$s")
+        `when`(rh.gs(R.string.smscommunicator_loopsuspended)).thenReturn("Loop suspended")
+        `when`(rh.gs(R.string.smscommunicator_unknowncommand)).thenReturn("Unknown command or wrong reply")
+        `when`(rh.gs(R.string.notconfigured)).thenReturn("Not configured")
+        `when`(rh.gs(R.string.smscommunicator_profilereplywithcode)).thenReturn("To switch profile to %1\$s %2\$d%% reply with code %3\$s")
+        `when`(rh.gs(R.string.profileswitchcreated)).thenReturn("Profile switch created")
+        `when`(rh.gs(R.string.smscommunicator_basalstopreplywithcode)).thenReturn("To stop temp basal reply with code %1\$s")
+        `when`(rh.gs(R.string.smscommunicator_basalpctreplywithcode)).thenReturn("To start basal %1\$d%% for %2\$d min reply with code %3\$s")
+        `when`(rh.gs(R.string.smscommunicator_tempbasalset_percent)).thenReturn("Temp basal %1\$d%% for %2\$d min started successfully")
+        `when`(rh.gs(R.string.smscommunicator_basalreplywithcode)).thenReturn("To start basal %1$.2fU/h for %2\$d min reply with code %3\$s")
+        `when`(rh.gs(R.string.smscommunicator_tempbasalset)).thenReturn("Temp basal %1$.2fU/h for %2\$d min started successfully")
+        `when`(rh.gs(R.string.smscommunicator_extendedstopreplywithcode)).thenReturn("To stop extended bolus reply with code %1\$s")
+        `when`(rh.gs(R.string.smscommunicator_extendedcanceled)).thenReturn("Extended bolus canceled")
+        `when`(rh.gs(R.string.smscommunicator_extendedreplywithcode)).thenReturn("To start extended bolus %1$.2fU for %2\$d min reply with code %3\$s")
+        `when`(rh.gs(R.string.smscommunicator_extendedset)).thenReturn("Extended bolus %1$.2fU for %2\$d min started successfully")
+        `when`(rh.gs(R.string.smscommunicator_bolusreplywithcode)).thenReturn("To deliver bolus %1$.2fU reply with code %2\$s")
+        `when`(rh.gs(R.string.smscommunicator_bolusdelivered)).thenReturn("Bolus %1$.2fU delivered successfully")
+        `when`(rh.gs(R.string.smscommunicator_remotebolusnotallowed)).thenReturn("Remote bolus not available. Try again later.")
+        `when`(rh.gs(R.string.smscommunicator_calibrationreplywithcode)).thenReturn("To send calibration %1$.2f reply with code %2\$s")
+        `when`(rh.gs(R.string.smscommunicator_calibrationsent)).thenReturn("Calibration sent. Receiving must be enabled in xDrip.")
+        `when`(rh.gs(R.string.smscommunicator_carbsreplywithcode)).thenReturn("To enter %1\$dg at %2\$s reply with code %3\$s")
+        `when`(rh.gs(R.string.smscommunicator_carbsset)).thenReturn("Carbs %1\$dg entered successfully")
+        `when`(rh.gs(R.string.noprofile)).thenReturn("No profile loaded from NS yet")
+        `when`(rh.gs(R.string.pumpsuspended)).thenReturn("Pump suspended")
+        `when`(rh.gs(R.string.sms_delta)).thenReturn("Delta:")
+        `when`(rh.gs(R.string.sms_bolus)).thenReturn("Bolus:")
+        `when`(rh.gs(R.string.sms_basal)).thenReturn("Basal:")
+        `when`(rh.gs(R.string.cob)).thenReturn("COB")
+        `when`(rh.gs(R.string.smscommunicator_mealbolusdelivered)).thenReturn("Meal Bolus %1\$.2fU delivered successfully")
+        `when`(rh.gs(R.string.smscommunicator_mealbolusdelivered_tt)).thenReturn("Target %1\$s for %2\$d minutes")
+        `when`(rh.gs(R.string.sms_actualbg)).thenReturn("BG:")
+        `when`(rh.gs(R.string.sms_lastbg)).thenReturn("Last BG:")
+        `when`(rh.gs(R.string.smscommunicator_loopdisablereplywithcode)).thenReturn("To disable loop reply with code %1\$s")
+        `when`(rh.gs(R.string.smscommunicator_loopenablereplywithcode)).thenReturn("To enable loop reply with code %1\$s")
+        `when`(rh.gs(R.string.smscommunicator_loopresumereplywithcode)).thenReturn("To resume loop reply with code %1\$s")
+        `when`(rh.gs(R.string.smscommunicator_pumpdisconnectwithcode)).thenReturn("To disconnect pump for %1d minutes reply with code %2\$s")
+        `when`(rh.gs(R.string.smscommunicator_pumpconnectwithcode)).thenReturn("To connect pump reply with code %1\$s")
+        `when`(rh.gs(R.string.smscommunicator_reconnect)).thenReturn("Pump reconnected")
+        `when`(rh.gs(R.string.smscommunicator_pumpconnectfail)).thenReturn("Connection to pump failed")
+        `when`(rh.gs(R.string.smscommunicator_pumpdisconnected)).thenReturn("Pump disconnected")
+        `when`(rh.gs(R.string.smscommunicator_code_from_authenticator_for)).thenReturn("from Authenticator app for: %1\$s followed by PIN")
+        `when`(rh.gs(R.string.patient_name_default)).thenReturn("User")
+        `when`(rh.gs(R.string.invalidprofile)).thenReturn("Invalid profile !!!")
+        `when`(rh.gsNotLocalised(R.string.loopsuspended)).thenReturn("Loop suspended")
+        `when`(rh.gsNotLocalised(R.string.smscommunicator_stoppedsms)).thenReturn("SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone.")
+        `when`(rh.gsNotLocalised(R.string.profileswitchcreated)).thenReturn("Profile switch created")
+        `when`(rh.gsNotLocalised(R.string.smscommunicator_tempbasalcanceled)).thenReturn("Temp basal canceled")
+        `when`(rh.gsNotLocalised(R.string.smscommunicator_calibrationsent)).thenReturn("Calibration sent. Receiving must be enabled in xDrip+.")
+        `when`(rh.gsNotLocalised(R.string.smscommunicator_tt_canceled)).thenReturn("Temp Target canceled successfully")
 
     }
 
@@ -464,7 +465,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
 
         //NSCLIENT RESTART
-        `when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        `when`(loopPlugin.isEnabled()).thenReturn(true)
         `when`(loopPlugin.isSuspended).thenReturn(false)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "NSCLIENT RESTART")
@@ -474,7 +475,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("NSCLIENT RESTART"))
 
         //NSCLIENT BLA BLA
-        `when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        `when`(loopPlugin.isEnabled()).thenReturn(true)
         `when`(loopPlugin.isSuspended).thenReturn(false)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "NSCLIENT BLA BLA")
@@ -484,7 +485,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
 
         //NSCLIENT BLABLA
-        `when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        `when`(loopPlugin.isEnabled()).thenReturn(true)
         `when`(loopPlugin.isSuspended).thenReturn(false)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "NSCLIENT BLABLA")
@@ -707,6 +708,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To switch profile to someProfile 100% reply with code"))
 
         //PROFILE 1 90(OK)
+        `when`(profileFunction.createProfileSwitch(anyObject(), Mockito.anyString(), Mockito.anyInt(), Mockito.anyInt(), Mockito.anyInt(), anyLong())).thenReturn(true)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "PROFILE 1 90")
         smsCommunicatorPlugin.processSms(sms)
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
index 3c2edb886ff..0fb0290810d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinLyumjevPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinLyumjevPluginTest.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Insulin
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert.assertEquals
@@ -25,8 +25,8 @@ class InsulinLyumjevPluginTest {
 
     private lateinit var sut: InsulinLyumjevPlugin
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var rh: ResourceHelper
+    @Mock lateinit var rxBus: RxBus
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var aapsLogger: AAPSLogger
 
@@ -37,7 +37,7 @@ class InsulinLyumjevPluginTest {
 
     @Before
     fun setup() {
-        sut = InsulinLyumjevPlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger)
+        sut = InsulinLyumjevPlugin(injector, rh, profileFunction, rxBus, aapsLogger)
     }
 
     @Test
@@ -52,13 +52,13 @@ class InsulinLyumjevPluginTest {
 
     @Test
     fun commentStandardTextTest() {
-        `when`(resourceHelper.gs(eq(R.string.lyumjev))).thenReturn("Lyumjev")
+        `when`(rh.gs(eq(R.string.lyumjev))).thenReturn("Lyumjev")
         assertEquals("Lyumjev", sut.commentStandardText())
     }
 
     @Test
     fun getFriendlyNameTest() {
-        `when`(resourceHelper.gs(eq(R.string.lyumjev))).thenReturn("Lyumjev")
+        `when`(rh.gs(eq(R.string.lyumjev))).thenReturn("Lyumjev")
         assertEquals("Lyumjev", sut.friendlyName)
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.kt
index 112585e8e0e..dcd01949cd7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Insulin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefBasePlugin.Companion.MIN_DIA
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -30,12 +30,12 @@ class InsulinOrefBasePluginTest {
 
     inner class InsulinBaseTest(
         injector: HasAndroidInjector,
-        resourceHelper: ResourceHelper,
+        rh: ResourceHelper,
         profileFunction: ProfileFunction,
-        rxBus: RxBusWrapper,
+        rxBus: RxBus,
         aapsLogger: AAPSLogger
     ) : InsulinOrefBasePlugin(
-        injector, resourceHelper, profileFunction, rxBus, aapsLogger
+        injector, rh, profileFunction, rxBus, aapsLogger
     ) {
 
         override fun sendShortDiaNotification(dia: Double) {
@@ -61,9 +61,9 @@ class InsulinOrefBasePluginTest {
     private lateinit var sut: InsulinBaseTest
 
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var profileFunction: ProfileFunction
-    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var rxBus: RxBus
     @Mock lateinit var aapsLogger: AAPSLogger
     @Mock lateinit var activePlugin: ActivePlugin
 
@@ -74,7 +74,7 @@ class InsulinOrefBasePluginTest {
 
     @Before
     fun setUp() {
-        sut = InsulinBaseTest(injector, resourceHelper, profileFunction, rxBus, aapsLogger)
+        sut = InsulinBaseTest(injector, rh, profileFunction, rxBus, aapsLogger)
     }
 
     @Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPluginTest.kt
index 3f6e828b344..dfe79379726 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPluginTest.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Insulin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -26,8 +26,8 @@ class InsulinOrefFreePeakPluginTest : TestBase() {
     lateinit var sut: InsulinOrefFreePeakPlugin
 
     @Mock lateinit var sp: SP
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var rh: ResourceHelper
+    @Mock lateinit var rxBus: RxBus
     @Mock lateinit var profileFunction: ProfileFunction
 
     private var injector: HasAndroidInjector = HasAndroidInjector {
@@ -40,7 +40,7 @@ class InsulinOrefFreePeakPluginTest : TestBase() {
         sut = InsulinOrefFreePeakPlugin(
             injector,
             sp,
-            resourceHelper,
+            rh,
             profileFunction,
             rxBus,
             aapsLogger)
@@ -60,13 +60,13 @@ class InsulinOrefFreePeakPluginTest : TestBase() {
     @Test
     fun commentStandardTextTest() {
         `when`(sp.getInt(eq(R.string.key_insulin_oref_peak), anyInt())).thenReturn(90)
-        `when`(resourceHelper.gs(eq(R.string.insulin_peak_time))).thenReturn("Peak Time [min]")
+        `when`(rh.gs(eq(R.string.insulin_peak_time))).thenReturn("Peak Time [min]")
         assertEquals("Peak Time [min]: 90", sut.commentStandardText())
     }
 
     @Test
     fun getFriendlyNameTest() {
-        `when`(resourceHelper.gs(eq(R.string.free_peak_oref))).thenReturn("Free-Peak Oref")
+        `when`(rh.gs(eq(R.string.free_peak_oref))).thenReturn("Free-Peak Oref")
         assertEquals("Free-Peak Oref", sut.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPluginTest.kt
index aa4990808aa..fcd6de648ef 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPluginTest.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Insulin
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert.assertEquals
@@ -25,8 +25,8 @@ class InsulinOrefRapidActingPluginTest {
 
     private lateinit var sut: InsulinOrefRapidActingPlugin
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var rh: ResourceHelper
+    @Mock lateinit var rxBus: RxBus
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var aapsLogger: AAPSLogger
 
@@ -37,7 +37,7 @@ class InsulinOrefRapidActingPluginTest {
 
     @Before
     fun setup() {
-        sut = InsulinOrefRapidActingPlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger)
+        sut = InsulinOrefRapidActingPlugin(injector, rh, profileFunction, rxBus, aapsLogger)
     }
 
     @Test
@@ -52,13 +52,13 @@ class InsulinOrefRapidActingPluginTest {
 
     @Test
     fun commentStandardTextTest() {
-        `when`(resourceHelper.gs(eq(R.string.fastactinginsulincomment))).thenReturn("Novorapid, Novolog, Humalog")
+        `when`(rh.gs(eq(R.string.fastactinginsulincomment))).thenReturn("Novorapid, Novolog, Humalog")
         assertEquals("Novorapid, Novolog, Humalog", sut.commentStandardText())
     }
 
     @Test
     fun getFriendlyNameTest() {
-        `when`(resourceHelper.gs(eq(R.string.rapid_acting_oref))).thenReturn("Rapid-Acting Oref")
+        `when`(rh.gs(eq(R.string.rapid_acting_oref))).thenReturn("Rapid-Acting Oref")
         assertEquals("Rapid-Acting Oref", sut.friendlyName)
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt
index 77390490639..88ecff887f4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.Insulin
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert.assertEquals
@@ -25,8 +25,8 @@ class InsulinOrefUltraRapidActingPluginTest {
 
     private lateinit var sut: InsulinOrefUltraRapidActingPlugin
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var rh: ResourceHelper
+    @Mock lateinit var rxBus: RxBus
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var aapsLogger: AAPSLogger
 
@@ -37,7 +37,7 @@ class InsulinOrefUltraRapidActingPluginTest {
 
     @Before
     fun setup() {
-        sut = InsulinOrefUltraRapidActingPlugin(injector, resourceHelper, profileFunction, rxBus, aapsLogger)
+        sut = InsulinOrefUltraRapidActingPlugin(injector, rh, profileFunction, rxBus, aapsLogger)
     }
 
     @Test
@@ -52,13 +52,13 @@ class InsulinOrefUltraRapidActingPluginTest {
 
     @Test
     fun commentStandardTextTest() {
-        `when`(resourceHelper.gs(eq(R.string.ultrafastactinginsulincomment))).thenReturn("Fiasp")
+        `when`(rh.gs(eq(R.string.ultrafastactinginsulincomment))).thenReturn("Fiasp")
         assertEquals("Fiasp", sut.commentStandardText())
     }
 
     @Test
     fun getFriendlyNameTest() {
-        `when`(resourceHelper.gs(eq(R.string.ultrarapid_oref))).thenReturn("Ultra-Rapid Oref")
+        `when`(rh.gs(eq(R.string.ultrarapid_oref))).thenReturn("Ultra-Rapid Oref")
         assertEquals("Ultra-Rapid Oref", sut.friendlyName)
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
index 3cae3960316..3545c1e258d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
@@ -3,11 +3,11 @@ package info.nightscout.androidaps.plugins.pump.virtual
 import dagger.android.AndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -22,13 +22,13 @@ import org.mockito.Mockito.`when`
 
 class VirtualPumpPluginUTest : TestBase() {
 
-    private val rxBus = RxBusWrapper(aapsSchedulers)
+    private val rxBus = RxBus(aapsSchedulers, aapsLogger)
     @Mock lateinit var fabricPrivacy: FabricPrivacy
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var sp: SP
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var iobCobCalculator: IobCobCalculator
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var pumpSync: PumpSync
 
@@ -36,7 +36,7 @@ class VirtualPumpPluginUTest : TestBase() {
 
     @Before
     fun prepareMocks() {
-        virtualPumpPlugin = VirtualPumpPlugin({ AndroidInjector { } }, aapsLogger, rxBus, fabricPrivacy, resourceHelper, aapsSchedulers, sp, profileFunction, iobCobCalculator, commandQueue, pumpSync, ConfigImpl(), dateUtil)
+        virtualPumpPlugin = VirtualPumpPlugin({ AndroidInjector { } }, aapsLogger, rxBus, fabricPrivacy, rh, aapsSchedulers, sp, profileFunction, iobCobCalculator, commandQueue, pumpSync, ConfigImpl(), dateUtil)
     }
 
     @Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
index a35ff07f17a..724e4f567a9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
@@ -18,10 +18,10 @@ import org.mockito.Mock
 class AbstractSensitivityPluginTest : TestBase() {
 
     @Mock lateinit var pluginDescription: PluginDescription
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var sp: SP
 
-    private inner class SensitivityTestClass(pluginDescription: PluginDescription, aapsLogger: AAPSLogger, resourceHelper: ResourceHelper, sp: SP) : AbstractSensitivityPlugin(pluginDescription, HasAndroidInjector { AndroidInjector { } }, aapsLogger, resourceHelper, sp) {
+    private inner class SensitivityTestClass(pluginDescription: PluginDescription, aapsLogger: AAPSLogger, rh: ResourceHelper, sp: SP) : AbstractSensitivityPlugin(pluginDescription, HasAndroidInjector { AndroidInjector { } }, aapsLogger, rh, sp) {
 
         override fun detectSensitivity(ads: AutosensDataStore, fromTime: Long, toTime: Long): AutosensResult {
             return AutosensResult()
@@ -37,7 +37,7 @@ class AbstractSensitivityPluginTest : TestBase() {
 
     @Test
     fun fillResultTest() {
-        val sut = SensitivityTestClass(pluginDescription, aapsLogger, resourceHelper, sp)
+        val sut = SensitivityTestClass(pluginDescription, aapsLogger, rh, sp)
         var ar = sut.fillResult(1.0, 1.0, "1",
             "1.2", "1", 12, 0.7, 1.2)
         Assert.assertEquals(1.0, ar.ratio, 0.01)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/GlimpPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/GlimpPluginTest.kt
index 882f754d6d4..e6282c23c37 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/GlimpPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/GlimpPluginTest.kt
@@ -14,12 +14,12 @@ class GlimpPluginTest : TestBase() {
 
     private lateinit var glimpPlugin: GlimpPlugin
 
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var sp: SP
 
     @Before
     fun setup() {
-        glimpPlugin = GlimpPlugin(HasAndroidInjector { AndroidInjector { } }, resourceHelper, aapsLogger, sp)
+        glimpPlugin = GlimpPlugin(HasAndroidInjector { AndroidInjector { } }, rh, aapsLogger, sp)
     }
 
     @Test fun advancedFilteringSupported() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt
index a1c98901c82..e1c4662fd92 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt
@@ -14,12 +14,12 @@ class MM640GPluginTest : TestBase() {
 
     private lateinit var mM640gPlugin: MM640gPlugin
 
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var sp: SP
 
     @Before
     fun setup() {
-        mM640gPlugin = MM640gPlugin(HasAndroidInjector { AndroidInjector { } }, resourceHelper, aapsLogger, sp)
+        mM640gPlugin = MM640gPlugin(HasAndroidInjector { AndroidInjector { } }, rh, aapsLogger, sp)
     }
 
     @Test fun advancedFilteringSupported() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt
index 0a1211596e7..981c343bff7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt
@@ -14,12 +14,12 @@ class NSClientPluginTest : TestBase() {
 
     private lateinit var nsClientSourcePlugin: NSClientSourcePlugin
 
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var sp: SP
 
     @Before
     fun setup() {
-        nsClientSourcePlugin = NSClientSourcePlugin({ AndroidInjector { } }, resourceHelper, aapsLogger, ConfigImpl())
+        nsClientSourcePlugin = NSClientSourcePlugin({ AndroidInjector { } }, rh, aapsLogger, ConfigImpl())
     }
 
     @Test fun advancedFilteringSupported() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt
index 8b49149b3d6..120bbcd2354 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt
@@ -13,11 +13,11 @@ class XdripPluginTest : TestBase() {
 
     private lateinit var xdripPlugin: XdripPlugin
 
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
 
     @Before
     fun setup() {
-        xdripPlugin = XdripPlugin(HasAndroidInjector { AndroidInjector { } }, resourceHelper, aapsLogger)
+        xdripPlugin = XdripPlugin(HasAndroidInjector { AndroidInjector { } }, rh, aapsLogger)
     }
 
     @Test fun advancedFilteringSupported() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
index a8c38819de0..d097a387218 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
@@ -26,12 +26,12 @@ class TreatmentsPluginTest : TestBaseWithProfile() {
 
     @Before
     fun prepare() {
-        insulinOrefRapidActingPlugin = InsulinOrefRapidActingPlugin(profileInjector, resourceHelper, profileFunction, rxBus, aapsLogger)
+        insulinOrefRapidActingPlugin = InsulinOrefRapidActingPlugin(profileInjector, rh, profileFunction, rxBus, aapsLogger)
 
         `when`(profileFunction.getProfile(ArgumentMatchers.anyLong())).thenReturn(validProfile)
         `when`(activePluginProvider.activeInsulin).thenReturn(insulinOrefRapidActingPlugin)
 
-        sot = TreatmentsPlugin(profileInjector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, context, sp, profileFunction, activePluginProvider, nsUpload, fabricPrivacy, dateUtil, databaseHelper, repository)
+        sot = TreatmentsPlugin(profileInjector, aapsLogger, rxBus, aapsSchedulers, rh, context, sp, profileFunction, activePluginProvider, nsUpload, fabricPrivacy, dateUtil, databaseHelper, repository)
         sot.service = treatmentService
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueImplementationTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
rename to app/src/test/java/info/nightscout/androidaps/queue/CommandQueueImplementationTest.kt
index 1398462b423..4830daa3c8c 100644
--- a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueImplementationTest.kt
@@ -8,6 +8,7 @@ import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.TestPumpPlugin
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.database.entities.Bolus
@@ -17,7 +18,7 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
 import info.nightscout.androidaps.queue.commands.*
@@ -38,7 +39,7 @@ import org.mockito.Mockito.`when`
 import org.mockito.Mockito.anyLong
 import java.util.*
 
-class CommandQueueTest : TestBaseWithProfile() {
+class CommandQueueImplementationTest : TestBaseWithProfile() {
 
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var activePlugin: ActivePlugin
@@ -50,9 +51,9 @@ class CommandQueueTest : TestBaseWithProfile() {
     class CommandQueueMocked(
         injector: HasAndroidInjector,
         aapsLogger: AAPSLogger,
-        rxBus: RxBusWrapper,
+        rxBus: RxBus,
         aapsSchedulers: AapsSchedulers,
-        resourceHelper: ResourceHelper,
+        rh: ResourceHelper,
         constraintChecker: ConstraintChecker,
         profileFunction: ProfileFunction,
         activePlugin: ActivePlugin,
@@ -63,8 +64,8 @@ class CommandQueueTest : TestBaseWithProfile() {
         repository: AppRepository,
         fabricPrivacy: FabricPrivacy,
         config: Config
-    ) : CommandQueue(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, constraintChecker, profileFunction,
-                     activePlugin, context, sp, buildHelper, dateUtil, repository, fabricPrivacy, config) {
+    ) : CommandQueueImplementation(injector, aapsLogger, rxBus, aapsSchedulers, rh, constraintChecker, profileFunction,
+                                   activePlugin, context, sp, buildHelper, dateUtil, repository, fabricPrivacy, config) {
 
         override fun notifyAboutNewCommand() {}
 
@@ -74,7 +75,7 @@ class CommandQueueTest : TestBaseWithProfile() {
         AndroidInjector {
             if (it is Command) {
                 it.aapsLogger = aapsLogger
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
             if (it is CommandTempBasalPercent) {
                 it.activePlugin = activePlugin
@@ -92,15 +93,18 @@ class CommandQueueTest : TestBaseWithProfile() {
             if (it is CommandLoadHistory) {
                 it.activePlugin = activePlugin
             }
+           if (it is PumpEnactResult) {
+                it.rh = rh
+            }
         }
     }
 
-    private lateinit var commandQueue: CommandQueue
+    private lateinit var commandQueue: CommandQueueImplementation
     private lateinit var testPumpPlugin: TestPumpPlugin
 
     @Before
     fun prepare() {
-        commandQueue = CommandQueueMocked(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper,
+        commandQueue = CommandQueueMocked(injector, aapsLogger, rxBus, aapsSchedulers, rh,
                                           constraintChecker, profileFunction, activePlugin, context, sp,
                                          BuildHelperImpl(ConfigImpl(), fileListProvider), dateUtil, repository,
                                           fabricPrivacy, config)
@@ -129,15 +133,15 @@ class CommandQueueTest : TestBaseWithProfile() {
         `when`(constraintChecker.applyBasalConstraints(anyObject(), anyObject())).thenReturn(rateConstraint)
         val percentageConstraint = Constraint(0)
         `when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject())).thenReturn(percentageConstraint)
-        `when`(resourceHelper.gs(R.string.connectiontimedout)).thenReturn("Connection timed out")
+        `when`(rh.gs(R.string.connectiontimedout)).thenReturn("Connection timed out")
     }
 
     @Test
     fun commandIsPickedUp() {
-        val commandQueue = CommandQueue(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper,
-                                        constraintChecker, profileFunction, activePlugin, context, sp,
-                                        BuildHelperImpl(ConfigImpl(), fileListProvider), dateUtil, repository,
-                                        fabricPrivacy, config)
+        val commandQueue = CommandQueueImplementation(injector, aapsLogger, rxBus, aapsSchedulers, rh,
+                                                      constraintChecker, profileFunction, activePlugin, context, sp,
+                                                      BuildHelperImpl(ConfigImpl(), fileListProvider), dateUtil, repository,
+                                                      fabricPrivacy, config)
         // start with empty queue
         Assert.assertEquals(0, commandQueue.size())
 
diff --git a/app/src/test/java/info/nightscout/androidaps/queue/QueueThreadTest.kt b/app/src/test/java/info/nightscout/androidaps/queue/QueueThreadTest.kt
index 7944588efdc..9c6688791d6 100644
--- a/app/src/test/java/info/nightscout/androidaps/queue/QueueThreadTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/queue/QueueThreadTest.kt
@@ -37,7 +37,7 @@ class QueueThreadTest : TestBaseWithProfile() {
         AndroidInjector {
             if (it is Command) {
                 it.aapsLogger = aapsLogger
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
             if (it is CommandTempBasalAbsolute) {
                 it.activePlugin = activePlugin
@@ -46,14 +46,14 @@ class QueueThreadTest : TestBaseWithProfile() {
     }
 
     private lateinit var pumpPlugin: TestPumpPlugin
-    private lateinit var commandQueue: CommandQueue
+    private lateinit var commandQueue: CommandQueueImplementation
     private lateinit var sut: QueueThread
 
     @Before
     fun prepare() {
         pumpPlugin = TestPumpPlugin(injector)
-        commandQueue = CommandQueue(
-            injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, constraintChecker,
+        commandQueue = CommandQueueImplementation(
+            injector, aapsLogger, rxBus, aapsSchedulers, rh, constraintChecker,
             profileFunction, activePlugin, context, sp,
             BuildHelperImpl(ConfigImpl(), fileListProvider), dateUtil, repository, fabricPrivacy, config
         )
@@ -76,7 +76,7 @@ class QueueThreadTest : TestBaseWithProfile() {
         Mockito.`when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject()))
             .thenReturn(percentageConstraint)
 
-        sut = QueueThread(commandQueue, context, aapsLogger, rxBus, activePlugin, resourceHelper, sp)
+        sut = QueueThread(commandQueue, context, aapsLogger, rxBus, activePlugin, rh, sp)
     }
 
     @Test
diff --git a/app/src/test/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/utils/defaultProfile/DefaultProfileTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileTest.kt
rename to app/src/test/java/info/nightscout/androidaps/utils/defaultProfile/DefaultProfileTest.kt
index 66a540531cd..8bfbd998c64 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/utils/defaultProfile/DefaultProfileTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.data.defaultProfile
+package info.nightscout.androidaps.utils.defaultProfile
 
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.interfaces.GlucoseUnit
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt b/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
index 8246239f76e..3a3c67cdfaf 100644
--- a/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.data.IobTotal
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
@@ -26,12 +26,12 @@ class BolusWizardTest : TestBase() {
 
     private val pumpBolusStep = 0.1
 
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var context: Context
     @Mock lateinit var activePlugin: ActivePlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var loopPlugin: LoopPlugin
     @Mock lateinit var iobCobCalculator: IobCobCalculator
     @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
@@ -42,8 +42,8 @@ class BolusWizardTest : TestBase() {
         AndroidInjector {
             if (it is BolusWizard) {
                 it.aapsLogger = aapsLogger
-                it.resourceHelper = resourceHelper
-                it.rxBus = RxBusWrapper(aapsSchedulers)
+                it.rh = rh
+                it.rxBus = RxBus(aapsSchedulers, aapsLogger)
                 it.profileFunction = profileFunction
                 it.constraintChecker = constraintChecker
                 it.activePlugin = activePlugin
diff --git a/automation/src/main/java/info/nightscout/androidaps/automation/di/AutomationModule.kt b/automation/src/main/java/info/nightscout/androidaps/automation/di/AutomationModule.kt
index 977cc208d53..b5bf1ccaf10 100644
--- a/automation/src/main/java/info/nightscout/androidaps/automation/di/AutomationModule.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/automation/di/AutomationModule.kt
@@ -39,6 +39,7 @@ abstract class AutomationModule {
     @ContributesAndroidInjector abstract fun actionLoopSuspendInjector(): ActionLoopSuspend
     @ContributesAndroidInjector abstract fun actionNotificationInjector(): ActionNotification
     @ContributesAndroidInjector abstract fun actionAlarmInjector(): ActionAlarm
+    @ContributesAndroidInjector abstract fun actionCarePortalEventInjector(): ActionCarePortalEvent
     @ContributesAndroidInjector abstract fun actionProfileSwitchInjector(): ActionProfileSwitch
     @ContributesAndroidInjector abstract fun actionProfileSwitchPercentInjector(): ActionProfileSwitchPercent
     @ContributesAndroidInjector abstract fun actionSendSMSInjector(): ActionSendSMS
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.kt
index b02dfb0dd32..c372d1d2164 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.kt
@@ -4,7 +4,6 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.general.automation.actions.Action
 import info.nightscout.androidaps.plugins.general.automation.actions.ActionDummy
-import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDummy
 import info.nightscout.androidaps.utils.DateUtil
@@ -24,8 +23,9 @@ class AutomationEvent(private val injector: HasAndroidInjector) {
     var systemAction: Boolean = false // true = generated by AAPS, false = entered by user
     var readOnly: Boolean = false // removing, editing disabled
     var autoRemove: Boolean = false // auto-remove once used
+    var userAction: Boolean = false // shows button on Overview
 
-    var trigger: Trigger = TriggerConnector(injector)
+    var trigger: TriggerConnector = TriggerConnector(injector)
     val actions: MutableList<Action> = ArrayList()
 
     var lastRun: Long = 0
@@ -44,9 +44,10 @@ class AutomationEvent(private val injector: HasAndroidInjector) {
 
     fun addAction(action: Action) = actions.add(action)
 
-    fun areActionsValid() : Boolean {
+    fun areActionsValid(): Boolean {
         var result = true
         for (action in actions) result = result && action.isValid()
+        if (!result) isEnabled = false
         return result
     }
 
@@ -59,6 +60,7 @@ class AutomationEvent(private val injector: HasAndroidInjector) {
             .put("systemAction", systemAction)
             .put("readOnly", readOnly)
             .put("autoRemove", autoRemove)
+            .put("userAction", userAction)
             .put("trigger", trigger.toJSON())
             .put("actions", array)
             .toString()
@@ -71,7 +73,8 @@ class AutomationEvent(private val injector: HasAndroidInjector) {
         systemAction = d.optBoolean("systemAction", false)
         readOnly = d.optBoolean("readOnly", false)
         autoRemove = d.optBoolean("autoRemove", false)
-        trigger = TriggerDummy(injector).instantiate(JSONObject(d.getString("trigger")))
+        userAction = d.optBoolean("userAction", false)
+        trigger = TriggerDummy(injector).instantiate(JSONObject(d.getString("trigger"))) as TriggerConnector
         val array = d.getJSONArray("actions")
         actions.clear()
         for (i in 0 until array.length()) {
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
index 6fba938876f..6fd6d4a2c7a 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
@@ -23,7 +23,7 @@ import info.nightscout.androidaps.automation.databinding.AutomationFragmentBindi
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog
 import info.nightscout.androidaps.plugins.general.automation.dragHelpers.ItemTouchHelperAdapter
 import info.nightscout.androidaps.plugins.general.automation.dragHelpers.ItemTouchHelperViewHolder
@@ -46,8 +46,8 @@ import javax.inject.Inject
 class AutomationFragment : DaggerFragment(), OnStartDragListener {
 
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rh: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var automationPlugin: AutomationPlugin
     @Inject lateinit var injector: HasAndroidInjector
@@ -100,14 +100,14 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
             .toObservable(EventAutomationUpdateGui::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({
-                updateGui()
-            }, fabricPrivacy::logException)
+                           updateGui()
+                       }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventAutomationDataChanged::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({
-                eventListAdapter.notifyDataSetChanged()
-            }, fabricPrivacy::logException)
+                           eventListAdapter.notifyDataSetChanged()
+                       }, fabricPrivacy::logException)
         updateGui()
     }
 
@@ -160,29 +160,34 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
         private fun addImage(@DrawableRes res: Int, context: Context, layout: LinearLayout) {
             val iv = ImageView(context)
             iv.setImageResource(res)
-            iv.layoutParams = LinearLayout.LayoutParams(resourceHelper.dpToPx(24), resourceHelper.dpToPx(24))
+            iv.layoutParams = LinearLayout.LayoutParams(rh.dpToPx(24), rh.dpToPx(24))
             layout.addView(iv)
         }
 
         @SuppressLint("ClickableViewAccessibility")
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
             val event = automationPlugin.at(position)
-            holder.binding.rootLayout.setBackgroundColor(resourceHelper.gc(if (event.areActionsValid()) R.color.ribbonDefault else R.color.errorAlertBackground))
+            holder.binding.rootLayout.setBackgroundColor(rh.gc(
+                if (event.userAction) R.color.mdtp_line_dark
+                else if (event.areActionsValid()) R.color.ribbonDefault
+                else R.color.errorAlertBackground)
+            )
             holder.binding.eventTitle.text = event.title
             holder.binding.enabled.isChecked = event.isEnabled
             holder.binding.enabled.isEnabled = !event.readOnly
             holder.binding.iconLayout.removeAllViews()
             // trigger icons
             val triggerIcons = HashSet<Int>()
-            fillIconSet(event.trigger as TriggerConnector, triggerIcons)
+            if (event.userAction) triggerIcons.add(R.drawable.ic_danar_useropt)
+            fillIconSet(event.trigger, triggerIcons)
             for (res in triggerIcons) {
                 addImage(res, holder.context, holder.binding.iconLayout)
             }
             // arrow icon
             val iv = ImageView(holder.context)
             iv.setImageResource(R.drawable.ic_arrow_forward_white_24dp)
-            iv.layoutParams = LinearLayout.LayoutParams(resourceHelper.dpToPx(24), resourceHelper.dpToPx(24))
-            iv.setPadding(resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4), 0)
+            iv.layoutParams = LinearLayout.LayoutParams(rh.dpToPx(24), rh.dpToPx(24))
+            iv.setPadding(rh.dpToPx(4), 0, rh.dpToPx(4), 0)
             holder.binding.iconLayout.addView(iv)
             // action icons
             val actionIcons = HashSet<Int>()
@@ -216,14 +221,14 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
             }
             // remove event
             holder.binding.iconTrash.setOnClickListener {
-                OKDialog.showConfirmation(requireContext(), resourceHelper.gs(R.string.removerecord) + " " + automationPlugin.at(position).title,
-                    {
-                        uel.log(Action.AUTOMATION_REMOVED, Sources.Automation, automationPlugin.at(position).title)
-                        automationPlugin.removeAt(position)
-                        notifyItemRemoved(position)
-                    }, {
-                    rxBus.send(EventAutomationUpdateGui())
-                })
+                OKDialog.showConfirmation(requireContext(), rh.gs(R.string.removerecord) + " " + automationPlugin.at(position).title,
+                                          {
+                                              uel.log(Action.AUTOMATION_REMOVED, Sources.Automation, automationPlugin.at(position).title)
+                                              automationPlugin.removeAt(position)
+                                              notifyItemRemoved(position)
+                                          }, {
+                                              rxBus.send(EventAutomationUpdateGui())
+                                          })
             }
             holder.binding.iconTrash.visibility = (!event.readOnly).toVisibility()
             holder.binding.aapsLogo.visibility = (event.systemAction).toVisibility()
@@ -239,13 +244,15 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
 
         override fun onItemDismiss(position: Int) {
             activity?.let { activity ->
-                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord) + " " + automationPlugin.at(position).title,
-                    Runnable {
+                OKDialog.showConfirmation(
+                    activity,
+                    rh.gs(R.string.removerecord) + " " + automationPlugin.at(position).title,
+                    {
                         uel.log(Action.AUTOMATION_REMOVED, Sources.Automation, automationPlugin.at(position).title)
                         automationPlugin.removeAt(position)
                         notifyItemRemoved(position)
                         rxBus.send(EventAutomationDataChanged())
-                    }, Runnable { rxBus.send(EventAutomationUpdateGui()) })
+                    }, { rxBus.send(EventAutomationUpdateGui()) })
             }
         }
 
@@ -255,7 +262,7 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
 
             override fun onItemSelected() = itemView.setBackgroundColor(Color.LTGRAY)
 
-            override fun onItemClear() = itemView.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
+            override fun onItemClear() = itemView.setBackgroundColor(rh.gc(R.color.ribbonDefault))
         }
     }
 }
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
index 404df4f4bb7..fafa93d1179 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.automation.actions.*
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationDataChanged
@@ -43,30 +43,31 @@ import kotlin.collections.ArrayList
 @Singleton
 class AutomationPlugin @Inject constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val context: Context,
     private val sp: SP,
     private val fabricPrivacy: FabricPrivacy,
     private val loopPlugin: Loop,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val constraintChecker: ConstraintChecker,
     aapsLogger: AAPSLogger,
     private val aapsSchedulers: AapsSchedulers,
     private val config: Config,
     private val locationServiceHelper: LocationServiceHelper,
     private val dateUtil: DateUtil
-) : PluginBase(PluginDescription()
-    .mainType(PluginType.GENERAL)
-    .fragmentClass(AutomationFragment::class.qualifiedName)
-    .pluginIcon(R.drawable.ic_automation)
-    .pluginName(R.string.automation)
-    .shortName(R.string.automation_short)
-    .showInList(config.APS)
-    .neverVisible(!config.APS)
-    .alwaysEnabled(!config.APS)
-    .preferencesId(R.xml.pref_automation)
-    .description(R.string.automation_description),
-    aapsLogger, resourceHelper, injector
+) : PluginBase(
+    PluginDescription()
+        .mainType(PluginType.GENERAL)
+        .fragmentClass(AutomationFragment::class.qualifiedName)
+        .pluginIcon(R.drawable.ic_automation)
+        .pluginName(R.string.automation)
+        .shortName(R.string.automation_short)
+        .showInList(config.APS)
+        .neverVisible(!config.APS)
+        .alwaysEnabled(!config.APS)
+        .preferencesId(R.xml.pref_automation)
+        .description(R.string.automation_description),
+    aapsLogger, rh, injector
 ) {
 
     private var disposable: CompositeDisposable = CompositeDisposable()
@@ -82,7 +83,8 @@ class AutomationPlugin @Inject constructor(
 
     companion object {
 
-        const val event = "{\"title\":\"Low\",\"enabled\":true,\"trigger\":\"{\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\\\",\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[\\\"{\\\\\\\"type\\\\\\\":\\\\\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBg\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"bg\\\\\\\":4,\\\\\\\"comparator\\\\\\\":\\\\\\\"IS_LESSER\\\\\\\",\\\\\\\"units\\\\\\\":\\\\\\\"mmol\\\\\\\"}}\\\",\\\"{\\\\\\\"type\\\\\\\":\\\\\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDelta\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"value\\\\\\\":-0.1,\\\\\\\"units\\\\\\\":\\\\\\\"mmol\\\\\\\",\\\\\\\"deltaType\\\\\\\":\\\\\\\"DELTA\\\\\\\",\\\\\\\"comparator\\\\\\\":\\\\\\\"IS_LESSER\\\\\\\"}}\\\"]}}\",\"actions\":[\"{\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.actions.ActionStartTempTarget\\\",\\\"data\\\":{\\\"value\\\":8,\\\"units\\\":\\\"mmol\\\",\\\"durationInMinutes\\\":60}}\"]}"
+        const val event =
+            "{\"title\":\"Low\",\"enabled\":true,\"trigger\":\"{\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\\\",\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[\\\"{\\\\\\\"type\\\\\\\":\\\\\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBg\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"bg\\\\\\\":4,\\\\\\\"comparator\\\\\\\":\\\\\\\"IS_LESSER\\\\\\\",\\\\\\\"units\\\\\\\":\\\\\\\"mmol\\\\\\\"}}\\\",\\\"{\\\\\\\"type\\\\\\\":\\\\\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDelta\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"value\\\\\\\":-0.1,\\\\\\\"units\\\\\\\":\\\\\\\"mmol\\\\\\\",\\\\\\\"deltaType\\\\\\\":\\\\\\\"DELTA\\\\\\\",\\\\\\\"comparator\\\\\\\":\\\\\\\"IS_LESSER\\\\\\\"}}\\\"]}}\",\"actions\":[\"{\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.actions.ActionStartTempTarget\\\",\\\"data\\\":{\\\"value\\\":8,\\\"units\\\":\\\"mmol\\\",\\\"durationInMinutes\\\":60}}\"]}"
     }
 
     init {
@@ -103,11 +105,11 @@ class AutomationPlugin @Inject constructor(
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ e ->
-                if (e.isChanged(resourceHelper, R.string.key_location)) {
-                    locationServiceHelper.stopService(context)
-                    locationServiceHelper.startService(context)
-                }
-            }, fabricPrivacy::logException)
+                           if (e.isChanged(rh, R.string.key_location)) {
+                               locationServiceHelper.stopService(context)
+                               locationServiceHelper.startService(context)
+                           }
+                       }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventAutomationDataChanged::class.java)
             .observeOn(aapsSchedulers.io)
@@ -116,11 +118,11 @@ class AutomationPlugin @Inject constructor(
             .toObservable(EventLocationChange::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ e ->
-                e?.let {
-                    aapsLogger.debug(LTag.AUTOMATION, "Grabbed location: $it.location.latitude $it.location.longitude Provider: $it.location.provider")
-                    processActions()
-                }
-            }, fabricPrivacy::logException)
+                           e?.let {
+                               aapsLogger.debug(LTag.AUTOMATION, "Grabbed location: $it.location.latitude $it.location.longitude Provider: $it.location.provider")
+                               processActions()
+                           }
+                       }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventChargingState::class.java)
             .observeOn(aapsSchedulers.io)
@@ -137,10 +139,10 @@ class AutomationPlugin @Inject constructor(
             .toObservable(EventBTChange::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({
-                aapsLogger.debug(LTag.AUTOMATION, "Grabbed new BT event: $it")
-                btConnects.add(it)
-                processActions()
-            }, fabricPrivacy::logException)
+                           aapsLogger.debug(LTag.AUTOMATION, "Grabbed new BT event: $it")
+                           btConnects.add(it)
+                           processActions()
+                       }, fabricPrivacy::logException)
     }
 
     override fun onStop() {
@@ -187,7 +189,7 @@ class AutomationPlugin @Inject constructor(
         if (config.APS) {
             if (loopPlugin.isSuspended || !(loopPlugin as PluginBase).isEnabled()) {
                 aapsLogger.debug(LTag.AUTOMATION, "Loop deactivated")
-                executionLog.add(resourceHelper.gs(R.string.loopisdisabled))
+                executionLog.add(rh.gs(R.string.loopisdisabled))
                 userEventsEnabled = false
             }
             val enabled = constraintChecker.isAutomationEnabled()
@@ -201,40 +203,8 @@ class AutomationPlugin @Inject constructor(
         val iterator: MutableIterator<AutomationEvent> = automationEvents.iterator()
         while (iterator.hasNext()) {
             val event = iterator.next()
-            if (event.isEnabled && event.shouldRun() && event.trigger.shouldRun() && event.getPreconditions().shouldRun()) {
-                if (event.systemAction || userEventsEnabled) {
-                    val actions = event.actions
-                    for (action in actions) {
-                        action.title = event.title
-                        if (action.isValid())
-                            action.doAction(object : Callback() {
-                                override fun run() {
-                                    val sb = StringBuilder()
-                                    sb.append(dateUtil.timeString(dateUtil.now()))
-                                    sb.append(" ")
-                                    sb.append(if (result.success) "☺" else "▼")
-                                    sb.append(" <b>")
-                                    sb.append(event.title)
-                                    sb.append(":</b> ")
-                                    sb.append(action.shortDescription())
-                                    sb.append(": ")
-                                    sb.append(result.comment)
-                                    executionLog.add(sb.toString())
-                                    aapsLogger.debug(LTag.AUTOMATION, "Executed: $sb")
-                                    rxBus.send(EventAutomationUpdateGui())
-                                }
-                            })
-                        else {
-                            executionLog.add("Invalid action: ${action.shortDescription()}")
-                            aapsLogger.debug(LTag.AUTOMATION, "Invalid action: ${action.shortDescription()}")
-                            rxBus.send(EventAutomationUpdateGui())
-                        }
-                    }
-                    SystemClock.sleep(1100)
-                    event.lastRun = dateUtil.now()
-                    if (event.autoRemove) automationEvents.remove(event)
-                }
-            }
+            if (event.isEnabled && !event.userAction && event.shouldRun())
+                processEvent(event, userEventsEnabled)
         }
         // we cannot detect connected BT devices
         // so let's collect all connection/disconnections between 2 runs of processActions()
@@ -245,6 +215,43 @@ class AutomationPlugin @Inject constructor(
         storeToSP() // save last run time
     }
 
+    fun processEvent(event: AutomationEvent, userEventsEnabled: Boolean) {
+        if (event.trigger.shouldRun() && event.getPreconditions().shouldRun()) {
+            if (event.systemAction || userEventsEnabled) {
+                val actions = event.actions
+                for (action in actions) {
+                    action.title = event.title
+                    if (action.isValid())
+                        action.doAction(object : Callback() {
+                            override fun run() {
+                                val sb = StringBuilder()
+                                sb.append(dateUtil.timeString(dateUtil.now()))
+                                sb.append(" ")
+                                sb.append(if (result.success) "☺" else "▼")
+                                sb.append(" <b>")
+                                sb.append(event.title)
+                                sb.append(":</b> ")
+                                sb.append(action.shortDescription())
+                                sb.append(": ")
+                                sb.append(result.comment)
+                                executionLog.add(sb.toString())
+                                aapsLogger.debug(LTag.AUTOMATION, "Executed: $sb")
+                                rxBus.send(EventAutomationUpdateGui())
+                            }
+                        })
+                    else {
+                        executionLog.add("Invalid action: ${action.shortDescription()}")
+                        aapsLogger.debug(LTag.AUTOMATION, "Invalid action: ${action.shortDescription()}")
+                        rxBus.send(EventAutomationUpdateGui())
+                    }
+                }
+                SystemClock.sleep(1100)
+                event.lastRun = dateUtil.now()
+                if (event.autoRemove) automationEvents.remove(event)
+            }
+        }
+    }
+
     @Synchronized
     fun add(event: AutomationEvent) {
         automationEvents.add(event)
@@ -260,6 +267,16 @@ class AutomationPlugin @Inject constructor(
         rxBus.send(EventAutomationDataChanged())
     }
 
+    @Synchronized
+    fun removeIfExists(event: AutomationEvent) {
+        for (e in automationEvents) {
+            if (event.title == e.title) {
+                automationEvents.remove(e)
+                rxBus.send(EventAutomationDataChanged())
+            }
+        }
+    }
+
     @Synchronized
     fun set(event: AutomationEvent, index: Int) {
         automationEvents[index] = event
@@ -283,6 +300,16 @@ class AutomationPlugin @Inject constructor(
         rxBus.send(EventAutomationDataChanged())
     }
 
+    fun userEvents(): List<AutomationEvent> {
+        val list = mutableListOf<AutomationEvent>()
+        val iterator: MutableIterator<AutomationEvent> = automationEvents.iterator()
+        while (iterator.hasNext()) {
+            val event = iterator.next()
+            if (event.userAction) list.add(event)
+        }
+        return list
+    }
+
     fun getActionDummyObjects(): List<Action> {
         return listOf(
             //ActionLoopDisable(injector),
@@ -293,6 +320,7 @@ class AutomationPlugin @Inject constructor(
             ActionStopTempTarget(injector),
             ActionNotification(injector),
             ActionAlarm(injector),
+            ActionCarePortalEvent(injector),
             ActionProfileSwitchPercent(injector),
             ActionProfileSwitch(injector),
             ActionSendSMS(injector)
@@ -317,7 +345,7 @@ class AutomationPlugin @Inject constructor(
             TriggerAutosensValue(injector),
             TriggerBolusAgo(injector),
             TriggerPumpLastConnection(injector),
-            TriggerBTDevice(injector)
+            TriggerBTDevice(injector),
         )
     }
 }
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt
index 184b082cf5d..26c9c5365b7 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt
@@ -6,6 +6,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
 import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONException
 import org.json.JSONObject
 import javax.inject.Inject
@@ -13,6 +14,7 @@ import javax.inject.Inject
 abstract class Action(val injector: HasAndroidInjector) {
 
     @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rh: ResourceHelper
 
     var precondition: Trigger? = null
 
@@ -51,6 +53,8 @@ abstract class Action(val injector: HasAndroidInjector) {
             return when (type) {
                 ActionAlarm::class.java.name,              // backward compatibility
                 ActionAlarm::class.java.simpleName                -> ActionAlarm(injector).fromJSON(data.toString())
+                ActionCarePortalEvent::class.java.name,
+                ActionCarePortalEvent::class.java.simpleName      -> ActionCarePortalEvent(injector).fromJSON(data.toString())
                 ActionDummy::class.java.name,
                 ActionDummy::class.java.simpleName                -> ActionDummy(injector).fromJSON(data.toString())
                 ActionLoopDisable::class.java.name,
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarm.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarm.kt
index 1461e20838e..92f9064948d 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarm.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarm.kt
@@ -6,7 +6,7 @@ import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.data.PumpEnactResult
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.elements.InputString
 import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
 import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
@@ -15,14 +15,12 @@ import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.TimerUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import javax.inject.Inject
 
 class ActionAlarm(injector: HasAndroidInjector) : Action(injector) {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var context: Context
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var timerUtil: TimerUtil
@@ -34,14 +32,14 @@ class ActionAlarm(injector: HasAndroidInjector) : Action(injector) {
     }
 
     override fun friendlyName(): Int = R.string.alarm
-    override fun shortDescription(): String = resourceHelper.gs(R.string.alarm_message, text.value)
+    override fun shortDescription(): String = rh.gs(R.string.alarm_message, text.value)
     @DrawableRes override fun icon(): Int = R.drawable.ic_access_alarm_24dp
 
     override fun isValid(): Boolean = true // empty alarm will show app name
 
     override fun doAction(callback: Callback) {
         timerUtil.scheduleReminder(dateUtil.now() + T.secs(10L).msecs(), text.value.takeIf { it.isNotBlank() }
-            ?: resourceHelper.gs(R.string.app_name))
+            ?: rh.gs(R.string.app_name))
         callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
     }
 
@@ -63,7 +61,7 @@ class ActionAlarm(injector: HasAndroidInjector) : Action(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.alarm_short), "", text))
+            .add(LabelWithElement(rh, rh.gs(R.string.alarm_short), "", text))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEvent.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEvent.kt
new file mode 100644
index 00000000000..5e3f3669eba
--- /dev/null
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEvent.kt
@@ -0,0 +1,121 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import android.widget.LinearLayout
+import androidx.annotation.DrawableRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.automation.R
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.entities.TherapyEvent
+import info.nightscout.androidaps.database.entities.UserEntry
+import info.nightscout.androidaps.database.entities.ValueWithUnit
+import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
+import info.nightscout.androidaps.extensions.fromConstant
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.androidaps.plugins.general.automation.elements.InputCarePortalMenu
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
+import info.nightscout.androidaps.plugins.general.automation.elements.InputString
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import org.json.JSONObject
+import javax.inject.Inject
+
+class ActionCarePortalEvent(injector: HasAndroidInjector) : Action(injector) {
+
+    @Inject lateinit var repository: AppRepository
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var sp: SP
+    @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
+    @Inject lateinit var uel: UserEntryLogger
+
+
+    private val disposable = CompositeDisposable()
+
+    var note = InputString()
+    var duration = InputDuration(0, InputDuration.TimeUnit.MINUTES)
+    var cpEvent = InputCarePortalMenu(rh)
+    private var valuesWithUnit = mutableListOf<ValueWithUnit?>()
+
+    private constructor(injector: HasAndroidInjector, actionCPEvent: ActionCarePortalEvent) : this(injector) {
+        cpEvent = InputCarePortalMenu(rh, actionCPEvent.cpEvent.value)
+    }
+
+    override fun friendlyName(): Int = R.string.careportal
+    override fun shortDescription(): String = rh.gs(cpEvent.value.stringResWithValue, note.value)
+
+    @DrawableRes override fun icon(): Int = cpEvent.value.drawableRes
+
+    override fun doAction(callback: Callback) {
+        val enteredBy = sp.getString("careportal_enteredby", "AndroidAPS")
+        val eventTime = dateUtil.now()
+        val therapyEvent = TherapyEvent(
+            timestamp = eventTime,
+            type = cpEvent.value.therapyEventType,
+            glucoseUnit = TherapyEvent.GlucoseUnit.fromConstant(profileFunction.getUnits())
+        )
+        valuesWithUnit.add(ValueWithUnit.TherapyEventType(therapyEvent.type))
+
+        therapyEvent.enteredBy = enteredBy
+        if ( therapyEvent.type == TherapyEvent.Type.QUESTION || therapyEvent.type == TherapyEvent.Type.ANNOUNCEMENT) {
+            val glucoseStatus = glucoseStatusProvider.glucoseStatusData
+            if (glucoseStatus != null) {
+                therapyEvent.glucose = glucoseStatus.glucose
+                therapyEvent.glucoseType = TherapyEvent.MeterType.SENSOR
+                valuesWithUnit.add(ValueWithUnit.fromGlucoseUnit(glucoseStatus.glucose, profileFunction.getUnits().asText))
+                valuesWithUnit.add(ValueWithUnit.TherapyEventMeterType(TherapyEvent.MeterType.SENSOR))
+            }
+        } else {
+            therapyEvent.duration = T.mins(duration.value.toLong()).msecs()
+            valuesWithUnit.add(ValueWithUnit.Minute(duration.value).takeIf { !duration.value.equals(0) } )
+        }
+        therapyEvent.note = note.value
+        valuesWithUnit.add(ValueWithUnit.SimpleString(note.value).takeIf { note.value.isNotBlank() } )
+        disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction(therapyEvent))
+            .subscribe(
+                { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted therapy event $it") } },
+                { aapsLogger.error(LTag.DATABASE, "Error while saving therapy event", it) }
+            )
+        uel.log(UserEntry.Action.CAREPORTAL, UserEntry.Sources.Automation, title, valuesWithUnit)
+    }
+
+    override fun toJSON(): String {
+        val data = JSONObject()
+            .put("cpEvent", cpEvent.value)
+            .put("note", note.value)
+            .put("durationInMinutes", duration.value)
+        return JSONObject()
+            .put("type", this.javaClass.name)
+            .put("data", data)
+            .toString()
+    }
+
+    override fun fromJSON(data: String): Action {
+        val o = JSONObject(data)
+        cpEvent.value = InputCarePortalMenu.EventType.valueOf(JsonHelper.safeGetString(o, "cpEvent")!!)
+        note.value = JsonHelper.safeGetString(o, "note", "")
+        duration.value = JsonHelper.safeGetInt(o, "durationInMinutes")
+        return this
+    }
+
+    override fun hasDialog(): Boolean = true
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(cpEvent)
+            .add(LabelWithElement(rh, rh.gs(R.string.duration_min_label), "", duration))
+            .add(LabelWithElement(rh, rh.gs(R.string.notes_label), "", note))
+            .build(root)
+    }
+
+    override fun isValid(): Boolean = true
+}
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.kt
index b6c391ebacc..0a4866c298b 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.kt
@@ -7,27 +7,26 @@ import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.events.EventRefreshOverview
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.ConfigBuilder
 import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.queue.Callback
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
 class ActionLoopDisable(injector: HasAndroidInjector) : Action(injector) {
+
     @Inject lateinit var loopPlugin: Loop
-    @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var configBuilder: ConfigBuilder
-    @Inject lateinit var commandQueue: CommandQueueProvider
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var commandQueue: CommandQueue
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var uel: UserEntryLogger
 
     override fun friendlyName(): Int = R.string.disableloop
-    override fun shortDescription(): String = resourceHelper.gs(R.string.disableloop)
+    override fun shortDescription(): String = rh.gs(R.string.disableloop)
     @DrawableRes override fun icon(): Int = R.drawable.ic_stop_24dp
 
     override fun doAction(callback: Callback) {
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.kt
index 2864c2b96e3..fef97824bd5 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.kt
@@ -12,21 +12,19 @@ import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.queue.Callback
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
 class ActionLoopEnable(injector: HasAndroidInjector) : Action(injector) {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var loopPlugin: Loop
     @Inject lateinit var configBuilder: ConfigBuilder
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var uel: UserEntryLogger
 
     override fun friendlyName(): Int = R.string.enableloop
-    override fun shortDescription(): String = resourceHelper.gs(R.string.enableloop)
+    override fun shortDescription(): String = rh.gs(R.string.enableloop)
     @DrawableRes override fun icon(): Int = R.drawable.ic_play_circle_outline_24dp
 
     override fun doAction(callback: Callback) {
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt
index 25a22f54f0c..bafd2e21ad4 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt
@@ -13,25 +13,24 @@ import info.nightscout.androidaps.interfaces.ConfigBuilder
 import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import javax.inject.Inject
 
 class ActionLoopResume(injector: HasAndroidInjector) : Action(injector) {
-    @Inject lateinit var resourceHelper: ResourceHelper
+
     @Inject lateinit var loopPlugin: Loop
     @Inject lateinit var configBuilder: ConfigBuilder
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var dateUtil: DateUtil
 
     override fun friendlyName(): Int = R.string.resumeloop
-    override fun shortDescription(): String = resourceHelper.gs(R.string.resumeloop)
+    override fun shortDescription(): String = rh.gs(R.string.resumeloop)
     @DrawableRes override fun icon(): Int = R.drawable.ic_replay_24dp
 
     val disposable = CompositeDisposable()
@@ -40,10 +39,10 @@ class ActionLoopResume(injector: HasAndroidInjector) : Action(injector) {
         if (loopPlugin.isSuspended) {
             disposable += repository.runTransactionForResult(CancelCurrentOfflineEventIfAnyTransaction(dateUtil.now()))
                 .subscribe({ result ->
-                    result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $it") }
-                }, {
-                    aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
-                })
+                               result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $it") }
+                           }, {
+                               aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
+                           })
             rxBus.send(EventRefreshOverview("ActionLoopResume"))
             uel.log(UserEntry.Action.RESUME, Sources.Automation, title)
             callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.kt
index 1ca41aa699d..a1c568b6a9e 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.kt
@@ -11,34 +11,35 @@ import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
 import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
 import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.JsonHelper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import javax.inject.Inject
 
 class ActionLoopSuspend(injector: HasAndroidInjector) : Action(injector) {
-    @Inject lateinit var resourceHelper: ResourceHelper
+
     @Inject lateinit var loopPlugin: Loop
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var uel: UserEntryLogger
 
     var minutes = InputDuration(30, InputDuration.TimeUnit.MINUTES)
 
     override fun friendlyName(): Int = R.string.suspendloop
-    override fun shortDescription(): String = resourceHelper.gs(R.string.suspendloopforXmin, minutes.getMinutes())
+    override fun shortDescription(): String = rh.gs(R.string.suspendloopforXmin, minutes.getMinutes())
     @DrawableRes override fun icon(): Int = R.drawable.ic_pause_circle_outline_24dp
 
     override fun doAction(callback: Callback) {
         if (!loopPlugin.isSuspended) {
             loopPlugin.suspendLoop(minutes.getMinutes())
             rxBus.send(EventRefreshOverview("ActionLoopSuspend"))
-            uel.log(UserEntry.Action.SUSPEND, Sources.Automation, title + ": " + resourceHelper.gs(R.string.suspendloopforXmin, minutes.getMinutes()),
-                ValueWithUnit.Minute(minutes.getMinutes()))
+            uel.log(
+                UserEntry.Action.SUSPEND, Sources.Automation, title + ": " + rh.gs(R.string.suspendloopforXmin, minutes.getMinutes()),
+                ValueWithUnit.Minute(minutes.getMinutes())
+            )
             callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
         } else {
             callback.result(PumpEnactResult(injector).success(true).comment(R.string.alreadysuspended))?.run()
@@ -63,7 +64,7 @@ class ActionLoopSuspend(injector: HasAndroidInjector) : Action(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.duration_min_label), "", minutes))
+            .add(LabelWithElement(rh, rh.gs(R.string.duration_min_label), "", minutes))
             .build(root)
     }
 
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt
index 38550e5fa5f..488b21608ed 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.androidaps.events.EventRefreshOverview
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.elements.InputString
 import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
 import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
@@ -16,7 +16,6 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotifi
 import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationUserMessage
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.JsonHelper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import org.json.JSONObject
@@ -24,8 +23,7 @@ import javax.inject.Inject
 
 class ActionNotification(injector: HasAndroidInjector) : Action(injector) {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var repository: AppRepository
 
     private val disposable = CompositeDisposable()
@@ -33,7 +31,7 @@ class ActionNotification(injector: HasAndroidInjector) : Action(injector) {
     var text = InputString()
 
     override fun friendlyName(): Int = R.string.notification
-    override fun shortDescription(): String = resourceHelper.gs(R.string.notification_message, text.value)
+    override fun shortDescription(): String = rh.gs(R.string.notification_message, text.value)
     @DrawableRes override fun icon(): Int = R.drawable.ic_notifications
 
     override fun doAction(callback: Callback) {
@@ -62,7 +60,7 @@ class ActionNotification(injector: HasAndroidInjector) : Action(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.message_short), "", text))
+            .add(LabelWithElement(rh, rh.gs(R.string.message_short), "", text))
             .build(root)
     }
 
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
index 38985b833a4..83119e47a8c 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
@@ -9,8 +9,8 @@ import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.automation.elements.InputProfileName
 import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
@@ -18,21 +18,20 @@ import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuil
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.JsonHelper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import javax.inject.Inject
 
 class ActionProfileSwitch(injector: HasAndroidInjector) : Action(injector) {
-    @Inject lateinit var resourceHelper: ResourceHelper
+
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var uel: UserEntryLogger
 
-    var inputProfileName: InputProfileName = InputProfileName(resourceHelper, activePlugin, "")
+    var inputProfileName: InputProfileName = InputProfileName(rh, activePlugin, "")
 
     override fun friendlyName(): Int = R.string.profilename
-    override fun shortDescription(): String = resourceHelper.gs(R.string.changengetoprofilename, inputProfileName.value)
+    override fun shortDescription(): String = rh.gs(R.string.changengetoprofilename, inputProfileName.value)
     @DrawableRes override fun icon(): Int = R.drawable.ic_actions_profileswitch
 
     override fun doAction(callback: Callback) {
@@ -59,16 +58,18 @@ class ActionProfileSwitch(injector: HasAndroidInjector) : Action(injector) {
             callback.result(PumpEnactResult(injector).success(false).comment(R.string.notexists))?.run()
             return
         }
-        uel.log(UserEntry.Action.PROFILE_SWITCH, Sources.Automation, title,
+        uel.log(
+            UserEntry.Action.PROFILE_SWITCH, Sources.Automation, title,
             ValueWithUnit.SimpleString(inputProfileName.value),
-            ValueWithUnit.Percent(100))
-        profileFunction.createProfileSwitch(profileStore, inputProfileName.value, 0, 100, 0, dateUtil.now())
-        callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
+            ValueWithUnit.Percent(100)
+        )
+        val result = profileFunction.createProfileSwitch(profileStore, inputProfileName.value, 0, 100, 0, dateUtil.now())
+        callback.result(PumpEnactResult(injector).success(result).comment(R.string.ok))?.run()
     }
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.profilename), "", inputProfileName))
+            .add(LabelWithElement(rh, rh.gs(R.string.profilename), "", inputProfileName))
             .build(root)
     }
 
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
index 06340215648..353f91ce279 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
@@ -19,13 +19,11 @@ import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuil
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerProfilePercent
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.JsonHelper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import javax.inject.Inject
 
 class ActionProfileSwitchPercent(injector: HasAndroidInjector) : Action(injector) {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var uel: UserEntryLogger
 
@@ -34,8 +32,8 @@ class ActionProfileSwitchPercent(injector: HasAndroidInjector) : Action(injector
 
     override fun friendlyName(): Int = R.string.profilepercentage
     override fun shortDescription(): String =
-        if (duration.value == 0) resourceHelper.gs(R.string.startprofileforever, pct.value.toInt())
-        else resourceHelper.gs(R.string.startprofile, pct.value.toInt(), duration.value)
+        if (duration.value == 0) rh.gs(R.string.startprofileforever, pct.value.toInt())
+        else rh.gs(R.string.startprofile, pct.value.toInt(), duration.value)
 
     @DrawableRes override fun icon(): Int = R.drawable.ic_actions_profileswitch
 
@@ -48,20 +46,21 @@ class ActionProfileSwitchPercent(injector: HasAndroidInjector) : Action(injector
             uel.log(
                 UserEntry.Action.PROFILE_SWITCH,
                 Sources.Automation,
-                title + ": " + resourceHelper.gs(R.string.startprofile, pct.value.toInt(), duration.value),
+                title + ": " + rh.gs(R.string.startprofile, pct.value.toInt(), duration.value),
                 ValueWithUnit.Percent(pct.value.toInt()),
                 ValueWithUnit.Minute(duration.value)
             )
+            callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
         } else {
             aapsLogger.error(LTag.AUTOMATION, "Final profile not valid")
+            callback.result(PumpEnactResult(injector).success(false).comment(R.string.ok))?.run()
         }
-        callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
     }
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.percent_u), "", pct))
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.duration_min_label), "", duration))
+            .add(LabelWithElement(rh, rh.gs(R.string.percent_u), "", pct))
+            .add(LabelWithElement(rh, rh.gs(R.string.duration_min_label), "", duration))
             .build(root)
     }
 
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt
index 446eeb4ceee..4c96e337843 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt
@@ -10,19 +10,17 @@ import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithE
 import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.JsonHelper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import javax.inject.Inject
 
 class ActionSendSMS(injector: HasAndroidInjector) : Action(injector) {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var smsCommunicatorPlugin: SmsCommunicator
 
     var text = InputString()
 
     override fun friendlyName(): Int = R.string.sendsmsactiondescription
-    override fun shortDescription(): String = resourceHelper.gs(R.string.sendsmsactionlabel, text.value)
+    override fun shortDescription(): String = rh.gs(R.string.sendsmsactionlabel, text.value)
     override fun icon(): Int = R.drawable.ic_notifications
 
     override fun doAction(callback: Callback) {
@@ -50,7 +48,7 @@ class ActionSendSMS(injector: HasAndroidInjector) : Action(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.sendsmsactiontext), "", text))
+            .add(LabelWithElement(rh, rh.gs(R.string.sendsmsactiontext), "", text))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
index 6775c1b34b6..61a9d259520 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
@@ -5,7 +5,6 @@ import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.automation.R
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.TemporaryTarget
@@ -13,7 +12,10 @@ import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
+import info.nightscout.androidaps.extensions.friendlyDescription
 import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -27,9 +29,6 @@ import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.JsonHelper.safeGetDouble
-import info.nightscout.androidaps.extensions.friendlyDescription
-import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import org.json.JSONObject
@@ -38,7 +37,6 @@ import javax.inject.Inject
 
 class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var profileFunction: ProfileFunction
@@ -55,7 +53,7 @@ class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) {
     }
 
     override fun friendlyName(): Int = R.string.starttemptarget
-    override fun shortDescription(): String = resourceHelper.gs(R.string.starttemptarget) + ": " + tt().friendlyDescription(value.units, resourceHelper)
+    override fun shortDescription(): String = rh.gs(R.string.starttemptarget) + ": " + tt().friendlyDescription(value.units, rh)
     @DrawableRes override fun icon(): Int = R.drawable.ic_temptarget_high
 
     override fun doAction(callback: Callback) {
@@ -65,8 +63,8 @@ class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) {
                 result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
                 uel.log(UserEntry.Action.TT, Sources.Automation, title,
                     ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.AUTOMATION),
-                    ValueWithUnit.fromGlucoseUnit(tt().lowTarget, Constants.MGDL),
-                    ValueWithUnit.fromGlucoseUnit(tt().highTarget, Constants.MGDL).takeIf { tt().lowTarget != tt().highTarget },
+                    ValueWithUnit.fromGlucoseUnit(tt().lowTarget, value.units.asText),
+                    ValueWithUnit.fromGlucoseUnit(tt().highTarget, value.units.asText).takeIf { tt().lowTarget != tt().highTarget },
                     ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(tt().duration).toInt()))
                 callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
             }, {
@@ -78,8 +76,8 @@ class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) {
     override fun generateDialog(root: LinearLayout) {
         val unitResId = if (value.units == GlucoseUnit.MGDL) R.string.mgdl else R.string.mmol
         LayoutBuilder()
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.careportal_temporarytarget) + "\n[" + resourceHelper.gs(unitResId) + "]", "", value))
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.duration_min_label), "", duration))
+            .add(LabelWithElement(rh, rh.gs(R.string.careportal_temporarytarget) + "\n[" + rh.gs(unitResId) + "]", "", value))
+            .add(LabelWithElement(rh, rh.gs(R.string.duration_min_label), "", duration))
             .build(root)
     }
 
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
index 9d4443d4661..50a19b144e3 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
@@ -11,14 +11,12 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import javax.inject.Inject
 
 class ActionStopTempTarget(injector: HasAndroidInjector) : Action(injector) {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var uel: UserEntryLogger
@@ -26,17 +24,17 @@ class ActionStopTempTarget(injector: HasAndroidInjector) : Action(injector) {
     private val disposable = CompositeDisposable()
 
     override fun friendlyName(): Int = R.string.stoptemptarget
-    override fun shortDescription(): String = resourceHelper.gs(R.string.stoptemptarget)
+    override fun shortDescription(): String = rh.gs(R.string.stoptemptarget)
     override fun icon(): Int = R.drawable.ic_stop_24dp
 
     override fun doAction(callback: Callback) {
         disposable += repository.runTransactionForResult(CancelCurrentTemporaryTargetIfAnyTransaction(dateUtil.now()))
             .subscribe({ result ->
-                uel.log(UserEntry.Action.CANCEL_TT, Sources.Automation, title)
-                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
-            }, {
-                aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
-            })
+                           uel.log(UserEntry.Action.CANCEL_TT, Sources.Automation, title)
+                           result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
+                       }, {
+                           aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
+                       })
         callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
     }
 
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt
index cf831c4481c..d6ec553117f 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt
@@ -8,7 +8,7 @@ import android.widget.RadioButton
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.automation.databinding.AutomationDialogChooseActionBinding
 import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.automation.actions.Action
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationAddAction
@@ -19,7 +19,7 @@ import kotlin.reflect.full.primaryConstructor
 class ChooseActionDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var automationPlugin: AutomationPlugin
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var injector: HasAndroidInjector
 
     private var checkedIndex = -1
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseOperationDialog.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseOperationDialog.kt
new file mode 100644
index 00000000000..c20789e4d0f
--- /dev/null
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseOperationDialog.kt
@@ -0,0 +1,96 @@
+package info.nightscout.androidaps.plugins.general.automation.dialogs
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RadioButton
+import info.nightscout.androidaps.automation.databinding.AutomationDialogChooseOperationBinding
+import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+class ChooseOperationDialog : DialogFragmentWithDate() {
+
+    @Inject lateinit var rh: ResourceHelper
+
+    private var checkedIndex = -1
+
+    private var _binding: AutomationDialogChooseOperationBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
+    abstract class Callback : Runnable {
+
+        var result: Int? = null
+        fun result(result: Int?): Callback {
+            this.result = result
+            return this
+        }
+    }
+
+    private var callback: Callback? = null
+
+    fun setCallback(callback: Callback): ChooseOperationDialog {
+        this.callback = callback
+        return this
+    }
+
+    fun setCheckedIndex(checkedIndex: Int): ChooseOperationDialog {
+        this.checkedIndex = checkedIndex
+        return this
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        // restore checked radio button
+        savedInstanceState?.let { bundle ->
+            checkedIndex = bundle.getInt("checkedIndex")
+        }
+
+        onCreateViewGeneral()
+        _binding = AutomationDialogChooseOperationBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        for (t in TriggerConnector.Type.labels(rh)) {
+            val radioButton = RadioButton(context)
+            radioButton.text = t
+            binding.chooseOperationRadioGroup.addView(radioButton)
+        }
+
+        if (checkedIndex != -1)
+            (binding.chooseOperationRadioGroup.getChildAt(checkedIndex) as RadioButton).isChecked = true
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    override fun submit(): Boolean {
+        callback?.result(determineCheckedIndex())?.run()
+        return true
+    }
+
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        super.onSaveInstanceState(savedInstanceState)
+        savedInstanceState.putInt("checkedIndex", determineCheckedIndex())
+    }
+
+    private fun determineCheckedIndex(): Int {
+        for (i in 0 until binding.chooseOperationRadioGroup.childCount) {
+            if ((binding.chooseOperationRadioGroup.getChildAt(i) as RadioButton).isChecked)
+                return i
+        }
+        return -1
+    }
+}
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
index 269080b948a..6f40e9c12f6 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.automation.databinding.AutomationDialogActionBinding
 import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.actions.Action
 import info.nightscout.androidaps.plugins.general.automation.actions.ActionDummy
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateAction
@@ -16,7 +16,7 @@ import javax.inject.Inject
 
 class EditActionDialog : DialogFragmentWithDate() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var injector: HasAndroidInjector
 
     private var action: Action? = null
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt
index 9c2e327cbc7..43a1025eff4 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt
@@ -13,7 +13,8 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.automation.databinding.AutomationDialogEventBinding
 import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.AutomationEvent
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.automation.actions.Action
@@ -22,19 +23,17 @@ import info.nightscout.androidaps.plugins.general.automation.events.EventAutomat
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateAction
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateGui
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateTrigger
-import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.ToastUtils
-import io.reactivex.rxkotlin.plusAssign
-import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import javax.inject.Inject
 
 class EditEventDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var automationPlugin: AutomationPlugin
@@ -73,6 +72,8 @@ class EditEventDialog : DialogFragmentWithDate() {
         binding.inputEventTitle.setText(event.title)
         binding.inputEventTitle.isFocusable = !event.readOnly
         binding.triggerDescription.text = event.trigger.friendlyDescription()
+        binding.userAction.isChecked = event.userAction
+        binding.enabled.isChecked = event.isEnabled
 
         binding.editTrigger.visibility = (!event.readOnly).toVisibility()
         binding.editTrigger.setOnClickListener {
@@ -131,9 +132,11 @@ class EditEventDialog : DialogFragmentWithDate() {
             return false
         }
         event.title = title
+        event.userAction = binding.userAction.isChecked
+        event.isEnabled = binding.enabled.isChecked
         // check for at least one trigger
-        val con = event.trigger as TriggerConnector
-        if (con.size() == 0) {
+        val con = event.trigger
+        if (con.size() == 0 && !event.userAction) {
             ToastUtils.showToastInUiThread(context, R.string.automation_missing_trigger)
             return false
         }
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt
index 7a0225a686a..24281a91bc2 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.automation.databinding.AutomationDialogEditTriggerBinding
 import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.events.EventAutomationUpdateTrigger
 import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerChanged
 import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerClone
@@ -16,22 +16,22 @@ import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDummy
 import info.nightscout.androidaps.utils.FabricPrivacy
-import io.reactivex.rxkotlin.plusAssign
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import org.json.JSONObject
 import javax.inject.Inject
 
 class EditTriggerDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var fabricPrivacy: FabricPrivacy
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
-    private var triggers: Trigger? = null
+    private var triggers: TriggerConnector? = null
 
     private var _binding: AutomationDialogEditTriggerBinding? = null
 
@@ -39,11 +39,13 @@ class EditTriggerDialog : DialogFragmentWithDate() {
     // onDestroyView.
     private val binding get() = _binding!!
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View {
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
         // load data from bundle
         (savedInstanceState ?: arguments)?.let { bundle ->
-            bundle.getString("trigger")?.let { triggers = TriggerDummy(injector).instantiate(JSONObject(it)) }
+            bundle.getString("trigger")?.let { triggers = TriggerDummy(injector).instantiate(JSONObject(it)) as TriggerConnector }
         }
 
         onCreateViewGeneral()
@@ -58,26 +60,26 @@ class EditTriggerDialog : DialogFragmentWithDate() {
             .toObservable(EventTriggerChanged::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({
-                binding.layoutTrigger.removeAllViews()
-                triggers?.generateDialog(binding.layoutTrigger)
-            }, fabricPrivacy::logException)
+                           binding.layoutTrigger.removeAllViews()
+                           triggers?.generateDialog(binding.layoutTrigger)
+                       }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventTriggerRemove::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({
-                findParent(triggers, it.trigger)?.list?.remove(it.trigger)
-                binding.layoutTrigger.removeAllViews()
-                triggers?.generateDialog(binding.layoutTrigger)
-            }, fabricPrivacy::logException)
+                           findParent(triggers, it.trigger)?.list?.remove(it.trigger)
+                           binding.layoutTrigger.removeAllViews()
+                           triggers?.generateDialog(binding.layoutTrigger)
+                       }, fabricPrivacy::logException)
 
         disposable += rxBus
             .toObservable(EventTriggerClone::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({
-                findParent(triggers, it.trigger)?.list?.add(it.trigger.duplicate())
-                binding.layoutTrigger.removeAllViews()
-                triggers?.generateDialog(binding.layoutTrigger)
-            }, fabricPrivacy::logException)
+                           findParent(triggers, it.trigger)?.list?.add(it.trigger.duplicate())
+                           binding.layoutTrigger.removeAllViews()
+                           triggers?.generateDialog(binding.layoutTrigger)
+                       }, fabricPrivacy::logException)
 
         // display root trigger
         triggers?.generateDialog(binding.layoutTrigger)
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.kt
index 97f80e44606..c7f7149757b 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
@@ -9,7 +10,7 @@ import androidx.annotation.StringRes
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
-class Comparator(private val resourceHelper: ResourceHelper) : Element() {
+class Comparator(private val rh: ResourceHelper) : Element() {
 
     enum class Compare {
         IS_LESSER,
@@ -42,42 +43,42 @@ class Comparator(private val resourceHelper: ResourceHelper) : Element() {
         }
 
         companion object {
-            fun labels(resourceHelper: ResourceHelper): List<String> {
+
+            fun labels(rh: ResourceHelper): List<String> {
                 val list: MutableList<String> = ArrayList()
                 for (c in values()) {
-                    list.add(resourceHelper.gs(c.stringRes))
+                    list.add(rh.gs(c.stringRes))
                 }
                 return list
             }
         }
     }
 
-    constructor(resourceHelper: ResourceHelper, value: Compare) : this(resourceHelper) {
+    constructor(rh: ResourceHelper, value: Compare) : this(rh) {
         this.value = value
     }
 
     var value = Compare.IS_EQUAL
 
     override fun addToLayout(root: LinearLayout) {
-        val spinner = Spinner(root.context)
-        val spinnerArrayAdapter = ArrayAdapter(root.context, R.layout.spinner_centered, Compare.labels(resourceHelper))
-        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        spinner.adapter = spinnerArrayAdapter
-        val spinnerParams = LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.MATCH_PARENT,
-            LinearLayout.LayoutParams.WRAP_CONTENT
-        )
-        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
-        spinner.layoutParams = spinnerParams
-        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                value = Compare.values()[position]
-            }
+        root.addView(
+            Spinner(root.context).apply {
+                adapter = ArrayAdapter(root.context, R.layout.spinner_centered, Compare.labels(rh)).apply {
+                    setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                }
+                layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                    setMargins(0, rh.dpToPx(1), 0, rh.dpToPx(1))
+                }
+                onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                        value = Compare.values()[position]
+                    }
 
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-        }
-        spinner.setSelection(value.ordinal)
-        root.addView(spinner)
+                    override fun onNothingSelected(parent: AdapterView<*>?) {}
+                }
+                setSelection(value.ordinal)
+                gravity = Gravity.CENTER_HORIZONTAL
+            })
     }
 
     fun setValue(compare: Compare): Comparator {
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnect.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnect.kt
index d27b0c4ee51..6b185597676 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnect.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnect.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
@@ -9,48 +10,52 @@ import androidx.annotation.StringRes
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
-class ComparatorConnect(private val resourceHelper: ResourceHelper) : Element() {
+class ComparatorConnect(private val rh: ResourceHelper) : Element() {
 
     enum class Compare {
         ON_CONNECT, ON_DISCONNECT;
 
         @get:StringRes val stringRes: Int
             get() = when (this) {
-                ON_CONNECT    -> R.string.onconnect
+                ON_CONNECT -> R.string.onconnect
                 ON_DISCONNECT -> R.string.ondisconnect
             }
 
         companion object {
-            fun labels(resourceHelper: ResourceHelper): List<String> {
+
+            fun labels(rh: ResourceHelper): List<String> {
                 val list: MutableList<String> = ArrayList()
-                for (c in values()) list.add(resourceHelper.gs(c.stringRes))
+                for (c in values()) list.add(rh.gs(c.stringRes))
                 return list
             }
         }
     }
 
-    constructor(resourceHelper: ResourceHelper, value: Compare) : this(resourceHelper) {
+    constructor(rh: ResourceHelper, value: Compare) : this(rh) {
         this.value = value
     }
 
     var value = Compare.ON_CONNECT
 
     override fun addToLayout(root: LinearLayout) {
-        val spinner = Spinner(root.context)
-        val spinnerArrayAdapter = ArrayAdapter(root.context, R.layout.spinner_centered, Compare.labels(resourceHelper))
-        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        spinner.adapter = spinnerArrayAdapter
-        val spinnerParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
-        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
-        spinner.layoutParams = spinnerParams
-        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                value = Compare.values()[position]
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-        }
-        spinner.setSelection(value.ordinal)
-        root.addView(spinner)
+        root.addView(
+            Spinner(root.context).apply {
+                adapter = ArrayAdapter(root.context, R.layout.spinner_centered, Compare.labels(rh)).apply {
+                    setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                }
+
+                layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                    setMargins(0, rh.dpToPx(4), 0, rh.dpToPx(4))
+                }
+                onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                        value = Compare.values()[position]
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>?) {}
+                }
+                setSelection(value.ordinal)
+                gravity = Gravity.CENTER_HORIZONTAL
+            })
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.kt
index 9337dd93fb2..c9b1b421def 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
@@ -9,42 +10,46 @@ import androidx.annotation.StringRes
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
-class ComparatorExists(private val resourceHelper: ResourceHelper, var value: Compare = Compare.EXISTS) : Element() {
+class ComparatorExists(private val rh: ResourceHelper, var value: Compare = Compare.EXISTS) : Element() {
 
     enum class Compare {
         EXISTS, NOT_EXISTS;
 
         @get:StringRes val stringRes: Int
             get() = when (this) {
-                EXISTS     -> R.string.exists
+                EXISTS -> R.string.exists
                 NOT_EXISTS -> R.string.notexists
             }
 
         companion object {
-            fun labels(resourceHelper: ResourceHelper): List<String> {
+
+            fun labels(rh: ResourceHelper): List<String> {
                 val list: MutableList<String> = ArrayList()
-                for (c in values()) list.add(resourceHelper.gs(c.stringRes))
+                for (c in values()) list.add(rh.gs(c.stringRes))
                 return list
             }
         }
     }
 
     override fun addToLayout(root: LinearLayout) {
-        val spinner = Spinner(root.context)
-        val spinnerArrayAdapter = ArrayAdapter(root.context, R.layout.spinner_centered, Compare.labels(resourceHelper))
-        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        spinner.adapter = spinnerArrayAdapter
-        val spinnerParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
-        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
-        spinner.layoutParams = spinnerParams
-        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                value = Compare.values()[position]
-            }
+        root.addView(
+            Spinner(root.context).apply {
+                adapter = ArrayAdapter(root.context, R.layout.spinner_centered, Compare.labels(rh)).apply {
+                    setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                }
+                layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                    setMargins(0, rh.dpToPx(4), 0, rh.dpToPx(4))
+                }
 
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-        }
-        spinner.setSelection(value.ordinal)
-        root.addView(spinner)
+                onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                        value = Compare.values()[position]
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>?) {}
+                }
+                setSelection(value.ordinal)
+                gravity = Gravity.CENTER_HORIZONTAL
+            })
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
index 59f638dc171..f54cd4aefed 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.widget.LinearLayout
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.interfaces.GlucoseUnit
@@ -26,13 +27,15 @@ class InputBg(profileFunction: ProfileFunction) : Element() {
     }
 
     override fun addToLayout(root: LinearLayout) {
-        val numberPicker = NumberPicker(root.context, null)
-        numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, false, root.findViewById(R.id.ok))
-        numberPicker.setOnValueChangedListener { value: Double -> this.value = value }
-        root.addView(numberPicker)
+        root.addView(
+            NumberPicker(root.context, null).also {
+                it.setParams(value, minValue, maxValue, step, decimalFormat, false, root.findViewById(R.id.ok))
+                it.setOnValueChangedListener { v: Double -> value = v }
+                it.gravity = Gravity.CENTER_HORIZONTAL
+            })
     }
 
-    fun setValue(value: Double) : InputBg {
+    fun setValue(value: Double): InputBg {
         this.value = value
         return this
     }
@@ -54,6 +57,7 @@ class InputBg(profileFunction: ProfileFunction) : Element() {
     }
 
     companion object {
+
         const val MMOL_MIN = 3.0
         const val MMOL_MAX = 20.0
         const val MGDL_MIN = 54.0
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputButton.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputButton.kt
index cd9773fd696..216f54e3fd8 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputButton.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputButton.kt
@@ -1,9 +1,11 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.widget.Button
 import android.widget.LinearLayout
 
 class InputButton() : Element() {
+
     var text: String? = null
     var runnable: Runnable? = null
 
@@ -13,9 +15,11 @@ class InputButton() : Element() {
     }
 
     override fun addToLayout(root: LinearLayout) {
-        val button = Button(root.context)
-        button.text = text
-        button.setOnClickListener { runnable?.run() }
-        root.addView(button)
+        root.addView(
+            Button(root.context).apply {
+                text = text
+                setOnClickListener { runnable?.run() }
+                gravity = Gravity.CENTER_HORIZONTAL
+            })
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputCarePortalMenu.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputCarePortalMenu.kt
new file mode 100644
index 00000000000..ab82beffe07
--- /dev/null
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputCarePortalMenu.kt
@@ -0,0 +1,90 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import android.view.Gravity
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import android.widget.Spinner
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.automation.R
+import info.nightscout.androidaps.database.entities.TherapyEvent
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class InputCarePortalMenu(private val rh: ResourceHelper) : Element() {
+
+    enum class EventType(val therapyEventType: TherapyEvent.Type) {
+        NOTE(TherapyEvent.Type.NOTE),
+        EXERCISE(TherapyEvent.Type.EXERCISE),
+        QUESTION(TherapyEvent.Type.QUESTION),
+        ANNOUNCEMENT(TherapyEvent.Type.ANNOUNCEMENT);
+
+        @get:StringRes val stringResWithValue: Int
+            get() = when (this) {
+                NOTE         -> R.string.careportal_note_message
+                EXERCISE     -> R.string.careportal_exercise_message
+                QUESTION     -> R.string.careportal_question_message
+                ANNOUNCEMENT -> R.string.careportal_announcement_message
+            }
+
+        @get:StringRes val stringRes: Int
+            get() = when (this) {
+                NOTE         -> R.string.careportal_note
+                EXERCISE     -> R.string.careportal_exercise
+                QUESTION     -> R.string.careportal_question
+                ANNOUNCEMENT -> R.string.careportal_announcement
+            }
+        @get:DrawableRes val drawableRes: Int
+            get() = when (this) {
+                NOTE         -> R.drawable.ic_cp_note
+                EXERCISE     -> R.drawable.ic_cp_exercise
+                QUESTION     -> R.drawable.ic_cp_question
+                ANNOUNCEMENT -> R.drawable.ic_cp_announcement
+            }
+
+        companion object {
+
+            fun labels(rh: ResourceHelper): List<String> {
+                val list: MutableList<String> = ArrayList()
+                for (e in values()) {
+                    list.add(rh.gs(e.stringRes))
+                }
+                return list
+            }
+        }
+    }
+
+    constructor(rh: ResourceHelper, value: EventType) : this(rh) {
+        this.value = value
+    }
+
+    var value = EventType.NOTE
+
+    override fun addToLayout(root: LinearLayout) {
+        root.addView(
+            Spinner(root.context).apply {
+                adapter = ArrayAdapter(root.context, R.layout.spinner_centered, EventType.labels(rh)).apply {
+                    setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                }
+                layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                    setMargins(0, rh.dpToPx(4), 0, rh.dpToPx(4))
+                }
+
+                onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                        value = EventType.values()[position]
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>?) {}
+                }
+                setSelection(value.ordinal)
+                gravity = Gravity.CENTER_HORIZONTAL
+            })
+    }
+
+    fun setValue(eventType: EventType): InputCarePortalMenu {
+        value = eventType
+        return this
+    }
+}
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt
index df0939bfa7d..fb1f779f0f8 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt
@@ -12,74 +12,74 @@ import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 
-class InputDateTime(private val resourceHelper: ResourceHelper, private val dateUtil: DateUtil, var value: Long = dateUtil.now()) : Element() {
+class InputDateTime(private val rh: ResourceHelper, private val dateUtil: DateUtil, var value: Long = dateUtil.now()) : Element() {
 
     override fun addToLayout(root: LinearLayout) {
-        val label = TextView(root.context)
-        val dateButton = TextView(root.context)
-        val timeButton = TextView(root.context)
-        dateButton.text = dateUtil.dateString(value)
-        timeButton.text = dateUtil.timeString(value)
+        val px = rh.dpToPx(10)
 
-        // create an OnDateSetListener
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = value
-            cal.set(Calendar.YEAR, year)
-            cal.set(Calendar.MONTH, monthOfYear)
-            cal.set(Calendar.DAY_OF_MONTH, dayOfMonth)
-            value = cal.timeInMillis
-            dateButton.text = dateUtil.dateString(value)
-        }
-
-        dateButton.setOnClickListener {
-            root.context?.let {
-                val cal = Calendar.getInstance()
-                cal.timeInMillis = value
-                DatePickerDialog(it, dateSetListener,
-                    cal.get(Calendar.YEAR),
-                    cal.get(Calendar.MONTH),
-                    cal.get(Calendar.DAY_OF_MONTH)
-                ).show()
-            }
-        }
-
-        // create an OnTimeSetListener
-        val timeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = value
-            cal.set(Calendar.HOUR_OF_DAY, hour)
-            cal.set(Calendar.MINUTE, minute)
-            cal.set(Calendar.SECOND, 0) // randomize seconds to prevent creating record of the same time, if user choose time manually
-            value = cal.timeInMillis
-            timeButton.text = dateUtil.timeString(value)
-        }
-
-        timeButton.setOnClickListener {
-            root.context?.let {
-                val cal = Calendar.getInstance()
-                cal.timeInMillis = value
-                TimePickerDialog(it, timeSetListener,
-                    cal.get(Calendar.HOUR_OF_DAY),
-                    cal.get(Calendar.MINUTE),
-                    DateFormat.is24HourFormat(it)
-                ).show()
-            }
-        }
-
-        val px = resourceHelper.dpToPx(10)
-        label.text = resourceHelper.gs(R.string.atspecifiedtime, "")
-        label.setTypeface(label.typeface, Typeface.BOLD)
-        label.setPadding(px, px, px, px)
-        dateButton.setPadding(px, px, px, px)
-        timeButton.setPadding(px, px, px, px)
-        val l = LinearLayout(root.context)
-        l.orientation = LinearLayout.HORIZONTAL
-        l.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        l.addView(label)
-        l.addView(dateButton)
-        l.addView(timeButton)
-        root.addView(l)
+        root.addView(
+            LinearLayout(root.context).apply {
+                orientation = LinearLayout.HORIZONTAL
+                layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+                addView(
+                    TextView(root.context).apply {
+                        text = rh.gs(R.string.atspecifiedtime, "")
+                        setTypeface(typeface, Typeface.BOLD)
+                        setPadding(px, px, px, px)
+                    })
+                addView(
+                    TextView(root.context).apply {
+                        text = dateUtil.dateString(value)
+                        setPadding(px, px, px, px)
+                        setOnClickListener {
+                            root.context?.let {
+                                val cal = Calendar.getInstance()
+                                cal.timeInMillis = value
+                                DatePickerDialog(
+                                    it,
+                                    { _, year, monthOfYear, dayOfMonth ->
+                                        value = Calendar.getInstance().apply {
+                                            timeInMillis = value
+                                            set(Calendar.YEAR, year)
+                                            set(Calendar.MONTH, monthOfYear)
+                                            set(Calendar.DAY_OF_MONTH, dayOfMonth)
+                                        }.timeInMillis
+                                        text = dateUtil.dateString(value)
+                                    },
+                                    cal.get(Calendar.YEAR),
+                                    cal.get(Calendar.MONTH),
+                                    cal.get(Calendar.DAY_OF_MONTH)
+                                ).show()
+                            }
+                        }
+                    })
+                addView(
+                    TextView(root.context).apply {
+                        text = dateUtil.timeString(value)
+                        setPadding(px, px, px, px)
+                        setOnClickListener {
+                            root.context?.let {
+                                val cal = Calendar.getInstance()
+                                cal.timeInMillis = value
+                                TimePickerDialog(
+                                    it,
+                                    { _, hour, minute ->
+                                        value = Calendar.getInstance().apply {
+                                            timeInMillis = value
+                                            set(Calendar.HOUR_OF_DAY, hour)
+                                            set(Calendar.MINUTE, minute)
+                                            set(Calendar.SECOND, 0) // randomize seconds to prevent creating record of the same time, if user choose time manually
+                                        }.timeInMillis
+                                        text = dateUtil.timeString(value)
+                                    },
+                                    cal.get(Calendar.HOUR_OF_DAY),
+                                    cal.get(Calendar.MINUTE),
+                                    DateFormat.is24HourFormat(it)
+                                ).show()
+                            }
+                        }
+                    }
+                )
+            })
     }
-
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
index 365de3c2dd2..946c0576e1c 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
@@ -1,34 +1,35 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.view.View
-import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.LinearLayout
 import android.widget.Spinner
 import androidx.annotation.StringRes
 import info.nightscout.androidaps.automation.R
-import info.nightscout.androidaps.utils.ui.NumberPicker
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
-class InputDelta(private val resourceHelper: ResourceHelper) : Element() {
+class InputDelta(private val rh: ResourceHelper) : Element() {
 
     enum class DeltaType {
         DELTA, SHORT_AVERAGE, LONG_AVERAGE;
 
         @get:StringRes val stringRes: Int
             get() = when (this) {
-                DELTA         -> R.string.delta
+                DELTA -> R.string.delta
                 SHORT_AVERAGE -> R.string.short_avgdelta
-                LONG_AVERAGE  -> R.string.long_avgdelta
+                LONG_AVERAGE -> R.string.long_avgdelta
             }
 
         companion object {
-            fun labels(resourceHelper: ResourceHelper): List<String> {
+
+            fun labels(rh: ResourceHelper): List<String> {
                 val list: MutableList<String> = ArrayList()
                 for (d in values()) {
-                    list.add(resourceHelper.gs(d.stringRes))
+                    list.add(rh.gs(d.stringRes))
                 }
                 return list
             }
@@ -42,7 +43,7 @@ class InputDelta(private val resourceHelper: ResourceHelper) : Element() {
     private var decimalFormat: DecimalFormat? = null
     var deltaType: DeltaType = DeltaType.DELTA
 
-    constructor(resourceHelper: ResourceHelper, value: Double, minValue: Double, maxValue: Double, step: Double, decimalFormat: DecimalFormat, deltaType: DeltaType) : this(resourceHelper) {
+    constructor(rh: ResourceHelper, value: Double, minValue: Double, maxValue: Double, step: Double, decimalFormat: DecimalFormat, deltaType: DeltaType) : this(rh) {
         this.value = value
         this.minValue = minValue
         this.maxValue = maxValue
@@ -51,7 +52,7 @@ class InputDelta(private val resourceHelper: ResourceHelper) : Element() {
         this.deltaType = deltaType
     }
 
-    constructor(resourceHelper: ResourceHelper, inputDelta: InputDelta) : this(resourceHelper) {
+    constructor(rh: ResourceHelper, inputDelta: InputDelta) : this(rh) {
         value = inputDelta.value
         minValue = inputDelta.minValue
         maxValue = inputDelta.maxValue
@@ -61,32 +62,29 @@ class InputDelta(private val resourceHelper: ResourceHelper) : Element() {
     }
 
     override fun addToLayout(root: LinearLayout) {
-        val spinner = Spinner(root.context)
-        val spinnerArrayAdapter = ArrayAdapter(root.context, R.layout.spinner_centered, DeltaType.labels(resourceHelper))
-        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        spinner.adapter = spinnerArrayAdapter
-        val spinnerParams = LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.WRAP_CONTENT,
-            LinearLayout.LayoutParams.WRAP_CONTENT
-        )
-        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
-        spinner.layoutParams = spinnerParams
-        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                deltaType = DeltaType.values()[position]
-            }
+        root.addView(
+            Spinner(root.context).apply {
+                adapter = ArrayAdapter(root.context, R.layout.spinner_centered, DeltaType.labels(rh)).apply {
+                    setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                }
+                layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                    setMargins(0, rh.dpToPx(4), 0, rh.dpToPx(4))
+                }
+                onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                        deltaType = DeltaType.values()[position]
+                    }
 
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-        }
-        spinner.setSelection(deltaType.ordinal)
-        val numberPicker = NumberPicker(root.context, null)
-        numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, null, null)
-        numberPicker.setOnValueChangedListener { value: Double -> this.value = value }
-        val l = LinearLayout(root.context)
-        l.orientation = LinearLayout.VERTICAL
-        l.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        l.addView(spinner)
-        l.addView(numberPicker)
-        root.addView(l)
+                    override fun onNothingSelected(parent: AdapterView<*>?) {}
+                }
+                setSelection(deltaType.ordinal)
+                gravity = Gravity.CENTER_HORIZONTAL
+            })
+        root.addView(
+            NumberPicker(root.context, null).also {
+                it.setParams(value, minValue, maxValue, step, decimalFormat, true, null, null)
+                it.setOnValueChangedListener { v: Double -> value = v }
+                it.gravity = Gravity.CENTER_HORIZONTAL
+            })
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt
index d6f975fa787..9d3e3f45c28 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt
@@ -1,11 +1,13 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.widget.LinearLayout
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
 class InputDouble() : Element() {
+
     var value = 0.0
     private var minValue = 0.0
     private var maxValue = 0.0
@@ -30,9 +32,11 @@ class InputDouble() : Element() {
     }
 
     override fun addToLayout(root: LinearLayout) {
-        numberPicker = NumberPicker(root.context, null)
-        numberPicker?.setParams(value, minValue, maxValue, step, decimalFormat, true, root.findViewById(R.id.ok))
-        numberPicker?.setOnValueChangedListener { value: Double -> this.value = value }
+        numberPicker = NumberPicker(root.context, null).also {
+            it.setParams(value, minValue, maxValue, step, decimalFormat, true, root.findViewById(R.id.ok))
+            it.setOnValueChangedListener { v: Double -> value = v }
+            it.gravity = Gravity.CENTER_HORIZONTAL
+        }
         root.addView(numberPicker)
     }
 
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDropdownMenu.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDropdownMenu.kt
index c2e7e215449..4929bb3278a 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDropdownMenu.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDropdownMenu.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.view.View
-import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.LinearLayout
@@ -10,44 +10,40 @@ import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 
-class InputDropdownMenu(private val resourceHelper: ResourceHelper) : Element() {
+class InputDropdownMenu(private val rh: ResourceHelper) : Element() {
 
     private var itemList: ArrayList<CharSequence> = ArrayList()
     var value: String = ""
 
-    constructor(resourceHelper: ResourceHelper, name: String) : this(resourceHelper) {
+    constructor(rh: ResourceHelper, name: String) : this(rh) {
         value = name
     }
 
     @Suppress("unused")
-    constructor(resourceHelper: ResourceHelper, another: InputDropdownMenu) : this(resourceHelper) {
+    constructor(rh: ResourceHelper, another: InputDropdownMenu) : this(rh) {
         value = another.value
     }
 
     override fun addToLayout(root: LinearLayout) {
-        val spinner = Spinner(root.context)
-        spinner.adapter = ArrayAdapter(root.context,
-            R.layout.spinner_centered, itemList).also {
-            it.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        }
-        spinner.layoutParams = LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.WRAP_CONTENT,
-            LinearLayout.LayoutParams.WRAP_CONTENT
-        ).also { it.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4)) }
-
-        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                setValue(itemList[position].toString())
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-        }
-        spinner.setSelection(0)
-        root.addView(LinearLayout(root.context).also {
-            it.orientation = LinearLayout.VERTICAL
-            it.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-            it.addView(spinner)
-        })
+        root.addView(
+            Spinner(root.context).apply {
+                adapter = ArrayAdapter(root.context, R.layout.spinner_centered, itemList).apply {
+                    setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                }
+                layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).also {
+                    it.setMargins(0, rh.dpToPx(4), 0, rh.dpToPx(4))
+                }
+
+                onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                        setValue(itemList[position].toString())
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>?) {}
+                }
+                gravity = Gravity.CENTER_HORIZONTAL
+                for (i in 0 until itemList.size) if (itemList[i] == value) setSelection(i)
+            })
     }
 
     fun setValue(name: String): InputDropdownMenu {
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt
index 1ae61ced9a5..6e275190e91 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.widget.LinearLayout
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.utils.ui.MinutesNumberPicker
@@ -25,6 +26,7 @@ class InputDuration(
             numberPicker.setParams(value.toDouble(), 1.0, 24.0, 1.0, DecimalFormat("0"), false, root.findViewById(R.id.ok))
         }
         numberPicker.setOnValueChangedListener { value: Double -> this.value = value.toInt() }
+        numberPicker.gravity = Gravity.CENTER_HORIZONTAL
         root.addView(numberPicker)
     }
 
@@ -44,4 +46,6 @@ class InputDuration(
             this.value = value / 60
         return this
     }
+
+    override fun toString(): String = "InputDuration: $value $unit"
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt
index 038449f6eb4..4b394fdcfc1 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt
@@ -1,11 +1,13 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.widget.LinearLayout
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
 class InputInsulin() : Element() {
+
     var value = 0.0
 
     constructor(another: InputInsulin) : this() {
@@ -13,10 +15,11 @@ class InputInsulin() : Element() {
     }
 
     override fun addToLayout(root: LinearLayout) {
-        val numberPicker = NumberPicker(root.context, null)
-        numberPicker.setParams(0.0, -20.0, 20.0, 0.1, DecimalFormat("0.0"), true, root.findViewById(R.id.ok))
-        numberPicker.value = value
-        numberPicker.setOnValueChangedListener { value: Double -> this.value = value }
-        root.addView(numberPicker)
+        root.addView(
+            NumberPicker(root.context, null).also {
+                it.setParams(value, -20.0, 20.0, 0.1, DecimalFormat("0.0"), true, root.findViewById(R.id.ok))
+                it.setOnValueChangedListener { v: Double -> value = v }
+                it.gravity = Gravity.CENTER_HORIZONTAL
+            })
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.kt
index 2174da64252..0a4200aae97 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
@@ -9,7 +10,7 @@ import androidx.annotation.StringRes
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
-class InputLocationMode(private val resourceHelper: ResourceHelper) : Element() {
+class InputLocationMode(private val rh: ResourceHelper) : Element() {
 
     enum class Mode {
         INSIDE, OUTSIDE, GOING_IN, GOING_OUT;
@@ -30,10 +31,11 @@ class InputLocationMode(private val resourceHelper: ResourceHelper) : Element()
         }
 
         companion object {
-            fun labels(resourceHelper: ResourceHelper): List<String> {
+
+            fun labels(rh: ResourceHelper): List<String> {
                 val list: MutableList<String> = ArrayList()
                 for (c in values()) {
-                    list.add(resourceHelper.gs(c.stringRes))
+                    list.add(rh.gs(c.stringRes))
                 }
                 return list
             }
@@ -42,29 +44,29 @@ class InputLocationMode(private val resourceHelper: ResourceHelper) : Element()
 
     var value: Mode = Mode.INSIDE
 
-    constructor(resourceHelper: ResourceHelper, value: InputLocationMode.Mode) : this(resourceHelper) {
+    constructor(rh: ResourceHelper, value: InputLocationMode.Mode) : this(rh) {
         this.value = value
     }
 
     override fun addToLayout(root: LinearLayout) {
-        val adapter = ArrayAdapter(root.context, R.layout.spinner_centered, Mode.labels(resourceHelper))
-        val spinner = Spinner(root.context)
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        spinner.adapter = adapter
-        val spinnerParams = LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.WRAP_CONTENT,
-            LinearLayout.LayoutParams.WRAP_CONTENT
-        )
-        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
-        spinner.layoutParams = spinnerParams
-        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                value = Mode.values()[position]
-            }
+        root.addView(
+            Spinner(root.context).apply {
+                adapter = ArrayAdapter(root.context, R.layout.spinner_centered, Mode.labels(rh)).apply {
+                    setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                }
+                val spinnerParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                    setMargins(0, rh.dpToPx(4), 0, rh.dpToPx(4))
+                }
+                layoutParams = spinnerParams
+                onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                        value = Mode.values()[position]
+                    }
 
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-        }
-        spinner.setSelection(value.ordinal)
-        root.addView(spinner)
+                    override fun onNothingSelected(parent: AdapterView<*>?) {}
+                }
+                setSelection(value.ordinal)
+                gravity = Gravity.CENTER_HORIZONTAL
+            })
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt
index ffb27badfe5..61cfd2b5502 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.widget.LinearLayout
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.utils.ui.NumberPicker
@@ -14,11 +15,12 @@ class InputPercent() : Element() {
     }
 
     override fun addToLayout(root: LinearLayout) {
-        val numberPicker = NumberPicker(root.context, null)
-        numberPicker.setParams(100.0, MIN, MAX, 5.0, DecimalFormat("0"), true, root.findViewById(R.id.ok))
-        numberPicker.value = value
-        numberPicker.setOnValueChangedListener { value: Double -> this.value = value }
-        root.addView(numberPicker)
+        root.addView(
+            NumberPicker(root.context, null).also {
+                it.setParams(value, MIN, MAX, 5.0, DecimalFormat("0"), true, root.findViewById(R.id.ok))
+                it.setOnValueChangedListener { v: Double -> value = v }
+                it.gravity = Gravity.CENTER_HORIZONTAL
+            })
     }
 
     companion object {
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.kt
index 967f22e0bf5..d28a78408f3 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.view.View
-import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.LinearLayout
@@ -10,35 +10,31 @@ import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
-class InputProfileName(private val resourceHelper: ResourceHelper, private val activePlugin: ActivePlugin, val name: String = "") : Element() {
+class InputProfileName(private val rh: ResourceHelper, private val activePlugin: ActivePlugin, val name: String = "") : Element() {
 
     var value: String = name
 
     override fun addToLayout(root: LinearLayout) {
         val profileStore = activePlugin.activeProfileSource.profile ?: return
         val profileList = profileStore.getProfileList()
-        val adapter = ArrayAdapter(root.context, R.layout.spinner_centered, profileList)
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        val spinner = Spinner(root.context)
-        spinner.adapter = adapter
-        val spinnerParams = LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.WRAP_CONTENT,
-            LinearLayout.LayoutParams.WRAP_CONTENT
-        )
-        spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
-        spinner.layoutParams = spinnerParams
-        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                value = profileList[position].toString()
-            }
 
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-        }
-        spinner.setSelection(0)
-        val l = LinearLayout(root.context)
-        l.orientation = LinearLayout.VERTICAL
-        l.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        l.addView(spinner)
-        root.addView(l)
+        root.addView(
+            Spinner(root.context).apply {
+                adapter = ArrayAdapter(root.context, R.layout.spinner_centered, profileList).apply {
+                    setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                }
+                layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                    setMargins(0, rh.dpToPx(4), 0, rh.dpToPx(4))
+                }
+                onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                        value = profileList[position].toString()
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>?) {}
+                }
+                for (i in 0 until profileList.size) if (profileList[i] == value) setSelection(i)
+                gravity = Gravity.CENTER_HORIZONTAL
+            })
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputString.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputString.kt
index 7ef46bd7a96..dd24d0f9937 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputString.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputString.kt
@@ -2,11 +2,13 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 
 import android.text.Editable
 import android.text.TextWatcher
+import android.view.Gravity
 import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.LinearLayout
 
 class InputString(var value: String = "") : Element() {
+
     private val textWatcher: TextWatcher = object : TextWatcher {
         override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
         override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
@@ -16,10 +18,12 @@ class InputString(var value: String = "") : Element() {
     }
 
     override fun addToLayout(root: LinearLayout) {
-        val editText = EditText(root.context)
-        editText.setText(value)
-        editText.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        editText.addTextChangedListener(textWatcher)
-        root.addView(editText)
+        root.addView(
+            EditText(root.context).apply {
+                setText(value)
+                layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+                addTextChangedListener(textWatcher)
+                gravity = Gravity.CENTER_HORIZONTAL
+            })
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
index 31a2c1b64af..474dda7c9c7 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.view.Gravity
 import android.widget.LinearLayout
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.automation.R
@@ -9,6 +10,7 @@ import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
 class InputTempTarget(profileFunction: ProfileFunction) : Element() {
+
     var units: GlucoseUnit = GlucoseUnit.MGDL
     var value = 0.0
 
@@ -38,9 +40,12 @@ class InputTempTarget(profileFunction: ProfileFunction) : Element() {
             step = 1.0
             decimalFormat = DecimalFormat("0")
         }
-        val numberPicker = NumberPicker(root.context, null)
-        numberPicker.setParams(value, minValue, maxValue, step, decimalFormat, true, root.findViewById(R.id.ok))
-        numberPicker.setOnValueChangedListener { value: Double -> this.value = value }
-        root.addView(numberPicker)
+        root.addView(
+            NumberPicker(root.context, null).also {
+                it.setParams(value, minValue, maxValue, step, decimalFormat, true, root.findViewById(R.id.ok))
+                it.setOnValueChangedListener { v: Double -> value = v }
+                it.gravity = Gravity.CENTER_HORIZONTAL
+
+            })
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTime.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTime.kt
index 36f93bbe019..fcee35b411e 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTime.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTime.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import android.app.TimePickerDialog
 import android.graphics.Typeface
 import android.text.format.DateFormat
+import android.view.Gravity
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -13,42 +14,43 @@ import info.nightscout.androidaps.utils.MidnightTime
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 
-class InputTime(private val resourceHelper: ResourceHelper, private val dateUtil: DateUtil) : Element() {
+class InputTime(private val rh: ResourceHelper, private val dateUtil: DateUtil) : Element() {
 
     var value: Int = getMinSinceMidnight(dateUtil.now())
 
     override fun addToLayout(root: LinearLayout) {
-        val label = TextView(root.context)
-        val startButton = TextView(root.context)
-        startButton.text = dateUtil.timeString(toMills(value))
-
-        val startTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
-            value = 60 * hour + minute
-            startButton.text = dateUtil.timeString(toMills(value))
-        }
-
-        startButton.setOnClickListener {
-            root.context?.let {
-                val cal = Calendar.getInstance()
-                cal.timeInMillis = toMills(value)
-                TimePickerDialog(it, startTimeSetListener,
-                    cal.get(Calendar.HOUR_OF_DAY),
-                    cal.get(Calendar.MINUTE),
-                    DateFormat.is24HourFormat(it)
-                ).show()
-            }
-        }
-
-        val px = resourceHelper.dpToPx(10)
-        label.text = resourceHelper.gs(R.string.atspecifiedtime, "")
-        label.setTypeface(label.typeface, Typeface.BOLD)
-        startButton.setPadding(px, px, px, px)
-        val l = LinearLayout(root.context)
-        l.orientation = LinearLayout.HORIZONTAL
-        l.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        l.addView(label)
-        l.addView(startButton)
-        root.addView(l)
+        root.addView(
+            LinearLayout(root.context).apply {
+                orientation = LinearLayout.HORIZONTAL
+                layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+                addView(
+                    TextView(root.context).apply {
+                        text = rh.gs(R.string.atspecifiedtime, "")
+                        setTypeface(typeface, Typeface.BOLD)
+                    })
+                addView(
+                    TextView(root.context).apply {
+                        text = dateUtil.timeString(toMills(value))
+                        val px = rh.dpToPx(10)
+                        setPadding(px, px, px, px)
+                        setOnClickListener {
+                            root.context?.let {
+                                val cal = Calendar.getInstance()
+                                cal.timeInMillis = toMills(value)
+                                TimePickerDialog(
+                                    it,
+                                    { _, hour, minute ->
+                                        value = 60 * hour + minute
+                                        text = dateUtil.timeString(toMills(value))
+                                    },
+                                    cal.get(Calendar.HOUR_OF_DAY),
+                                    cal.get(Calendar.MINUTE),
+                                    DateFormat.is24HourFormat(it)
+                                ).show()
+                            }
+                        }
+                    })
+            })
     }
 
     private fun toMills(minutesSinceMidnight: Int): Long = MidnightTime.calcPlusMinutes(minutesSinceMidnight)
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTimeRange.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTimeRange.kt
index c9873da2bfa..343f617a27d 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTimeRange.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTimeRange.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import android.app.TimePickerDialog
 import android.graphics.Typeface
 import android.text.format.DateFormat
+import android.view.Gravity
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -13,65 +14,68 @@ import info.nightscout.androidaps.utils.MidnightTime
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 
-class InputTimeRange(private val resourceHelper: ResourceHelper, private val dateUtil: DateUtil) : Element() {
+class InputTimeRange(private val rh: ResourceHelper, private val dateUtil: DateUtil) : Element() {
 
     var start: Int = getMinSinceMidnight(dateUtil.now())
     var end: Int = getMinSinceMidnight(dateUtil.now())
 
     override fun addToLayout(root: LinearLayout) {
-        val label = TextView(root.context)
-        val startButton = TextView(root.context)
-        val endButton = TextView(root.context)
-        startButton.text = dateUtil.timeString(toMills(start))
-        @Suppress("SetTextI18n")
-        endButton.text = resourceHelper.gs(R.string.and) + "      " + dateUtil.timeString(toMills(end))
+        val px = rh.dpToPx(10)
 
-        val startTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
-            start = 60 * hour + minute
-            startButton.text = dateUtil.timeString(toMills(start))
-        }
-
-        startButton.setOnClickListener {
-            root.context?.let {
-                val cal = Calendar.getInstance()
-                cal.timeInMillis = toMills(start)
-                TimePickerDialog(it, startTimeSetListener,
-                    cal.get(Calendar.HOUR_OF_DAY),
-                    cal.get(Calendar.MINUTE),
-                    DateFormat.is24HourFormat(it)
-                ).show()
-            }
-        }
-
-        val endTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
-            end = 60 * hour + minute
-            endButton.text = dateUtil.timeString(toMills(end))
-        }
-
-        endButton.setOnClickListener {
-            root.context?.let {
-                val cal = Calendar.getInstance()
-                cal.timeInMillis = toMills(end)
-                TimePickerDialog(it, endTimeSetListener,
-                    cal.get(Calendar.HOUR_OF_DAY),
-                    cal.get(Calendar.MINUTE),
-                    DateFormat.is24HourFormat(it)
-                ).show()
-            }
-        }
-
-        val px = resourceHelper.dpToPx(10)
-        label.text = resourceHelper.gs(R.string.between)
-        label.setTypeface(label.typeface, Typeface.BOLD)
-        startButton.setPadding(px, px, px, px)
-        endButton.setPadding(px, px, px, px)
-        val l = LinearLayout(root.context)
-        l.orientation = LinearLayout.HORIZONTAL
-        l.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        l.addView(label)
-        l.addView(startButton)
-        l.addView(endButton)
-        root.addView(l)
+        root.addView(
+            TextView(root.context).apply {
+                text = rh.gs(R.string.between)
+                setTypeface(typeface, Typeface.BOLD)
+                gravity = Gravity.CENTER_HORIZONTAL
+            })
+        root.addView(
+            LinearLayout(root.context).apply {
+                orientation = LinearLayout.HORIZONTAL
+                layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+                gravity = Gravity.CENTER_HORIZONTAL
+                addView(
+                    TextView(root.context).apply {
+                        text = dateUtil.timeString(toMills(start))
+                        setPadding(px, px, px, px)
+                        setOnClickListener {
+                            root.context?.let {
+                                val cal = Calendar.getInstance()
+                                cal.timeInMillis = toMills(start)
+                                TimePickerDialog(
+                                    it,
+                                    { _, hour, minute ->
+                                        start = 60 * hour + minute
+                                        text = dateUtil.timeString(toMills(start))
+                                    },
+                                    cal.get(Calendar.HOUR_OF_DAY),
+                                    cal.get(Calendar.MINUTE),
+                                    DateFormat.is24HourFormat(it)
+                                ).show()
+                            }
+                        }
+                    })
+                addView(TextView(root.context).apply {
+                    @Suppress("SetTextI18n")
+                    text = rh.gs(R.string.and) + "      " + dateUtil.timeString(toMills(end))
+                    setPadding(px, px, px, px)
+                    setOnClickListener {
+                        root.context?.let {
+                            val cal = Calendar.getInstance()
+                            cal.timeInMillis = toMills(end)
+                            TimePickerDialog(
+                                it,
+                                { _, hour, minute ->
+                                    end = 60 * hour + minute
+                                    text = dateUtil.timeString(toMills(end))
+                                },
+                                cal.get(Calendar.HOUR_OF_DAY),
+                                cal.get(Calendar.MINUTE),
+                                DateFormat.is24HourFormat(it)
+                            ).show()
+                        }
+                    }
+                })
+            })
     }
 
     private fun toMills(minutesSinceMidnight: Int): Long = MidnightTime.calcPlusMinutes(minutesSinceMidnight)
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputWeekDay.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputWeekDay.kt
index 359e252f971..c34a53444cb 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputWeekDay.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputWeekDay.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 
 import android.widget.LinearLayout
 import androidx.annotation.StringRes
-import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.utils.ui.WeekdayPicker
 import java.util.*
@@ -20,6 +19,7 @@ class InputWeekDay : Element() {
             get() = shortNames[ordinal]
 
         companion object {
+
             private val calendarInts = intArrayOf(
                 Calendar.MONDAY,
                 Calendar.TUESDAY,
@@ -76,10 +76,11 @@ class InputWeekDay : Element() {
     }
 
     override fun addToLayout(root: LinearLayout) {
-        WeekdayPicker(root.context).apply {
-            setSelectedDays(getSelectedDays())
-            setOnWeekdaysChangeListener { i: Int, selected: Boolean -> set(DayOfWeek.fromCalendarInt(i), selected) }
-            root.addView(this)
-        }
+        root.addView(
+            WeekdayPicker(root.context).apply {
+                setSelectedDays(getSelectedDays())
+                setOnWeekdaysChangeListener { i: Int, selected: Boolean -> set(DayOfWeek.fromCalendarInt(i), selected) }
+            }
+        )
     }
 }
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElement.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElement.kt
index adc29fdb1e2..648ee6a3973 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElement.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElement.kt
@@ -1,49 +1,40 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
 import android.graphics.Typeface
-import android.view.ViewGroup
+import android.view.Gravity
 import android.widget.LinearLayout
-import android.widget.TableLayout
 import android.widget.TextView
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class LabelWithElement(
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     var textPre: String = "",
     var textPost: String = "",
     var element: Element? = null,
 ) : Element() {
 
     override fun addToLayout(root: LinearLayout) { // container layout
-        val layout = LinearLayout(root.context)
-        layout.orientation = LinearLayout.HORIZONTAL
-        layout.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT)
         // text view pre element
-        var px = resourceHelper.dpToPx(10)
-        val textViewPre = TextView(root.context)
-        textViewPre.text = textPre
-        textViewPre.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT)
-        textViewPre.setPadding(px, px, px, px)
-        textViewPre.setTypeface(textViewPre.typeface, Typeface.BOLD)
-        layout.addView(textViewPre)
-        val spacer = TextView(root.context)
-        spacer.layoutParams = TableLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, 1f)
-        layout.addView(spacer)
+        val px = rh.dpToPx(1)
+
+        root.addView(
+            TextView(root.context).apply {
+                text = textPre
+                setPadding(px, px, px, px)
+                setTypeface(typeface, Typeface.BOLD)
+                gravity = Gravity.CENTER
+            }
+        )
+
         // add element to layout
-        element?.addToLayout(layout)
+        element?.addToLayout(root)
         // text view post element
-        px = resourceHelper.dpToPx(5)
-        val textViewPost = TextView(root.context)
-        textViewPost.text = textPost
-        textViewPost.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT)
-        textViewPost.setPadding(px, px, px, px)
-        textViewPost.setTypeface(textViewPost.typeface, Typeface.BOLD)
-        layout.addView(textViewPost)
-        // add layout to root layout
-        root.addView(layout)
+        root.addView(
+            TextView(root.context).apply {
+                text = textPost
+                setPadding(px, px, px, px)
+                setTypeface(typeface, Typeface.BOLD)
+                gravity = Gravity.CENTER
+            })
     }
-
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilder.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilder.kt
index 0bf18e383d3..0c87f393d2c 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilder.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilder.kt
@@ -1,6 +1,10 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
+import android.content.Context
+import android.view.Gravity
+import android.view.ViewGroup
 import android.widget.LinearLayout
+import info.nightscout.androidaps.automation.R
 
 class LayoutBuilder {
 
@@ -16,8 +20,21 @@ class LayoutBuilder {
     }
 
     fun build(layout: LinearLayout) {
+        val elementLayout = LinearLayout(layout.context).apply {
+            orientation = LinearLayout.VERTICAL
+            layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
+                setMargins(0, 0, dpToPx(layout.context, 2), dpToPx(layout.context, 2))
+            }
+            setBackgroundColor(layout.context.getColor(R.color.mdtp_line_dark))
+        }
         for (e in mElements) {
-            e.addToLayout(layout)
+            e.addToLayout(elementLayout)
         }
+        layout.addView(elementLayout)
+    }
+
+    fun dpToPx(context: Context, dp: Int): Int {
+        val scale = context.resources.displayMetrics.density
+        return (dp * scale + 0.5f).toInt()
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.kt
index 96320c2cd1d..57ef1c09c72 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.kt
@@ -4,45 +4,44 @@ import android.graphics.Typeface
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
-import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
 import info.nightscout.androidaps.utils.resources.ResourceHelper
-import javax.inject.Inject
 
-class StaticLabel(private val resourceHelper: ResourceHelper) : Element() {
+class StaticLabel(private val rh: ResourceHelper) : Element() {
 
     var label = ""
     var trigger: Trigger? = null
 
-    constructor(resourceHelper: ResourceHelper, label: String, trigger: Trigger) : this(resourceHelper) {
+    constructor(rh: ResourceHelper, label: String, trigger: Trigger) : this(rh) {
         this.label = label
         this.trigger = trigger
     }
 
-    constructor(resourceHelper: ResourceHelper, resourceId: Int, trigger: Trigger) : this(resourceHelper) {
-        label = resourceHelper.gs(resourceId)
+    constructor(rh: ResourceHelper, resourceId: Int, trigger: Trigger) : this(rh) {
+        label = rh.gs(resourceId)
         this.trigger = trigger
     }
 
     override fun addToLayout(root: LinearLayout) {
-        val headerLayout = LinearLayout(root.context)
-        headerLayout.orientation = LinearLayout.HORIZONTAL
-        headerLayout.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        headerLayout.setBackgroundColor(resourceHelper.gc(android.R.color.black))
-        // text
-        val px = resourceHelper.dpToPx(10)
-        val textView = TextView(root.context)
-        textView.text = label
-        val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        params.weight = 1.0f
-        textView.layoutParams = params
-        textView.setPadding(px, px, px, px)
-        textView.setTypeface(textView.typeface, Typeface.BOLD)
-        headerLayout.addView(textView)
-        trigger?.let {
-            headerLayout.addView(it.createDeleteButton(root.context, it))
-            headerLayout.addView(it.createCloneButton(root.context, it))
-        }
-        root.addView(headerLayout)
+        val px = rh.dpToPx(10)
+        root.addView(
+            LinearLayout(root.context).apply {
+                orientation = LinearLayout.HORIZONTAL
+                layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+                setBackgroundColor(rh.gc(android.R.color.black))
+                addView(
+                    TextView(root.context).apply {
+                        text = label
+                        layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
+                            weight = 1.0f
+                        }
+                        setPadding(px, px, px, px)
+                        setTypeface(typeface, Typeface.BOLD)
+                    })
+                trigger?.let {
+                    addView(it.createDeleteButton(root.context, it))
+                    addView(it.createCloneButton(root.context, it))
+                }
+            })
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventAutomationUpdateTrigger.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventAutomationUpdateTrigger.kt
index f9b67a74dee..4ba39c74619 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventAutomationUpdateTrigger.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/events/EventAutomationUpdateTrigger.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.general.automation.events
 
 import info.nightscout.androidaps.events.Event
-import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
 
-class EventAutomationUpdateTrigger(val trigger: Trigger) : Event()
+class EventAutomationUpdateTrigger(val trigger: TriggerConnector) : Event()
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
index 1a4b2283981..e9c1160edfb 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseTriggerDialog
 import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerChanged
 import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerClone
@@ -31,8 +31,8 @@ import javax.inject.Inject
 abstract class Trigger(val injector: HasAndroidInjector) {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var sp: SP
     @Inject lateinit var locationDataContainer: LastLocationDataContainer
@@ -56,7 +56,7 @@ abstract class Trigger(val injector: HasAndroidInjector) {
     abstract fun icon(): Optional<Int?>
     abstract fun duplicate(): Trigger
 
-    private fun scanForActivity(cont: Context?): AppCompatActivity? {
+    fun scanForActivity(cont: Context?): AppCompatActivity? {
         return when (cont) {
             null                 -> null
             is AppCompatActivity -> cont
@@ -84,27 +84,19 @@ abstract class Trigger(val injector: HasAndroidInjector) {
         //return (clazz.primaryConstructor?.call(injector) as Trigger).fromJSON(data?.toString() ?: "")
         return when (type) {
             TriggerAutosensValue::class.java.name,              // backward compatibility
-            TriggerAutosensValue::class.java.simpleName      -> TriggerAutosensValue(injector).fromJSON(
-                data.toString()
-            )
+            TriggerAutosensValue::class.java.simpleName      -> TriggerAutosensValue(injector).fromJSON(data.toString())
             TriggerBg::class.java.name,
             TriggerBg::class.java.simpleName                 -> TriggerBg(injector).fromJSON(data.toString())
             TriggerBolusAgo::class.java.name,
-            TriggerBolusAgo::class.java.simpleName           -> TriggerBolusAgo(injector).fromJSON(
-                data.toString()
-            )
+            TriggerBolusAgo::class.java.simpleName           -> TriggerBolusAgo(injector).fromJSON(data.toString())
             TriggerBTDevice::class.java.name,
-            TriggerBTDevice::class.java.simpleName           -> TriggerBTDevice(injector).fromJSON(
-                data.toString()
-            )
+            TriggerBTDevice::class.java.simpleName           -> TriggerBTDevice(injector).fromJSON(data.toString())
             TriggerIob::class.java.name,
             TriggerIob::class.java.simpleName                -> TriggerIob(injector).fromJSON(data.toString())
             TriggerCOB::class.java.name,
             TriggerCOB::class.java.simpleName                -> TriggerCOB(injector).fromJSON(data.toString())
             TriggerConnector::class.java.name,
-            TriggerConnector::class.java.simpleName          -> TriggerConnector(injector).fromJSON(
-                data.toString()
-            )
+            TriggerConnector::class.java.simpleName          -> TriggerConnector(injector).fromJSON(data.toString())
             TriggerDelta::class.java.name,
             TriggerDelta::class.java.simpleName              -> TriggerDelta(injector).fromJSON(data.toString())
             TriggerDummy::class.java.name,
@@ -112,100 +104,73 @@ abstract class Trigger(val injector: HasAndroidInjector) {
             TriggerIob::class.java.name,
             TriggerIob::class.java.simpleName                -> TriggerIob(injector).fromJSON(data.toString())
             TriggerLocation::class.java.name,
-            TriggerLocation::class.java.simpleName           -> TriggerLocation(injector).fromJSON(
-                data.toString()
-            )
+            TriggerLocation::class.java.simpleName           -> TriggerLocation(injector).fromJSON(data.toString())
             TriggerProfilePercent::class.java.name,
-            TriggerProfilePercent::class.java.simpleName     -> TriggerProfilePercent(injector).fromJSON(
-                data.toString()
-            )
+            TriggerProfilePercent::class.java.simpleName     -> TriggerProfilePercent(injector).fromJSON(data.toString())
             TriggerPumpLastConnection::class.java.name,
-            TriggerPumpLastConnection::class.java.simpleName -> TriggerPumpLastConnection(injector).fromJSON(
-                data.toString()
-            )
+            TriggerPumpLastConnection::class.java.simpleName -> TriggerPumpLastConnection(injector).fromJSON(data.toString())
             TriggerRecurringTime::class.java.name,
-            TriggerRecurringTime::class.java.simpleName      -> TriggerRecurringTime(injector).fromJSON(
-                data.toString()
-            )
+            TriggerRecurringTime::class.java.simpleName      -> TriggerRecurringTime(injector).fromJSON(data.toString())
             TriggerTempTarget::class.java.name,
-            TriggerTempTarget::class.java.simpleName         -> TriggerTempTarget(injector).fromJSON(
-                data.toString()
-            )
+            TriggerTempTarget::class.java.simpleName         -> TriggerTempTarget(injector).fromJSON(data.toString())
             TriggerTempTargetValue::class.java.name,
-            TriggerTempTargetValue::class.java.simpleName         -> TriggerTempTargetValue(injector).fromJSON(
-                data.toString()
-            )
+            TriggerTempTargetValue::class.java.simpleName    -> TriggerTempTargetValue(injector).fromJSON(data.toString())
             TriggerTime::class.java.name,
             TriggerTime::class.java.simpleName               -> TriggerTime(injector).fromJSON(data.toString())
             TriggerTimeRange::class.java.name,
-            TriggerTimeRange::class.java.simpleName          -> TriggerTimeRange(injector).fromJSON(
-                data.toString()
-            )
+            TriggerTimeRange::class.java.simpleName          -> TriggerTimeRange(injector).fromJSON(data.toString())
             TriggerWifiSsid::class.java.name,
-            TriggerWifiSsid::class.java.simpleName           -> TriggerWifiSsid(injector).fromJSON(
-                data.toString()
-            )
+            TriggerWifiSsid::class.java.simpleName           -> TriggerWifiSsid(injector).fromJSON(data.toString())
             else                                             -> TriggerConnector(injector)
         }
     }
 
-    fun createAddButton(context: Context, trigger: TriggerConnector): ImageButton {
+    fun createAddButton(context: Context, trigger: TriggerConnector): ImageButton =
         // Button [+]
-        val buttonAdd = ImageButton(context)
-        val params = LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.WRAP_CONTENT,
-            LinearLayout.LayoutParams.WRAP_CONTENT
-        )
-        params.gravity = Gravity.CENTER
-        buttonAdd.layoutParams = params
-        buttonAdd.setImageResource(R.drawable.ic_add)
-        buttonAdd.contentDescription = resourceHelper.gs(R.string.add_short)
-        buttonAdd.setOnClickListener {
-            scanForActivity(context)?.supportFragmentManager?.let {
-                val dialog = ChooseTriggerDialog()
-                dialog.show(it, "ChooseTriggerDialog")
-                dialog.setOnClickListener(object : ChooseTriggerDialog.OnClickListener {
-                    override fun onClick(newTriggerObject: Trigger) {
-                        trigger.list.add(newTriggerObject)
-                        rxBus.send(EventTriggerChanged())
-                    }
-                })
+        ImageButton(context).apply {
+            layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                gravity = Gravity.CENTER
+            }
+            setImageResource(R.drawable.ic_add)
+            contentDescription = rh.gs(R.string.add_short)
+            setOnClickListener {
+                scanForActivity(context)?.supportFragmentManager?.let {
+                    val dialog = ChooseTriggerDialog()
+                    dialog.show(it, "ChooseTriggerDialog")
+                    dialog.setOnClickListener(object : ChooseTriggerDialog.OnClickListener {
+                        override fun onClick(newTriggerObject: Trigger) {
+                            trigger.list.add(newTriggerObject)
+                            rxBus.send(EventTriggerChanged())
+                        }
+                    })
+                }
             }
         }
-        return buttonAdd
-    }
 
-    fun createDeleteButton(context: Context, trigger: Trigger): ImageButton {
+    fun createDeleteButton(context: Context, trigger: Trigger): ImageButton =
         // Button [-]
-        val buttonRemove = ImageButton(context)
-        val params = LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.WRAP_CONTENT,
-            LinearLayout.LayoutParams.WRAP_CONTENT
-        )
-        params.gravity = Gravity.CENTER
-        buttonRemove.layoutParams = params
-        buttonRemove.setImageResource(R.drawable.ic_remove)
-        buttonRemove.contentDescription = resourceHelper.gs(R.string.delete_short)
-        buttonRemove.setOnClickListener {
-            rxBus.send(EventTriggerRemove(trigger))
+        ImageButton(context).apply {
+            layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                gravity = Gravity.CENTER
+            }
+            setImageResource(R.drawable.ic_remove)
+            contentDescription = rh.gs(R.string.delete_short)
+            setOnClickListener {
+                rxBus.send(EventTriggerRemove(trigger))
+            }
         }
-        return buttonRemove
-    }
 
-    fun createCloneButton(context: Context, trigger: Trigger): ImageButton {
+    fun createCloneButton(context: Context, trigger: Trigger): ImageButton =
         // Button [*]
-        val buttonClone = ImageButton(context)
-        val params = LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.WRAP_CONTENT,
-            LinearLayout.LayoutParams.WRAP_CONTENT
-        )
-        params.gravity = Gravity.CENTER
-        buttonClone.layoutParams = params
-        buttonClone.setImageResource(R.drawable.ic_clone)
-        buttonClone.contentDescription = resourceHelper.gs(R.string.copy_short)
-        buttonClone.setOnClickListener {
-            rxBus.send(EventTriggerClone(trigger))
+        ImageButton(context).apply {
+            val params = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                gravity = Gravity.CENTER
+            }
+            layoutParams = params
+            setImageResource(R.drawable.ic_clone)
+            contentDescription = rh.gs(R.string.copy_short)
+            setOnClickListener {
+                rxBus.send(EventTriggerClone(trigger))
+            }
         }
-        return buttonClone
-    }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt
index 45fc094d6a6..cad06f303de 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt
@@ -22,11 +22,11 @@ class TriggerAutosensValue(injector: HasAndroidInjector) : Trigger(injector) {
     private val decimalFormat = DecimalFormat("1")
     var autosens: InputDouble = InputDouble(100.0, minValue.toDouble(), maxValue.toDouble(), step, decimalFormat)
 
-    var comparator: Comparator = Comparator(resourceHelper)
+    var comparator: Comparator = Comparator(rh)
 
     private constructor(injector: HasAndroidInjector, triggerAutosensValue: TriggerAutosensValue) : this(injector) {
         autosens = InputDouble(triggerAutosensValue.autosens)
-        comparator = Comparator(resourceHelper, triggerAutosensValue.comparator.value)
+        comparator = Comparator(rh, triggerAutosensValue.comparator.value)
     }
 
     override fun shouldRun(): Boolean {
@@ -61,7 +61,7 @@ class TriggerAutosensValue(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.autosenslabel
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.autosenscompared, resourceHelper.gs(comparator.value.stringRes), autosens.value)
+        rh.gs(R.string.autosenscompared, rh.gs(comparator.value.stringRes), autosens.value)
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_as)
 
@@ -69,9 +69,9 @@ class TriggerAutosensValue(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.autosenslabel, this))
+            .add(StaticLabel(rh, R.string.autosenslabel, this))
             .add(comparator)
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.autosenslabel) + ": ", "", autosens))
+            .add(LabelWithElement(rh, rh.gs(R.string.autosenslabel) + ": ", "", autosens))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDevice.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDevice.kt
index 292a29cda66..36d4297ef2a 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDevice.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDevice.kt
@@ -22,11 +22,11 @@ class TriggerBTDevice(injector: HasAndroidInjector) : Trigger(injector) {
     @Inject lateinit var context: Context
     @Inject lateinit var automationPlugin: AutomationPlugin
 
-    var btDevice = InputDropdownMenu(resourceHelper, "")
-    var comparator: ComparatorConnect = ComparatorConnect(resourceHelper)
+    var btDevice = InputDropdownMenu(rh, "")
+    var comparator: ComparatorConnect = ComparatorConnect(rh)
 
     private constructor(injector: HasAndroidInjector, triggerBTDevice: TriggerBTDevice) : this(injector) {
-        comparator = ComparatorConnect(resourceHelper, triggerBTDevice.comparator.value)
+        comparator = ComparatorConnect(rh, triggerBTDevice.comparator.value)
         btDevice.value = triggerBTDevice.btDevice.value
     }
 
@@ -54,7 +54,7 @@ class TriggerBTDevice(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.btdevice
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.btdevicecompared, btDevice.value, resourceHelper.gs(comparator.value.stringRes))
+        rh.gs(R.string.btdevicecompared, btDevice.value, rh.gs(comparator.value.stringRes))
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_bluetooth_white_48dp)
 
@@ -64,7 +64,7 @@ class TriggerBTDevice(injector: HasAndroidInjector) : Trigger(injector) {
         val pairedDevices = devicesPaired()
         btDevice.setList(pairedDevices)
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.btdevice, this))
+            .add(StaticLabel(rh, R.string.btdevice, this))
             .add(btDevice)
             .add(comparator)
             .build(root)
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt
index b28654035d9..85564f63604 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt
@@ -19,16 +19,16 @@ import org.json.JSONObject
 class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) {
 
     var bg = InputBg(profileFunction)
-    var comparator = Comparator(resourceHelper)
+    var comparator = Comparator(rh)
 
     constructor(injector: HasAndroidInjector, value: Double, units: GlucoseUnit, compare: Comparator.Compare) : this(injector) {
         bg = InputBg(profileFunction, value, units)
-        comparator = Comparator(resourceHelper, compare)
+        comparator = Comparator(rh, compare)
     }
 
     constructor(injector: HasAndroidInjector, triggerBg: TriggerBg) : this(injector) {
         bg = InputBg(profileFunction, triggerBg.bg.value, triggerBg.bg.units)
-        comparator = Comparator(resourceHelper, triggerBg.comparator.value)
+        comparator = Comparator(rh, triggerBg.comparator.value)
     }
 
     fun setUnits(units: GlucoseUnit): TriggerBg {
@@ -82,9 +82,9 @@ class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun friendlyDescription(): String {
         return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE)
-            resourceHelper.gs(R.string.glucoseisnotavailable)
+            rh.gs(R.string.glucoseisnotavailable)
         else
-            resourceHelper.gs(if (bg.units == GlucoseUnit.MGDL) R.string.glucosecomparedmgdl else R.string.glucosecomparedmmol, resourceHelper.gs(comparator.value.stringRes), bg.value, bg.units)
+            rh.gs(if (bg.units == GlucoseUnit.MGDL) R.string.glucosecomparedmgdl else R.string.glucosecomparedmmol, rh.gs(comparator.value.stringRes), bg.value, bg.units)
     }
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_cp_bgcheck)
@@ -93,9 +93,9 @@ class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.glucose, this))
+            .add(StaticLabel(rh, R.string.glucose, this))
             .add(comparator)
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.glucose_u, bg.units), "", bg))
+            .add(LabelWithElement(rh, rh.gs(R.string.glucose_u, bg.units), "", bg))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
index b7b47aa66f2..9d8c9794488 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
@@ -4,6 +4,7 @@ import android.widget.LinearLayout
 import com.google.common.base.Optional
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.automation.R
+import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.database.entities.Bolus
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
@@ -18,11 +19,11 @@ import org.json.JSONObject
 class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {
 
     var minutesAgo: InputDuration = InputDuration(30, InputDuration.TimeUnit.MINUTES)
-    var comparator: Comparator = Comparator(resourceHelper)
+    var comparator: Comparator = Comparator(rh)
 
     private constructor(injector: HasAndroidInjector, triggerBolusAgo: TriggerBolusAgo) : this(injector) {
         minutesAgo = InputDuration(triggerBolusAgo.minutesAgo.value, InputDuration.TimeUnit.MINUTES)
-        comparator = Comparator(resourceHelper, triggerBolusAgo.comparator.value)
+        comparator = Comparator(rh, triggerBolusAgo.comparator.value)
     }
 
     fun setValue(value: Int): TriggerBolusAgo {
@@ -36,7 +37,8 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {
     }
 
     override fun shouldRun(): Boolean {
-        val lastBolusTime = repository.getLastBolusRecordOfType(Bolus.Type.NORMAL)?.timestamp ?: 0L
+        val lastBolus = repository.getLastBolusRecordOfTypeWrapped(Bolus.Type.NORMAL).blockingGet()
+        val lastBolusTime = if (lastBolus is ValueWrapper.Existing) lastBolus.value.timestamp else 0L
         if (lastBolusTime == 0L)
             return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) {
                 aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
@@ -71,7 +73,7 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.lastboluslabel
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.lastboluscompared, resourceHelper.gs(comparator.value.stringRes), minutesAgo.getMinutes())
+        rh.gs(R.string.lastboluscompared, rh.gs(comparator.value.stringRes), minutesAgo.getMinutes())
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_bolus)
 
@@ -79,9 +81,9 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.lastboluslabel, this))
+            .add(StaticLabel(rh, R.string.lastboluslabel, this))
             .add(comparator)
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.lastboluslabel) + ": ", "", minutesAgo))
+            .add(LabelWithElement(rh, rh.gs(R.string.lastboluslabel) + ": ", rh.gs(R.string.unit_minutes), minutesAgo))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
index dda052bcaf6..c582f8103de 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
@@ -20,11 +20,11 @@ class TriggerCOB(injector: HasAndroidInjector) : Trigger(injector) {
     private val minValue = 0
     private val maxValue = sp.getInt(R.string.key_treatmentssafety_maxcarbs, 48)
     var cob: InputDouble = InputDouble(0.0, minValue.toDouble(), maxValue.toDouble(), 1.0, DecimalFormat("1"))
-    var comparator: Comparator = Comparator(resourceHelper)
+    var comparator: Comparator = Comparator(rh)
 
     private constructor(injector: HasAndroidInjector, triggerCOB: TriggerCOB) : this(injector) {
         cob = InputDouble(triggerCOB.cob)
-        comparator = Comparator(resourceHelper, triggerCOB.comparator.value)
+        comparator = Comparator(rh, triggerCOB.comparator.value)
     }
 
     fun setValue(value: Double): TriggerCOB {
@@ -71,7 +71,7 @@ class TriggerCOB(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.triggercoblabel
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.cobcompared, resourceHelper.gs(comparator.value.stringRes), cob.value)
+        rh.gs(R.string.cobcompared, rh.gs(comparator.value.stringRes), cob.value)
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_cp_bolus_carbs)
 
@@ -79,9 +79,9 @@ class TriggerCOB(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.triggercoblabel, this))
+            .add(StaticLabel(rh, R.string.triggercoblabel, this))
             .add(comparator)
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.triggercoblabel) + ": ", "", cob))
+            .add(LabelWithElement(rh, rh.gs(R.string.triggercoblabel) + ": ", "", cob))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
index 91311a84da9..9e6bc5d3eb7 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
@@ -1,19 +1,20 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers
 
 import android.content.Context
-import android.view.View
+import android.graphics.Typeface
+import android.view.Gravity
 import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
 import android.widget.LinearLayout
-import android.widget.Spinner
+import android.widget.TextView
 import androidx.annotation.StringRes
 import com.google.common.base.Optional
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseOperationDialog
 import info.nightscout.androidaps.utils.JsonHelper.safeGetString
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.ui.VerticalTextView
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.*
@@ -35,17 +36,17 @@ class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) {
 
         @get:StringRes val stringRes: Int
             get() = when (this) {
-                OR  -> R.string.or
+                OR -> R.string.or
                 XOR -> R.string.xor
                 AND -> R.string.and
             }
 
         companion object {
 
-            fun labels(resourceHelper: ResourceHelper): List<String> {
+            fun labels(rh: ResourceHelper): List<String> {
                 val list: MutableList<String> = ArrayList()
                 for (t in values()) {
-                    list.add(resourceHelper.gs(t.stringRes))
+                    list.add(rh.gs(t.stringRes))
                 }
                 return list
             }
@@ -108,7 +109,7 @@ class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) {
         val result = StringBuilder()
         for ((counter, t) in list.withIndex()) {
             if (counter > 0)
-                result.append("\n").append(resourceHelper.gs(friendlyName())).append("\n")
+                result.append("\n").append(rh.gs(friendlyName())).append("\n")
             result.append(t.friendlyDescription())
         }
         return result.toString()
@@ -119,51 +120,75 @@ class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) {
     override fun duplicate(): Trigger = TriggerConnector(injector, connectorType)
 
     override fun generateDialog(root: LinearLayout) {
-        val padding = resourceHelper.dpToPx(5)
-        root.setPadding(padding, padding, padding, padding)
-        root.setBackgroundResource(R.drawable.border_automation_unit)
-        // Header with spinner
-        val headerLayout = LinearLayout(root.context)
-        headerLayout.orientation = LinearLayout.HORIZONTAL
-        headerLayout.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        headerLayout.addView(createSpinner(root.context))
-        headerLayout.addView(createAddButton(root.context, this))
-        headerLayout.addView(createDeleteButton(root.context, this))
-        root.addView(headerLayout)
+        val mainLayout = LinearLayout(root.context).also {
+            it.orientation = LinearLayout.HORIZONTAL
+            it.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        }
+        val padding = rh.dpToPx(3)
+        mainLayout.setPadding(padding, padding, padding, padding)
+        mainLayout.setBackgroundResource(R.drawable.border_automation_unit)
+
+        val buttonLayout = LinearLayout(root.context).also {
+            it.orientation = LinearLayout.HORIZONTAL
+            it.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        }
+        buttonLayout.addView(createAddButton(root.context, this))
+        buttonLayout.addView(createDeleteButton(root.context, this))
+
+        val rightSideLayout = LinearLayout(root.context).also {
+            it.orientation = LinearLayout.VERTICAL
+            it.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, 1f)
+        }
+
+        rightSideLayout.addView(buttonLayout)
+
         // Child triggers
-        val listLayout = LinearLayout(root.context)
-        listLayout.orientation = LinearLayout.VERTICAL
-        listLayout.setBackgroundColor(resourceHelper.gc(R.color.mdtp_line_dark))
-        //listLayout.setPadding(resourceHelper.dpToPx(5), resourceHelper.dpToPx(5), resourceHelper.dpToPx(5), 0)
-        val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        params.setMargins(resourceHelper.dpToPx(15), 0, resourceHelper.dpToPx(5), resourceHelper.dpToPx(4))
-        listLayout.layoutParams = params
-        for (t in list) t.generateDialog(listLayout)
-        root.addView(listLayout)
+        val listLayout = LinearLayout(root.context).also {
+            it.orientation = LinearLayout.VERTICAL
+            it.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { params ->
+                params.setMargins(rh.dpToPx(1), 0, rh.dpToPx(1), rh.dpToPx(2))
+            }
+        }
+        for (t in list) {
+            t.generateDialog(listLayout)
+            listLayout.addView(
+                TextView(root.context).also {
+                    it.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+                    it.setPadding(0, rh.dpToPx(0.3f), 0, 0)
+                })
+        }
+        rightSideLayout.addView(listLayout)
+
+        // Header with spinner
+        mainLayout.addView(createVerticalView(root.context))
+        mainLayout.addView(rightSideLayout)
+        root.addView(mainLayout)
     }
 
-    private fun createSpinner(context: Context): Spinner {
-        val initialPosition = connectorType.ordinal
-        val spinner = Spinner(context)
-        val spinnerArrayAdapter = ArrayAdapter(context, R.layout.spinner_centered, Type.labels(resourceHelper))
-        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        spinner.adapter = spinnerArrayAdapter
-        spinner.setSelection(initialPosition)
-        spinner.setBackgroundColor(resourceHelper.gc(R.color.black_overlay))
-        val params = LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.WRAP_CONTENT,
-            LinearLayout.LayoutParams.WRAP_CONTENT
-        )
-        params.setMargins(0, resourceHelper.dpToPx(8), 0, resourceHelper.dpToPx(8))
-        params.weight = 1.0f
-        spinner.layoutParams = params
-        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                setType(Type.values()[position])
+    private fun createVerticalView(context: Context): VerticalTextView =
+        VerticalTextView(context).apply {
+            text = rh.gs(connectorType.stringRes)
+            gravity = gravity or Gravity.CENTER_VERTICAL
+            setTypeface(typeface, Typeface.BOLD)
+            setBackgroundColor(rh.gc(R.color.black_overlay))
+            layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT).also { ll ->
+                ll.setMargins(rh.dpToPx(3), rh.dpToPx(3), rh.dpToPx(3), rh.dpToPx(3))
+            }
+            setOnClickListener {
+                scanForActivity(context)?.supportFragmentManager?.let {
+                    ChooseOperationDialog().also { dialog ->
+                        dialog.setCallback(object : ChooseOperationDialog.Callback() {
+                            override fun run() {
+                                result?.let { result ->
+                                    setType(Type.values()[result])
+                                    text = rh.gs(connectorType.stringRes)
+                                }
+                            }
+                        })
+                        dialog.setCheckedIndex(connectorType.ordinal)
+                        dialog.show(it, "TriggerConnector")
+                    }
+                }
             }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
         }
-        return spinner
-    }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt
index 4b93bd60768..fc44c27227b 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt
@@ -21,8 +21,8 @@ import java.text.DecimalFormat
 class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
 
     var units: GlucoseUnit = GlucoseUnit.MGDL
-    var delta: InputDelta = InputDelta(resourceHelper)
-    var comparator: Comparator = Comparator(resourceHelper)
+    var delta: InputDelta = InputDelta(rh)
+    var comparator: Comparator = Comparator(rh)
 
     companion object {
 
@@ -32,8 +32,8 @@ class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
 
     init {
         units = profileFunction.getUnits()
-        delta = if (units == GlucoseUnit.MMOL) InputDelta(resourceHelper, 0.0, (-MMOL_MAX), MMOL_MAX, 0.1, DecimalFormat("0.1"), DeltaType.DELTA)
-        else InputDelta(resourceHelper, 0.0, (-MGDL_MAX), MGDL_MAX, 1.0, DecimalFormat("1"), DeltaType.DELTA)
+        delta = if (units == GlucoseUnit.MMOL) InputDelta(rh, 0.0, (-MMOL_MAX), MMOL_MAX, 0.1, DecimalFormat("0.1"), DeltaType.DELTA)
+        else InputDelta(rh, 0.0, (-MGDL_MAX), MGDL_MAX, 1.0, DecimalFormat("1"), DeltaType.DELTA)
     }
 
     constructor(injector: HasAndroidInjector, inputDelta: InputDelta, units: GlucoseUnit, comparator: Comparator.Compare) : this(injector) {
@@ -44,8 +44,8 @@ class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
 
     private constructor(injector: HasAndroidInjector, triggerDelta: TriggerDelta) : this(injector) {
         units = triggerDelta.units
-        delta = InputDelta(resourceHelper, triggerDelta.delta)
-        comparator = Comparator(resourceHelper, triggerDelta.comparator.value)
+        delta = InputDelta(rh, triggerDelta.delta)
+        comparator = Comparator(rh, triggerDelta.comparator.value)
     }
 
     fun units(units: GlucoseUnit): TriggerDelta {
@@ -99,8 +99,8 @@ class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
         val type = DeltaType.valueOf(JsonHelper.safeGetString(d, "deltaType", ""))
         val value = JsonHelper.safeGetDouble(d, "value")
         delta =
-            if (units == GlucoseUnit.MMOL) InputDelta(resourceHelper, value, (-MMOL_MAX), MMOL_MAX, 0.1, DecimalFormat("0.1"), type)
-            else InputDelta(resourceHelper, value, (-MGDL_MAX), MGDL_MAX, 1.0, DecimalFormat("1"), type)
+            if (units == GlucoseUnit.MMOL) InputDelta(rh, value, (-MMOL_MAX), MMOL_MAX, 0.1, DecimalFormat("0.1"), type)
+            else InputDelta(rh, value, (-MGDL_MAX), MGDL_MAX, 1.0, DecimalFormat("1"), type)
         comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!))
         return this
     }
@@ -108,7 +108,7 @@ class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.deltalabel
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.deltacompared, resourceHelper.gs(comparator.value.stringRes), delta.value, resourceHelper.gs(delta.deltaType.stringRes))
+        rh.gs(R.string.deltacompared, rh.gs(comparator.value.stringRes), delta.value, rh.gs(delta.deltaType.stringRes))
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_auto_delta)
 
@@ -116,9 +116,9 @@ class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.deltalabel, this))
+            .add(StaticLabel(rh, R.string.deltalabel, this))
             .add(comparator)
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.deltalabel_u, units) + ": ", "", delta))
+            .add(LabelWithElement(rh, rh.gs(R.string.deltalabel_u, units) + ": ", "", delta))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.kt
index 8707c6c5769..cc17bbcf52c 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.kt
@@ -15,11 +15,11 @@ import org.json.JSONObject
 
 class TriggerIob(injector: HasAndroidInjector) : Trigger(injector) {
     var insulin = InputInsulin()
-    var comparator: Comparator = Comparator(resourceHelper)
+    var comparator: Comparator = Comparator(rh)
 
     constructor(injector: HasAndroidInjector, triggerIob: TriggerIob) : this(injector) {
         insulin = InputInsulin(triggerIob.insulin)
-        comparator = Comparator(resourceHelper, triggerIob.comparator.value)
+        comparator = Comparator(rh, triggerIob.comparator.value)
     }
 
     fun setValue(value: Double): TriggerIob {
@@ -58,7 +58,7 @@ class TriggerIob(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.iob
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.iobcompared, resourceHelper.gs(comparator.value.stringRes), insulin.value)
+        rh.gs(R.string.iobcompared, rh.gs(comparator.value.stringRes), insulin.value)
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_keyboard_capslock)
 
@@ -66,9 +66,9 @@ class TriggerIob(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.iob, this))
+            .add(StaticLabel(rh, R.string.iob, this))
             .add(comparator)
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.iob_u), "", insulin))
+            .add(LabelWithElement(rh, rh.gs(R.string.iob_u), "", insulin))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt
index f9fbbfc27b0..94d98ff603e 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt
@@ -16,7 +16,7 @@ class TriggerLocation(injector: HasAndroidInjector) : Trigger(injector) {
     var latitude = InputDouble(0.0, -90.0, +90.0, 0.000001, DecimalFormat("0.000000"))
     var longitude = InputDouble(0.0, -180.0, +180.0, 0.000001, DecimalFormat("0.000000"))
     var distance = InputDouble(200.0, 0.0, 100000.0, 10.0, DecimalFormat("0"))
-    var modeSelected = InputLocationMode(resourceHelper)
+    var modeSelected = InputLocationMode(rh)
     var name: InputString = InputString()
 
     var lastMode = InputLocationMode.Mode.INSIDE
@@ -32,7 +32,7 @@ class TriggerLocation(injector: HasAndroidInjector) : Trigger(injector) {
         latitude = InputDouble(triggerLocation.latitude)
         longitude = InputDouble(triggerLocation.longitude)
         distance = InputDouble(triggerLocation.distance)
-        modeSelected = InputLocationMode(resourceHelper, triggerLocation.modeSelected.value)
+        modeSelected = InputLocationMode(rh, triggerLocation.modeSelected.value)
         if (modeSelected.value == InputLocationMode.Mode.GOING_OUT)
             lastMode = InputLocationMode.Mode.OUTSIDE
         name = triggerLocation.name
@@ -79,7 +79,7 @@ class TriggerLocation(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.location
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.locationis, resourceHelper.gs(modeSelected.value.stringRes), " " + name.value)
+        rh.gs(R.string.locationis, rh.gs(modeSelected.value.stringRes), " " + name.value)
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_location_on)
 
@@ -87,13 +87,13 @@ class TriggerLocation(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.location, this))
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.name_short), "", name))
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.latitude_short), "", latitude))
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.longitude_short), "", longitude))
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.distance_short), "", distance))
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.location_mode), "", modeSelected))
-            .maybeAdd(InputButton(resourceHelper.gs(R.string.currentlocation), buttonAction), locationDataContainer.lastLocation != null)
+            .add(StaticLabel(rh, R.string.location, this))
+            .add(LabelWithElement(rh, rh.gs(R.string.name_short), "", name))
+            .add(LabelWithElement(rh, rh.gs(R.string.latitude_short), "", latitude))
+            .add(LabelWithElement(rh, rh.gs(R.string.longitude_short), "", longitude))
+            .add(LabelWithElement(rh, rh.gs(R.string.distance_short), "", distance))
+            .add(LabelWithElement(rh, rh.gs(R.string.location_mode), "", modeSelected))
+            .maybeAdd(InputButton(rh.gs(R.string.currentlocation), buttonAction), locationDataContainer.lastLocation != null)
             .build(root)
     }
 
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt
index 9724d52278d..bea8e799a17 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt
@@ -4,6 +4,7 @@ import android.widget.LinearLayout
 import com.google.common.base.Optional
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.automation.R
+import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
 import info.nightscout.androidaps.plugins.general.automation.elements.InputPercent
@@ -16,16 +17,16 @@ import org.json.JSONObject
 class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) {
 
     var pct = InputPercent()
-    var comparator = Comparator(resourceHelper)
+    var comparator = Comparator(rh)
 
     constructor(injector: HasAndroidInjector, value: Double, compare: Comparator.Compare) : this(injector) {
         pct = InputPercent(value)
-        comparator = Comparator(resourceHelper, compare)
+        comparator = Comparator(rh, compare)
     }
 
     constructor(injector: HasAndroidInjector, triggerProfilePercent: TriggerProfilePercent) : this(injector) {
         pct = InputPercent(triggerProfilePercent.pct.value)
-        comparator = Comparator(resourceHelper, triggerProfilePercent.comparator.value)
+        comparator = Comparator(rh, triggerProfilePercent.comparator.value)
     }
 
     fun setValue(value: Double): TriggerProfilePercent {
@@ -48,9 +49,17 @@ class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) {
             aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
             return false
         }
-        if (comparator.value.check(profile.percentage.toDouble(), pct.value)) {
-            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
-            return true
+        if (profile is ProfileSealed.EPS) {
+            if (comparator.value.check(profile.value.originalPercentage.toDouble(), pct.value)) {
+                aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+                return true
+            }
+        }
+        if (profile is ProfileSealed.Pure) {
+            if (comparator.value.check(100.0, pct.value)) {
+                aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+                return true
+            }
         }
         aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
         return false
@@ -71,7 +80,7 @@ class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.profilepercentage
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.percentagecompared, resourceHelper.gs(comparator.value.stringRes), pct.value.toInt())
+        rh.gs(R.string.percentagecompared, rh.gs(comparator.value.stringRes), pct.value.toInt())
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_actions_profileswitch)
 
@@ -79,9 +88,9 @@ class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.profilepercentage, this))
+            .add(StaticLabel(rh, R.string.profilepercentage, this))
             .add(comparator)
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.percent_u), "", pct))
+            .add(LabelWithElement(rh, rh.gs(R.string.percent_u), "", pct))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt
index cfcdd788ba7..8472a64814d 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt
@@ -17,17 +17,17 @@ import org.json.JSONObject
 class TriggerPumpLastConnection(injector: HasAndroidInjector) : Trigger(injector) {
 
     var minutesAgo = InputDuration()
-    var comparator = Comparator(resourceHelper)
+    var comparator = Comparator(rh)
 
     @Suppress("unused")
     constructor(injector: HasAndroidInjector, value: Int, unit: InputDuration.TimeUnit, compare: Comparator.Compare) : this(injector) {
         minutesAgo = InputDuration(value, unit)
-        comparator = Comparator(resourceHelper, compare)
+        comparator = Comparator(rh, compare)
     }
 
     constructor(injector: HasAndroidInjector, triggerPumpLastConnection: TriggerPumpLastConnection) : this(injector) {
         minutesAgo = InputDuration(triggerPumpLastConnection.minutesAgo.value, triggerPumpLastConnection.minutesAgo.unit)
-        comparator = Comparator(resourceHelper, triggerPumpLastConnection.comparator.value)
+        comparator = Comparator(rh, triggerPumpLastConnection.comparator.value)
     }
 
     fun setValue(value: Int): TriggerPumpLastConnection {
@@ -71,7 +71,7 @@ class TriggerPumpLastConnection(injector: HasAndroidInjector) : Trigger(injector
     override fun friendlyName(): Int = R.string.automation_trigger_pump_last_connection_label
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.automation_trigger_pump_last_connection_compared, resourceHelper.gs(comparator.value.stringRes), minutesAgo.value)
+        rh.gs(R.string.automation_trigger_pump_last_connection_compared, rh.gs(comparator.value.stringRes), minutesAgo.value)
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_remove)
 
@@ -79,9 +79,9 @@ class TriggerPumpLastConnection(injector: HasAndroidInjector) : Trigger(injector
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.automation_trigger_pump_last_connection_label, this))
+            .add(StaticLabel(rh, R.string.automation_trigger_pump_last_connection_label, this))
             .add(comparator)
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.automation_trigger_pump_last_connection_description) + ": ", "", minutesAgo))
+            .add(LabelWithElement(rh, rh.gs(R.string.automation_trigger_pump_last_connection_description) + ": ", "", minutesAgo))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
index aefd11b83a9..cc9df0d5c75 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
@@ -18,7 +18,7 @@ import java.util.*
 class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {
 
     val days = InputWeekDay()
-    val time = InputTime(resourceHelper, dateUtil)
+    val time = InputTime(rh, dateUtil)
 
     constructor(injector: HasAndroidInjector, triggerRecurringTime: TriggerRecurringTime) : this(injector) {
         this.time.value = triggerRecurringTime.time.value
@@ -72,16 +72,16 @@ class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun friendlyDescription(): String {
         val sb = StringBuilder()
-        sb.append(resourceHelper.gs(R.string.every))
+        sb.append(rh.gs(R.string.every))
         sb.append(" ")
         var counter = 0
         for (i in days.getSelectedDays()) {
             if (counter++ > 0) sb.append(",")
-            sb.append(resourceHelper.gs(Objects.requireNonNull(InputWeekDay.DayOfWeek.fromCalendarInt(i)).shortName))
+            sb.append(rh.gs(Objects.requireNonNull(InputWeekDay.DayOfWeek.fromCalendarInt(i)).shortName))
         }
         sb.append(" ")
         sb.append(dateUtil.timeString(toMills(time.value)))
-        return if (counter == 0) resourceHelper.gs(R.string.never) else sb.toString()
+        return if (counter == 0) rh.gs(R.string.never) else sb.toString()
     }
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_access_alarm_24dp)
@@ -94,7 +94,7 @@ class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.recurringTime, this))
+            .add(StaticLabel(rh, R.string.recurringTime, this))
             .add(days)
             .add(time)
             .build(root)
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt
index 216e84871d1..1a0b707b83e 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt
@@ -14,14 +14,14 @@ import org.json.JSONObject
 
 class TriggerTempTarget(injector: HasAndroidInjector) : Trigger(injector) {
 
-    var comparator = ComparatorExists(resourceHelper)
+    var comparator = ComparatorExists(rh)
 
     constructor(injector: HasAndroidInjector, compare: ComparatorExists.Compare) : this(injector) {
-        comparator = ComparatorExists(resourceHelper, compare)
+        comparator = ComparatorExists(rh, compare)
     }
 
     constructor(injector: HasAndroidInjector, triggerTempTarget: TriggerTempTarget) : this(injector) {
-        comparator = ComparatorExists(resourceHelper, triggerTempTarget.comparator.value)
+        comparator = ComparatorExists(rh, triggerTempTarget.comparator.value)
     }
 
     fun comparator(comparator: ComparatorExists.Compare): TriggerTempTarget {
@@ -56,7 +56,7 @@ class TriggerTempTarget(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.careportal_temporarytarget
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.temptargetcompared, resourceHelper.gs(comparator.value.stringRes))
+        rh.gs(R.string.temptargetcompared, rh.gs(comparator.value.stringRes))
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_keyboard_tab)
 
@@ -64,7 +64,7 @@ class TriggerTempTarget(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.careportal_temporarytarget, this))
+            .add(StaticLabel(rh, R.string.careportal_temporarytarget, this))
             .add(comparator)
             .build(root)
     }
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValue.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValue.kt
index 96d83c0326b..fbd0e560e58 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValue.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValue.kt
@@ -20,16 +20,16 @@ import org.json.JSONObject
 class TriggerTempTargetValue(injector: HasAndroidInjector) : Trigger(injector) {
 
     var ttValue = InputBg(profileFunction)
-    var comparator = Comparator(resourceHelper)
+    var comparator = Comparator(rh)
 
     constructor(injector: HasAndroidInjector, value: Double, units: GlucoseUnit, compare: Comparator.Compare) : this(injector) {
         ttValue = InputBg(profileFunction, value, units)
-        comparator = Comparator(resourceHelper, compare)
+        comparator = Comparator(rh, compare)
     }
 
     constructor(injector: HasAndroidInjector, triggerTempTarget: TriggerTempTargetValue) : this(injector) {
         ttValue = InputBg(profileFunction, triggerTempTarget.ttValue.value, triggerTempTarget.ttValue.units)
-        comparator = Comparator(resourceHelper, triggerTempTarget.comparator.value)
+        comparator = Comparator(rh, triggerTempTarget.comparator.value)
     }
 
     fun comparator(comparator: Comparator.Compare): TriggerTempTargetValue {
@@ -79,9 +79,9 @@ class TriggerTempTargetValue(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun friendlyDescription(): String  {
         return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE)
-            resourceHelper.gs(R.string.notemptarget)
+            rh.gs(R.string.notemptarget)
         else
-            resourceHelper.gs(if (ttValue.units == GlucoseUnit.MGDL) R.string.temptargetcomparedmgdl else R.string.temptargetcomparedmmol, resourceHelper.gs(comparator.value.stringRes), ttValue.value, ttValue.units)
+            rh.gs(if (ttValue.units == GlucoseUnit.MGDL) R.string.temptargetcomparedmgdl else R.string.temptargetcomparedmmol, rh.gs(comparator.value.stringRes), ttValue.value, ttValue.units)
     }
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_keyboard_tab)
@@ -90,9 +90,9 @@ class TriggerTempTargetValue(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.careportal_temporarytargetvalue, this))
+            .add(StaticLabel(rh, R.string.careportal_temporarytargetvalue, this))
             .add(comparator)
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.target_u, ttValue.units), "", ttValue))
+            .add(LabelWithElement(rh, rh.gs(R.string.target_u, ttValue.units), "", ttValue))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt
index f03c35c6fc9..1e3bbd73474 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt
@@ -14,7 +14,7 @@ import org.json.JSONObject
 
 class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) {
 
-    var time = InputDateTime(resourceHelper, dateUtil)
+    var time = InputDateTime(rh, dateUtil)
 
     constructor(injector: HasAndroidInjector, runAt: Long) : this(injector) {
         this.time.value = runAt
@@ -53,7 +53,7 @@ class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.time
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.atspecifiedtime, dateUtil.dateAndTimeString(time.value))
+        rh.gs(R.string.atspecifiedtime, dateUtil.dateAndTimeString(time.value))
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_access_alarm_24dp)
 
@@ -61,7 +61,7 @@ class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.time, this))
+            .add(StaticLabel(rh, R.string.time, this))
             .add(time)
             .build(root)
     }
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt
index 3a563147067..44ccddd2786 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt
@@ -17,7 +17,7 @@ import org.json.JSONObject
 class TriggerTimeRange(injector: HasAndroidInjector) : Trigger(injector) {
 
     // in minutes since midnight 60 means 1AM
-    var range = InputTimeRange(resourceHelper, dateUtil)
+    var range = InputTimeRange(rh, dateUtil)
 
     constructor(injector: HasAndroidInjector, start: Int, end: Int) : this(injector) {
         range.start = start
@@ -64,7 +64,7 @@ class TriggerTimeRange(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.time_range
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.timerange_value, dateUtil.timeString(toMills(range.start)), dateUtil.timeString(toMills(range.end)))
+        rh.gs(R.string.timerange_value, dateUtil.timeString(toMills(range.start)), dateUtil.timeString(toMills(range.end)))
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_access_alarm_24dp)
 
@@ -76,7 +76,7 @@ class TriggerTimeRange(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.time_range, this))
+            .add(StaticLabel(rh, R.string.time_range, this))
             .add(range)
             .build(root)
     }
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
index 8fa919e8c37..28b57681892 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
@@ -20,17 +20,17 @@ class TriggerWifiSsid(injector: HasAndroidInjector) : Trigger(injector) {
     @Inject lateinit var receiverStatusStore: ReceiverStatusStore
 
     var ssid = InputString()
-    var comparator = Comparator(resourceHelper)
+    var comparator = Comparator(rh)
 
     @Suppress("unused")
     constructor(injector: HasAndroidInjector, ssid: String, compare: Comparator.Compare) : this(injector) {
         this.ssid = InputString(ssid)
-        comparator = Comparator(resourceHelper, compare)
+        comparator = Comparator(rh, compare)
     }
 
     constructor(injector: HasAndroidInjector, triggerWifiSsid: TriggerWifiSsid) : this(injector) {
         this.ssid = InputString(triggerWifiSsid.ssid.value)
-        comparator = Comparator(resourceHelper, triggerWifiSsid.comparator.value)
+        comparator = Comparator(rh, triggerWifiSsid.comparator.value)
     }
 
     fun setValue(ssid: String): TriggerWifiSsid {
@@ -72,7 +72,7 @@ class TriggerWifiSsid(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.ns_wifi_ssids
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.wifissidcompared, resourceHelper.gs(comparator.value.stringRes), ssid.value)
+        rh.gs(R.string.wifissidcompared, rh.gs(comparator.value.stringRes), ssid.value)
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_network_wifi)
 
@@ -80,9 +80,9 @@ class TriggerWifiSsid(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun generateDialog(root: LinearLayout) {
         LayoutBuilder()
-            .add(StaticLabel(resourceHelper, R.string.ns_wifi_ssids, this))
+            .add(StaticLabel(rh, R.string.ns_wifi_ssids, this))
             .add(comparator)
-            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.ns_wifi_ssids) + ": ", "", ssid))
+            .add(LabelWithElement(rh, rh.gs(R.string.ns_wifi_ssids) + ": ", "", ssid))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt b/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt
index bd293160db9..0acbe925dc0 100644
--- a/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.events.EventLocationChange
 import info.nightscout.androidaps.interfaces.NotificationHolder
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
@@ -33,7 +33,7 @@ import javax.inject.Inject
 class LocationService : DaggerService() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var fabricPrivacy: FabricPrivacy
diff --git a/automation/src/main/res/layout/automation_dialog_choose_operation.xml b/automation/src/main/res/layout/automation_dialog_choose_operation.xml
new file mode 100644
index 00000000000..6f380dfbda0
--- /dev/null
+++ b/automation/src/main/res/layout/automation_dialog_choose_operation.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView 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:focusableInTouchMode="true"
+    android:minWidth="300dp"
+    android:orientation="vertical"
+    tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseOperationDialog">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/dialog_title_background"
+            android:orientation="horizontal"
+            android:padding="5dp">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/please_choose_a_operation_type"
+                app:srcCompat="@drawable/ic_trigger_green_48dp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/please_choose_a_operation_type"
+                android:textAlignment="center"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        </RelativeLayout>
+
+        <RadioGroup
+            android:id="@+id/chooseOperationRadioGroup"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="10dp"/>
+
+        <include layout="@layout/okcancel" />
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/automation/src/main/res/layout/automation_dialog_edit_trigger.xml b/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
index 45fb0e3a533..bb019f1ef37 100644
--- a/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
+++ b/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
@@ -7,7 +7,7 @@
     android:focusableInTouchMode="true"
     android:minWidth="300dp"
     android:orientation="vertical"
-    tools:context=".plugins.general.automation.dialogs.EditEventDialog">
+    tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -45,7 +45,7 @@
             android:id="@+id/layoutTrigger"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:padding="0dp"
             android:orientation="vertical" />
 
         <include layout="@layout/okcancel" />
diff --git a/automation/src/main/res/layout/automation_dialog_event.xml b/automation/src/main/res/layout/automation_dialog_event.xml
index 68fc935634a..d40056549e4 100644
--- a/automation/src/main/res/layout/automation_dialog_event.xml
+++ b/automation/src/main/res/layout/automation_dialog_event.xml
@@ -7,14 +7,14 @@
     android:focusableInTouchMode="true"
     android:minWidth="300dp"
     android:orientation="vertical"
-    tools:context=".plugins.general.automation.dialogs.EditEventDialog">
+    tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -29,17 +29,23 @@
                 app:srcCompat="@drawable/ic_action_orange_48dp" />
 
             <TextView
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:text="@string/automation_event"
                 android:textAlignment="center"
+                android:layout_weight="1"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-        </RelativeLayout>
+            <CheckBox
+                android:id="@+id/enabled"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/spacer"
@@ -54,6 +60,27 @@
             android:orientation="vertical"
             android:padding="10dp">
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageButton
+                    android:id="@+id/imageButton"
+                    android:layout_width="27dp"
+                    android:layout_height="match_parent"
+                    android:scaleX="0.7"
+                    android:scaleY="0.7"
+                    android:src="@drawable/ic_danar_useropt" />
+
+                <CheckBox
+                    android:id="@+id/user_action"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/user_action" />
+
+            </LinearLayout>
+
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/inputEventTitle"
                 android:layout_width="match_parent"
diff --git a/automation/src/main/res/values-bg-rBG/strings.xml b/automation/src/main/res/values-bg-rBG/strings.xml
index 0a5d42ab5f9..42294181736 100644
--- a/automation/src/main/res/values-bg-rBG/strings.xml
+++ b/automation/src/main/res/values-bg-rBG/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">КЗ не е достъпна</string>
     <string name="glucosecomparedmgdl">КЗ %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">КЗ %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Времената цел не съществува</string>
+    <string name="temptargetcomparedmgdl">Временна цел %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Временна цел %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Профил процент %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">И</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Ширина:</string>
     <string name="longitude_short">Дължина:</string>
     <string name="glucose_u">КЗ [%1$s]:</string>
+    <string name="target_u">Цел [%1$s]:</string>
     <string name="lastboluslabel">Последен болус</string>
     <string name="lastboluscompared">Последен болус преди %1$s %2$s минути</string>
     <string name="triggercoblabel">Активни въглехидрати</string>
@@ -101,9 +105,11 @@
     <string name="edit_short">РЕД</string>
     <string name="please_choose_an_action_type">Избиране на действие</string>
     <string name="please_choose_a_trigger_type">Иберете условие</string>
+    <string name="please_choose_a_operation_type">Избери тип на операция</string>
     <string name="triggers">Активиращи условия:</string>
     <string name="remove_label">ИЗТРИИ</string>
     <string name="preconditions">Предварителни условия:</string>
     <string name="automation_event">Събитие</string>
     <string name="reorder_label">Подреди</string>
+    <string name="user_action">Потребителско действие</string>
 </resources>
diff --git a/automation/src/main/res/values-ca-rES/strings.xml b/automation/src/main/res/values-ca-rES/strings.xml
index 2c3eb7c1263..e1bcb612e66 100644
--- a/automation/src/main/res/values-ca-rES/strings.xml
+++ b/automation/src/main/res/values-ca-rES/strings.xml
@@ -1,16 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="automation_short">Auto</string>
+    <string name="automation">Automatització</string>
     <string name="automation_description">Tasques d\'automatització definides per l\'usuari</string>
     <string name="automation_missing_task_name">Introduïu un nom de tasca.</string>
     <string name="automation_missing_trigger">Especifiqueu almenys un activador.</string>
     <string name="automation_missing_action">Especifiqueu almenys una acció.</string>
+    <string name="alarm_message">Alarma: %1$s</string>
+    <string name="alarm_short">Alarma:</string>
+    <string name="message_short">Msstg:</string>
+    <string name="alreadyenabled">Ja activat</string>
+    <string name="alreadydisabled">Ja desactivat</string>
     <string name="alreadysuspended">Ja aturat</string>
     <string name="notsuspended">No aturat</string>
     <string name="suspendloopforXmin">Aturar el llaç durant %1$d min</string>
     <string name="notification_message">Avís: %1$s</string>
+    <string name="profilename">Canviar perfil a</string>
+    <string name="changengetoprofilename">Canviar perfil a %1$s</string>
+    <string name="automation_trigger_pump_last_connection_label">Darrera connexió a la bomba</string>
+    <string name="automation_trigger_pump_last_connection_description">Darrera connexió a la bomba [minuts transcorreguts]</string>
+    <string name="automation_trigger_pump_last_connection_compared">Darrera connexió a la bomba fa %1$s %2$s min</string>
+    <string name="alreadyset">Ja definit</string>
+    <string name="profilepercentage">Percentatge de perfil</string>
+    <string name="startprofileforever">Iniciar perfil %1$d%%</string>
+    <string name="percent_u">Percentatge [%]:</string>
+    <string name="sendsmsactionlabel">Enviar SMS: %1$s</string>
+    <string name="sendsmsactiontext">Enviar SMS amb text</string>
+    <string name="starttemptarget">Iniciar objectiu temporal</string>
+    <string name="stoptemptarget">Aturar objectiu temporal</string>
+    <string name="islesser">és menor que</string>
+    <string name="isequalorlesser">és igual o menor que</string>
+    <string name="isequal">és igual a</string>
+    <string name="isequalorgreater">és igual o més gran que</string>
+    <string name="isgreater">és més gran que</string>
+    <string name="isnotavailable">no està disponible</string>
+    <string name="glucoseisnotavailable">Glucèmia no disponible</string>
+    <string name="glucosecomparedmgdl">Glucèmia %1$s %2$.0f %3$s</string>
+    <string name="glucosecomparedmmol">Glucèmia %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">L’Objectiu Temporal no existeix</string>
+    <string name="temptargetcomparedmgdl">Objectiu Temporal %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Objectiu Temporal %1$s %2$.1f %3$s</string>
+    <string name="or">O</string>
+    <string name="xor">Exclusiu o</string>
+    <string name="atspecifiedtime">A les %1$s</string>
+    <string name="use_network_location">Utilitzar ubicació de xarxa</string>
+    <string name="use_gps_location">Utilitzar ubicació GPS</string>
+    <string name="use_passive_location">Utilitzar ubicació passiva</string>
+    <string name="locationservice">Servei d\'ubicació</string>
+    <string name="onconnect">En connectar</string>
+    <string name="ondisconnect">En desconnectar</string>
     <string name="short_avgdelta">Delta mitjana curta</string>
     <string name="long_avgdelta">Delta mitjana llarga</string>
     <string name="delta">Delta</string>
+    <string name="location_mode">Quan </string>
+    <string name="location_inside">Quan sigueu dins la zona</string>
+    <string name="location_outside">Quan sigueu fora de la zona</string>
+    <string name="location_going_in">Quan entreu a l\'àrea anomenada</string>
     <string name="weekday_sunday_short">Dg</string>
     <string name="weekday_saturday_short">Ds</string>
     <string name="weekday_friday_short">Dv</string>
diff --git a/automation/src/main/res/values-cs-rCZ/strings.xml b/automation/src/main/res/values-cs-rCZ/strings.xml
index 5b993f0975d..a3f1c9d0e9a 100644
--- a/automation/src/main/res/values-cs-rCZ/strings.xml
+++ b/automation/src/main/res/values-cs-rCZ/strings.xml
@@ -105,9 +105,11 @@
     <string name="edit_short">EDIT</string>
     <string name="please_choose_an_action_type">Vyberte akci</string>
     <string name="please_choose_a_trigger_type">Vyberte podmínku</string>
+    <string name="please_choose_a_operation_type">Vyberte typ operace</string>
     <string name="triggers">Podmínky:</string>
     <string name="remove_label">ODSTRANIT</string>
     <string name="preconditions">Nutné podmínky:</string>
     <string name="automation_event">Událost automatizace</string>
     <string name="reorder_label">Změna pořadí</string>
+    <string name="user_action">Uživatelská akce</string>
 </resources>
diff --git a/automation/src/main/res/values-es-rES/strings.xml b/automation/src/main/res/values-es-rES/strings.xml
index 87cd568406a..d7b9c0515a9 100644
--- a/automation/src/main/res/values-es-rES/strings.xml
+++ b/automation/src/main/res/values-es-rES/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">El valor de glucosa no está disponible</string>
     <string name="glucosecomparedmgdl">Glucosa %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glucosa %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">El objetivo temporal no existe</string>
+    <string name="temptargetcomparedmgdl">Objetivo Temporal %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Objetivo Temporal %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Porcentaje de basal en perfil %1$s %2$d</string>
     <string name="iobcompared">IOB (Insulina a Bordo) %1$s %2$.1f</string>
     <string name="and">Y</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Lat:</string>
     <string name="longitude_short">Long:</string>
     <string name="glucose_u">Glucosa [%1$s]:</string>
+    <string name="target_u">Objetivo [%1$s]:</string>
     <string name="lastboluslabel">Último bolo</string>
     <string name="lastboluscompared">Hora del último bolo: hace %1$s %2$s min</string>
     <string name="triggercoblabel">COB</string>
diff --git a/automation/src/main/res/values-fr-rFR/strings.xml b/automation/src/main/res/values-fr-rFR/strings.xml
index a42641de69e..c580c81d443 100644
--- a/automation/src/main/res/values-fr-rFR/strings.xml
+++ b/automation/src/main/res/values-fr-rFR/strings.xml
@@ -105,9 +105,11 @@
     <string name="edit_short">ÉDITER</string>
     <string name="please_choose_an_action_type">Choisir un type d\'action</string>
     <string name="please_choose_a_trigger_type">Choisir un type de déclencheur</string>
+    <string name="please_choose_a_operation_type">Choisissez un type d\'opération</string>
     <string name="triggers">Déclencheurs :</string>
     <string name="remove_label">SUPPRIMER</string>
     <string name="preconditions">Conditions préalables :</string>
     <string name="automation_event">Evénement auto.</string>
     <string name="reorder_label">Réordonner</string>
+    <string name="user_action">Actions utilisateur</string>
 </resources>
diff --git a/automation/src/main/res/values-hu-rHU/strings.xml b/automation/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/automation/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/automation/src/main/res/values-it-rIT/strings.xml b/automation/src/main/res/values-it-rIT/strings.xml
index 0bcdb263285..2ff0e7466fa 100644
--- a/automation/src/main/res/values-it-rIT/strings.xml
+++ b/automation/src/main/res/values-it-rIT/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">Glicemia non disponibile</string>
     <string name="glucosecomparedmgdl">Glicemia %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glicemia %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Il target temporaneo non esiste</string>
+    <string name="temptargetcomparedmgdl">Temp-Target %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Temp-Target %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">PCT profilo %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">E (AND)</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Lat:</string>
     <string name="longitude_short">Lon:</string>
     <string name="glucose_u">Glicemia [%1$s]:</string>
+    <string name="target_u">Target [%1$s]:</string>
     <string name="lastboluslabel">Ultimo bolo</string>
     <string name="lastboluscompared">Ora ultimo bolo %1$s %2$s min fa</string>
     <string name="triggercoblabel">COB</string>
@@ -101,9 +105,11 @@
     <string name="edit_short">MODIFICA</string>
     <string name="please_choose_an_action_type">Scegli un tipo di azione</string>
     <string name="please_choose_a_trigger_type">Scegli un tipo di trigger</string>
+    <string name="please_choose_a_operation_type">Scegli un tipo di operazione</string>
     <string name="triggers">Trigger:</string>
     <string name="remove_label">RIMUOVI</string>
     <string name="preconditions">Presupposti:</string>
     <string name="automation_event">Evento di automazione</string>
     <string name="reorder_label">Riordina</string>
+    <string name="user_action">Azione utente</string>
 </resources>
diff --git a/automation/src/main/res/values-iw-rIL/strings.xml b/automation/src/main/res/values-iw-rIL/strings.xml
index 46a2efd8ef5..5ba51cb7fac 100644
--- a/automation/src/main/res/values-iw-rIL/strings.xml
+++ b/automation/src/main/res/values-iw-rIL/strings.xml
@@ -105,9 +105,11 @@
     <string name="edit_short">עריכה</string>
     <string name="please_choose_an_action_type">בחרו סוג פעולה</string>
     <string name="please_choose_a_trigger_type">בחירת סוג הטריגר</string>
+    <string name="please_choose_a_operation_type">נא לבחור סוג פעולה</string>
     <string name="triggers">טריגרים:</string>
     <string name="remove_label">הסר</string>
     <string name="preconditions">תנאים מוקדמים:</string>
     <string name="automation_event">אירוע אוטומציה</string>
     <string name="reorder_label">סדר מחדש</string>
+    <string name="user_action">פעולות משתמש</string>
 </resources>
diff --git a/automation/src/main/res/values-lt-rLT/strings.xml b/automation/src/main/res/values-lt-rLT/strings.xml
index 9a77054a2db..ea6f54dcbc2 100644
--- a/automation/src/main/res/values-lt-rLT/strings.xml
+++ b/automation/src/main/res/values-lt-rLT/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">Glikemija nepasiekiama</string>
     <string name="glucosecomparedmgdl">Glikemija %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glikemija %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Laikinas tikslas neegzistuoja</string>
+    <string name="temptargetcomparedmgdl">Laikinas tikslas %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Laikinas tikslas %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profilis %1$s%2$d</string>
     <string name="iobcompared">AIO %1$s %2$.1f</string>
     <string name="and">Ir</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Platuma:</string>
     <string name="longitude_short">Ilguma:</string>
     <string name="glucose_u">Gliukozė [%1$s]:</string>
+    <string name="target_u">Tikslas [%1$s]:</string>
     <string name="lastboluslabel">Paskutinis bolusas</string>
     <string name="lastboluscompared">Paskutinis Bolusas prieš %1$s %2$s min</string>
     <string name="triggercoblabel">AAO</string>
diff --git a/automation/src/main/res/values-nl-rNL/strings.xml b/automation/src/main/res/values-nl-rNL/strings.xml
index afd667fa95f..d7314aa8b16 100644
--- a/automation/src/main/res/values-nl-rNL/strings.xml
+++ b/automation/src/main/res/values-nl-rNL/strings.xml
@@ -7,6 +7,7 @@
     <string name="automation_missing_trigger">Voer minstens één trigger in.</string>
     <string name="automation_missing_action">Voer minstens één actie in.</string>
     <string name="alarm_message">Alarm: %1$s</string>
+    <string name="alarm_short">Alarm:</string>
     <string name="message_short">Boodsch:</string>
     <string name="alreadyenabled">Al ingeschakeld</string>
     <string name="alreadydisabled">Al uitgeschakeld</string>
@@ -37,6 +38,9 @@
     <string name="glucoseisnotavailable">Glucose is niet beschikbaar</string>
     <string name="glucosecomparedmgdl">Glucose %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glucose %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Tijdelijk streefdoel bestaat niet</string>
+    <string name="temptargetcomparedmgdl">Tijdelijk streefdoel %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Tijdelijk streefdoel %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profiel pct %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">En</string>
@@ -85,8 +89,10 @@
     <string name="latitude_short">Br:</string>
     <string name="longitude_short">Leng:</string>
     <string name="glucose_u">Glucose [%1$s]:</string>
+    <string name="target_u">Streefdoel [%1$s]:</string>
     <string name="lastboluslabel">Laatste bolus</string>
     <string name="lastboluscompared">Laatste bolus %1$s %2$s min geleden</string>
+    <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="iob_u">IOB [E]:</string>
     <string name="distance_short">Afst [m]:</string>
diff --git a/automation/src/main/res/values-no-rNO/strings.xml b/automation/src/main/res/values-no-rNO/strings.xml
index 29def33fd2a..9ddd8db9432 100644
--- a/automation/src/main/res/values-no-rNO/strings.xml
+++ b/automation/src/main/res/values-no-rNO/strings.xml
@@ -38,6 +38,9 @@
     <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="notemptarget">Temp target finnes ikke</string>
+    <string name="temptargetcomparedmgdl">Temp target %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Temp target %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>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Lat:</string>
     <string name="longitude_short">Long:</string>
     <string name="glucose_u">Glukose [%1$s]:</string>
+    <string name="target_u">Target [%1$s]:</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>
@@ -101,9 +105,11 @@
     <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="please_choose_a_operation_type">Velg en handling</string>
     <string name="triggers">Triggere:</string>
     <string name="remove_label">FJERN</string>
     <string name="preconditions">Forutsetninger:</string>
     <string name="automation_event">Automasjons hendelse</string>
     <string name="reorder_label">Endre rekkefølge</string>
+    <string name="user_action">Bruker handling</string>
 </resources>
diff --git a/automation/src/main/res/values-pl-rPL/strings.xml b/automation/src/main/res/values-pl-rPL/strings.xml
index 8c90e0fd108..f6b97097b5d 100644
--- a/automation/src/main/res/values-pl-rPL/strings.xml
+++ b/automation/src/main/res/values-pl-rPL/strings.xml
@@ -7,6 +7,7 @@
     <string name="automation_missing_trigger">Proszę podać przynajmniej jedno wywołanie.</string>
     <string name="automation_missing_action">Proszę podać przynajmniej jedną akcję.</string>
     <string name="alarm_message">Alarm: %1$s</string>
+    <string name="alarm_short">Alarm:</string>
     <string name="message_short">Inf:</string>
     <string name="alreadyenabled">Już włączono</string>
     <string name="alreadydisabled">Już wyłączono</string>
@@ -37,6 +38,9 @@
     <string name="glucoseisnotavailable">Poziom jest nieznany</string>
     <string name="glucosecomparedmgdl">Poziom %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Poziom %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Cel tymczasowy nie istnieje</string>
+    <string name="temptargetcomparedmgdl">Cel tymczasowy %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Cel tymczasowy %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profil pct %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">i</string>
@@ -85,6 +89,7 @@
     <string name="latitude_short">Szerokość:</string>
     <string name="longitude_short">Długość:</string>
     <string name="glucose_u">Poziom [%1$s]:</string>
+    <string name="target_u">Cel [%1$s]:</string>
     <string name="lastboluslabel">Przed ostatnim bolusem</string>
     <string name="lastboluscompared">Czas ostatniego bolusa %1$s %2$s min temu</string>
     <string name="triggercoblabel">Węgle</string>
diff --git a/automation/src/main/res/values-ro-rRO/strings.xml b/automation/src/main/res/values-ro-rRO/strings.xml
index 34b202532b0..f2886728d14 100644
--- a/automation/src/main/res/values-ro-rRO/strings.xml
+++ b/automation/src/main/res/values-ro-rRO/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">Glicemia nu este disponibilă</string>
     <string name="glucosecomparedmgdl">Glicemie %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glicemie %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Ținta temporară nu există</string>
+    <string name="temptargetcomparedmgdl">Tinta temporara %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Tinta temporara %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profil %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">Și</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Lat:</string>
     <string name="longitude_short">Long:</string>
     <string name="glucose_u">Glicemie [%1$s]:</string>
+    <string name="target_u">Tinta [%1$s]:</string>
     <string name="lastboluslabel">Ultimul bolus</string>
     <string name="lastboluscompared">Ultimul bolus acum %1$s %2$s min</string>
     <string name="triggercoblabel">COB</string>
@@ -101,9 +105,11 @@
     <string name="edit_short">EDITARE</string>
     <string name="please_choose_an_action_type">Selectați tipul de acțiune</string>
     <string name="please_choose_a_trigger_type">Selectați un tip de factor declanșator</string>
+    <string name="please_choose_a_operation_type">Alege tipul de operațiune</string>
     <string name="triggers">Declanșatori:</string>
     <string name="remove_label">ȘTERGE</string>
     <string name="preconditions">Condiții pre-existente:</string>
     <string name="automation_event">Eveniment automatizare</string>
     <string name="reorder_label">Reordonează</string>
+    <string name="user_action">Acțiunea utilizatorului</string>
 </resources>
diff --git a/automation/src/main/res/values-ru-rRU/strings.xml b/automation/src/main/res/values-ru-rRU/strings.xml
index 82246d8ba0b..96a71d6cd0c 100644
--- a/automation/src/main/res/values-ru-rRU/strings.xml
+++ b/automation/src/main/res/values-ru-rRU/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">ГК недоступна</string>
     <string name="glucosecomparedmgdl">Гк %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Гк %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Временная цель не существует</string>
+    <string name="temptargetcomparedmgdl">Временная цель %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Временная цель %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Профиль %1$s%2$d</string>
     <string name="iobcompared">Акт инс IOB %1$s %2$.1f</string>
     <string name="and">И</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Широта:</string>
     <string name="longitude_short">Долгота:</string>
     <string name="glucose_u">Гк %1$s]:</string>
+    <string name="target_u">Цель %1$d м</string>
     <string name="lastboluslabel">Предыдущий болюс</string>
     <string name="lastboluscompared">Время болюса %1$s %2$s мин назад</string>
     <string name="triggercoblabel">Активн углеводы</string>
@@ -101,9 +105,11 @@
     <string name="edit_short">РЕДАКТ</string>
     <string name="please_choose_an_action_type">Выберите тип действия</string>
     <string name="please_choose_a_trigger_type">Выберите тип триггера</string>
+    <string name="please_choose_a_operation_type">Выберите тип действия</string>
     <string name="triggers">Триггеры:</string>
     <string name="remove_label">УДАЛИТЬ</string>
     <string name="preconditions">Предусловия:</string>
     <string name="automation_event">Автоматизированное событие</string>
     <string name="reorder_label">Повторный заказ</string>
+    <string name="user_action">Действия пользователя</string>
 </resources>
diff --git a/automation/src/main/res/values-sk-rSK/strings.xml b/automation/src/main/res/values-sk-rSK/strings.xml
index b06dc622ac1..4e39609a620 100644
--- a/automation/src/main/res/values-sk-rSK/strings.xml
+++ b/automation/src/main/res/values-sk-rSK/strings.xml
@@ -105,9 +105,11 @@
     <string name="edit_short">EDIT</string>
     <string name="please_choose_an_action_type">Vyberte akciu</string>
     <string name="please_choose_a_trigger_type">Vyberte typ podmienky</string>
+    <string name="please_choose_a_operation_type">Vyberte typ operácie</string>
     <string name="triggers">Podmienky:</string>
     <string name="remove_label">VYMAZAŤ</string>
     <string name="preconditions">Predpoklady:</string>
     <string name="automation_event">Udalosť automatiky</string>
     <string name="reorder_label">Zmena poradia</string>
+    <string name="user_action">Akcia užívateľa</string>
 </resources>
diff --git a/automation/src/main/res/values-sv-rSE/strings.xml b/automation/src/main/res/values-sv-rSE/strings.xml
index 464cfdb7e1f..98c412a7db1 100644
--- a/automation/src/main/res/values-sv-rSE/strings.xml
+++ b/automation/src/main/res/values-sv-rSE/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">BG-data är inte tillgängligt</string>
     <string name="glucosecomparedmgdl">BG %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">BG %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Temp mål finns inte</string>
+    <string name="temptargetcomparedmgdl">Temp mål %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Temp mål %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profil pct %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">och</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Lat:</string>
     <string name="longitude_short">Lon:</string>
     <string name="glucose_u">BG [%1$s]:</string>
+    <string name="target_u">Mål [%1$s]:</string>
     <string name="lastboluslabel">Senaste bolus</string>
     <string name="lastboluscompared">Senaste bolus %1$s %2$s min sedan</string>
     <string name="triggercoblabel">COB</string>
@@ -101,9 +105,11 @@
     <string name="edit_short">ÄNDRA</string>
     <string name="please_choose_an_action_type">Välj en åtgärd</string>
     <string name="please_choose_a_trigger_type">Vänligen välj typ av utlösare</string>
+    <string name="please_choose_a_operation_type">Välj en åtgärdstyp</string>
     <string name="triggers">Utlösare:</string>
     <string name="remove_label">TA BORT</string>
     <string name="preconditions">Förutsättningar:</string>
     <string name="automation_event">Automationshändelse</string>
     <string name="reorder_label">Ändra ordning</string>
+    <string name="user_action">Användaråtgärd</string>
 </resources>
diff --git a/automation/src/main/res/values-tr-rTR/strings.xml b/automation/src/main/res/values-tr-rTR/strings.xml
index 452c77aa689..4375cca0f06 100644
--- a/automation/src/main/res/values-tr-rTR/strings.xml
+++ b/automation/src/main/res/values-tr-rTR/strings.xml
@@ -1,13 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="alreadydisabled">Hali hazır iptal edilmiş</string>
-    <string name="suspendloopforXmin">%1$d dak döngüyü duraklat</string>
+    <string name="automation_short">Otomatik</string>
+    <string name="automation">Otomasyon</string>
+    <string name="automation_description">Kullanıcı tanımlı otomasyon görevleri</string>
+    <string name="automation_missing_task_name">Lütfen bir görev adı girin.</string>
+    <string name="automation_missing_trigger">Lütfen en az bir tetikleyici belirtin.</string>
+    <string name="automation_missing_action">Lütfen en az bir işlem belirtin.</string>
+    <string name="alarm_message">Alarm: %1$s</string>
+    <string name="alarm_short">Alarm:</string>
+    <string name="message_short">Msj:</string>
+    <string name="alreadyenabled">Zaten etkin</string>
+    <string name="alreadydisabled">Zaten devre dışı</string>
+    <string name="alreadysuspended">Zaten askıya alındı</string>
+    <string name="notsuspended">Askıya alınmadı</string>
+    <string name="suspendloopforXmin">%1$d dk. döngüyü duraklat</string>
+    <string name="notification_message">Bildirim: %1$s</string>
+    <string name="profilename">Profili değiştir</string>
+    <string name="changengetoprofilename">Profili %1$s olarak değiştir</string>
+    <string name="automation_trigger_pump_last_connection_label">Pompayla son bağlantı</string>
+    <string name="automation_trigger_pump_last_connection_description">Pompayla son bağlantı [dakika önce]</string>
+    <string name="automation_trigger_pump_last_connection_compared">Pompayla son bağlantı %1$s %2$s dakika önce</string>
+    <string name="alreadyset">Zaten ayarlanmış</string>
+    <string name="profilepercentage">Profil yüzdesi</string>
+    <string name="startprofileforever">Profil %1$d%% başladı</string>
+    <string name="percent_u">Yüzde [%]:</string>
+    <string name="sendsmsactionlabel">SMS gönder: %1$s</string>
+    <string name="sendsmsactiondescription">Tüm numaralara SMS gönder</string>
+    <string name="sendsmsactiontext">Metin ile SMS gönder</string>
+    <string name="starttemptarget">Geçici hedefi başlat</string>
+    <string name="stoptemptarget">Geçici hedefi durdur</string>
+    <string name="islesser">küçükse</string>
+    <string name="isequalorlesser">eşit veya küçükse</string>
+    <string name="isequal">eşitse</string>
+    <string name="isequalorgreater">eşit veya büyükse</string>
+    <string name="isgreater">büyükse</string>
+    <string name="isnotavailable">mevcut değil</string>
     <string name="glucoseisnotavailable">Glikoz verileri mevcut değil</string>
+    <string name="glucosecomparedmgdl">Glukoz %1$s %2$.0f %3$s</string>
+    <string name="glucosecomparedmmol">Glukoz %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Geçici Hedef mevcut değil</string>
+    <string name="temptargetcomparedmgdl">Geçici Hedef %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Geçici Hedef %1$s %2$.1f %3$s</string>
+    <string name="percentagecompared">Profil yüzdesi %1$s %2$d</string>
+    <string name="iobcompared">Aktif insülin %1$s %2$.1f</string>
     <string name="and">Ve</string>
     <string name="or">Veya</string>
+    <string name="xor">Özel veya</string>
+    <string name="atspecifiedtime">%1$s\'de</string>
+    <string name="use_network_location">Ağ konumunu kullan</string>
+    <string name="use_gps_location">GPS konumunu kullan</string>
+    <string name="use_passive_location">Pasif konumu kullan</string>
+    <string name="locationservice">Konum servisi</string>
+    <string name="onconnect">Bağlandığında</string>
+    <string name="ondisconnect">Bağlantı kesildiğinde</string>
     <string name="short_avgdelta">Kısa ortalama delta</string>
     <string name="long_avgdelta">Uzun ortalama delta</string>
     <string name="delta">Delta</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Ne zaman </string>
+    <string name="location_inside">Bölgenin içindeyken</string>
+    <string name="location_outside">Alanın dışında olduğunuzda</string>
+    <string name="location_going_in">Adlı alana girdiğinizde</string>
+    <string name="location_going_out">Adlı alandan ayrıldığınızda</string>
+    <string name="time_range">Zaman aralığı</string>
+    <string name="timerange_value">%1$s ile %2$s arasında</string>
+    <string name="between">Arasında </string>
     <string name="weekday_sunday_short">Pzr</string>
     <string name="weekday_saturday_short">Cts</string>
     <string name="weekday_friday_short">Cum</string>
@@ -15,5 +72,44 @@
     <string name="weekday_wednesday_short">Çrş</string>
     <string name="weekday_tuesday_short">Salı</string>
     <string name="weekday_monday_short">Pzt</string>
+    <string name="delete_short">SİL</string>
     <string name="add_short">EKLE</string>
+    <string name="copy_short">KOPYALA</string>
+    <string name="temptargetcompared">Geçici hedef %1$s</string>
+    <string name="btdevicecompared">%1$s %2$s cihazına Bluetooth bağlantısı</string>
+    <string name="btdevice">Bluetooth cihazına bağlantı </string>
+    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
+    <string name="autosenscompared">Otoduyarlılık %1$s %2$s %%</string>
+    <string name="autosenslabel">Otoduyarlılık %</string>
+    <string name="deltacompared">%3$s %1$s %2$s</string>
+    <string name="deltalabel">KŞ farkı</string>
+    <string name="deltalabel_u">KŞ farkı [%1$s]</string>
+    <string name="currentlocation">Mevcut konum</string>
+    <string name="location">Konum</string>
+    <string name="latitude_short">Enlem:</string>
+    <string name="longitude_short">Boylam:</string>
+    <string name="glucose_u">Glukoz [%1$s]:</string>
+    <string name="target_u">Hedef [%1$s]:</string>
+    <string name="lastboluslabel">Son bolus önce</string>
+    <string name="lastboluscompared">Son bolus zamanı %1$s %2$s dakika önce</string>
+    <string name="triggercoblabel">COB</string>
+    <string name="cobcompared">AK (COB) %1$s %2$.0f</string>
+    <string name="iob_u">IOB [U]:</string>
+    <string name="distance_short">Mesafe [m]:</string>
+    <string name="recurringTime">Yinelenen zaman</string>
+    <string name="every">Her</string>
+    <string name="never">Asla</string>
+    <string name="condition">Koşul:</string>
+    <string name="action">Aksiyon:</string>
+    <string name="taskname">Görev adı</string>
+    <string name="edit_short">DÜZENLE</string>
+    <string name="please_choose_an_action_type">Eylem tipini seçin</string>
+    <string name="please_choose_a_trigger_type">Tetikleyici tipini seçin</string>
+    <string name="please_choose_a_operation_type">İşlem tipini seçin</string>
+    <string name="triggers">Tetikleyiciler:</string>
+    <string name="remove_label">KALDIR</string>
+    <string name="preconditions">Ön koşullar:</string>
+    <string name="automation_event">Otomasyon durumu</string>
+    <string name="reorder_label">Yeniden sırala</string>
+    <string name="user_action">Kullanıcı Hareketleri</string>
 </resources>
diff --git a/automation/src/main/res/values/strings.xml b/automation/src/main/res/values/strings.xml
index 842e53b14d4..334d6530d10 100644
--- a/automation/src/main/res/values/strings.xml
+++ b/automation/src/main/res/values/strings.xml
@@ -107,12 +107,13 @@
     <string name="edit_short">EDIT</string>
     <string name="please_choose_an_action_type">Choose an action type</string>
     <string name="please_choose_a_trigger_type">Choose a trigger type</string>
+    <string name="please_choose_a_operation_type">Choose a operation type</string>
     <string name="triggers">Triggers:</string>
     <string name="remove_label">REMOVE</string>
     <string name="preconditions">Preconditions:</string>
     <string name="automation_event">Automation event</string>
     <string name="reorder_label">Reorder</string>
     <string name="key_automation_settings" translatable="false">automation_settings</string>
-
+    <string name="user_action">User action</string>
 
 </resources>
\ No newline at end of file
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.kt
index cf77f4a9726..30b8fe078ee 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.kt
@@ -5,9 +5,10 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.ConfigBuilder
 import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.actions.Action
 import info.nightscout.androidaps.plugins.general.automation.actions.ActionLoopEnable
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnectorTest
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDummy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -19,7 +20,7 @@ import org.mockito.Mock
 class AutomationEventTest : TestBase() {
 
     @Mock lateinit var loopPlugin: Loop
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var configBuilder: ConfigBuilder
 
     var injector: HasAndroidInjector = HasAndroidInjector {
@@ -32,9 +33,9 @@ class AutomationEventTest : TestBase() {
             }
             if (it is ActionLoopEnable) {
                 it.loopPlugin = loopPlugin
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.configBuilder = configBuilder
-                it.rxBus = RxBusWrapper(aapsSchedulers)
+                it.rxBus = RxBus(aapsSchedulers, aapsLogger)
             }
         }
     }
@@ -44,11 +45,12 @@ class AutomationEventTest : TestBase() {
         // create test object
         val event = AutomationEvent(injector)
         event.title = "Test"
-        event.trigger = TriggerDummy(injector).instantiate(JSONObject(TriggerConnectorTest.oneItem))
+        event.trigger = TriggerDummy(injector).instantiate(JSONObject(TriggerConnectorTest.oneItem)) as TriggerConnector
         event.addAction(ActionLoopEnable(injector))
 
         // export to json
-        val eventJsonExpected = "{\"autoRemove\":false,\"readOnly\":false,\"trigger\":\"{\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[\\\"{\\\\\\\"data\\\\\\\":{\\\\\\\"connectorType\\\\\\\":\\\\\\\"AND\\\\\\\",\\\\\\\"triggerList\\\\\\\":[]},\\\\\\\"type\\\\\\\":\\\\\\\"TriggerConnector\\\\\\\"}\\\"]},\\\"type\\\":\\\"TriggerConnector\\\"}\",\"title\":\"Test\",\"systemAction\":false,\"actions\":[\"{\\\"type\\\":\\\"ActionLoopEnable\\\"}\"],\"enabled\":true}"
+        val eventJsonExpected =
+            "{\"userAction\":false,\"autoRemove\":false,\"readOnly\":false,\"trigger\":\"{\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[\\\"{\\\\\\\"data\\\\\\\":{\\\\\\\"connectorType\\\\\\\":\\\\\\\"AND\\\\\\\",\\\\\\\"triggerList\\\\\\\":[]},\\\\\\\"type\\\\\\\":\\\\\\\"TriggerConnector\\\\\\\"}\\\"]},\\\"type\\\":\\\"TriggerConnector\\\"}\",\"title\":\"Test\",\"systemAction\":false,\"actions\":[\"{\\\"type\\\":\\\"ActionLoopEnable\\\"}\"],\"enabled\":true}"
         Assert.assertEquals(eventJsonExpected, event.toJSON())
 
         // clone
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestBaseWithProfile.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestBaseWithProfile.kt
index 1aa632efca1..37e7e01ad7a 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestBaseWithProfile.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestBaseWithProfile.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.ProfileStore
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -24,7 +24,7 @@ import org.mockito.Mock
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
@@ -32,9 +32,9 @@ open class TestBaseWithProfile : TestBase() {
     @Mock lateinit var config: Config
     @Mock lateinit var repository: AppRepository
 
-    val rxBus = RxBusWrapper(aapsSchedulers)
+    val rxBus = RxBus(aapsSchedulers, aapsLogger)
 
-    val profileInjector = HasAndroidInjector {
+    private val profileInjector = HasAndroidInjector {
         AndroidInjector {
         }
     }
@@ -45,7 +45,9 @@ open class TestBaseWithProfile : TestBase() {
 
     @Before
     fun prepareMock() {
-        validProfileJSON = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+        validProfileJSON = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"3\"}," +
+            "{\"time\":\"2:00\",\"value\":\"3.4\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4.5\"}]," +
+            "\"target_high\":[{\"time\":\"00:00\",\"value\":\"7\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
         validProfile = ProfileSealed.Pure(pureProfileFromJson(JSONObject(validProfileJSON), dateUtil)!!)
     }
 
@@ -57,4 +59,4 @@ open class TestBaseWithProfile : TestBase() {
         json.put("store", store)
         return ProfileStore(profileInjector, json, dateUtil)
     }
-}
\ No newline at end of file
+}
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestPumpPlugin.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestPumpPlugin.kt
index cb63dea9ecd..892bf09e122 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestPumpPlugin.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestPumpPlugin.kt
@@ -19,10 +19,10 @@ import org.json.JSONObject
 @Suppress("MemberVisibilityCanBePrivate")
 class TestPumpPlugin(pluginDescription: PluginDescription,
                      aapsLogger: AAPSLogger,
-                     resourceHelper: ResourceHelper,
+                     rh: ResourceHelper,
                      injector: HasAndroidInjector
 ) : PluginBase(
-    pluginDescription, aapsLogger, resourceHelper, injector
+    pluginDescription, aapsLogger, rh, injector
 ), Pump {
 
     var connected = false
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt
index 0aad1dd7baf..d49a9fcc83d 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt
@@ -6,7 +6,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.data.PumpEnactResult
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.elements.InputString
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
@@ -21,8 +21,8 @@ import org.mockito.Mockito.`when`
 
 class ActionAlarmTest : TestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var rh: ResourceHelper
+    @Mock lateinit var rxBus: RxBus
     @Mock lateinit var context: Context
     @Mock lateinit var timerUtil: TimerUtil
     @Mock lateinit var dateUtil: DateUtil
@@ -31,23 +31,23 @@ class ActionAlarmTest : TestBase() {
     var injector: HasAndroidInjector = HasAndroidInjector {
         AndroidInjector {
             if (it is ActionAlarm) {
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.rxBus = rxBus
                 it.context = context
                 it.timerUtil = timerUtil
                 it.dateUtil = dateUtil
             }
             if (it is PumpEnactResult) {
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
         }
     }
 
     @Before
     fun setup() {
-        `when`(resourceHelper.gs(R.string.ok)).thenReturn("OK")
-        `when`(resourceHelper.gs(R.string.alarm)).thenReturn("Alarm")
-        `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.alarm_message), ArgumentMatchers.anyString())).thenReturn("Alarm: %s")
+        `when`(rh.gs(R.string.ok)).thenReturn("OK")
+        `when`(rh.gs(R.string.alarm)).thenReturn("Alarm")
+        `when`(rh.gs(ArgumentMatchers.eq(R.string.alarm_message), ArgumentMatchers.anyString())).thenReturn("Alarm: %s")
 
         sut = ActionAlarm(injector)
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEventTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEventTest.kt
new file mode 100644
index 00000000000..8badae72d20
--- /dev/null
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEventTest.kt
@@ -0,0 +1,81 @@
+package info.nightscout.androidaps.plugins.general.automation.actions
+
+import info.nightscout.androidaps.automation.R
+import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
+import info.nightscout.androidaps.database.transactions.Transaction
+import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.androidaps.plugins.general.automation.elements.InputCarePortalMenu
+import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
+import info.nightscout.androidaps.plugins.general.automation.elements.InputString
+import info.nightscout.androidaps.queue.Callback
+import io.reactivex.Single
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers
+import org.mockito.Mockito.`when`
+
+class ActionCarePortalEventTest : ActionsTestBase() {
+
+    private lateinit var sut: ActionCarePortalEvent
+
+    @Before
+    fun setup() {
+        `when`(sp.getString(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn("AndroidAPS")
+        `when`(
+            rh.gs(
+                ArgumentMatchers.eq(R.string.careportal_note_message),
+                ArgumentMatchers.anyString()
+            )
+        ).thenReturn("Note : %s")
+        `when`(dateUtil.now()).thenReturn(0)
+        `when`(profileFunction.getUnits()).thenReturn(GlucoseUnit.MGDL)
+        `when`(repository.runTransactionForResult(anyObject<Transaction<InsertIfNewByTimestampTherapyEventTransaction.TransactionResult>>()))
+            .thenReturn(Single.just(InsertIfNewByTimestampTherapyEventTransaction.TransactionResult().apply {
+            }))
+        sut = ActionCarePortalEvent(injector)
+        sut.cpEvent = InputCarePortalMenu(rh)
+        sut.cpEvent.value = InputCarePortalMenu.EventType.NOTE
+        sut.note = InputString("Asd")
+        sut.duration = InputDuration(5, InputDuration.TimeUnit.MINUTES)
+    }
+
+    @Test fun friendlyNameTest() {
+        Assert.assertEquals(R.string.careportal, sut.friendlyName())
+    }
+
+    @Test fun shortDescriptionTest() {
+        Assert.assertEquals("Note : %s", sut.shortDescription())
+    }
+
+    @Test fun iconTest() {
+        Assert.assertEquals(R.drawable.ic_cp_note, sut.icon())
+    }
+
+    @Test fun doActionTest() {
+        sut.doAction(object : Callback() {
+            override fun run() {
+                Assert.assertTrue(result.success)
+            }
+        })
+    }
+
+    @Test fun hasDialogTest() {
+        Assert.assertTrue(sut.hasDialog())
+    }
+
+    @Test fun toJSONTest() {
+        Assert.assertEquals(
+            "{\"data\":{\"note\":\"Asd\",\"cpEvent\":\"NOTE\",\"durationInMinutes\":5},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionCarePortalEvent\"}",
+            sut.toJSON()
+        )
+    }
+
+    @Test fun fromJSONTest() {
+        sut.note = InputString("Asd")
+        sut.fromJSON("{\"note\":\"Asd\",\"cpEvent\":\"NOTE\",\"durationInMinutes\":5}")
+        Assert.assertEquals("Asd", sut.note.value)
+        Assert.assertEquals(5, sut.duration.value)
+        Assert.assertEquals(InputCarePortalMenu.EventType.NOTE, sut.cpEvent.value)
+    }
+}
\ No newline at end of file
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.kt
index c50f16ea5a4..17858ebea5f 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.kt
@@ -18,8 +18,8 @@ class ActionLoopDisableTest : ActionsTestBase() {
     fun setup() {
 
         testPumpPlugin.pumpDescription.isTempBasalCapable = true
-        `when`(resourceHelper.gs(R.string.disableloop)).thenReturn("Disable loop")
-        `when`(resourceHelper.gs(R.string.alreadydisabled)).thenReturn("Disable loop")
+        `when`(rh.gs(R.string.disableloop)).thenReturn("Disable loop")
+        `when`(rh.gs(R.string.alreadydisabled)).thenReturn("Disable loop")
 
         sut = ActionLoopDisable(injector)
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.kt
index e7bc6e53200..0ab4e677f2c 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.kt
@@ -17,8 +17,8 @@ class ActionLoopEnableTest : ActionsTestBase() {
     fun setup() {
 
         testPumpPlugin.pumpDescription.isTempBasalCapable = true
-        `when`(resourceHelper.gs(R.string.enableloop)).thenReturn("Enable loop")
-        `when`(resourceHelper.gs(R.string.alreadyenabled)).thenReturn("Already enabled")
+        `when`(rh.gs(R.string.enableloop)).thenReturn("Enable loop")
+        `when`(rh.gs(R.string.alreadyenabled)).thenReturn("Already enabled")
 
         sut = ActionLoopEnable(injector)
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt
index e630a0df011..72401cc0a73 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt
@@ -18,8 +18,8 @@ class ActionLoopResumeTest : ActionsTestBase() {
     @Before
     fun setup() {
 
-        `when`(resourceHelper.gs(R.string.resumeloop)).thenReturn("Resume loop")
-        `when`(resourceHelper.gs(R.string.notsuspended)).thenReturn("Not suspended")
+        `when`(rh.gs(R.string.resumeloop)).thenReturn("Resume loop")
+        `when`(rh.gs(R.string.notsuspended)).thenReturn("Not suspended")
 
         sut = ActionLoopResume(injector)
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt
index 66140b09d08..2c5bddf948c 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt
@@ -17,9 +17,9 @@ class ActionLoopSuspendTest : ActionsTestBase() {
     @Before
     fun setup() {
 
-        `when`(resourceHelper.gs(R.string.suspendloop)).thenReturn("Suspend loop")
-        `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.suspendloopforXmin), ArgumentMatchers.anyInt())).thenReturn("Suspend loop for %d min")
-        `when`(resourceHelper.gs(R.string.alreadysuspended)).thenReturn("Already suspended")
+        `when`(rh.gs(R.string.suspendloop)).thenReturn("Suspend loop")
+        `when`(rh.gs(ArgumentMatchers.eq(R.string.suspendloopforXmin), ArgumentMatchers.anyInt())).thenReturn("Suspend loop for %d min")
+        `when`(rh.gs(R.string.alreadysuspended)).thenReturn("Already suspended")
 
         sut = ActionLoopSuspend(injector)
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt
index d48c9683a1c..21c08126276 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt
@@ -6,16 +6,13 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
-import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.androidaps.database.transactions.Transaction
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.elements.InputString
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.Completable
-import io.reactivex.Single
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -23,35 +20,33 @@ import org.mockito.ArgumentMatchers
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.mockito.Mockito.any
-import org.mockito.Mockito.doNothing
 
 class ActionNotificationTest : TestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var rh: ResourceHelper
+    @Mock lateinit var rxBus: RxBus
     @Mock lateinit var repository: AppRepository
 
     private lateinit var sut: ActionNotification
     var injector: HasAndroidInjector = HasAndroidInjector {
         AndroidInjector {
             if (it is ActionNotification) {
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.rxBus = rxBus
                 it.repository = repository
             }
             if (it is PumpEnactResult) {
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
         }
     }
 
     @Before
     fun setup() {
-        `when`(resourceHelper.gs(R.string.ok)).thenReturn("OK")
-        `when`(resourceHelper.gs(R.string.notification)).thenReturn("Notification")
+        `when`(rh.gs(R.string.ok)).thenReturn("OK")
+        `when`(rh.gs(R.string.notification)).thenReturn("Notification")
         `when`(
-            resourceHelper.gs(
+            rh.gs(
                 ArgumentMatchers.eq(R.string.notification_message),
                 ArgumentMatchers.anyString()
             )
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
index 60a109bd621..7a37cac6e00 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
@@ -7,6 +7,7 @@ import info.nightscout.androidaps.queue.Callback
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
+import org.mockito.ArgumentMatchers
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
 
@@ -17,8 +18,8 @@ class ActionProfileSwitchPercentTest : ActionsTestBase() {
     @Before
     fun setup() {
 
-        `when`(resourceHelper.gs(R.string.startprofileforever)).thenReturn("Start profile %d%%")
-        `when`(resourceHelper.gs(R.string.startprofile)).thenReturn("Start profile %d%% for %d min")
+        `when`(rh.gs(R.string.startprofileforever)).thenReturn("Start profile %d%%")
+        `when`(rh.gs(R.string.startprofile)).thenReturn("Start profile %d%% for %d min")
 
         sut = ActionProfileSwitchPercent(injector)
     }
@@ -38,6 +39,7 @@ class ActionProfileSwitchPercentTest : ActionsTestBase() {
     }
 
     @Test fun doActionTest() {
+        `when`(profileFunction.createProfileSwitch(Mockito.anyInt(), Mockito.anyInt(), Mockito.anyInt())).thenReturn(true)
         sut.pct = InputPercent(110.0)
         sut.duration = InputDuration(30, InputDuration.TimeUnit.MINUTES)
         sut.doAction(object : Callback() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
index c15d1030b01..51d36bf4f3c 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
@@ -20,12 +20,12 @@ class ActionProfileSwitchTest : ActionsTestBase() {
     private val stringJson = "{\"data\":{\"profileToSwitchTo\":\"Test\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionProfileSwitch\"}"
 
     @Before fun setUp() {
-        `when`(resourceHelper.gs(R.string.profilename)).thenReturn("Change profile to")
-        `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.changengetoprofilename), ArgumentMatchers.anyString())).thenReturn("Change profile to %s")
-        `when`(resourceHelper.gs(R.string.alreadyset)).thenReturn("Already set")
-        `when`(resourceHelper.gs(R.string.notexists)).thenReturn("not exists")
-        `when`(resourceHelper.gs(R.string.error_field_must_not_be_empty)).thenReturn("The field must not be empty")
-        `when`(resourceHelper.gs(R.string.noprofile)).thenReturn("No profile loaded from NS yet")
+        `when`(rh.gs(R.string.profilename)).thenReturn("Change profile to")
+        `when`(rh.gs(ArgumentMatchers.eq(R.string.changengetoprofilename), ArgumentMatchers.anyString())).thenReturn("Change profile to %s")
+        `when`(rh.gs(R.string.alreadyset)).thenReturn("Already set")
+        `when`(rh.gs(R.string.notexists)).thenReturn("not exists")
+        `when`(rh.gs(R.string.error_field_must_not_be_empty)).thenReturn("The field must not be empty")
+        `when`(rh.gs(R.string.noprofile)).thenReturn("No profile loaded from NS yet")
 
         sut = ActionProfileSwitch(injector)
     }
@@ -41,7 +41,7 @@ class ActionProfileSwitchTest : ActionsTestBase() {
     @Test fun doAction() {
         //Empty input
         `when`(profileFunction.getProfileName()).thenReturn("Test")
-        sut.inputProfileName = InputProfileName(resourceHelper, activePlugin, "")
+        sut.inputProfileName = InputProfileName(rh, activePlugin, "")
         sut.doAction(object : Callback() {
             override fun run() {
                 Assert.assertFalse(result.success)
@@ -50,7 +50,7 @@ class ActionProfileSwitchTest : ActionsTestBase() {
 
         //Not initialized profileStore
         `when`(profileFunction.getProfile()).thenReturn(null)
-        sut.inputProfileName = InputProfileName(resourceHelper, activePlugin, "someProfile")
+        sut.inputProfileName = InputProfileName(rh, activePlugin, "someProfile")
         sut.doAction(object : Callback() {
             override fun run() {
                 Assert.assertFalse(result.success)
@@ -60,7 +60,7 @@ class ActionProfileSwitchTest : ActionsTestBase() {
         //profile already set
         `when`(profileFunction.getProfile()).thenReturn(validProfile)
         `when`(profileFunction.getProfileName()).thenReturn("Test")
-        sut.inputProfileName = InputProfileName(resourceHelper, activePlugin, "Test")
+        sut.inputProfileName = InputProfileName(rh, activePlugin, "Test")
         sut.doAction(object : Callback() {
             override fun run() {
                 Assert.assertTrue(result.success)
@@ -70,7 +70,7 @@ class ActionProfileSwitchTest : ActionsTestBase() {
 
         // profile doesn't exists
         `when`(profileFunction.getProfileName()).thenReturn("Active")
-        sut.inputProfileName = InputProfileName(resourceHelper, activePlugin, "Test")
+        sut.inputProfileName = InputProfileName(rh, activePlugin, "Test")
         sut.doAction(object : Callback() {
             override fun run() {
                 Assert.assertFalse(result.success)
@@ -80,7 +80,8 @@ class ActionProfileSwitchTest : ActionsTestBase() {
 
         // do profile switch
         `when`(profileFunction.getProfileName()).thenReturn("Test")
-        sut.inputProfileName = InputProfileName(resourceHelper, activePlugin, TESTPROFILENAME)
+        `when`(profileFunction.createProfileSwitch(anyObject(), anyString(), anyInt(), anyInt(), anyInt(), anyLong())).thenReturn(true)
+        sut.inputProfileName = InputProfileName(rh, activePlugin, TESTPROFILENAME)
         sut.doAction(object : Callback() {
             override fun run() {
                 Assert.assertTrue(result.success)
@@ -95,7 +96,7 @@ class ActionProfileSwitchTest : ActionsTestBase() {
     }
 
     @Test fun toJSONTest() {
-        sut.inputProfileName = InputProfileName(resourceHelper, activePlugin, "Test")
+        sut.inputProfileName = InputProfileName(rh, activePlugin, "Test")
         Assert.assertEquals(stringJson, sut.toJSON())
     }
 
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.kt
index cd2d36f941f..7c7e675826c 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.kt
@@ -17,8 +17,8 @@ class ActionSendSMSTest : ActionsTestBase() {
     @Before
     fun setup() {
 
-        `when`(resourceHelper.gs(eq(R.string.sendsmsactionlabel), anyString())).thenReturn("Send SMS: %s")
-        `when`(resourceHelper.gs(R.string.sendsmsactiondescription)).thenReturn("Send SMS to all numbers")
+        `when`(rh.gs(eq(R.string.sendsmsactionlabel), anyString())).thenReturn("Send SMS: %s")
+        `when`(rh.gs(R.string.sendsmsactiondescription)).thenReturn("Send SMS to all numbers")
 
         sut = ActionSendSMS(injector)
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
index bca2b68ef42..c01b372c093 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
@@ -21,7 +21,7 @@ class ActionStartTempTargetTest : ActionsTestBase() {
 
     @Before
     fun setup() {
-        `when`(resourceHelper.gs(R.string.starttemptarget)).thenReturn("Start temp target")
+        `when`(rh.gs(R.string.starttemptarget)).thenReturn("Start temp target")
 
         sut = ActionStartTempTarget(injector)
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt
index e3310ed65e7..08e1effa01f 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt
@@ -18,7 +18,7 @@ class ActionStopTempTargetTest : ActionsTestBase() {
 
     @Before
     fun setup() {
-        `when`(resourceHelper.gs(R.string.stoptemptarget)).thenReturn("Stop temp target")
+        `when`(rh.gs(R.string.stoptemptarget)).thenReturn("Stop temp target")
 
         sut = ActionStopTempTarget(injector)
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
index 38a2d884ebb..70f9462ce78 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
@@ -21,11 +21,11 @@ open class ActionsTestBase : TestBaseWithProfile() {
 
     open class TestLoopPlugin(
         aapsLogger: AAPSLogger,
-        resourceHelper: ResourceHelper,
+        rh: ResourceHelper,
         injector: HasAndroidInjector,
         pluginDescription: PluginDescription
     ) : PluginBase(
-        pluginDescription, aapsLogger, resourceHelper, injector
+        pluginDescription, aapsLogger, rh, injector
     ), Loop {
 
         private var suspended = false
@@ -44,7 +44,7 @@ open class ActionsTestBase : TestBaseWithProfile() {
     }
 
     @Mock lateinit var sp: SP
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var configBuilder: ConfigBuilder
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var profilePlugin: ProfileSource
@@ -59,14 +59,14 @@ open class ActionsTestBase : TestBaseWithProfile() {
         AndroidInjector {
             if (it is ActionStopTempTarget) {
                 it.aapsLogger = aapsLogger
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.dateUtil = dateUtil
                 it.repository = repository
                 it.uel = uel
             }
             if (it is ActionStartTempTarget) {
                 it.aapsLogger = aapsLogger
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.activePlugin = activePlugin
                 it.repository = repository
                 it.profileFunction = profileFunction
@@ -75,12 +75,12 @@ open class ActionsTestBase : TestBaseWithProfile() {
             }
             if (it is ActionSendSMS) {
                 it.aapsLogger = aapsLogger
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.smsCommunicatorPlugin = smsCommunicatorPlugin
             }
             if (it is ActionProfileSwitch) {
                 it.aapsLogger = aapsLogger
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.activePlugin = activePlugin
                 it.profileFunction = profileFunction
                 it.uel = uel
@@ -88,26 +88,26 @@ open class ActionsTestBase : TestBaseWithProfile() {
             }
             if (it is ActionProfileSwitchPercent) {
                 it.aapsLogger = aapsLogger
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.profileFunction = profileFunction
                 it.uel = uel
             }
             if (it is ActionNotification) {
                 it.aapsLogger = aapsLogger
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.rxBus = rxBus
             }
             if (it is ActionLoopSuspend) {
                 it.aapsLogger = aapsLogger
                 it.loopPlugin = loopPlugin
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.rxBus = rxBus
                 it.uel = uel
             }
             if (it is ActionLoopResume) {
                 it.aapsLogger = aapsLogger
                 it.loopPlugin = loopPlugin
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.configBuilder = configBuilder
                 it.rxBus = rxBus
                 it.repository = repository
@@ -117,7 +117,7 @@ open class ActionsTestBase : TestBaseWithProfile() {
             if (it is ActionLoopEnable) {
                 it.aapsLogger = aapsLogger
                 it.loopPlugin = loopPlugin
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.configBuilder = configBuilder
                 it.rxBus = rxBus
                 it.uel = uel
@@ -125,17 +125,25 @@ open class ActionsTestBase : TestBaseWithProfile() {
             if (it is ActionLoopDisable) {
                 it.aapsLogger = aapsLogger
                 it.loopPlugin = loopPlugin
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.configBuilder = configBuilder
                 it.commandQueue = commandQueue
                 it.rxBus = rxBus
                 it.uel = uel
             }
+            if (it is ActionCarePortalEvent) {
+                it.rh = rh
+                it.repository = repository
+                it.sp = sp
+                it.dateUtil = dateUtil
+                it.profileFunction = profileFunction
+                it.uel = uel
+            }
             if (it is PumpEnactResult) {
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
             if (it is Trigger) {
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.profileFunction = profileFunction
             }
         }
@@ -143,13 +151,13 @@ open class ActionsTestBase : TestBaseWithProfile() {
 
     @Before
     fun mock() {
-        testPumpPlugin = TestPumpPlugin(pluginDescription, aapsLogger, resourceHelper, injector)
+        testPumpPlugin = TestPumpPlugin(pluginDescription, aapsLogger, rh, injector)
         `when`(activePlugin.activePump).thenReturn(testPumpPlugin)
         `when`(profileFunction.getUnits()).thenReturn(GlucoseUnit.MGDL)
         `when`(activePlugin.activeProfileSource).thenReturn(profilePlugin)
         `when`(profilePlugin.profile).thenReturn(getValidProfileStore())
 
-        `when`(resourceHelper.gs(R.string.ok)).thenReturn("OK")
-        `when`(resourceHelper.gs(R.string.error)).thenReturn("Error")
+        `when`(rh.gs(R.string.ok)).thenReturn("OK")
+        `when`(rh.gs(R.string.error)).thenReturn("Error")
     }
 }
\ No newline at end of file
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnectTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnectTest.kt
index 0842c232d8c..045b3f30a7b 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnectTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnectTest.kt
@@ -7,11 +7,11 @@ import org.junit.Test
 class ComparatorConnectTest : TriggerTestBase() {
 
     @Test fun labelsTest() {
-        Assert.assertEquals(2, ComparatorConnect.Compare.labels(resourceHelper).size)
+        Assert.assertEquals(2, ComparatorConnect.Compare.labels(rh).size)
     }
 
     @Test fun setValueTest() {
-        val c = ComparatorConnect(resourceHelper)
+        val c = ComparatorConnect(rh)
         c.value = ComparatorConnect.Compare.ON_DISCONNECT
         Assert.assertEquals(ComparatorConnect.Compare.ON_DISCONNECT, c.value)
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.kt
index 1011db65650..8d5e8a487e6 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.kt
@@ -7,11 +7,11 @@ import org.junit.Test
 class ComparatorExistsTest : TriggerTestBase() {
 
     @Test fun labelsTest() {
-        Assert.assertEquals(2, ComparatorExists.Compare.labels(resourceHelper).size)
+        Assert.assertEquals(2, ComparatorExists.Compare.labels(rh).size)
     }
 
     @Test fun setValueTest() {
-        val c = ComparatorExists(resourceHelper)
+        val c = ComparatorExists(rh)
         c.value = ComparatorExists.Compare.NOT_EXISTS
         Assert.assertEquals(ComparatorExists.Compare.NOT_EXISTS, c.value)
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.kt
index 71b8fc42335..7a6532916e6 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.kt
@@ -24,12 +24,12 @@ class ComparatorTest : TriggerTestBase() {
 
     @Test
     fun labelsTest() {
-        Assert.assertEquals(6, Comparator.Compare.labels(resourceHelper).size)
+        Assert.assertEquals(6, Comparator.Compare.labels(rh).size)
     }
 
     @Test
     fun setValueTest() {
-        val c: Comparator = Comparator(resourceHelper).setValue(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        val c: Comparator = Comparator(rh).setValue(Comparator.Compare.IS_EQUAL_OR_GREATER)
         Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_GREATER, c.value)
     }
 }
\ No newline at end of file
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputCarePortalEventTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputCarePortalEventTest.kt
new file mode 100644
index 00000000000..54c50a58255
--- /dev/null
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputCarePortalEventTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.general.automation.elements
+
+import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
+import org.junit.Assert
+import org.junit.Test
+
+class InputCarePortalEventTest : TriggerTestBase() {
+
+    @Test
+    fun labelsTest() {
+        Assert.assertEquals(4, InputCarePortalMenu.EventType.labels(rh).size)
+    }
+
+    @Test
+    fun setValueTest() {
+        val cp = InputCarePortalMenu(rh, InputCarePortalMenu.EventType.EXERCISE)
+        Assert.assertEquals(InputCarePortalMenu.EventType.EXERCISE, cp.value)
+    }
+}
\ No newline at end of file
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.kt
index 26f0b699766..176672c9e1e 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.kt
@@ -7,7 +7,7 @@ import org.junit.Test
 class InputProfileNameTest : TriggerTestBase() {
 
     @Test fun setValue() {
-        val inputProfileName = InputProfileName(resourceHelper, activePlugin, "Test")
+        val inputProfileName = InputProfileName(rh, activePlugin, "Test")
         Assert.assertEquals("Test", inputProfileName.value)
         inputProfileName.value = "Test2"
         Assert.assertEquals("Test2", inputProfileName.value)
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.kt
index 5ccdb971ed6..32eb7379a20 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.kt
@@ -8,7 +8,7 @@ class LabelWithElementTest : TriggerTestBase() {
 
     @Test
     fun constructorTest() {
-        val l = LabelWithElement(resourceHelper, "A", "B", InputInsulin())
+        val l = LabelWithElement(rh, "A", "B", InputInsulin())
         Assert.assertEquals("A", l.textPre)
         Assert.assertEquals("B", l.textPost)
         Assert.assertEquals(InputInsulin::class.java, l.element!!.javaClass)
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.kt
index 0f5a9edda56..1277a84251a 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.kt
@@ -10,10 +10,10 @@ import org.mockito.Mockito.`when`
 class StaticLabelTest : TriggerTestBase() {
 
     @Test fun constructor() {
-        var sl = StaticLabel(resourceHelper, "any", TriggerDummy(injector))
+        var sl = StaticLabel(rh, "any", TriggerDummy(injector))
         Assert.assertEquals("any", sl.label)
-        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
-        sl = StaticLabel(resourceHelper, R.string.pumplimit, TriggerDummy(injector))
+        `when`(rh.gs(R.string.pumplimit)).thenReturn("pump limit")
+        sl = StaticLabel(rh, R.string.pumplimit, TriggerDummy(injector))
         Assert.assertEquals("pump limit", sl.label)
     }
 }
\ No newline at end of file
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
index 11d2b392c6b..d9a6ad05099 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
@@ -2,8 +2,10 @@ package info.nightscout.androidaps.plugins.general.automation.triggers
 
 import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
+import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.database.entities.Bolus
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import io.reactivex.Single
 import org.json.JSONException
 import org.json.JSONObject
 import org.junit.Assert
@@ -22,13 +24,18 @@ class TriggerBolusAgoTest : TriggerTestBase() {
 
     @Test
     fun shouldRunTest() {
-        `when`(repository.getLastBolusRecordOfType(Bolus.Type.NORMAL)).thenReturn(
-            Bolus(
-                timestamp = now,
-                amount = 0.0,
-                type = Bolus.Type.NORMAL
+        // Set last bolus time to now
+        `when`(repository.getLastBolusRecordOfTypeWrapped(Bolus.Type.NORMAL)).thenReturn(
+            Single.just(
+                ValueWrapper.Existing(
+                    Bolus(
+                        timestamp = now,
+                        amount = 0.0,
+                        type = Bolus.Type.NORMAL
+                    )
+                )
             )
-        ) // Set last bolus time to now
+        )
         `when`(dateUtil.now()).thenReturn(now + 10 * 60 * 1000) // set current time to now + 10 min
         var t = TriggerBolusAgo(injector).setValue(110).comparator(Comparator.Compare.IS_EQUAL)
         Assert.assertEquals(110, t.minutesAgo.value)
@@ -51,13 +58,18 @@ class TriggerBolusAgoTest : TriggerTestBase() {
         Assert.assertTrue(t.shouldRun())
         t = TriggerBolusAgo(injector).setValue(390).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
         Assert.assertTrue(t.shouldRun())
-        `when`(repository.getLastBolusRecordOfType(Bolus.Type.NORMAL)).thenReturn(
-            Bolus(
-                timestamp = 0L,
-                amount = 0.0,
-                type = Bolus.Type.NORMAL
+        // Set last bolus time to 0
+        `when`(repository.getLastBolusRecordOfTypeWrapped(Bolus.Type.NORMAL)).thenReturn(
+            Single.just(
+                ValueWrapper.Existing(
+                    Bolus(
+                        timestamp = 0,
+                        amount = 0.0,
+                        type = Bolus.Type.NORMAL
+                    )
+                )
             )
-        ) // Set last bolus time to 0
+        )
         t = TriggerBolusAgo(injector).comparator(Comparator.Compare.IS_NOT_AVAILABLE)
         Assert.assertTrue(t.shouldRun())
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
index d1343adf6c6..75d3e242382 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
@@ -53,7 +53,7 @@ class TriggerProfilePercentTest : TriggerTestBase() {
         Assert.assertEquals(bgJson, t.toJSON())
     }
 
-    @Test @Throws(JSONException::class) fun fromJSONTest() {
+    @Test fun fromJSONTest() {
         val t: TriggerProfilePercent = TriggerProfilePercent(injector).setValue(120.0).comparator(Comparator.Compare.IS_EQUAL)
         val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerProfilePercent
         Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.comparator.value)
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
index dcd98a45e93..b8af1dbee06 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.TestPumpPlugin
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.PluginDescription
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.automation.TestBaseWithProfile
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
@@ -36,7 +36,7 @@ open class TriggerTestBase : TestBaseWithProfile() {
     @Before
     fun prepareMock1() {
         receiverStatusStore = ReceiverStatusStore(context, rxBus)
-        testPumpPlugin = TestPumpPlugin(pluginDescription, aapsLogger, resourceHelper, injector)
+        testPumpPlugin = TestPumpPlugin(pluginDescription, aapsLogger, rh, injector)
         `when`(activePlugin.activePump).thenReturn(testPumpPlugin)
         `when`(iobCobCalculator.ads).thenReturn(autosensDataStore)
     }
@@ -45,8 +45,8 @@ open class TriggerTestBase : TestBaseWithProfile() {
         AndroidInjector {
             if (it is Trigger) {
                 it.aapsLogger = aapsLogger
-                it.rxBus = RxBusWrapper(aapsSchedulers)
-                it.resourceHelper = resourceHelper
+                it.rxBus = RxBus(aapsSchedulers, aapsLogger)
+                it.rh = rh
                 it.profileFunction = profileFunction
                 it.sp = sp
                 it.locationDataContainer = locationDataContainer
diff --git a/build.gradle b/build.gradle
index 69f3e7777af..b13b7a62c47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,14 +2,14 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.5.31'
+        kotlin_version = '1.6.0'
         coreVersion = '1.6.0'
         rxjava_version = '2.2.21'
         rxandroid_version = '2.1.1'
         rxkotlin_version = '2.4.0'
         room_version = '2.3.0'
         lifecycle_version = '2.3.1'
-        dagger_version = '2.39.1'
+        dagger_version = '2.40.1'
         coroutinesVersion = '1.4.1'
         activityVersion = '1.3.1'
         fragmentktx_version = '1.3.6'
@@ -21,7 +21,7 @@ buildscript {
         preferencektx_version = '1.1.1'
         commonslang3_version = '3.11'
         commonscodec_version = '1.15'
-        jodatime_version = '2.10.12'
+        jodatime_version = '2.10.13'
         work_version = '2.5.0'
         tink_version = '1.5.0'
 
@@ -30,7 +30,7 @@ buildscript {
         dexmakerVersion = "1.2"
         retrofit2Version = '2.9.0'
         okhttp3Version = '4.9.0'
-        byteBuddyVersion = '1.11.18'
+        byteBuddyVersion = '1.12.0'
 
         androidx_junit = '1.1.2'
         androidx_rules = '1.4.0-alpha04'
@@ -41,9 +41,9 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -73,7 +73,7 @@ allprojects {
                     "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
                     '-Xjvm-default=all'     //Support @JvmDefault
             ]
-            jvmTarget = "1.8"
+            jvmTarget = "11"
         }
     }
 }
diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
index e6d8b990bff..9e10c4701ff 100644
--- a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
+++ b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
@@ -17,8 +17,8 @@
 
 import dagger.android.support.DaggerFragment;
 import info.nightscout.androidaps.combo.R;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.interfaces.CommandQueue;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.pump.combo.events.EventComboPumpUpdateGUI;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
@@ -33,9 +33,9 @@
 
 public class ComboFragment extends DaggerFragment {
     @Inject ComboPlugin comboPlugin;
-    @Inject CommandQueueProvider commandQueue;
-    @Inject ResourceHelper resourceHelper;
-    @Inject RxBusWrapper rxBus;
+    @Inject CommandQueue commandQueue;
+    @Inject ResourceHelper rh;
+    @Inject RxBus rxBus;
     @Inject SP sp;
     @Inject DateUtil dateUtil;
     @Inject FabricPrivacy fabricPrivacy;
@@ -149,7 +149,7 @@ public void updateGui() {
         } else {
             activityView.setTextColor(Color.RED);
             activityView.setTextSize(14);
-            activityView.setText(resourceHelper.gs(R.string.pump_unreachable));
+            activityView.setText(rh.gs(R.string.pump_unreachable));
         }
 
         if (comboPlugin.isInitialized()) {
@@ -169,13 +169,13 @@ public void updateGui() {
             // reservoir
             int reservoirLevel = comboPlugin.getPump().reservoirLevel;
             if (reservoirLevel != -1) {
-                reservoirView.setText(reservoirLevel + " " + resourceHelper.gs(R.string.insulin_unit_shortname));
+                reservoirView.setText(reservoirLevel + " " + rh.gs(R.string.insulin_unit_shortname));
             } else if (ps.insulinState == PumpState.LOW) {
-                reservoirView.setText(resourceHelper.gs(R.string.combo_reservoir_low));
+                reservoirView.setText(rh.gs(R.string.combo_reservoir_low));
             } else if (ps.insulinState == PumpState.EMPTY) {
-                reservoirView.setText(resourceHelper.gs(R.string.combo_reservoir_empty));
+                reservoirView.setText(rh.gs(R.string.combo_reservoir_empty));
             } else {
-                reservoirView.setText(resourceHelper.gs(R.string.combo_reservoir_normal));
+                reservoirView.setText(rh.gs(R.string.combo_reservoir_normal));
             }
 
             if (ps.insulinState == PumpState.UNKNOWN) {
@@ -193,13 +193,13 @@ public void updateGui() {
             }
 
             // last connection
-            String minAgo = dateUtil.minAgo(resourceHelper, comboPlugin.getPump().lastSuccessfulCmdTime);
+            String minAgo = dateUtil.minAgo(rh, comboPlugin.getPump().lastSuccessfulCmdTime);
             long min = (System.currentTimeMillis() - comboPlugin.getPump().lastSuccessfulCmdTime) / 1000 / 60;
             if (comboPlugin.getPump().lastSuccessfulCmdTime + 60 * 1000 > System.currentTimeMillis()) {
                 lastConnectionView.setText(R.string.combo_pump_connected_now);
                 lastConnectionView.setTextColor(Color.WHITE);
             } else if (comboPlugin.getPump().lastSuccessfulCmdTime + 30 * 60 * 1000 < System.currentTimeMillis()) {
-                lastConnectionView.setText(resourceHelper.gs(R.string.combo_no_pump_connection, min));
+                lastConnectionView.setText(rh.gs(R.string.combo_no_pump_connection, min));
                 lastConnectionView.setTextColor(Color.RED);
             } else {
                 lastConnectionView.setText(minAgo);
@@ -211,22 +211,22 @@ public void updateGui() {
             if (bolus != null) {
                 long agoMsc = System.currentTimeMillis() - bolus.timestamp;
                 double bolusMinAgo = agoMsc / 60d / 1000d;
-                String unit = resourceHelper.gs(R.string.insulin_unit_shortname);
+                String unit = rh.gs(R.string.insulin_unit_shortname);
                 String ago;
                 if ((agoMsc < 60 * 1000)) {
-                    ago = resourceHelper.gs(R.string.combo_pump_connected_now);
+                    ago = rh.gs(R.string.combo_pump_connected_now);
                 } else if (bolusMinAgo < 60) {
-                    ago = dateUtil.minAgo(resourceHelper, bolus.timestamp);
+                    ago = dateUtil.minAgo(rh, bolus.timestamp);
                 } else {
-                    ago = dateUtil.hourAgo(bolus.timestamp, resourceHelper);
+                    ago = dateUtil.hourAgo(bolus.timestamp, rh);
                 }
-                lastBolusView.setText(resourceHelper.gs(R.string.combo_last_bolus, bolus.amount, unit, ago));
+                lastBolusView.setText(rh.gs(R.string.combo_last_bolus, bolus.amount, unit, ago));
             } else {
                 lastBolusView.setText("");
             }
 
             // base basal rate
-            baseBasalRate.setText(resourceHelper.gs(R.string.pump_basebasalrate, comboPlugin.getBaseBasalRate()));
+            baseBasalRate.setText(rh.gs(R.string.pump_basebasalrate, comboPlugin.getBaseBasalRate()));
 
             // TBR
             String tbrStr = "";
@@ -234,7 +234,7 @@ public void updateGui() {
                 long minSinceRead = (System.currentTimeMillis() - comboPlugin.getPump().state.timestamp) / 1000 / 60;
                 long remaining = ps.tbrRemainingDuration - minSinceRead;
                 if (remaining >= 0) {
-                    tbrStr = resourceHelper.gs(R.string.combo_tbr_remaining, ps.tbrPercent, remaining);
+                    tbrStr = rh.gs(R.string.combo_tbr_remaining, ps.tbrPercent, remaining);
                 }
             }
             tempBasalText.setText(tbrStr);
diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index b50e85a5bc3..ae14fc7c384 100644
--- a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -27,7 +27,7 @@
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.extensions.PumpStateExtensionKt;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.CommandQueue;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.Constraints;
 import info.nightscout.androidaps.interfaces.PluginDescription;
@@ -40,7 +40,7 @@
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
@@ -93,8 +93,8 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
     // collaborators
     private final ProfileFunction profileFunction;
     private final SP sp;
-    private RxBusWrapper rxBus;
-    private final CommandQueueProvider commandQueue;
+    private RxBus rxBus;
+    private final CommandQueue commandQueue;
     private final Context context;
     private final PumpSync pumpSync;
     private final DateUtil dateUtil;
@@ -146,11 +146,11 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
     public ComboPlugin(
             HasAndroidInjector injector,
             AAPSLogger aapsLogger,
-            RxBusWrapper rxBus,
-            ResourceHelper resourceHelper,
+            RxBus rxBus,
+            ResourceHelper rh,
             ProfileFunction profileFunction,
             SP sp,
-            CommandQueueProvider commandQueue,
+            CommandQueue commandQueue,
             Context context,
             PumpSync pumpSync,
             DateUtil dateUtil
@@ -162,7 +162,7 @@ public ComboPlugin(
                         .pluginName(R.string.combopump)
                         .shortName(R.string.combopump_shortname)
                         .description(R.string.description_pump_combo),
-                injector, aapsLogger, resourceHelper, commandQueue
+                injector, aapsLogger, rh, commandQueue
         );
         this.rxBus = rxBus;
         this.profileFunction = profileFunction;
@@ -193,15 +193,15 @@ String getStateSummary() {
                     ? "E" + ps.activeAlert.errorCode + ": " + ps.activeAlert.message
                     : "W" + ps.activeAlert.warningCode + ": " + ps.activeAlert.message;
         } else if (ps.suspended && (ps.batteryState == PumpState.EMPTY || ps.insulinState == PumpState.EMPTY)) {
-            return getResourceHelper().gs(R.string.combo_pump_state_suspended_due_to_error);
+            return getRh().gs(R.string.combo_pump_state_suspended_due_to_error);
         } else if (ps.suspended) {
-            return getResourceHelper().gs(R.string.combo_pump_state_suspended_by_user);
+            return getRh().gs(R.string.combo_pump_state_suspended_by_user);
         } else if (!pump.initialized) {
-            return getResourceHelper().gs(R.string.combo_pump_state_initializing);
+            return getRh().gs(R.string.combo_pump_state_initializing);
         } else if (!validBasalRateProfileSelectedOnPump) {
-            return getResourceHelper().gs(R.string.loopdisabled);
+            return getRh().gs(R.string.loopdisabled);
         }
-        return getResourceHelper().gs(R.string.combo_pump_state_running);
+        return getRh().gs(R.string.combo_pump_state_running);
     }
 
     @Override
@@ -263,7 +263,7 @@ public synchronized PumpEnactResult setNewBasalProfile(@NonNull Profile profile)
             // note that this should not happen anymore since the queue is present, which
             // issues a READSTATE when starting to issue commands which initializes the pump
             getAapsLogger().error("setNewBasalProfile not initialized");
-            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, getResourceHelper().gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
+            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, getRh().gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
             rxBus.send(new EventNewNotification(notification));
             return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(R.string.pumpNotInitializedProfileNotSet);
         }
@@ -281,10 +281,10 @@ public synchronized PumpEnactResult setNewBasalProfile(@NonNull Profile profile)
             return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(R.string.combo_force_disabled_notification);
         }
 
-        CommandResult setResult = runCommand(getResourceHelper().gs(R.string.combo_activity_setting_basal_profile), 2,
+        CommandResult setResult = runCommand(getRh().gs(R.string.combo_activity_setting_basal_profile), 2,
                 () -> ruffyScripter.setBasalProfile(requestedBasalProfile));
         if (!setResult.success) {
-            Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, getResourceHelper().gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, getRh().gs(R.string.failedupdatebasalprofile), Notification.URGENT);
             rxBus.send(new EventNewNotification(notification));
             return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(R.string.failedupdatebasalprofile);
         }
@@ -295,7 +295,7 @@ public synchronized PumpEnactResult setNewBasalProfile(@NonNull Profile profile)
         rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
         rxBus.send(new EventDismissNotification(Notification.FAILED_UPDATE_PROFILE));
         //issue success notification
-        Notification notification = new Notification(Notification.PROFILE_SET_OK, getResourceHelper().gs(R.string.profile_set_ok), Notification.INFO, 60);
+        Notification notification = new Notification(Notification.PROFILE_SET_OK, getRh().gs(R.string.profile_set_ok), Notification.INFO, 60);
         rxBus.send(new EventNewNotification(notification));
         return new PumpEnactResult(getInjector()).success(true).enacted(true);
     }
@@ -370,7 +370,7 @@ private synchronized void initializePump() {
         CommandResult stateResult = runCommand(null, 1, ruffyScripter::readPumpState);
         if (stateResult.invalidSetup) {
             rxBus.send(new EventNewNotification(
-                    new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_invalid_setup), Notification.URGENT)));
+                    new Notification(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.combo_invalid_setup), Notification.URGENT)));
             return;
         }
         if (!stateResult.success) {
@@ -386,7 +386,7 @@ private synchronized void initializePump() {
 
         if (stateResult.state.unsafeUsageDetected == PumpState.UNSUPPORTED_BASAL_RATE_PROFILE) {
             Notification n = new Notification(Notification.COMBO_PUMP_ALARM,
-                    getResourceHelper().gs(R.string.combo_force_disabled_notification),
+                    getRh().gs(R.string.combo_force_disabled_notification),
                     Notification.URGENT);
             n.setSoundId(R.raw.alarm);
             rxBus.send(new EventNewNotification(n));
@@ -394,7 +394,7 @@ private synchronized void initializePump() {
         }
 
         // read basal profile into cache (KeepAlive will trigger a profile update if needed)
-        CommandResult readBasalResult = runCommand(getResourceHelper().gs(R.string.combo_actvity_reading_basal_profile), 2, ruffyScripter::readBasalProfile);
+        CommandResult readBasalResult = runCommand(getRh().gs(R.string.combo_actvity_reading_basal_profile), 2, ruffyScripter::readBasalProfile);
         if (!readBasalResult.success) {
             return;
         }
@@ -410,7 +410,7 @@ private synchronized void initializePump() {
             long lastBolusTimestamp = recentBoluses.get(0).timestamp;
             long now = System.currentTimeMillis();
             if (lastBolusTimestamp < now - 24 * 60 * 60 * 1000 || lastBolusTimestamp > now + 5 * 60 * 1000) {
-                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_check_date), Notification.URGENT);
+                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.combo_check_date), Notification.URGENT);
                 rxBus.send(new EventNewNotification(notification));
             }
         }
@@ -475,19 +475,19 @@ public int getBatteryLevel() {
         EventOverviewBolusProgress event = EventOverviewBolusProgress.INSTANCE;
         switch (state) {
             case PROGRAMMING:
-                event.setStatus(getResourceHelper().gs(R.string.combo_programming_bolus));
+                event.setStatus(getRh().gs(R.string.combo_programming_bolus));
                 break;
             case DELIVERING:
-                event.setStatus(getResourceHelper().gs(R.string.bolusdelivering, delivered));
+                event.setStatus(getRh().gs(R.string.bolusdelivering, delivered));
                 break;
             case DELIVERED:
-                event.setStatus(getResourceHelper().gs(R.string.bolusdelivered, delivered));
+                event.setStatus(getRh().gs(R.string.bolusdelivered, delivered));
                 break;
             case STOPPING:
-                event.setStatus(getResourceHelper().gs(R.string.bolusstopping));
+                event.setStatus(getRh().gs(R.string.bolusstopping));
                 break;
             case STOPPED:
-                event.setStatus(getResourceHelper().gs(R.string.bolusstopped));
+                event.setStatus(getRh().gs(R.string.bolusstopped));
                 break;
         }
         event.setPercent(percent);
@@ -503,7 +503,7 @@ public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
             throw new IllegalArgumentException(detailedBolusInfo.toString());
         }
         try {
-            pump.activity = getResourceHelper().gs(R.string.combo_pump_action_bolusing, detailedBolusInfo.insulin);
+            pump.activity = getRh().gs(R.string.combo_pump_action_bolusing, detailedBolusInfo.insulin);
             rxBus.send(new EventComboPumpUpdateGUI());
 
             // check pump is ready and all pump bolus records are known
@@ -608,7 +608,7 @@ public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
             // check pump bolus record has a sane timestamp
             long now = System.currentTimeMillis();
             if (lastPumpBolus.timestamp < now - 10 * 60 * 1000 || lastPumpBolus.timestamp > now + 10 * 60 * 1000) {
-                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_suspious_bolus_time), Notification.URGENT);
+                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.combo_suspious_bolus_time), Notification.URGENT);
                 rxBus.send(new EventNewNotification(notification));
             }
 
@@ -622,7 +622,7 @@ public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
                     return new PumpEnactResult(getInjector()).success(true).enacted(true);
                 }
                 return new PumpEnactResult(getInjector()).success(false).enacted(true)
-                        .comment(getResourceHelper().gs(R.string.combo_error_partial_bolus_delivered,
+                        .comment(getRh().gs(R.string.combo_error_partial_bolus_delivered,
                                 lastPumpBolus.amount, detailedBolusInfo.insulin));
             }
 
@@ -650,11 +650,7 @@ private void incrementTbrCount() {
     }
 
     private void incrementBolusCount() {
-        try {
-            sp.putLong(R.string.combo_boluses_delivered, sp.getLong(R.string.combo_boluses_delivered, 0L) + 1);
-        } catch (Exception e) {
-            // ignore
-        }
+        sp.incLong(R.string.combo_boluses_delivered);
     }
 
     public Long getTbrsSet() {
@@ -681,7 +677,7 @@ private boolean addBolusToTreatments(DetailedBolusInfo detailedBolusInfo, Bolus
         } catch (Exception e) {
             getAapsLogger().error("Adding treatment record failed", e);
             if (detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB) {
-                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_error_updating_treatment_record), Notification.URGENT);
+                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.combo_error_updating_treatment_record), Notification.URGENT);
                 rxBus.send(new EventNewNotification(notification));
             }
             return false;
@@ -756,7 +752,7 @@ private PumpEnactResult setTempBasalPercent(Integer percent, final Integer durat
         }
 
         int finalAdjustedPercent = adjustedPercent;
-        CommandResult commandResult = runCommand(getResourceHelper().gs(R.string.combo_pump_action_setting_tbr, percent, durationInMinutes),
+        CommandResult commandResult = runCommand(getRh().gs(R.string.combo_pump_action_setting_tbr, percent, durationInMinutes),
                 3, () -> ruffyScripter.setTbr(finalAdjustedPercent, durationInMinutes));
         if (!commandResult.success) {
             return new PumpEnactResult(getInjector()).success(false).enacted(false);
@@ -807,7 +803,7 @@ public PumpEnactResult cancelTempBasal(boolean enforceNew) {
         getAapsLogger().debug(LTag.PUMP, "cancelTempBasal called");
         final PumpSync.PumpState.TemporaryBasal activeTemp = pumpSync.expectedPumpState().getTemporaryBasal();
         if (enforceNew) {
-            CommandResult stateResult = runCommand(getResourceHelper().gs(R.string.combo_pump_action_refreshing), 2, ruffyScripter::readPumpState);
+            CommandResult stateResult = runCommand(getRh().gs(R.string.combo_pump_action_refreshing), 2, ruffyScripter::readPumpState);
             if (!stateResult.success) {
                 return new PumpEnactResult(getInjector()).success(false).enacted(false);
             }
@@ -815,7 +811,7 @@ public PumpEnactResult cancelTempBasal(boolean enforceNew) {
                 return new PumpEnactResult(getInjector()).success(true).enacted(false);
             }
             getAapsLogger().debug(LTag.PUMP, "cancelTempBasal: hard-cancelling TBR since force requested");
-            CommandResult cancelResult = runCommand(getResourceHelper().gs(R.string.combo_pump_action_cancelling_tbr), 2, ruffyScripter::cancelTbr);
+            CommandResult cancelResult = runCommand(getRh().gs(R.string.combo_pump_action_cancelling_tbr), 2, ruffyScripter::cancelTbr);
             if (!cancelResult.success) {
                 return new PumpEnactResult(getInjector()).success(false).enacted(false);
             }
@@ -871,7 +867,7 @@ private synchronized CommandResult runCommand(String activity, int retries, Comm
         try {
             if (!ruffyScripter.isConnected()) {
                 String originalActivity = pump.activity;
-                pump.activity = getResourceHelper().gs(R.string.combo_activity_checking_pump_state);
+                pump.activity = getRh().gs(R.string.combo_activity_checking_pump_state);
                 rxBus.send(new EventComboPumpUpdateGUI());
                 CommandResult preCheckError = runOnConnectChecks();
                 pump.activity = originalActivity;
@@ -904,7 +900,7 @@ private synchronized CommandResult runCommand(String activity, int retries, Comm
                 if (validBasalRateProfileSelectedOnPump && commandResult.state.unsafeUsageDetected == PumpState.UNSUPPORTED_BASAL_RATE_PROFILE) {
                     setValidBasalRateProfileSelectedOnPump(false);
                     Notification n = new Notification(Notification.COMBO_PUMP_ALARM,
-                            getResourceHelper().gs(R.string.combo_force_disabled_notification),
+                            getRh().gs(R.string.combo_force_disabled_notification),
                             Notification.URGENT);
                     n.setSoundId(R.raw.alarm);
                     rxBus.send(new EventNewNotification(n));
@@ -954,7 +950,7 @@ private CommandResult runOnConnectChecks() {
                 // so update the var with it, so the check routines below can work on it
                 preCheckResult = alertConfirmationResult;
             } else if (activeAlert.errorCode != null) {
-                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, dateUtil.now(), getResourceHelper().gs(R.string.combo_is_in_error_state, activeAlert.errorCode, activeAlert.message), Notification.URGENT, 0);
+                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, dateUtil.now(), getRh().gs(R.string.combo_is_in_error_state, activeAlert.errorCode, activeAlert.message), Notification.URGENT, 0);
                 rxBus.send(new EventNewNotification(notification));
                 return preCheckResult.success(false);
             }
@@ -1015,13 +1011,13 @@ private void checkBasalRate(PumpState state) {
         }
 
         if (Math.abs(pumpBasalRate - getBaseBasalRate()) > 0.001) {
-            CommandResult readBasalResult = runCommand(getResourceHelper().gs(R.string.combo_actvity_reading_basal_profile), 2, ruffyScripter::readBasalProfile);
+            CommandResult readBasalResult = runCommand(getRh().gs(R.string.combo_actvity_reading_basal_profile), 2, ruffyScripter::readBasalProfile);
             if (readBasalResult.success) {
                 pump.basalProfile = readBasalResult.basalProfile;
-                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_warning_pump_basal_rate_changed), Notification.NORMAL);
+                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.combo_warning_pump_basal_rate_changed), Notification.NORMAL);
                 rxBus.send(new EventNewNotification(notification));
             } else {
-                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_error_failure_reading_changed_basal_rate), Notification.URGENT);
+                Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.combo_error_failure_reading_changed_basal_rate), Notification.URGENT);
                 rxBus.send(new EventNewNotification(notification));
             }
         }
@@ -1036,11 +1032,11 @@ private void checkPumpTime(PumpState state) {
             // time couldn't be read (e.g. a warning is displayed on the menu , hiding the time field)
         } else if (Math.abs(state.pumpTime - System.currentTimeMillis()) >= 10 * 60 * 1000) {
             getAapsLogger().debug(LTag.PUMP, "Pump clock needs update, pump time: " + state.pumpTime + " (" + new Date(state.pumpTime) + ")");
-            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_notification_check_time_date), Notification.URGENT);
+            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.combo_notification_check_time_date), Notification.URGENT);
             rxBus.send(new EventNewNotification(notification));
         } else if (Math.abs(state.pumpTime - System.currentTimeMillis()) >= 3 * 60 * 1000) {
             getAapsLogger().debug(LTag.PUMP, "Pump clock needs update, pump time: " + state.pumpTime + " (" + new Date(state.pumpTime) + ")");
-            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.combo_notification_check_time_date), Notification.NORMAL);
+            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.combo_notification_check_time_date), Notification.NORMAL);
             rxBus.send(new EventNewNotification(notification));
         }
     }
@@ -1057,11 +1053,11 @@ private void notifyAboutPumpWarning(WarningOrErrorCode activeAlert) {
         notification.setId(Notification.COMBO_PUMP_ALARM);
         notification.setLevel(Notification.NORMAL);
         if (activeAlert.warningCode == PumpWarningCodes.CARTRIDGE_LOW) {
-            notification.setText(getResourceHelper().gs(R.string.combo_pump_cartridge_low_warrning));
+            notification.setText(getRh().gs(R.string.combo_pump_cartridge_low_warrning));
         } else if (activeAlert.warningCode == PumpWarningCodes.BATTERY_LOW) {
-            notification.setText(getResourceHelper().gs(R.string.combo_pump_battery_low_warrning));
+            notification.setText(getRh().gs(R.string.combo_pump_battery_low_warrning));
         } else if (activeAlert.warningCode == PumpWarningCodes.TBR_CANCELLED) {
-            notification.setText(getResourceHelper().gs(R.string.combo_pump_tbr_cancelled_warrning));
+            notification.setText(getRh().gs(R.string.combo_pump_tbr_cancelled_warrning));
         }
         rxBus.send(new EventNewNotification(notification));
     }
@@ -1083,7 +1079,7 @@ private void checkForUnsafeUsage(CommandResult commandResult) {
             lowSuspendOnlyLoopEnforcedUntil = lastViolation + 6 * 60 * 60 * 1000;
             if (lowSuspendOnlyLoopEnforcedUntil > System.currentTimeMillis() && violationWarningRaisedForBolusAt != lowSuspendOnlyLoopEnforcedUntil) {
                 Notification n = new Notification(Notification.COMBO_PUMP_ALARM,
-                        getResourceHelper().gs(R.string.combo_low_suspend_forced_notification),
+                        getRh().gs(R.string.combo_low_suspend_forced_notification),
                         Notification.URGENT);
                 n.setSoundId(R.raw.alarm);
                 rxBus.send(new EventNewNotification(n));
@@ -1154,7 +1150,7 @@ private void checkAndResolveTbrMismatch(PumpState state) {
      * Reads the pump's history and updates the DB accordingly.
      */
     private boolean readHistory(@Nullable PumpHistoryRequest request) {
-        CommandResult historyResult = runCommand(getResourceHelper().gs(R.string.combo_activity_reading_pump_history), 3, () -> ruffyScripter.readHistory(request));
+        CommandResult historyResult = runCommand(getRh().gs(R.string.combo_activity_reading_pump_history), 3, () -> ruffyScripter.readHistory(request));
         PumpHistory history = historyResult.history;
         if (!historyResult.success || history == null) {
             return false;
@@ -1213,7 +1209,7 @@ long generatePumpBolusId(Bolus pumpBolus) {
      * @return null on success or the failed command result
      */
     private CommandResult checkHistory() {
-        CommandResult quickInfoResult = runCommand(getResourceHelper().gs(R.string.combo_activity_checking_for_history_changes), 3,
+        CommandResult quickInfoResult = runCommand(getRh().gs(R.string.combo_activity_checking_for_history_changes), 3,
                 () -> ruffyScripter.readQuickInfo(2));
 
         // no history, nothing to check or complain about
@@ -1240,7 +1236,7 @@ private CommandResult checkHistory() {
 
         // fetch new records
         long lastKnownPumpRecordTimestamp = recentBoluses.isEmpty() ? 0 : recentBoluses.get(0).timestamp;
-        CommandResult historyResult = runCommand(getResourceHelper().gs(R.string.combo_activity_reading_pump_history), 3, () ->
+        CommandResult historyResult = runCommand(getRh().gs(R.string.combo_activity_reading_pump_history), 3, () ->
                 ruffyScripter.readHistory(new PumpHistoryRequest().bolusHistory(lastKnownPumpRecordTimestamp)));
         if (!historyResult.success) {
             pumpHistoryChanged = true;
@@ -1254,7 +1250,7 @@ private CommandResult checkHistory() {
         HashSet<Bolus> bolusSet = new HashSet<>(historyResult.history.bolusHistory);
         if (bolusSet.size() != historyResult.history.bolusHistory.size()) {
             getAapsLogger().debug(LTag.PUMP, "Bolus with same amount within the same minute imported. Only one will make it to the DB.");
-            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getResourceHelper().gs(R.string.
+            Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.
                     combo_error_multiple_boluses_with_identical_timestamp), Notification.URGENT);
             rxBus.send(new EventNewNotification(notification));
         }
@@ -1409,14 +1405,14 @@ public PumpEnactResult loadTDDs() {
     @NonNull @Override
     public Constraint<Boolean> isLoopInvocationAllowed(@NonNull Constraint<Boolean> value) {
         if (!validBasalRateProfileSelectedOnPump)
-            value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.novalidbasalrate), this);
+            value.set(getAapsLogger(), false, getRh().gs(R.string.novalidbasalrate), this);
         return value;
     }
 
     @NonNull @Override
     public Constraint<Double> applyMaxIOBConstraints(@NonNull Constraint<Double> maxIob) {
         if (lowSuspendOnlyLoopEnforcedUntil > System.currentTimeMillis())
-            maxIob.setIfSmaller(getAapsLogger(), 0d, String.format(getResourceHelper().gs(R.string.limitingmaxiob), 0d, getResourceHelper().gs(R.string.unsafeusage)), this);
+            maxIob.setIfSmaller(getAapsLogger(), 0d, String.format(getRh().gs(R.string.limitingmaxiob), 0d, getRh().gs(R.string.unsafeusage)), this);
         return maxIob;
     }
 
diff --git a/combo/src/main/res/values-es-rES/strings.xml b/combo/src/main/res/values-es-rES/strings.xml
index 5ae2d5ff3c8..81b225a546c 100644
--- a/combo/src/main/res/values-es-rES/strings.xml
+++ b/combo/src/main/res/values-es-rES/strings.xml
@@ -3,6 +3,7 @@
     <string name="description_pump_combo">Integración de bombas de insulina Accu-Check Combo, necesita tener ruffy instalado</string>
     <string name="combo_programming_bolus">Programando bomba para emitir bolo</string>
     <string name="combo_pump_state_label">Estado</string>
+    <string name="combo_pump_activity_label">Actividad</string>
     <string name="combo_no_pump_connection">Ninguna conexión por %1$d min</string>
     <string name="combo_tbr_remaining">%1$d%% (%2$d min restan)</string>
     <string name="combo_pump_state_initializing">Inicializando</string>
diff --git a/combo/src/main/res/values-hu-rHU/strings.xml b/combo/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/combo/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/combo/src/main/res/values-iw-rIL/strings.xml b/combo/src/main/res/values-iw-rIL/strings.xml
index 8eb2f9e680b..5c8c7b0e8bd 100644
--- a/combo/src/main/res/values-iw-rIL/strings.xml
+++ b/combo/src/main/res/values-iw-rIL/strings.xml
@@ -19,7 +19,7 @@
     <string name="combo_force_disabled_notification">שימוש לא בטוח: המשאבה משתמשת בפרופיל בזאלי שונה מהראשון. הלולאה הושבתה. בחרו את הפרופיל הראשון במשאבה ורעננו.</string>
     <string name="bolus_frequency_exceeded">התבקשו בולוסים זהים בשתי הדקות האחרונות. כדי למנוע בולוסים כפולים בטעות ולשמור מפני באגים הדבר אסור.</string>
     <string name="combo_pump_connected_now">עכשיו</string>
-    <string name="combo_activity_reading_pump_history">קריאת היסטוריית המשאבה</string>
+    <string name="combo_activity_reading_pump_history">קורא היסטוריית המשאבה</string>
     <string name="combo_activity_setting_basal_profile">הגדרת פרופיל בזאלי</string>
     <string name="combo_pump_cartridge_low_warrning">רמת מכל נמוכה</string>
     <string name="combo_pump_battery_low_warrning">סוללת המשאבה חלשה</string>
@@ -35,7 +35,7 @@
     <string name="combo_error_bolus_verification_failed">אספקת הבולוס ואימות ההיסטוריה של המשאבה נכשלו, אנא בדקו את המשאבה. אם ניתן בולוס, הוא יתווסף לטיפולים במהלך החיבור הבא למשאבה.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">לא נותר מספיק אינסולין במיכל בשביל להשלים את הבולוס</string>
     <string name="combo_invalid_setup">הגדרת משאבה לא חוקית, בדקו את הוראות ההפעלה וודאו שתפריט \'מידע מהיר\' נקרא בשם QUICK INFO באמצעות תוכנת התצורה 360.</string>
-    <string name="combo_actvity_reading_basal_profile">קריאת פרופיל בזאלי</string>
+    <string name="combo_actvity_reading_basal_profile">קורא פרופיל בזאלי</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">היסטוריית המשאבה השתנתה לאחר ביצוע חישוב הבולוס. הבולוס לא הוזרק. אנא חשב מחדש אם יש עדיין צורך בבולוס.</string>
     <string name="combo_error_updating_treatment_record">הבולוס הוזרק בהצלחה אבל רישומו נכשל. זה יכול לקרות אם שני בולוסים קטנים, באותו הגודל, ניתנים בתוך שתי הדקות האחרונות. בדקו את היסטוריית המשאבה ואת ערכי הטיפול והשתמשו בפורטל הטיפולים להוספת ערכים חסרים. הקפידו לא להוסיף טיפולים זהים באותה דקה.</string>
     <string name="combo_high_temp_rejected_due_to_pump_history_changes">הגדרת ערך מטרה גבוה נדחתה כיוון שהחישוב לא לקח בחשבון שינוי שנעשה לאחרונה בהיסטוריית המשאבה</string>
diff --git a/combo/src/main/res/values-nl-rNL/strings.xml b/combo/src/main/res/values-nl-rNL/strings.xml
index 48be091c2bc..d373ebb673c 100644
--- a/combo/src/main/res/values-nl-rNL/strings.xml
+++ b/combo/src/main/res/values-nl-rNL/strings.xml
@@ -3,6 +3,7 @@
     <string name="description_pump_combo">Pomp integratie voor Accu-Chek Combo pompen, vereist dat ruffy geïnstalleerd is</string>
     <string name="combo_programming_bolus">Bolus in pomp programmeren </string>
     <string name="combo_pump_state_label">Status</string>
+    <string name="combo_pump_activity_label">Activiteit</string>
     <string name="combo_no_pump_connection">Geen verbinding gedurende %1$d min</string>
     <string name="combo_tbr_remaining">%1$d%% (%2$d min resterend)</string>
     <string name="combo_pump_state_initializing">Initialiseren</string>
diff --git a/combo/src/main/res/values-pl-rPL/strings.xml b/combo/src/main/res/values-pl-rPL/strings.xml
index 1ae9c9f1393..fac6f9dd6a3 100644
--- a/combo/src/main/res/values-pl-rPL/strings.xml
+++ b/combo/src/main/res/values-pl-rPL/strings.xml
@@ -3,6 +3,7 @@
     <string name="description_pump_combo">Integracja z pompą Accu-Chek Combo, wymaga zainstalowania sterownika ruffy</string>
     <string name="combo_programming_bolus">Programowanie pompy do podawania bolusa</string>
     <string name="combo_pump_state_label">Stan</string>
+    <string name="combo_pump_activity_label">Aktywność</string>
     <string name="combo_no_pump_connection">Brak połączenia przez %1$d min</string>
     <string name="combo_tbr_remaining">%1$d%% (%2$d min pozostało)</string>
     <string name="combo_pump_state_initializing">Rozpoczynanie</string>
diff --git a/combo/src/main/res/values-tr-rTR/strings.xml b/combo/src/main/res/values-tr-rTR/strings.xml
index e16e4246d82..ecda216f5cd 100644
--- a/combo/src/main/res/values-tr-rTR/strings.xml
+++ b/combo/src/main/res/values-tr-rTR/strings.xml
@@ -12,6 +12,7 @@
     <string name="combo_pump_state_running">Çalışıyor</string>
     <string name="combo_pump_action_cancelling_tbr">TBR (Geçici Bazal Oranı) İptal ediliyor</string>
     <string name="combo_pump_action_setting_tbr">TBR(Geçici Bazal Oranı) ayarı (%1$d%% / %2$d dak)</string>
+    <string name="combo_pump_action_bolusing">Bolus (%1$.1f Ü) teslim ediliyor</string>
     <string name="combo_pump_action_refreshing">Yenileniyor...</string>
     <string name="combo_pump_unsupported_operation">İstenen işlem pompası tarafından desteklenmiyor</string>
     <string name="combo_low_suspend_forced_notification">Güvensiz kullanım: yayım veya çoklu dalgalı (kare dalgalı) boluslar aktiftir. Döngü modu 6 saat içinde ekstra insülin vermeyecektir. Döngü modunda sadece normal boluslar desteklenir</string>
@@ -43,6 +44,7 @@
     <string name="combo_error_failure_reading_changed_basal_rate">Bazal oranı pompada değiştirildi, ancak okuma başarısız oldu</string>
     <string name="combo_activity_checking_for_history_changes">Geçmiş değişiklikleri kontrol ediliyor</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Aynı dakika içinde aynı miktarda birden fazla boluslar eklenildi. Tedavilere sadece bir kayıt eklenebilir. Lütfen pompayı kontrol edin ve Careportal sekmesini kullanarak elle bir bolus kaydı ekleyin. Başka bolus kullanmayan bir zamana sahip bir bolus oluşturduğunuzdan emin olun.</string>
+    <string name="about_link_urls">\n\ndocumentation:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <string name="combo_check_date">Son bolus 24 saatten daha eski veya gelecekte. Lütfen pompadaki tarihin doğru ayarlandığını kontrol edin.</string>
     <string name="combo_suspious_bolus_time">Teslim edilen bolusun pompadaki zamanı/tarihı yanlış görünüyor, IOB (Insulin On Board) muhtemelen yanlıştır. Lütfen pompa zamanını/tarihini kontrol edin.</string>
     <string name="combo_bolus_count">Bolus sayısı</string>
diff --git a/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt b/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
index 20397ef6e6c..efc08c4b1d3 100644
--- a/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
+++ b/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.combo.R
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.*
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -20,10 +20,10 @@ import org.mockito.Mockito.`when`
 
 class ComboPluginTest : TestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var activePlugin: ActivePlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var pumpSync: PumpSync
     @Mock lateinit var sp: SP
     @Mock lateinit var context: Context
@@ -32,7 +32,7 @@ class ComboPluginTest : TestBase() {
     val injector = HasAndroidInjector {
         AndroidInjector {
             if (it is PumpEnactResult) {
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
         }
     }
@@ -41,9 +41,9 @@ class ComboPluginTest : TestBase() {
 
     @Before
     fun prepareMocks() {
-        `when`(resourceHelper.gs(R.string.novalidbasalrate)).thenReturn("No valid basal rate read from pump")
-        `when`(resourceHelper.gs(R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump")
-        comboPlugin = ComboPlugin(injector, aapsLogger, RxBusWrapper(aapsSchedulers), resourceHelper, profileFunction, sp, commandQueue, context, pumpSync, dateUtil)
+        `when`(rh.gs(R.string.novalidbasalrate)).thenReturn("No valid basal rate read from pump")
+        `when`(rh.gs(R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump")
+        comboPlugin = ComboPlugin(injector, aapsLogger, RxBus(aapsSchedulers, aapsLogger), rh, profileFunction, sp, commandQueue, context, pumpSync, dateUtil)
     }
 
     @Test
diff --git a/core/core_dependencies.gradle b/core/core_dependencies.gradle
index fbfb5ce29e4..bd18f7fe52a 100644
--- a/core/core_dependencies.gradle
+++ b/core/core_dependencies.gradle
@@ -43,6 +43,7 @@ dependencies {
     api "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
     api "org.apache.commons:commons-lang3:$commonslang3_version"
     api "commons-codec:commons-codec:$commonscodec_version"
+    api "com.uber.rxdogtag:rxdogtag:1.0.1"
 
     //CryptoUtil
     api 'com.madgag.spongycastle:core:1.58.0.0'
@@ -106,4 +107,4 @@ dependencies {
     // Phone checker
     // updating to 0.0.9 prevents AAPS from build
     api 'com.scottyab:rootbeer-lib:0.0.8'
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/info/nightscout/androidaps/Constants.java b/core/src/main/java/info/nightscout/androidaps/Constants.java
index e8388b61787..9fe38e36507 100644
--- a/core/src/main/java/info/nightscout/androidaps/Constants.java
+++ b/core/src/main/java/info/nightscout/androidaps/Constants.java
@@ -54,7 +54,7 @@ public class Constants {
     public static final double MAX_TT_MMOL = 10d;
 
     //NSClientInternal
-    public static final int MAX_LOG_LINES = 100;
+    public static final int MAX_LOG_LINES = 30;
 
     //Screen: Threshold for width/height to go into small width/height layout
     public static final int SMALL_WIDTH = 320;
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt
index fe55cdcdf2a..063ebe0d7d9 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt
@@ -9,6 +9,7 @@ class BolusProgressHelperActivity : DialogAppCompatActivity() {
         BolusProgressDialog()
             .setHelperActivity(this)
             .setInsulin(intent.getDoubleExtra("insulin", 0.0))
+            .setTimestamp(intent.getLongExtra("timestamp", 0L))
             .show(supportFragmentManager, "BolusProgress")
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt b/core/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt
index 986ef957194..0a2941fe7b9 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt
@@ -15,7 +15,7 @@ import javax.inject.Inject
 
 open class DaggerAppCompatActivityWithResult : DaggerAppCompatActivity() {
 
-    @Inject lateinit var resourceHelper: ResourceHelperImplementation
+    @Inject lateinit var rh: ResourceHelperImplementation
     @Inject lateinit var importExportPrefs: ImportExportPrefs
 
     val callForPrefFile = registerForActivityResult(PrefsFileContract()) {
@@ -35,7 +35,7 @@ open class DaggerAppCompatActivityWithResult : DaggerAppCompatActivity() {
                     when (it.key) {
                         Manifest.permission.WRITE_EXTERNAL_STORAGE ->
                             //show dialog after permission is granted
-                            OKDialog.show(this, "", resourceHelper.gs(R.string.alert_dialog_storage_permission_text))
+                            OKDialog.show(this, "", rh.gs(R.string.alert_dialog_storage_permission_text))
                         //  ignore the rest
                     }
                 }
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
index 0e29d22b005..4b0fb71da77 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
@@ -23,11 +23,10 @@ import info.nightscout.androidaps.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.extensions.total
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 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.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -47,11 +46,11 @@ import kotlin.math.roundToInt
 class TDDStatsActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var aapsSchedulers: AapsSchedulers
@@ -95,23 +94,23 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                 trHead.setBackgroundColor(Color.DKGRAY)
                 trHead.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
                 trHead.addView(TextView(this).also { labelDate ->
-                    labelDate.text = resourceHelper.gs(R.string.date)
+                    labelDate.text = rh.gs(R.string.date)
                     labelDate.setTextColor(Color.WHITE)
                 })
                 trHead.addView(TextView(this).also { labelBasalRate ->
-                    labelBasalRate.text = resourceHelper.gs(R.string.basalrate)
+                    labelBasalRate.text = rh.gs(R.string.basalrate)
                     labelBasalRate.setTextColor(Color.WHITE)
                 })
                 trHead.addView(TextView(this).also { labelBolus ->
-                    labelBolus.text = resourceHelper.gs(R.string.bolus)
+                    labelBolus.text = rh.gs(R.string.bolus)
                     labelBolus.setTextColor(Color.WHITE)
                 })
                 trHead.addView(TextView(this).also { labelTdd ->
-                    labelTdd.text = resourceHelper.gs(R.string.tdd)
+                    labelTdd.text = rh.gs(R.string.tdd)
                     labelTdd.setTextColor(Color.WHITE)
                 })
                 trHead.addView(TextView(this).also { labelRatio ->
-                    labelRatio.text = resourceHelper.gs(R.string.ratio)
+                    labelRatio.text = rh.gs(R.string.ratio)
                     labelRatio.setTextColor(Color.WHITE)
                 })
             }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
@@ -123,15 +122,15 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                 ctrHead.setBackgroundColor(Color.DKGRAY)
                 ctrHead.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
                 ctrHead.addView(TextView(this).also { labelCumAmountDays ->
-                    labelCumAmountDays.text = resourceHelper.gs(R.string.amount_days)
+                    labelCumAmountDays.text = rh.gs(R.string.amount_days)
                     labelCumAmountDays.setTextColor(Color.WHITE)
                 })
                 ctrHead.addView(TextView(this).also { labelCumTdd ->
-                    labelCumTdd.text = resourceHelper.gs(R.string.tdd)
+                    labelCumTdd.text = rh.gs(R.string.tdd)
                     labelCumTdd.setTextColor(Color.WHITE)
                 })
                 ctrHead.addView(TextView(this).also { labelCumRatio ->
-                    labelCumRatio.text = resourceHelper.gs(R.string.ratio)
+                    labelCumRatio.text = rh.gs(R.string.ratio)
                     labelCumRatio.setTextColor(Color.WHITE)
                 })
             }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
@@ -143,15 +142,15 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                 etrHead.setBackgroundColor(Color.DKGRAY)
                 etrHead.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
                 etrHead.addView(TextView(this).also { labelExpWeight ->
-                    labelExpWeight.text = resourceHelper.gs(R.string.weight)
+                    labelExpWeight.text = rh.gs(R.string.weight)
                     labelExpWeight.setTextColor(Color.WHITE)
                 })
                 etrHead.addView(TextView(this).also { labelExpTdd ->
-                    labelExpTdd.text = resourceHelper.gs(R.string.tdd)
+                    labelExpTdd.text = rh.gs(R.string.tdd)
                     labelExpTdd.setTextColor(Color.WHITE)
                 })
                 etrHead.addView(TextView(this).also { labelExpRatio ->
-                    labelExpRatio.text = resourceHelper.gs(R.string.ratio)
+                    labelExpRatio.text = rh.gs(R.string.ratio)
                     labelExpRatio.setTextColor(Color.WHITE)
                 })
             }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
@@ -161,7 +160,7 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
             binding.reload.visibility = View.GONE
             binding.connectionStatus.visibility = View.VISIBLE
             binding.message.visibility = View.VISIBLE
-            binding.message.text = resourceHelper.gs(R.string.warning_Message)
+            binding.message.text = rh.gs(R.string.warning_Message)
             commandQueue.loadTDDs(object : Callback() {
                 override fun run() {
                     loadDataFromDB()
@@ -196,18 +195,20 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        disposable.add(rxBus
-            .toObservable(EventPumpStatusChanged::class.java)
-            .observeOn(aapsSchedulers.main)
-            .subscribe({ event -> binding.connectionStatus.text = event.getStatus(resourceHelper) }, fabricPrivacy::logException)
+        disposable.add(
+            rxBus
+                .toObservable(EventPumpStatusChanged::class.java)
+                .observeOn(aapsSchedulers.main)
+                .subscribe({ event -> binding.connectionStatus.text = event.getStatus(rh) }, fabricPrivacy::logException)
         )
-        disposable.add(rxBus
-            .toObservable(EventDanaRSyncStatus::class.java)
-            .observeOn(aapsSchedulers.main)
-            .subscribe({ event ->
-                aapsLogger.debug("EventDanaRSyncStatus: " + event.message)
-                binding.connectionStatus.text = event.message
-            }, fabricPrivacy::logException)
+        disposable.add(
+            rxBus
+                .toObservable(EventDanaRSyncStatus::class.java)
+                .observeOn(aapsSchedulers.main)
+                .subscribe({ event ->
+                               aapsLogger.debug("EventDanaRSyncStatus: " + event.message)
+                               binding.connectionStatus.text = event.message
+                           }, fabricPrivacy::logException)
         )
     }
 
@@ -293,7 +294,8 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                         tr.id = 100 + i
                         tr.layoutParams = TableLayout.LayoutParams(
                             TableLayout.LayoutParams.MATCH_PARENT,
-                            TableLayout.LayoutParams.WRAP_CONTENT)
+                            TableLayout.LayoutParams.WRAP_CONTENT
+                        )
 
                         // Here create the TextView dynamically
                         tr.addView(TextView(this@TDDStatsActivity).also { labelDATE ->
@@ -303,17 +305,17 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                         })
                         tr.addView(TextView(this@TDDStatsActivity).also { labelBASAL ->
                             labelBASAL.id = 300 + i
-                            labelBASAL.text = resourceHelper.gs(R.string.formatinsulinunits, record.basalAmount)
+                            labelBASAL.text = rh.gs(R.string.formatinsulinunits, record.basalAmount)
                             labelBASAL.setTextColor(Color.WHITE)
                         })
                         tr.addView(TextView(this@TDDStatsActivity).also { labelBOLUS ->
                             labelBOLUS.id = 400 + i
-                            labelBOLUS.text = resourceHelper.gs(R.string.formatinsulinunits, record.bolusAmount)
+                            labelBOLUS.text = rh.gs(R.string.formatinsulinunits, record.bolusAmount)
                             labelBOLUS.setTextColor(Color.WHITE)
                         })
                         tr.addView(TextView(this@TDDStatsActivity).also { labelTDD ->
                             labelTDD.id = 500 + i
-                            labelTDD.text = resourceHelper.gs(R.string.formatinsulinunits, tdd)
+                            labelTDD.text = rh.gs(R.string.formatinsulinunits, tdd)
                             labelTDD.setTextColor(Color.WHITE)
                         })
                         tr.addView(TextView(this@TDDStatsActivity).also { labelRATIO ->
@@ -321,7 +323,8 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                             labelRATIO.text = (100 * tdd / magicNumber).roundToInt().toString() + "%"
                             labelRATIO.setTextColor(Color.WHITE)
                         })
-                    }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT))
+                    }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
+                )
                 i++
             }
             i = 0
@@ -350,7 +353,7 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
 
                         ctr.addView(TextView(this@TDDStatsActivity).also { labelCUMTDD ->
                             labelCUMTDD.id = 900 + i
-                            labelCUMTDD.text = resourceHelper.gs(R.string.formatinsulinunits, sum / i)
+                            labelCUMTDD.text = rh.gs(R.string.formatinsulinunits, sum / i)
                             labelCUMTDD.setTextColor(Color.WHITE)
                         })
 
@@ -364,7 +367,7 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
             }
             if (isOldData(historyList) && activePlugin.activePump.pumpDescription.needsManualTDDLoad) {
                 binding.message.visibility = View.VISIBLE
-                binding.message.text = resourceHelper.gs(R.string.olddata_Message)
+                binding.message.text = rh.gs(R.string.olddata_Message)
             } else binding.mainTable.setBackgroundColor(Color.TRANSPARENT)
             if (historyList.isNotEmpty() && df1.format(Date(historyList[0].timestamp)) == df1.format(Date())) {
                 //Today should not be included
@@ -402,9 +405,9 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                     etr.addView(TextView(this@TDDStatsActivity).also { labelEXPTDD ->
                         labelEXPTDD.id = 1300 + i
                         labelEXPTDD.text = """
-                ${resourceHelper.gs(R.string.formatinsulinunits, weighted03)}
-                ${resourceHelper.gs(R.string.formatinsulinunits, weighted05)}
-                ${resourceHelper.gs(R.string.formatinsulinunits, weighted07)}
+                ${rh.gs(R.string.formatinsulinunits, weighted03)}
+                ${rh.gs(R.string.formatinsulinunits, weighted05)}
+                ${rh.gs(R.string.formatinsulinunits, weighted07)}
                 """.trimIndent()
                         labelEXPTDD.setTextColor(Color.WHITE)
                     })
@@ -430,7 +433,8 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
 
     private fun isOldData(historyList: List<TotalDailyDose>): Boolean {
         val type = activePlugin.activePump.pumpDescription.pumpType
-        val startsYesterday = type == PumpType.DANA_R || type == PumpType.DANA_RS || type == PumpType.DANA_RV2 || type == PumpType.DANA_R_KOREAN || type == PumpType.ACCU_CHEK_INSIGHT_VIRTUAL || type == PumpType.DIACONN_G8
+        val startsYesterday =
+            type == PumpType.DANA_R || type == PumpType.DANA_RS || type == PumpType.DANA_RV2 || type == PumpType.DANA_R_KOREAN || type == PumpType.ACCU_CHEK_INSIGHT_VIRTUAL || type == PumpType.DIACONN_G8
         val df: DateFormat = SimpleDateFormat("dd.MM.", Locale.getDefault())
         return historyList.size < 3 || df.format(Date(historyList[0].timestamp)) != df.format(Date(System.currentTimeMillis() - if (startsYesterday) 1000 * 60 * 60 * 24 else 0))
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/data/IobTotal.kt b/core/src/main/java/info/nightscout/androidaps/data/IobTotal.kt
index 5f13bfe3517..327583b6621 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/IobTotal.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/IobTotal.kt
@@ -8,7 +8,7 @@ import org.json.JSONException
 import org.json.JSONObject
 
 @Suppress("SpellCheckingInspection")
-class IobTotal(var time: Long) : DataPointWithLabelInterface {
+class IobTotal(val time: Long) : DataPointWithLabelInterface {
 
     @JvmField var iob = 0.0
     @JvmField var activity = 0.0
diff --git a/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt b/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt
index 1dbba939d6a..57f95bfc748 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt
@@ -15,12 +15,11 @@ import info.nightscout.androidaps.interfaces.Profile.Companion.secondsFromMidnig
 import info.nightscout.androidaps.interfaces.Profile.Companion.toMgdl
 import info.nightscout.androidaps.interfaces.Profile.ProfileValue
 import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HardLimits
-import info.nightscout.androidaps.utils.Round
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONArray
@@ -96,8 +95,7 @@ sealed class ProfileSealed(
         value.timeZone.rawOffset.toLong()
     )
 
-    override fun isValid(from: String, pump: Pump, config: Config, resourceHelper: ResourceHelper, rxBus: RxBusWrapper, hardLimits: HardLimits): Profile.ValidityCheck {
-        val notify = true
+    override fun isValid(from: String, pump: Pump, config: Config, rh: ResourceHelper, rxBus: RxBus, hardLimits: HardLimits, sendNotifications: Boolean): Profile.ValidityCheck {
         val validityCheck = Profile.ValidityCheck()
         val description = pump.pumpDescription
         for (basal in basalBlocks) {
@@ -106,17 +104,17 @@ sealed class ProfileSealed(
                 // Check for hours alignment
                 val duration: Long = basal.duration
                 if (duration % 3600000 != 0L) {
-                    if (notify && config.APS) {
+                    if (sendNotifications && config.APS) {
                         val notification = Notification(
                             Notification.BASAL_PROFILE_NOT_ALIGNED_TO_HOURS,
-                            resourceHelper.gs(R.string.basalprofilenotaligned, from),
+                            rh.gs(R.string.basalprofilenotaligned, from),
                             Notification.NORMAL
                         )
                         rxBus.send(EventNewNotification(notification))
                     }
                     validityCheck.isValid = false
                     validityCheck.reasons.add(
-                        resourceHelper.gs(
+                        rh.gs(
                             R.string.basalprofilenotaligned,
                             from
                         )
@@ -124,73 +122,73 @@ sealed class ProfileSealed(
                     break
                 }
             }
+            if (!hardLimits.isInRange(basalAmount, 0.01, hardLimits.maxBasal())) {
+                validityCheck.isValid = false
+                validityCheck.reasons.add(rh.gs(R.string.value_out_of_hard_limits, rh.gs(R.string.basal_value), basalAmount))
+                break
+            }
             // Check for minimal basal value
             if (basalAmount < description.basalMinimumRate) {
                 basal.amount = description.basalMinimumRate
-                if (notify) sendBelowMinimumNotification(from, rxBus, resourceHelper)
+                if (sendNotifications) sendBelowMinimumNotification(from, rxBus, rh)
                 validityCheck.isValid = false
-                validityCheck.reasons.add(resourceHelper.gs(R.string.minimalbasalvaluereplaced, from))
+                validityCheck.reasons.add(rh.gs(R.string.minimalbasalvaluereplaced, from))
                 break
             } else if (basalAmount > description.basalMaximumRate) {
                 basal.amount = description.basalMaximumRate
-                if (notify) sendAboveMaximumNotification(from, rxBus, resourceHelper)
-                validityCheck.isValid = false
-                validityCheck.reasons.add(resourceHelper.gs(R.string.maximumbasalvaluereplaced, from))
-                break
-            }
-            if (!hardLimits.isInRange(basalAmount, 0.01, hardLimits.maxBasal())) {
+                if (sendNotifications) sendAboveMaximumNotification(from, rxBus, rh)
                 validityCheck.isValid = false
-                validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.basal_value), basalAmount))
+                validityCheck.reasons.add(rh.gs(R.string.maximumbasalvaluereplaced, from))
                 break
             }
         }
         if (!hardLimits.isInRange(dia, hardLimits.minDia(), hardLimits.maxDia())) {
             validityCheck.isValid = false
-            validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.profile_dia), dia))
+            validityCheck.reasons.add(rh.gs(R.string.value_out_of_hard_limits, rh.gs(R.string.profile_dia), dia))
         }
         for (ic in icBlocks)
             if (!hardLimits.isInRange(ic.amount * 100.0 / percentage, hardLimits.minIC(), hardLimits.maxIC())) {
                 validityCheck.isValid = false
-                validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.profile_carbs_ratio_value), ic.amount * 100.0 / percentage))
+                validityCheck.reasons.add(rh.gs(R.string.value_out_of_hard_limits, rh.gs(R.string.profile_carbs_ratio_value), ic.amount * 100.0 / percentage))
                 break
             }
         for (isf in isfBlocks)
             if (!hardLimits.isInRange(toMgdl(isf.amount * 100.0 / percentage, units), HardLimits.MIN_ISF, HardLimits.MAX_ISF)) {
                 validityCheck.isValid = false
-                validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.profile_sensitivity_value), isf.amount * 100.0 / percentage))
+                validityCheck.reasons.add(rh.gs(R.string.value_out_of_hard_limits, rh.gs(R.string.profile_sensitivity_value), isf.amount * 100.0 / percentage))
                 break
             }
         for (target in targetBlocks) {
             if (!hardLimits.isInRange(
-                    Profile.toMgdl(target.lowTarget, units),
-                    HardLimits.VERY_HARD_LIMIT_MIN_BG[0].toDouble(),
-                    HardLimits.VERY_HARD_LIMIT_MIN_BG[1].toDouble()
+                    toMgdl(target.lowTarget, units),
+                    HardLimits.VERY_HARD_LIMIT_MIN_BG[0],
+                    HardLimits.VERY_HARD_LIMIT_MIN_BG[1]
                 )
             ) {
                 validityCheck.isValid = false
-                validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.profile_low_target), target.lowTarget))
+                validityCheck.reasons.add(rh.gs(R.string.value_out_of_hard_limits, rh.gs(R.string.profile_low_target), target.lowTarget))
                 break
             }
             if (!hardLimits.isInRange(
-                    Profile.toMgdl(target.highTarget, units),
-                    HardLimits.VERY_HARD_LIMIT_MAX_BG[0].toDouble(),
-                    HardLimits.VERY_HARD_LIMIT_MAX_BG[1].toDouble()
+                    toMgdl(target.highTarget, units),
+                    HardLimits.VERY_HARD_LIMIT_MAX_BG[0],
+                    HardLimits.VERY_HARD_LIMIT_MAX_BG[1]
                 )
             ) {
                 validityCheck.isValid = false
-                validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.profile_high_target), target.highTarget))
+                validityCheck.reasons.add(rh.gs(R.string.value_out_of_hard_limits, rh.gs(R.string.profile_high_target), target.highTarget))
                 break
             }
         }
         return validityCheck
     }
 
-    protected open fun sendBelowMinimumNotification(from: String, rxBus: RxBusWrapper, resourceHelper: ResourceHelper) {
-        rxBus.send(EventNewNotification(Notification(Notification.MINIMAL_BASAL_VALUE_REPLACED, resourceHelper.gs(R.string.minimalbasalvaluereplaced, from), Notification.NORMAL)))
+    protected open fun sendBelowMinimumNotification(from: String, rxBus: RxBus, rh: ResourceHelper) {
+        rxBus.send(EventNewNotification(Notification(Notification.MINIMAL_BASAL_VALUE_REPLACED, rh.gs(R.string.minimalbasalvaluereplaced, from), Notification.NORMAL)))
     }
 
-    protected open fun sendAboveMaximumNotification(from: String, rxBus: RxBusWrapper, resourceHelper: ResourceHelper) {
-        rxBus.send(EventNewNotification(Notification(Notification.MAXIMUM_BASAL_VALUE_REPLACED, resourceHelper.gs(R.string.maximumbasalvaluereplaced, from), Notification.NORMAL)))
+    protected open fun sendAboveMaximumNotification(from: String, rxBus: RxBus, rh: ResourceHelper) {
+        rxBus.send(EventNewNotification(Notification(Notification.MAXIMUM_BASAL_VALUE_REPLACED, rh.gs(R.string.maximumbasalvaluereplaced, from), Notification.NORMAL)))
     }
 
     override val units: GlucoseUnit
@@ -213,8 +211,9 @@ sealed class ProfileSealed(
             if (getIcTimeFromMidnight(seconds) !=  profile.getIcTimeFromMidnight(seconds)) return false
             if (getTargetLowMgdlTimeFromMidnight(seconds) !=  profile.getTargetLowMgdlTimeFromMidnight(seconds)) return false
             if (getTargetHighMgdlTimeFromMidnight(seconds) !=  profile.getTargetHighMgdlTimeFromMidnight(seconds)) return false
-            if (dia != profile.dia) return false
         }
+        if (dia != profile.dia) return false
+        if ((profile is EPS) && profileName != profile.value.originalProfileName) return false // handle profile name change too
         return true
     }
 
@@ -241,10 +240,10 @@ sealed class ProfileSealed(
     private fun getTargetHighTimeFromMidnight(timeAsSeconds: Int): Double = targetBlocks.highTargetBlockValueBySeconds(timeAsSeconds, timeshift)
     override fun getTargetHighMgdlTimeFromMidnight(timeAsSeconds: Int): Double = toMgdl(targetBlocks.highTargetBlockValueBySeconds(timeAsSeconds, timeshift), units)
 
-    override fun getIcList(resourceHelper: ResourceHelper, dateUtil: DateUtil): String = getValuesList(icBlocks, 100.0 / percentage, DecimalFormat("0.0"), resourceHelper.gs(R.string.profile_carbs_per_unit), dateUtil)
-    override fun getIsfList(resourceHelper: ResourceHelper, dateUtil: DateUtil): String = getValuesList(isfBlocks, 100.0 / percentage, DecimalFormat("0.0"), units.asText + resourceHelper.gs(R.string.profile_per_unit), dateUtil)
-    override fun getBasalList(resourceHelper: ResourceHelper, dateUtil: DateUtil): String = getValuesList(basalBlocks, percentage / 100.0, DecimalFormat("0.00"), resourceHelper.gs(R.string.profile_ins_units_per_hour), dateUtil)
-    override fun getTargetList(resourceHelper: ResourceHelper, dateUtil: DateUtil): String = getTargetValuesList(targetBlocks, DecimalFormat("0.0"), units.asText, dateUtil)
+    override fun getIcList(rh: ResourceHelper, dateUtil: DateUtil): String = getValuesList(icBlocks, 100.0 / percentage, DecimalFormat("0.0"), rh.gs(R.string.profile_carbs_per_unit), dateUtil)
+    override fun getIsfList(rh: ResourceHelper, dateUtil: DateUtil): String = getValuesList(isfBlocks, 100.0 / percentage, DecimalFormat("0.0"), units.asText + rh.gs(R.string.profile_per_unit), dateUtil)
+    override fun getBasalList(rh: ResourceHelper, dateUtil: DateUtil): String = getValuesList(basalBlocks, percentage / 100.0, DecimalFormat("0.00"), rh.gs(R.string.profile_ins_units_per_hour), dateUtil)
+    override fun getTargetList(rh: ResourceHelper, dateUtil: DateUtil): String = getTargetValuesList(targetBlocks, DecimalFormat("0.0"), units.asText, dateUtil)
 
     override fun convertToNonCustomizedProfile(dateUtil: DateUtil): PureProfile =
         PureProfile(
diff --git a/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.kt b/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.kt
index 6b8b5ef214a..77985485bb9 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.kt
@@ -11,7 +11,7 @@ import javax.inject.Inject
 
 class PumpEnactResult(injector: HasAndroidInjector) {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
 
     init {
         injector.androidInjector().inject(this)
@@ -36,7 +36,7 @@ class PumpEnactResult(injector: HasAndroidInjector) {
     fun success(success: Boolean): PumpEnactResult = this.also { this.success = success }
     fun enacted(enacted: Boolean): PumpEnactResult = this.also { it.enacted = enacted }
     fun comment(comment: String): PumpEnactResult = this.also { it.comment = comment }
-    fun comment(comment: Int): PumpEnactResult = this.also { it.comment = resourceHelper.gs(comment) }
+    fun comment(comment: Int): PumpEnactResult = this.also { it.comment = rh.gs(comment) }
     fun duration(duration: Int): PumpEnactResult = this.also { it.duration = duration }
     fun absolute(absolute: Double): PumpEnactResult = this.also { it.absolute = absolute }
     fun percent(percent: Int): PumpEnactResult = this.also { it.percent = percent }
@@ -61,75 +61,75 @@ class PumpEnactResult(injector: HasAndroidInjector) {
     }
 
     override fun toString(): String {
-        var ret = resourceHelper.gs(R.string.success) + ": " + success
+        var ret = rh.gs(R.string.success) + ": " + success
         if (enacted) {
             when {
                 bolusDelivered > 0 -> {
-                    ret += "\n${resourceHelper.gs(R.string.enacted)}: $enacted"
-                    ret += "\n${resourceHelper.gs(R.string.comment)}: $comment"
-                    ret += "\n${resourceHelper.gs(R.string.configbuilder_insulin)}: $bolusDelivered ${resourceHelper.gs(R.string.insulin_unit_shortname)}"
+                    ret += "\n${rh.gs(R.string.enacted)}: $enacted"
+                    ret += "\n${rh.gs(R.string.comment)}: $comment"
+                    ret += "\n${rh.gs(R.string.configbuilder_insulin)}: $bolusDelivered ${rh.gs(R.string.insulin_unit_shortname)}"
                 }
 
                 isTempCancel       -> {
-                    ret += "\n${resourceHelper.gs(R.string.enacted)}: $enacted"
-                    if (comment.isNotEmpty()) ret += "\n${resourceHelper.gs(R.string.comment)}: $comment"
-                    ret += "\n${resourceHelper.gs(R.string.canceltemp)}"
+                    ret += "\n${rh.gs(R.string.enacted)}: $enacted"
+                    if (comment.isNotEmpty()) ret += "\n${rh.gs(R.string.comment)}: $comment"
+                    ret += "\n${rh.gs(R.string.canceltemp)}"
                 }
 
                 isPercent          -> {
-                    ret += "\n${resourceHelper.gs(R.string.enacted)}: $enacted"
-                    if (comment.isNotEmpty()) ret += "\n${resourceHelper.gs(R.string.comment)}: $comment"
-                    ret += "\n${resourceHelper.gs(R.string.duration)}: $duration min"
-                    ret += "\n${resourceHelper.gs(R.string.percent)}: $percent%"
+                    ret += "\n${rh.gs(R.string.enacted)}: $enacted"
+                    if (comment.isNotEmpty()) ret += "\n${rh.gs(R.string.comment)}: $comment"
+                    ret += "\n${rh.gs(R.string.duration)}: $duration min"
+                    ret += "\n${rh.gs(R.string.percent)}: $percent%"
                 }
 
                 else               -> {
-                    ret += "\n${resourceHelper.gs(R.string.enacted)}: $enacted"
-                    if (comment.isNotEmpty()) ret += "\n${resourceHelper.gs(R.string.comment)}: $comment"
-                    ret += "\n${resourceHelper.gs(R.string.duration)}: $duration min"
-                    ret += "\n${resourceHelper.gs(R.string.absolute)}: $absolute U/h"
+                    ret += "\n${rh.gs(R.string.enacted)}: $enacted"
+                    if (comment.isNotEmpty()) ret += "\n${rh.gs(R.string.comment)}: $comment"
+                    ret += "\n${rh.gs(R.string.duration)}: $duration min"
+                    ret += "\n${rh.gs(R.string.absolute)}: $absolute U/h"
                 }
             }
         } else {
-            ret += "\n${resourceHelper.gs(R.string.comment)}: $comment"
+            ret += "\n${rh.gs(R.string.comment)}: $comment"
         }
         return ret
     }
 
     fun toHtml(): String {
-        var ret = "<b>" + resourceHelper.gs(R.string.success) + "</b>: " + success
+        var ret = "<b>" + rh.gs(R.string.success) + "</b>: " + success
         if (queued) {
-            ret = resourceHelper.gs(R.string.waitingforpumpresult)
+            ret = rh.gs(R.string.waitingforpumpresult)
         } else if (enacted) {
             when {
                 bolusDelivered > 0         -> {
-                    ret += "<br><b>" + resourceHelper.gs(R.string.enacted) + "</b>: " + enacted
-                    if (comment.isNotEmpty()) ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment
-                    ret += "<br><b>" + resourceHelper.gs(R.string.smb_shortname) + "</b>: " + bolusDelivered + " " + resourceHelper.gs(R.string.insulin_unit_shortname)
+                    ret += "<br><b>" + rh.gs(R.string.enacted) + "</b>: " + enacted
+                    if (comment.isNotEmpty()) ret += "<br><b>" + rh.gs(R.string.comment) + "</b>: " + comment
+                    ret += "<br><b>" + rh.gs(R.string.smb_shortname) + "</b>: " + bolusDelivered + " " + rh.gs(R.string.insulin_unit_shortname)
                 }
 
                 isTempCancel               -> {
-                    ret += "<br><b>" + resourceHelper.gs(R.string.enacted) + "</b>: " + enacted
-                    ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment +
-                        "<br>" + resourceHelper.gs(R.string.canceltemp)
+                    ret += "<br><b>" + rh.gs(R.string.enacted) + "</b>: " + enacted
+                    ret += "<br><b>" + rh.gs(R.string.comment) + "</b>: " + comment +
+                        "<br>" + rh.gs(R.string.canceltemp)
                 }
 
                 isPercent && percent != -1 -> {
-                    ret += "<br><b>" + resourceHelper.gs(R.string.enacted) + "</b>: " + enacted
-                    if (comment.isNotEmpty()) ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment
-                    ret += "<br><b>" + resourceHelper.gs(R.string.duration) + "</b>: " + duration + " min"
-                    ret += "<br><b>" + resourceHelper.gs(R.string.percent) + "</b>: " + percent + "%"
+                    ret += "<br><b>" + rh.gs(R.string.enacted) + "</b>: " + enacted
+                    if (comment.isNotEmpty()) ret += "<br><b>" + rh.gs(R.string.comment) + "</b>: " + comment
+                    ret += "<br><b>" + rh.gs(R.string.duration) + "</b>: " + duration + " min"
+                    ret += "<br><b>" + rh.gs(R.string.percent) + "</b>: " + percent + "%"
                 }
 
                 absolute != -1.0           -> {
-                    ret += "<br><b>" + resourceHelper.gs(R.string.enacted) + "</b>: " + enacted
-                    if (comment.isNotEmpty()) ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment
-                    ret += "<br><b>" + resourceHelper.gs(R.string.duration) + "</b>: " + duration + " min"
-                    ret += "<br><b>" + resourceHelper.gs(R.string.absolute) + "</b>: " + DecimalFormatter.to2Decimal(absolute) + " U/h"
+                    ret += "<br><b>" + rh.gs(R.string.enacted) + "</b>: " + enacted
+                    if (comment.isNotEmpty()) ret += "<br><b>" + rh.gs(R.string.comment) + "</b>: " + comment
+                    ret += "<br><b>" + rh.gs(R.string.duration) + "</b>: " + duration + " min"
+                    ret += "<br><b>" + rh.gs(R.string.absolute) + "</b>: " + DecimalFormatter.to2Decimal(absolute) + " U/h"
                 }
             }
         } else {
-            if (comment.isNotEmpty()) ret += "<br><b>" + resourceHelper.gs(R.string.comment) + "</b>: " + comment
+            if (comment.isNotEmpty()) ret += "<br><b>" + rh.gs(R.string.comment) + "</b>: " + comment
         }
         return ret
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt b/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt
index 556f4735245..b67b8e50ff4 100644
--- a/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt
+++ b/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt
@@ -27,7 +27,7 @@ open class CoreModule {
 
     @Provides
     @Singleton
-    fun provideSharedPreferences(context: Context, resourceHelper: ResourceHelper): SP = SPImplementation(PreferenceManager.getDefaultSharedPreferences(context), resourceHelper)
+    fun provideSharedPreferences(context: Context, rh: ResourceHelper): SP = SPImplementation(PreferenceManager.getDefaultSharedPreferences(context), rh)
 
     @Provides
     @Singleton
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
index 9d9e323930f..c73ad818eb4 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
@@ -14,25 +14,26 @@ import info.nightscout.androidaps.core.databinding.DialogBolusprogressBinding
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.events.EventPumpStatusChanged
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import javax.inject.Inject
 
 class BolusProgressDialog : DaggerDialogFragment() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var uel: UserEntryLogger
@@ -40,15 +41,22 @@ class BolusProgressDialog : DaggerDialogFragment() {
     private val disposable = CompositeDisposable()
 
     companion object {
+
         var bolusEnded = false
         var stopPressed = false
     }
 
     private var running = true
     private var amount = 0.0
+    var timestamp: Long = 0L
     private var state: String? = null
     private var helpActivity: BolusProgressHelperActivity? = null
 
+    fun setTimestamp(timestamp: Long): BolusProgressDialog {
+        this.timestamp = timestamp
+        return this
+    }
+
     fun setInsulin(amount: Double): BolusProgressDialog {
         this.amount = amount
         bolusEnded = false
@@ -66,8 +74,10 @@ class BolusProgressDialog : DaggerDialogFragment() {
     // onDestroyView.
     private val binding get() = _binding!!
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View {
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
         dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE)
         dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
         isCancelable = false
@@ -80,8 +90,9 @@ class BolusProgressDialog : DaggerDialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         savedInstanceState?.let {
             amount = it.getDouble("amount")
+            timestamp = it.getLong("timestamp")
         }
-        binding.title.text = resourceHelper.gs(R.string.goingtodeliver, amount)
+        binding.title.text = rh.gs(R.string.goingtodeliver, amount)
         binding.stop.setOnClickListener {
             aapsLogger.debug(LTag.UI, "Stop bolus delivery button pressed")
             stopPressed = true
@@ -90,7 +101,7 @@ class BolusProgressDialog : DaggerDialogFragment() {
             uel.log(Action.CANCEL_BOLUS, Sources.Overview, state)
             commandQueue.cancelAllBoluses()
         }
-        val defaultState = resourceHelper.gs(R.string.waitingforpump)
+        val defaultState = rh.gs(R.string.waitingforpump)
         binding.progressbar.max = 100
         state = savedInstanceState?.getString("state", defaultState) ?: defaultState
         binding.status.text = state
@@ -111,30 +122,30 @@ class BolusProgressDialog : DaggerDialogFragment() {
         if (bolusEnded) dismiss()
         else running = true
 
-        disposable.add(rxBus
+        disposable += rxBus
             .toObservable(EventPumpStatusChanged::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({ binding.status.text = it.getStatus(resourceHelper) }, fabricPrivacy::logException)
-        )
-        disposable.add(rxBus
+            .subscribe({ binding.status.text = it.getStatus(rh) }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventDismissBolusProgressIfRunning::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({ if (running) dismiss() }, fabricPrivacy::logException)
-        )
-        disposable.add(rxBus
+            .subscribe({
+                           if (it.bolusTimestamp == null || it.bolusTimestamp == timestamp)
+                               if (running) dismiss()
+                       }, fabricPrivacy::logException)
+        disposable += rxBus
             .toObservable(EventOverviewBolusProgress::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({
-                aapsLogger.debug(LTag.UI, "Status: ${it.status} Percent: ${it.percent}")
-                binding.status.text = it.status
-                binding.progressbar.progress = it.percent
-                if (it.percent == 100) {
-                    binding.stop.visibility = View.INVISIBLE
-                    scheduleDismiss()
-                }
-                state = it.status
-            }, fabricPrivacy::logException)
-        )
+                           aapsLogger.debug(LTag.UI, "Status: ${it.status} Percent: ${it.percent}")
+                           binding.status.text = it.status
+                           binding.progressbar.progress = it.percent
+                           if (it.percent == 100) {
+                               binding.stop.visibility = View.INVISIBLE
+                               scheduleDismiss()
+                           }
+                           state = it.status
+                       }, fabricPrivacy::logException)
     }
 
     override fun dismiss() {
@@ -161,6 +172,7 @@ class BolusProgressDialog : DaggerDialogFragment() {
         super.onSaveInstanceState(outState)
         outState.putString("state", state)
         outState.putDouble("amount", amount)
+        outState.putLong("timestamp", timestamp)
     }
 
     override fun onDestroyView() {
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/NtpProgressDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/NtpProgressDialog.kt
index 4e6dbe72474..39e23a09d45 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/NtpProgressDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/NtpProgressDialog.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.core.databinding.DialogBolusprogressBinding
 import info.nightscout.androidaps.events.EventNtpStatus
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
@@ -21,9 +21,9 @@ import javax.inject.Inject
 
 class NtpProgressDialog : DaggerDialogFragment() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var aapsSchedulers: AapsSchedulers
 
@@ -51,14 +51,14 @@ class NtpProgressDialog : DaggerDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val defaultMessage = resourceHelper.gs(R.string.timedetection)
-        dialog?.setTitle(resourceHelper.gs(R.string.objectives))
+        val defaultMessage = rh.gs(R.string.timedetection)
+        dialog?.setTitle(rh.gs(R.string.objectives))
         binding.stop.setOnClickListener { dismiss() }
         binding.status.text = state ?: defaultMessage
         binding.progressbar.max = 100
         binding.progressbar.progress = percent
-        binding.stop.text = resourceHelper.gs(R.string.close)
-        binding.title.text = resourceHelper.gs(R.string.please_wait)
+        binding.stop.text = rh.gs(R.string.close)
+        binding.title.text = rh.gs(R.string.please_wait)
     }
 
     override fun onResume() {
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
index ccb87c07041..b51f4fe50c6 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
@@ -22,26 +22,25 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
-import java.io.File.separator
 import java.text.DecimalFormat
 import javax.inject.Inject
 
 class ProfileViewerDialog : DaggerDialogFragment() {
 
     @Inject lateinit var injector: HasAndroidInjector
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var config: Config
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var hardLimits: HardLimits
 
     private var time: Long = 0
@@ -141,7 +140,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
             profile?.let { profile1 ->
                 profile2?.let { profile2 ->
                     binding.units.text = profileFunction.getUnits().asText
-                    binding.dia.text = HtmlHelper.fromHtml(formatColors("", profile1.dia, profile2.dia, DecimalFormat("0.00"), resourceHelper.gs(R.string.shorthour)))
+                    binding.dia.text = HtmlHelper.fromHtml(formatColors("", profile1.dia, profile2.dia, DecimalFormat("0.00"), rh.gs(R.string.shorthour)))
                     val profileNames = profileName!!.split("\n").toTypedArray()
                     binding.activeprofile.text = HtmlHelper.fromHtml(formatColors(profileNames[0], profileNames[1]))
                     binding.date.text = date
@@ -153,25 +152,25 @@ class ProfileViewerDialog : DaggerDialogFragment() {
                 }
 
                 binding.noprofile.visibility = View.GONE
-                val validity = profile1.isValid("ProfileViewDialog", activePlugin.activePump, config, resourceHelper, rxBus, hardLimits)
-                binding.invalidprofile.text = resourceHelper.gs(R.string.invalidprofile) + "\n" + validity.reasons.joinToString(separator = "\n")
+                val validity = profile1.isValid("ProfileViewDialog", activePlugin.activePump, config, rh, rxBus, hardLimits, false)
+                binding.invalidprofile.text = rh.gs(R.string.invalidprofile) + "\n" + validity.reasons.joinToString(separator = "\n")
                 binding.invalidprofile.visibility = validity.isValid.not().toVisibility()
             }
         else
             profile?.let {
                 binding.units.text = it.units.asText
-                binding.dia.text = resourceHelper.gs(R.string.format_hours, it.dia)
+                binding.dia.text = rh.gs(R.string.format_hours, it.dia)
                 binding.activeprofile.text = profileName
                 binding.date.text = date
-                binding.ic.text = it.getIcList(resourceHelper, dateUtil)
-                binding.isf.text = it.getIsfList(resourceHelper, dateUtil)
-                binding.basal.text = it.getBasalList(resourceHelper, dateUtil)
-                binding.target.text = it.getTargetList(resourceHelper, dateUtil)
+                binding.ic.text = it.getIcList(rh, dateUtil)
+                binding.isf.text = it.getIsfList(rh, dateUtil)
+                binding.basal.text = it.getBasalList(rh, dateUtil)
+                binding.target.text = it.getTargetList(rh, dateUtil)
                 binding.basalGraph.show(it)
 
                 binding.noprofile.visibility = View.GONE
-                val validity = it.isValid("ProfileViewDialog", activePlugin.activePump, config, resourceHelper, rxBus, hardLimits)
-                binding.invalidprofile.text = resourceHelper.gs(R.string.invalidprofile) + "\n" + validity.reasons.joinToString(separator = "\n")
+                val validity = it.isValid("ProfileViewDialog", activePlugin.activePump, config, rh, rxBus, hardLimits, false)
+                binding.invalidprofile.text = rh.gs(R.string.invalidprofile) + "\n" + validity.reasons.joinToString(separator = "\n")
                 binding.invalidprofile.visibility = validity.isValid.not().toVisibility()
             }
     }
@@ -201,20 +200,20 @@ class ProfileViewerDialog : DaggerDialogFragment() {
     }
 
     private fun formatColors(label: String, text1: String, text2: String, units: String): String {
-        var s = "<font color='${resourceHelper.gc(R.color.white)}'>$label</font>"
+        var s = "<font color='${rh.gc(R.color.white)}'>$label</font>"
         s += "    "
-        s += "<font color='${resourceHelper.gc(R.color.tempbasal)}'>$text1</font>"
+        s += "<font color='${rh.gc(R.color.tempbasal)}'>$text1</font>"
         s += "    "
-        s += "<font color='${resourceHelper.gc(R.color.examinedProfile)}'>$text2</font>"
+        s += "<font color='${rh.gc(R.color.examinedProfile)}'>$text2</font>"
         s += "    "
-        s += "<font color='${resourceHelper.gc(R.color.white)}'>$units</font>"
+        s += "<font color='${rh.gc(R.color.white)}'>$units</font>"
         return s
     }
 
     private fun formatColors(text1: String, text2: String): String {
-        var s = "<font color='${resourceHelper.gc(R.color.tempbasal)}'>$text1</font>"
+        var s = "<font color='${rh.gc(R.color.tempbasal)}'>$text1</font>"
         s += "<BR/>"
-        s += "<font color='${resourceHelper.gc(R.color.examinedProfile)}'>$text2</font>"
+        s += "<font color='${rh.gc(R.color.examinedProfile)}'>$text2</font>"
         return s
     }
 
@@ -226,7 +225,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
             val val1 = profile1.getBasalTimeFromMidnight(hour * 60 * 60)
             val val2 = profile2.getBasalTimeFromMidnight(hour * 60 * 60)
             if (val1 != prev1 || val2 != prev2) {
-                s.append(formatColors(dateUtil.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.00"), " " + resourceHelper.gs(R.string.profile_ins_units_per_hour)))
+                s.append(formatColors(dateUtil.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.00"), " " + rh.gs(R.string.profile_ins_units_per_hour)))
                 s.append("<br>")
             }
             prev1 = val1
@@ -237,7 +236,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
             profile1.baseBasalSum(),
             profile2.baseBasalSum(),
             DecimalFormat("0.00"),
-            resourceHelper.gs(R.string.insulin_unit_shortname)))
+            rh.gs(R.string.insulin_unit_shortname)))
         return HtmlHelper.fromHtml(s.toString())
     }
 
@@ -249,7 +248,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
             val val1 = profile1.getIcTimeFromMidnight(hour * 60 * 60)
             val val2 = profile2.getIcTimeFromMidnight(hour * 60 * 60)
             if (val1 != prev1 || val2 != prev2) {
-                s.append(formatColors(dateUtil.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), " " + resourceHelper.gs(R.string.profile_carbs_per_unit)))
+                s.append(formatColors(dateUtil.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), " " + rh.gs(R.string.profile_carbs_per_unit)))
                 s.append("<br>")
             }
             prev1 = val1
@@ -267,7 +266,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
             val val1 = Profile.fromMgdlToUnits(profile1.getIsfMgdlTimeFromMidnight(hour * 60 * 60), units)
             val val2 = Profile.fromMgdlToUnits(profile2.getIsfMgdlTimeFromMidnight(hour * 60 * 60), units)
             if (val1 != prev1 || val2 != prev2) {
-                s.append(formatColors(dateUtil.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), units.asText + " " + resourceHelper.gs(R.string.profile_per_unit)))
+                s.append(formatColors(dateUtil.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), units.asText + " " + rh.gs(R.string.profile_per_unit)))
                 s.append("<br>")
             }
             prev1 = val1
diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventEffectiveProfileSwitchChanged.kt b/core/src/main/java/info/nightscout/androidaps/events/EventEffectiveProfileSwitchChanged.kt
new file mode 100644
index 00000000000..5ad91046dd4
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventEffectiveProfileSwitchChanged.kt
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.events
+
+import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch
+
+class EventEffectiveProfileSwitchChanged(effectiveProfileSwitch: EffectiveProfileSwitch?) : Event() {
+    var startDate: Long = 0
+
+    init {
+        effectiveProfileSwitch?.let { startDate = it.timestamp}
+    }
+    constructor(startDate: Long) : this(null) {
+        this.startDate = startDate
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt b/core/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt
index 2938a005c4b..04afc9e4869 100644
--- a/core/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt
@@ -11,11 +11,11 @@ class EventPreferenceChange : Event {
         changedKey = key
     }
 
-    constructor(resourceHelper: ResourceHelper, resourceID: Int) {
-        changedKey = resourceHelper.gs(resourceID)
+    constructor(rh: ResourceHelper, resourceID: Int) {
+        changedKey = rh.gs(resourceID)
     }
 
-    fun isChanged(resourceHelper: ResourceHelper, id: Int): Boolean {
-        return changedKey == resourceHelper.gs(id)
+    fun isChanged(rh: ResourceHelper, id: Int): Boolean {
+        return changedKey == rh.gs(id)
     }
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt b/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
index e65a7fe6e57..bb88afde62b 100644
--- a/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
@@ -45,14 +45,14 @@ class EventPumpStatusChanged : EventStatus {
     }
 
     // status for startup wizard
-    override fun getStatus(resourceHelper: ResourceHelper): String {
+    override fun getStatus(rh: ResourceHelper): String {
         return when (status) {
-            Status.CONNECTING                -> String.format(resourceHelper.gs(R.string.connectingfor), secondsElapsed)
-            Status.HANDSHAKING               -> resourceHelper.gs(R.string.handshaking)
-            Status.CONNECTED                 -> resourceHelper.gs(R.string.connected)
+            Status.CONNECTING                -> String.format(rh.gs(R.string.connectingfor), secondsElapsed)
+            Status.HANDSHAKING               -> rh.gs(R.string.handshaking)
+            Status.CONNECTED                 -> rh.gs(R.string.connected)
             Status.PERFORMING                -> performingAction
-            Status.WAITING_FOR_DISCONNECTION -> resourceHelper.gs(R.string.waiting_for_disconnection)
-            Status.DISCONNECTING             -> resourceHelper.gs(R.string.disconnecting)
+            Status.WAITING_FOR_DISCONNECTION -> rh.gs(R.string.waiting_for_disconnection)
+            Status.DISCONNECTING             -> rh.gs(R.string.disconnecting)
             Status.DISCONNECTED              -> ""
         }
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventStatus.kt b/core/src/main/java/info/nightscout/androidaps/events/EventStatus.kt
index 88c8073e699..bb88f3529ae 100644
--- a/core/src/main/java/info/nightscout/androidaps/events/EventStatus.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventStatus.kt
@@ -4,5 +4,5 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 // pass string to startup wizard
 abstract class EventStatus : Event() {
-    abstract fun getStatus(resourceHelper: ResourceHelper) : String
+    abstract fun getStatus(rh: ResourceHelper) : String
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt
index b1f49b603cc..a07e789856d 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt
@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.extensions
 
 import com.google.gson.Gson
+import com.google.gson.JsonSyntaxException
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.database.entities.BolusCalculatorResult
 import info.nightscout.androidaps.database.entities.TherapyEvent
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper
 import org.json.JSONObject
 
 fun BolusCalculatorResult.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
@@ -18,3 +20,23 @@ fun BolusCalculatorResult.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject
         .put("units", Constants.MGDL)
         .put("notes", note)
         .also { if (isAdd && interfaceIDs.nightscoutId != null) it.put("_id", interfaceIDs.nightscoutId) }
+
+fun bolusCalculatorResultFromJson(jsonObject: JSONObject): BolusCalculatorResult? {
+    val timestamp = JsonHelper.safeGetLongAllowNull(jsonObject, "mills", null) ?: return null
+    val isValid = JsonHelper.safeGetBoolean(jsonObject, "isValid", true)
+    val id = JsonHelper.safeGetStringAllowNull(jsonObject, "_id", null) ?: return null
+    val bcrString = JsonHelper.safeGetStringAllowNull(jsonObject, "bolusCalculatorResult", null) ?: return null
+
+    if (timestamp == 0L) return null
+
+    return try {
+        Gson().fromJson(bcrString, BolusCalculatorResult::class.java)
+            .also {
+                it.id = 0
+                it.isValid = isValid
+                it.interfaceIDs.nightscoutId = id
+            }
+    } catch (e: JsonSyntaxException) {
+        null
+    }
+}
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/EffectiveProfileSwitchExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/EffectiveProfileSwitchExtension.kt
index b8f5396b13b..38c7e0a208c 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/EffectiveProfileSwitchExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/EffectiveProfileSwitchExtension.kt
@@ -35,6 +35,7 @@ fun EffectiveProfileSwitch.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObjec
         .put("originalPercentage", originalPercentage)
         .put("originalDuration", originalDuration)
         .put("originalEnd", originalEnd)
+        .put("notes", originalCustomizedName)
         .also {
             if (interfaceIDs.pumpId != null) it.put("pumpId", interfaceIDs.pumpId)
             if (interfaceIDs.pumpType != null) it.put("pumpType", interfaceIDs.pumpType!!.name)
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/ExtendedBolusExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/ExtendedBolusExtension.kt
index d64713d0ad1..a09163585c0 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/ExtendedBolusExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/ExtendedBolusExtension.kt
@@ -50,10 +50,10 @@ fun ExtendedBolus.toTemporaryBasal(profile: Profile): TemporaryBasal =
         type = TemporaryBasal.Type.FAKE_EXTENDED
     )
 
-fun ExtendedBolus.toJson(isAdd: Boolean, profile: Profile, dateUtil: DateUtil, useAbsolute: Boolean): JSONObject =
+fun ExtendedBolus.toJson(isAdd: Boolean, profile: Profile, dateUtil: DateUtil): JSONObject =
     if (isEmulatingTempBasal)
         toTemporaryBasal(profile)
-            .toJson(isAdd, profile, dateUtil, useAbsolute)
+            .toJson(isAdd, profile, dateUtil)
             .put("extendedEmulated", toRealJson(isAdd, dateUtil))
     else toRealJson(isAdd, dateUtil)
 
@@ -63,6 +63,7 @@ fun ExtendedBolus.toRealJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
         .put("enteredBy", "openaps://" + "AndroidAPS")
         .put("eventType", TherapyEvent.Type.COMBO_BOLUS.text)
         .put("duration", T.msecs(duration).mins())
+        .put("durationInMilliseconds", duration)
         .put("splitNow", 0)
         .put("splitExt", 100)
         .put("enteredinsulin", amount)
@@ -99,6 +100,7 @@ fun extendedBolusFromJson(jsonObject: JSONObject): ExtendedBolus? {
     if (JsonHelper.safeGetIntAllowNull(jsonObject, "splitExt") != 100) return null
     val amount = JsonHelper.safeGetDoubleAllowNull(jsonObject, "enteredinsulin") ?: return null
     val duration = JsonHelper.safeGetLongAllowNull(jsonObject, "duration") ?: return null
+    val durationInMilliseconds = JsonHelper.safeGetLongAllowNull(jsonObject, "durationInMilliseconds")
     val isValid = JsonHelper.safeGetBoolean(jsonObject, "isValid", true)
     val isEmulatingTempBasal = JsonHelper.safeGetBoolean(jsonObject, "isEmulatingTempBasal", false)
     val id = JsonHelper.safeGetStringAllowNull(jsonObject, "_id", null) ?: return null
@@ -108,13 +110,13 @@ fun extendedBolusFromJson(jsonObject: JSONObject): ExtendedBolus? {
     val pumpSerial = JsonHelper.safeGetStringAllowNull(jsonObject, "pumpSerial", null)
 
     if (timestamp == 0L) return null
-    if (duration == 0L) return null
+    if (duration == 0L && durationInMilliseconds == 0L) return null
     if (amount == 0.0) return null
 
     return ExtendedBolus(
         timestamp = timestamp,
         amount = amount,
-        duration = T.mins(duration).msecs(),
+        duration = durationInMilliseconds ?: T.mins(duration).msecs(),
         isEmulatingTempBasal = isEmulatingTempBasal,
         isValid = isValid
     ).also {
@@ -133,7 +135,7 @@ fun ExtendedBolus.iobCalc(time: Long, profile: Profile, insulinInterface: Insuli
         val dia = profile.dia
         val diaAgo = time - dia * 60 * 60 * 1000
         val aboutFiveMinIntervals = ceil(realDuration / 5.0).toInt()
-        val spacing = realDuration / aboutFiveMinIntervals
+        val spacing = realDuration / aboutFiveMinIntervals.toDouble()
         for (j in 0L until aboutFiveMinIntervals) {
             // find middle of the interval
             val calcDate = (timestamp + j * spacing * 60 * 1000 + 0.5 * spacing * 60 * 1000).toLong()
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/HtmlString.kt b/core/src/main/java/info/nightscout/androidaps/extensions/HtmlString.kt
index e72d37e3346..56c6e6b46b3 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/HtmlString.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/HtmlString.kt
@@ -6,6 +6,6 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 fun String.formatBold(): String =
     "<b>$this</b>"
 
-fun String.formatColor(resourceHelper: ResourceHelper, @ColorRes colorId: Int): String =
-    "<font color='" + resourceHelper.gc(colorId) + "'>" + this + "</font>"
+fun String.formatColor(rh: ResourceHelper, @ColorRes colorId: Int): String =
+    "<font color='" + rh.gc(colorId) + "'>" + this + "</font>"
 
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/JSONObjectExt.kt b/core/src/main/java/info/nightscout/androidaps/extensions/JSONObjectExt.kt
index 3a42eabe4b8..15f400315a2 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/JSONObjectExt.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/JSONObjectExt.kt
@@ -5,43 +5,43 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONObject
 
-fun JSONObject.putInt(@StringRes key: Int, sp: SP, resourceHelper: ResourceHelper): JSONObject =
-    if (sp.contains(key)) put(resourceHelper.gs(key), sp.getInt(key, 0)) else this
+fun JSONObject.putInt(@StringRes key: Int, sp: SP, rh: ResourceHelper): JSONObject =
+    if (sp.contains(key)) put(rh.gs(key), sp.getInt(key, 0)) else this
 
-fun JSONObject.putLong(@StringRes key: Int, sp: SP, resourceHelper: ResourceHelper): JSONObject =
-    if (sp.contains(key)) put(resourceHelper.gs(key), sp.getLong(key, 0)) else this
+fun JSONObject.putLong(@StringRes key: Int, sp: SP, rh: ResourceHelper): JSONObject =
+    if (sp.contains(key)) put(rh.gs(key), sp.getLong(key, 0)) else this
 
-fun JSONObject.putDouble(@StringRes key: Int, sp: SP, resourceHelper: ResourceHelper): JSONObject =
-    if (sp.contains(key)) put(resourceHelper.gs(key), sp.getDouble(key, 0.0)) else this
+fun JSONObject.putDouble(@StringRes key: Int, sp: SP, rh: ResourceHelper): JSONObject =
+    if (sp.contains(key)) put(rh.gs(key), sp.getDouble(key, 0.0)) else this
 
-fun JSONObject.putString(@StringRes key: Int, sp: SP, resourceHelper: ResourceHelper): JSONObject =
-    if (sp.contains(key)) put(resourceHelper.gs(key), sp.getString(key, "")) else this
+fun JSONObject.putString(@StringRes key: Int, sp: SP, rh: ResourceHelper): JSONObject =
+    if (sp.contains(key)) put(rh.gs(key), sp.getString(key, "")) else this
 
-fun JSONObject.putBoolean(@StringRes key: Int, sp: SP, resourceHelper: ResourceHelper): JSONObject =
-    if (sp.contains(key)) put(resourceHelper.gs(key), sp.getBoolean(key, false)) else this
+fun JSONObject.putBoolean(@StringRes key: Int, sp: SP, rh: ResourceHelper): JSONObject =
+    if (sp.contains(key)) put(rh.gs(key), sp.getBoolean(key, false)) else this
 
-fun JSONObject.storeInt(@StringRes key: Int, sp: SP, resourceHelper: ResourceHelper): JSONObject {
-    if (has(resourceHelper.gs(key))) sp.putString(key, getInt(resourceHelper.gs(key)).toString())
+fun JSONObject.storeInt(@StringRes key: Int, sp: SP, rh: ResourceHelper): JSONObject {
+    if (has(rh.gs(key))) sp.putString(key, getInt(rh.gs(key)).toString())
     return this
 }
 
-fun JSONObject.storeLong(@StringRes key: Int, sp: SP, resourceHelper: ResourceHelper): JSONObject {
-    if (has(resourceHelper.gs(key))) sp.putString(key, getLong(resourceHelper.gs(key)).toString())
+fun JSONObject.storeLong(@StringRes key: Int, sp: SP, rh: ResourceHelper): JSONObject {
+    if (has(rh.gs(key))) sp.putString(key, getLong(rh.gs(key)).toString())
     return this
 }
 
-fun JSONObject.storeDouble(@StringRes key: Int, sp: SP, resourceHelper: ResourceHelper): JSONObject {
-    if (has(resourceHelper.gs(key))) sp.putString(key, getDouble(resourceHelper.gs(key)).toString())
+fun JSONObject.storeDouble(@StringRes key: Int, sp: SP, rh: ResourceHelper): JSONObject {
+    if (has(rh.gs(key))) sp.putString(key, getDouble(rh.gs(key)).toString())
     return this
 }
 
-fun JSONObject.storeString(@StringRes key: Int, sp: SP, resourceHelper: ResourceHelper): JSONObject {
-    if (has(resourceHelper.gs(key))) sp.putString(key, getString(resourceHelper.gs(key)).toString())
+fun JSONObject.storeString(@StringRes key: Int, sp: SP, rh: ResourceHelper): JSONObject {
+    if (has(rh.gs(key))) sp.putString(key, getString(rh.gs(key)).toString())
     return this
 }
 
-fun JSONObject.storeBoolean(@StringRes key: Int, sp: SP, resourceHelper: ResourceHelper): JSONObject {
-    if (has(resourceHelper.gs(key))) sp.putString(key, getBoolean(resourceHelper.gs(key)).toString())
+fun JSONObject.storeBoolean(@StringRes key: Int, sp: SP, rh: ResourceHelper): JSONObject {
+    if (has(rh.gs(key))) sp.putString(key, getBoolean(rh.gs(key)).toString())
     return this
 }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/OfflineEventExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/OfflineEventExtension.kt
index c18089c6c20..152a3fcb1d1 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/OfflineEventExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/OfflineEventExtension.kt
@@ -15,6 +15,7 @@ fun OfflineEvent.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
         .put("eventType", TherapyEvent.Type.APS_OFFLINE.text)
         .put("isValid", isValid)
         .put("duration", T.msecs(duration).mins())
+        .put("durationInMilliseconds", duration)
         .put("reason", reason.name)
         .also {
             if (interfaceIDs.pumpId != null) it.put("pumpId", interfaceIDs.pumpId)
@@ -39,6 +40,7 @@ fun OfflineEvent.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
 fun offlineEventFromJson(jsonObject: JSONObject): OfflineEvent? {
     val timestamp = JsonHelper.safeGetLongAllowNull(jsonObject, "mills", null) ?: return null
     val duration = JsonHelper.safeGetLong(jsonObject, "duration")
+    val durationInMilliseconds = JsonHelper.safeGetLongAllowNull(jsonObject, "durationInMilliseconds")
     val isValid = JsonHelper.safeGetBoolean(jsonObject, "isValid", true)
     val id = JsonHelper.safeGetStringAllowNull(jsonObject, "_id", null)
     val pumpId = JsonHelper.safeGetLongAllowNull(jsonObject, "pumpId", null)
@@ -50,7 +52,7 @@ fun offlineEventFromJson(jsonObject: JSONObject): OfflineEvent? {
 
     return OfflineEvent(
         timestamp = timestamp,
-        duration = T.mins(duration).msecs(),
+        duration = durationInMilliseconds ?: T.mins(duration).msecs(),
         isValid = isValid,
         reason = reason
     ).also {
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt
index fcb480a87c1..876a5443003 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt
@@ -97,8 +97,8 @@ fun profileSwitchFromJson(jsonObject: JSONObject, dateUtil: DateUtil, activePlug
  */
 fun pureProfileFromJson(jsonObject: JSONObject, dateUtil: DateUtil, defaultUnits: String? = null): PureProfile? {
     try {
-        JsonHelper.safeGetStringAllowNull(jsonObject, "units", defaultUnits) ?: return null
-        val units = GlucoseUnit.fromText(JsonHelper.safeGetString(jsonObject, "units", Constants.MGDL))
+        val txtUnits = JsonHelper.safeGetStringAllowNull(jsonObject, "units", defaultUnits) ?: return null
+        val units = GlucoseUnit.fromText(txtUnits)
         val dia = JsonHelper.safeGetDoubleAllowNull(jsonObject, "dia") ?: return null
         val timezone = TimeZone.getTimeZone(JsonHelper.safeGetString(jsonObject, "timezone", "UTC"))
 
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt
index 391fd5fed6a..1e2ba381a7a 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt
@@ -62,18 +62,19 @@ fun TemporaryBasal.toStringFull(profile: Profile, dateUtil: DateUtil): String {
     }
 }
 
-fun TemporaryBasal.toJson(isAdd: Boolean, profile: Profile, dateUtil: DateUtil, useAbsolute: Boolean): JSONObject =
+fun TemporaryBasal.toJson(isAdd: Boolean, profile: Profile, dateUtil: DateUtil): JSONObject =
     JSONObject()
         .put("created_at", dateUtil.toISOString(timestamp))
         .put("enteredBy", "openaps://" + "AndroidAPS")
         .put("eventType", TherapyEvent.Type.TEMPORARY_BASAL.text)
         .put("isValid", isValid)
         .put("duration", T.msecs(duration).mins())
+        .put("durationInMilliseconds", duration) // rounded duration leads to different basal IOB
         .put("rate", rate)
         .put("type", type.name)
+        .put("isAbsolute", isAbsolute)
+        .put("absolute", convertedToAbsolute(timestamp, profile))
         .also {
-            if (useAbsolute) it.put("absolute", convertedToAbsolute(timestamp, profile))
-            else it.put("percent", convertedToPercent(timestamp, profile) - 100)
             if (interfaceIDs.pumpId != null) it.put("pumpId", interfaceIDs.pumpId)
             if (interfaceIDs.endId != null) it.put("endId", interfaceIDs.endId)
             if (interfaceIDs.pumpType != null) it.put("pumpType", interfaceIDs.pumpType!!.name)
@@ -81,24 +82,15 @@ fun TemporaryBasal.toJson(isAdd: Boolean, profile: Profile, dateUtil: DateUtil,
             if (isAdd && interfaceIDs.nightscoutId != null) it.put("_id", interfaceIDs.nightscoutId)
         }
 
-/*
-        create fake object with nsID and isValid == false
- */
-fun temporaryBasalFromNsIdForInvalidating(nsId: String): TemporaryBasal =
-    temporaryBasalFromJson(
-        JSONObject()
-            .put("mills", 1)
-            .put("absolute", 1.0)
-            .put("duration", 1.0)
-            .put("_id", nsId)
-            .put("isValid", false)
-    )!!
-
+@Suppress("IfThenToElvis")
 fun temporaryBasalFromJson(jsonObject: JSONObject): TemporaryBasal? {
     val timestamp = JsonHelper.safeGetLongAllowNull(jsonObject, "mills", null) ?: return null
+    var rate = JsonHelper.safeGetDoubleAllowNull(jsonObject, "rate")
+    var isAbsolute = JsonHelper.safeGetBooleanAllowNull(jsonObject, "isAbsolute")
     val percent = JsonHelper.safeGetDoubleAllowNull(jsonObject, "percent")
     val absolute = JsonHelper.safeGetDoubleAllowNull(jsonObject, "absolute")
     val duration = JsonHelper.safeGetLongAllowNull(jsonObject, "duration") ?: return null
+    val durationInMilliseconds = JsonHelper.safeGetLongAllowNull(jsonObject, "durationInMilliseconds")
     val type = fromString(JsonHelper.safeGetString(jsonObject, "type"))
     val isValid = JsonHelper.safeGetBoolean(jsonObject, "isValid", true)
     val id = JsonHelper.safeGetStringAllowNull(jsonObject, "_id", null) ?: return null
@@ -107,16 +99,25 @@ fun temporaryBasalFromJson(jsonObject: JSONObject): TemporaryBasal? {
     val pumpType = InterfaceIDs.PumpType.fromString(JsonHelper.safeGetStringAllowNull(jsonObject, "pumpType", null))
     val pumpSerial = JsonHelper.safeGetStringAllowNull(jsonObject, "pumpSerial", null)
 
-    val rate = if (percent != null) percent + 100 else absolute ?: return null
+    if (rate == null) {
+        if (absolute != null)  {
+            rate = absolute
+            isAbsolute = true
+        } else if (percent != null) {
+            rate = percent + 100
+            isAbsolute = false
+        } else return null
+    }
+    if (isAbsolute == null) return null
     if (duration == 0L) return null
     if (timestamp == 0L) return null
 
     return TemporaryBasal(
         timestamp = timestamp,
         rate = rate,
-        duration = T.mins(duration).msecs(),
+        duration = durationInMilliseconds ?: T.mins(duration).msecs(),
         type = type,
-        isAbsolute = percent == null,
+        isAbsolute = isAbsolute,
         isValid = isValid
     ).also {
         it.interfaceIDs.nightscoutId = id
@@ -133,14 +134,14 @@ fun TemporaryBasal.toStringShort(): String =
 
 fun TemporaryBasal.iobCalc(time: Long, profile: Profile, insulinInterface: Insulin): IobTotal {
     val result = IobTotal(time)
-    val realDuration: Int = getPassedDurationToTimeInMinutes(time)
+    val realDuration = getPassedDurationToTimeInMinutes(time)
     var netBasalAmount = 0.0
     if (realDuration > 0) {
         var netBasalRate: Double
         val dia = profile.dia
         val diaAgo = time - dia * 60 * 60 * 1000
         val aboutFiveMinIntervals = ceil(realDuration / 5.0).toInt()
-        val tempBolusSpacing = (realDuration / aboutFiveMinIntervals).toDouble()
+        val tempBolusSpacing = realDuration / aboutFiveMinIntervals.toDouble()
         for (j in 0L until aboutFiveMinIntervals) {
             // find middle of the interval
             val calcDate = (timestamp + j * tempBolusSpacing * 60 * 1000 + 0.5 * tempBolusSpacing * 60 * 1000).toLong()
@@ -174,7 +175,7 @@ fun TemporaryBasal.iobCalc(time: Long, profile: Profile, insulinInterface: Insul
 
 fun TemporaryBasal.iobCalc(time: Long, profile: Profile, lastAutosensResult: AutosensResult, exercise_mode: Boolean, half_basal_exercise_target: Int, isTempTarget: Boolean, insulinInterface: Insulin): IobTotal {
     val result = IobTotal(time)
-    val realDuration: Double = getPassedDurationToTimeInMinutes(time).toDouble()
+    val realDuration = getPassedDurationToTimeInMinutes(time)
     var netBasalAmount = 0.0
     var sensitivityRatio = lastAutosensResult.ratio
     val normalTarget = 100.0
@@ -189,7 +190,7 @@ fun TemporaryBasal.iobCalc(time: Long, profile: Profile, lastAutosensResult: Aut
         val dia = profile.dia
         val diaAgo = time - dia * 60 * 60 * 1000
         val aboutFiveMinIntervals = ceil(realDuration / 5.0).toInt()
-        val tempBolusSpacing = realDuration / aboutFiveMinIntervals
+        val tempBolusSpacing = realDuration / aboutFiveMinIntervals.toDouble()
         for (j in 0L until aboutFiveMinIntervals) {
             // find middle of the interval
             val calcDate = (timestamp + j * tempBolusSpacing * 60 * 1000 + 0.5 * tempBolusSpacing * 60 * 1000).toLong()
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt
index 9c45de88ade..37b00f7c077 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt
@@ -28,10 +28,10 @@ fun TemporaryTarget.highValueToUnitsToString(units: GlucoseUnit): String =
 fun TemporaryTarget.target(): Double =
     (this.lowTarget + this.highTarget) / 2
 
-fun TemporaryTarget.friendlyDescription(units: GlucoseUnit, resourceHelper: ResourceHelper): String =
+fun TemporaryTarget.friendlyDescription(units: GlucoseUnit, rh: ResourceHelper): String =
     Profile.toTargetRangeString(lowTarget, highTarget, GlucoseUnit.MGDL, units) +
         units.asText +
-        "@" + resourceHelper.gs(R.string.format_mins, TimeUnit.MILLISECONDS.toMinutes(duration)) + "(" + reason.text + ")"
+        "@" + rh.gs(R.string.format_mins, TimeUnit.MILLISECONDS.toMinutes(duration)) + "(" + reason.text + ")"
 
 /*
         create fake object with nsID and isValid == false
@@ -50,6 +50,7 @@ fun temporaryTargetFromJson(jsonObject: JSONObject): TemporaryTarget? {
     val units = GlucoseUnit.fromText(JsonHelper.safeGetString(jsonObject, "units", Constants.MGDL))
     val timestamp = JsonHelper.safeGetLongAllowNull(jsonObject, "mills", null) ?: return null
     val duration = JsonHelper.safeGetLongAllowNull(jsonObject, "duration", null) ?: return null
+    val durationInMilliseconds = JsonHelper.safeGetLongAllowNull(jsonObject, "durationInMilliseconds")
     var low = JsonHelper.safeGetDouble(jsonObject, "targetBottom")
     low = Profile.toMgdl(low, units)
     var high = JsonHelper.safeGetDouble(jsonObject, "targetTop")
@@ -81,7 +82,7 @@ fun temporaryTargetFromJson(jsonObject: JSONObject): TemporaryTarget? {
     }
     val tt = TemporaryTarget(
         timestamp = timestamp,
-        duration = TimeUnit.MINUTES.toMillis(duration),
+        duration = durationInMilliseconds ?: T.mins(duration).msecs(),
         reason = reason,
         lowTarget = low,
         highTarget = high,
@@ -95,6 +96,7 @@ fun TemporaryTarget.toJson(isAdd: Boolean, units: GlucoseUnit, dateUtil: DateUti
     JSONObject()
         .put("eventType", TherapyEvent.Type.TEMPORARY_TARGET.text)
         .put("duration", T.msecs(duration).mins())
+        .put("durationInMilliseconds", duration)
         .put("isValid", isValid)
         .put("created_at", dateUtil.toISOString(timestamp))
         .put("enteredBy", "AndroidAPS").also {
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
index f02488f617f..c18ef9a31f2 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
@@ -12,13 +12,13 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import java.util.concurrent.TimeUnit
 
-fun TherapyEvent.age(useShortText: Boolean, resourceHelper: ResourceHelper, dateUtil: DateUtil): String {
+fun TherapyEvent.age(useShortText: Boolean, rh: ResourceHelper, dateUtil: DateUtil): String {
     val diff = dateUtil.computeDiff(timestamp, System.currentTimeMillis())
-    var days = " " + resourceHelper.gs(R.string.days) + " "
-    var hours = " " + resourceHelper.gs(R.string.hours) + " "
+    var days = " " + rh.gs(R.string.days) + " "
+    var hours = " " + rh.gs(R.string.hours) + " "
     if (useShortText) {
-        days = resourceHelper.gs(R.string.shortday)
-        hours = resourceHelper.gs(R.string.shorthour)
+        days = rh.gs(R.string.shortday)
+        hours = rh.gs(R.string.shorthour)
     }
     return diff[TimeUnit.DAYS].toString() + days + diff[TimeUnit.HOURS] + hours
 }
@@ -73,6 +73,7 @@ fun therapyEventFromJson(jsonObject: JSONObject): TherapyEvent? {
     val timestamp = JsonHelper.safeGetLongAllowNull(jsonObject, "mills", null) ?: return null
     val type = TherapyEvent.Type.fromString(JsonHelper.safeGetString(jsonObject, "eventType", TherapyEvent.Type.NONE.text))
     val duration = JsonHelper.safeGetLong(jsonObject, "duration")
+    val durationInMilliseconds = JsonHelper.safeGetLongAllowNull(jsonObject, "durationInMilliseconds")
     val glucose = JsonHelper.safeGetDoubleAllowNull(jsonObject, "glucose")
     val glucoseType = TherapyEvent.MeterType.fromString(JsonHelper.safeGetString(jsonObject, "glucoseType"))
     val enteredBy = JsonHelper.safeGetStringAllowNull(jsonObject, "enteredBy", null)
@@ -84,7 +85,7 @@ fun therapyEventFromJson(jsonObject: JSONObject): TherapyEvent? {
 
     val te = TherapyEvent(
         timestamp = timestamp,
-        duration = TimeUnit.MINUTES.toMillis(duration),
+        duration = durationInMilliseconds ?: T.mins(duration).msecs(),
         glucoseUnit = glucoseUnit,
         type = type,
         glucose = glucose,
@@ -106,6 +107,7 @@ fun TherapyEvent.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
         .put("units", if (glucoseUnit == TherapyEvent.GlucoseUnit.MGDL) Constants.MGDL else Constants.MMOL)
         .also {
             if (duration != 0L) it.put("duration", T.msecs(duration).mins())
+            if (duration != 0L) it.put("durationInMilliseconds", duration)
             if (note != null) it.put("notes", note)
             if (glucose != null) it.put("glucose", glucose)
             if (glucoseType != null) it.put("glucoseType", glucoseType!!.text)
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TotalDailyDoseExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/TotalDailyDoseExtension.kt
index eab8085a8ce..31f228125f3 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/TotalDailyDoseExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/TotalDailyDoseExtension.kt
@@ -4,7 +4,6 @@ import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.database.entities.TotalDailyDose
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
-import java.util.*
 
 val TotalDailyDose.total
     get() = if (totalAmount > 0) totalAmount else basalAmount + bolusAmount
@@ -12,10 +11,12 @@ val TotalDailyDose.total
 val TotalDailyDose.basalPct: Double
     get() = if (total > 0) basalAmount / total * 100 else 0.0
 
-fun TotalDailyDose.toText(resourceHelper: ResourceHelper, dateUtil: DateUtil, includeCarbs: Boolean): String =
-    if (includeCarbs) resourceHelper.gs(R.string.tddwithcarbsformat, dateUtil.dateStringShort(timestamp), total, bolusAmount, basalAmount, basalPct, carbs)
-    else resourceHelper.gs(R.string.tddformat, dateUtil.dateStringShort(timestamp), total, bolusAmount, basalAmount, basalPct)
+fun TotalDailyDose.toText(rh: ResourceHelper, dateUtil: DateUtil, includeCarbs: Boolean): String =
+    if (total.isNaN() || bolusAmount.isNaN() || basalAmount.isNaN() || carbs.isNaN()) ""
+    else if (includeCarbs) rh.gs(R.string.tddwithcarbsformat, dateUtil.dateStringShort(timestamp), total, bolusAmount, basalAmount, basalPct, carbs)
+    else rh.gs(R.string.tddformat, dateUtil.dateStringShort(timestamp), total, bolusAmount, basalAmount, basalPct)
 
-fun TotalDailyDose.toText(resourceHelper: ResourceHelper, days: Int, includeCarbs: Boolean): String =
-    if (includeCarbs) resourceHelper.gs(R.string.tddwithcarbsformat, String.format(Locale.getDefault(), "%d ", days) + resourceHelper.gs(R.string.days), total, bolusAmount, basalAmount, basalAmount / total * 100, carbs)
-    else resourceHelper.gs(R.string.tddformat, String.format(Locale.getDefault(), "%d ", days) + resourceHelper.gs(R.string.days), total, bolusAmount, basalAmount, basalAmount / total * 100)
+fun TotalDailyDose.toText(rh: ResourceHelper, days: Int, includeCarbs: Boolean): String =
+    if (total.isNaN() || bolusAmount.isNaN() || basalAmount.isNaN() || carbs.isNaN()) ""
+    else if (includeCarbs) rh.gs(R.string.tddwithcarbsformat, days.toString() + rh.gs(R.string.days), total, bolusAmount, basalAmount, basalAmount / total * 100, carbs)
+    else rh.gs(R.string.tddformat, days.toString() + rh.gs(R.string.days), total, bolusAmount, basalAmount, basalAmount / total * 100)
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueue.kt
similarity index 98%
rename from core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
rename to core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueue.kt
index 31fb77e6b12..7218b06df2b 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueue.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.queue.commands.CustomCommand
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.commands.Command
 
-interface CommandQueueProvider {
+interface CommandQueue {
 
     fun isRunning(type: Command.CommandType): Boolean
     fun pickup()
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt
index 168a51c97e8..7e6c49a8d09 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt
@@ -20,6 +20,8 @@ interface DataSyncSelector {
     data class PairOfflineEvent(val value: OfflineEvent, val updateRecordId: Long)
     data class PairProfileStore(val value: JSONObject, val timestampSync: Long)
 
+    fun queueSize(): Long
+
     fun doUpload()
 
     fun resetToNextFullSync()
@@ -47,7 +49,7 @@ interface DataSyncSelector {
     fun confirmLastGlucoseValueIdIfGreater(lastSynced: Long)
     fun changedGlucoseValues() : List<GlucoseValue>
     // Until NS v3
-    fun processChangedGlucoseValuesCompat(): Boolean
+    fun processChangedGlucoseValuesCompat()
 
     fun confirmLastTherapyEventIdIfGreater(lastSynced: Long)
     fun changedTherapyEvents() : List<TherapyEvent>
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ImportExportPrefs.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ImportExportPrefs.kt
index 81782fbb88d..95dbb3467f9 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/ImportExportPrefs.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ImportExportPrefs.kt
@@ -14,5 +14,5 @@ interface ImportExportPrefs {
     fun prefsFileExists(): Boolean
     fun verifyStoragePermissions(fragment: Fragment, onGranted: Runnable)
     fun exportSharedPreferences(f: Fragment)
-    fun exportUserEntriesCsv(activity: FragmentActivity, singleEntries: Single<List<UserEntry>>)
+    fun exportUserEntriesCsv(activity: FragmentActivity)
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt
index 9e3a9d428a7..7c75e0ebc89 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt
@@ -64,6 +64,17 @@ interface IobCobCalculator {
      */
     fun getTempBasalIncludingConvertedExtended(timestamp: Long): TemporaryBasal?
 
+    /**
+     * Get running temporary basals for given time range, sliced by calculationStep.
+     * For each step between given range it calculates equivalent of getTempBasalIncludingConvertedExtended
+     *
+     *  @param startTime start of calculated period, timestamp
+     *  @param endTime end of calculated period, timestamp
+     *  @param calculationStep calculation step, in millisecond
+     *  @return map where for each step, its timestamp is a key and calculated optional temporary basal is a value
+     */
+    fun getTempBasalIncludingConvertedExtendedForRange(startTime: Long, endTime: Long, calculationStep: Long): Map<Long, TemporaryBasal?>
+
     /**
      * Get running extended bolus at time
      *
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Overview.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Overview.kt
index 1639ec79aa8..729a855ae82 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/Overview.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Overview.kt
@@ -1,9 +1,9 @@
 package info.nightscout.androidaps.interfaces
 
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 
 interface Overview : ConfigExportImport {
 
     fun refreshLoop(from: String)
-    val overviewBus: RxBusWrapper
+    val overviewBus: RxBus
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
index 9e47f946395..a5972f31a74 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 abstract class PluginBase(
     val pluginDescription: PluginDescription,
     val aapsLogger: AAPSLogger,
-    val resourceHelper: ResourceHelper,
+    val rh: ResourceHelper,
     val injector: HasAndroidInjector
 ) {
 
@@ -30,20 +30,20 @@ abstract class PluginBase(
         get() = pluginDescription.pluginIcon2
 
     open val name: String
-        get() = if (pluginDescription.pluginName == -1) "UNKNOWN" else resourceHelper.gs(pluginDescription.pluginName)
+        get() = if (pluginDescription.pluginName == -1) "UNKNOWN" else rh.gs(pluginDescription.pluginName)
 
     //only if translation exists
     // use long name as fallback
     val nameShort: String
         get() {
             if (pluginDescription.shortName == -1) return name
-            val translatedName = resourceHelper.gs(pluginDescription.shortName)
+            val translatedName = rh.gs(pluginDescription.shortName)
             return if (translatedName.trim { it <= ' ' }.isNotEmpty()) translatedName else name
             // use long name as fallback
         }
 
     val description: String?
-        get() = if (pluginDescription.description == -1) null else resourceHelper.gs(pluginDescription.description)
+        get() = if (pluginDescription.description == -1) null else rh.gs(pluginDescription.description)
 
     fun getType(): PluginType = pluginDescription.mainType
 
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt
index 2cd9ac88f5c..7c808c3bbc1 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.interfaces
 
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.data.PureProfile
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter.to0Decimal
 import info.nightscout.androidaps.utils.DecimalFormatter.to1Decimal
@@ -16,7 +16,7 @@ interface Profile {
 
     class ValidityCheck(var isValid: Boolean = true, val reasons: ArrayList<String> = arrayListOf())
 
-    fun isValid(from: String, pump: Pump, config: Config, resourceHelper: ResourceHelper, rxBus: RxBusWrapper, hardLimits: HardLimits): ValidityCheck
+    fun isValid(from: String, pump: Pump, config: Config, rh: ResourceHelper, rxBus: RxBus, hardLimits: HardLimits, sendNotifications: Boolean): ValidityCheck
 
     /**
      * Units used for ISF & target
@@ -101,10 +101,10 @@ interface Profile {
      */
     fun getTargetHighMgdlTimeFromMidnight(timeAsSeconds: Int): Double
 
-    fun getIcList(resourceHelper: ResourceHelper, dateUtil: DateUtil): String
-    fun getIsfList(resourceHelper: ResourceHelper, dateUtil: DateUtil): String
-    fun getBasalList(resourceHelper: ResourceHelper, dateUtil: DateUtil): String
-    fun getTargetList(resourceHelper: ResourceHelper, dateUtil: DateUtil): String
+    fun getIcList(rh: ResourceHelper, dateUtil: DateUtil): String
+    fun getIsfList(rh: ResourceHelper, dateUtil: DateUtil): String
+    fun getBasalList(rh: ResourceHelper, dateUtil: DateUtil): String
+    fun getTargetList(rh: ResourceHelper, dateUtil: DateUtil): String
 
     fun convertToNonCustomizedProfile(dateUtil: DateUtil): PureProfile
     fun toPureNsJson(dateUtil: DateUtil): JSONObject
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt
index 03b2f035906..73d20102b42 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt
@@ -55,8 +55,9 @@ interface ProfileFunction {
      * @param percentage        100 = no modification
      * @param timeShiftInHours  0 = no modification
      * @param timestamp         expected time
+     * @return null if profile cannot be created from profile store
      */
-    fun buildProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long): ProfileSwitch
+    fun buildProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes:Int, percentage: Int, timeShiftInHours: Int, timestamp: Long): ProfileSwitch?
 
     /**
      * Create a new circadian profile switch request based on provided profile
@@ -67,8 +68,9 @@ interface ProfileFunction {
      * @param percentage        100 = no modification
      * @param timeShiftInHours  0 = no modification
      * @param timestamp         expected time
+     * @return true if profile was created from store
      */
-    fun createProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long)
+    fun createProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long): Boolean
 
     /**
      * Create a new circadian profile switch request based on currently selected profile interface and default profile
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
index 58841286063..c3a9e7e8df4 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
@@ -22,6 +22,8 @@ class ProfileStore(val injector: HasAndroidInjector, val data: JSONObject, val d
 
     private val cachedObjects = ArrayMap<String, PureProfile>()
 
+    private fun storeUnits() : String? = JsonHelper.safeGetStringAllowNull(data, "units", null)
+
     private fun getStore(): JSONObject? {
         try {
             if (data.has("store")) return data.getJSONObject("store")
@@ -61,14 +63,14 @@ class ProfileStore(val injector: HasAndroidInjector, val data: JSONObject, val d
 
     fun getSpecificProfile(profileName: String): PureProfile? {
         var profile: PureProfile? = null
-        val defaultUnits = JsonHelper.safeGetStringAllowNull(data, "units", null)
+        val units = JsonHelper.safeGetStringAllowNull(data, "units", storeUnits())
         getStore()?.let { store ->
             if (store.has(profileName)) {
                 profile = cachedObjects[profileName]
                 if (profile == null) {
                     JsonHelper.safeGetJSONObject(store, profileName, null)?.let { profileObject ->
-                        profile = pureProfileFromJson(profileObject, dateUtil, defaultUnits)
-                        cachedObjects[profileName] = profile
+                        profile = pureProfileFromJson(profileObject, dateUtil, units)
+                        profile?.let { cachedObjects[profileName] = profile }
                     }
                 }
             }
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt
index 969c85163c7..c044aee4cb2 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt
@@ -254,7 +254,7 @@ interface Pump {
 
     /**
      * Executes a custom queued command
-     * See [CommandQueueProvider.customCommand] for queuing a custom command.
+     * See [CommandQueue.customCommand] for queuing a custom command.
      *
      * @param customCommand the custom command to be executed
      * @return PumpEnactResult that represents the command execution result
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt
index 2def7e2affd..0c324bc0fe8 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt
@@ -9,9 +9,9 @@ abstract class PumpPluginBase(
     pluginDescription: PluginDescription,
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
-    val commandQueue: CommandQueueProvider
-) : PluginBase(pluginDescription, aapsLogger, resourceHelper, injector) {
+    rh: ResourceHelper,
+    val commandQueue: CommandQueue
+) : PluginBase(pluginDescription, aapsLogger, rh, injector) {
 
     override fun onStart() {
         super.onStart()
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt
index cc14666daca..f7a6acb102b 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt
@@ -27,8 +27,13 @@ interface PumpSync {
      *
      *  Call this function when new pump is paired to accept data from new pump
      *  to prevent overlapping pump histories
+     * @param endRunning    if true end previous running TBR and EB
      */
-    fun connectNewPump()
+
+    // @JvmOverloads and default value impossible on interface
+    // replace by `fun connectNewPump(endRunning: Boolean = true)` after full conversion to kotlin
+    fun connectNewPump(endRunning: Boolean)
+    fun connectNewPump() = connectNewPump(true)
 
     /*
      *   GENERAL STATUS
@@ -55,8 +60,29 @@ interface PumpSync {
      */
     data class PumpState(val temporaryBasal: TemporaryBasal?, val extendedBolus: ExtendedBolus?, val bolus: Bolus?, val profile: Profile?) {
 
-        data class TemporaryBasal(val timestamp: Long, val duration: Long, val rate: Double, val isAbsolute: Boolean, val type: TemporaryBasalType, val id: Long, val pumpId: Long?)
-        data class ExtendedBolus(val timestamp: Long, val duration: Long, val amount: Double, val rate: Double)
+        data class TemporaryBasal @JvmOverloads constructor(
+            val timestamp: Long,
+            val duration: Long,
+            val rate: Double,
+            val isAbsolute: Boolean,
+            val type: TemporaryBasalType,
+            val id: Long,
+            val pumpId: Long?,
+            // used only to cancel TBR on pump change
+            val pumpType: PumpType = PumpType.USER,
+            val pumpSerial: String = ""
+        )
+
+        data class ExtendedBolus @JvmOverloads constructor(
+            val timestamp: Long,
+            val duration: Long,
+            val amount: Double,
+            val rate: Double,
+            // used only to cancel EB on pump change
+            val pumpType: PumpType = PumpType.USER,
+            val pumpSerial: String = ""
+        )
+
         data class Bolus(val timestamp: Long, val amount: Double)
     }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt
index 6c7633e6930..5c5aaed3931 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt
@@ -39,7 +39,7 @@ open class APSResult @Inject constructor(val injector: HasAndroidInjector) {
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var iobCobCalculator: IobCobCalculator
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var dateUtil: DateUtil
 
     var date: Long = 0
@@ -97,56 +97,56 @@ open class APSResult @Inject constructor(val injector: HasAndroidInjector) {
     }
 
     val carbsRequiredText: String
-        get() = String.format(resourceHelper.gs(R.string.carbsreq), carbsReq, carbsReqWithin)
+        get() = String.format(rh.gs(R.string.carbsreq), carbsReq, carbsReqWithin)
 
     override fun toString(): String {
         val pump = activePlugin.activePump
         if (isChangeRequested) {
             // rate
-            var ret: String = if (rate == 0.0 && duration == 0) "${resourceHelper.gs(R.string.canceltemp)} "
-            else if (rate == -1.0) "${resourceHelper.gs(R.string.let_temp_basal_run)}\n"
-            else if (usePercent) "${resourceHelper.gs(R.string.rate)}: ${DecimalFormatter.to2Decimal(percent.toDouble())}% (${DecimalFormatter.to2Decimal(percent * pump.baseBasalRate / 100.0)} U/h) " +
-                "${resourceHelper.gs(R.string.duration)}: ${DecimalFormatter.to2Decimal(duration.toDouble())} min "
-            else "${resourceHelper.gs(R.string.rate)}: ${DecimalFormatter.to2Decimal(rate)} U/h (${DecimalFormatter.to2Decimal(rate / pump.baseBasalRate * 100)}%) " +
-                "${resourceHelper.gs(R.string.duration)}: ${DecimalFormatter.to2Decimal(duration.toDouble())} min "
+            var ret: String = if (rate == 0.0 && duration == 0) "${rh.gs(R.string.canceltemp)} "
+            else if (rate == -1.0) "${rh.gs(R.string.let_temp_basal_run)}\n"
+            else if (usePercent) "${rh.gs(R.string.rate)}: ${DecimalFormatter.to2Decimal(percent.toDouble())}% (${DecimalFormatter.to2Decimal(percent * pump.baseBasalRate / 100.0)} U/h) " +
+                "${rh.gs(R.string.duration)}: ${DecimalFormatter.to2Decimal(duration.toDouble())} min "
+            else "${rh.gs(R.string.rate)}: ${DecimalFormatter.to2Decimal(rate)} U/h (${DecimalFormatter.to2Decimal(rate / pump.baseBasalRate * 100)}%) " +
+                "${rh.gs(R.string.duration)}: ${DecimalFormatter.to2Decimal(duration.toDouble())} min "
             // smb
-            if (smb != 0.0) ret += "SMB: ${DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.activePump, resourceHelper)} "
+            if (smb != 0.0) ret += "SMB: ${DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.activePump, rh)} "
             if (isCarbsRequired) {
                 ret += "$carbsRequiredText "
             }
 
             // reason
-            ret += resourceHelper.gs(R.string.reason) + ": " + reason
+            ret += rh.gs(R.string.reason) + ": " + reason
             return ret
         }
         return if (isCarbsRequired) {
             carbsRequiredText
-        } else resourceHelper.gs(R.string.nochangerequested)
+        } else rh.gs(R.string.nochangerequested)
     }
 
     fun toSpanned(): Spanned {
         val pump = activePlugin.activePump
         if (isChangeRequested) {
             // rate
-            var ret: String = if (rate == 0.0 && duration == 0) resourceHelper.gs(R.string.canceltemp) + "<br>" else if (rate == -1.0) resourceHelper.gs(R.string.let_temp_basal_run) + "<br>" else if (usePercent) "<b>" + resourceHelper.gs(R.string.rate) + "</b>: " + DecimalFormatter.to2Decimal(percent.toDouble()) + "% " +
+            var ret: String = if (rate == 0.0 && duration == 0) rh.gs(R.string.canceltemp) + "<br>" else if (rate == -1.0) rh.gs(R.string.let_temp_basal_run) + "<br>" else if (usePercent) "<b>" + rh.gs(R.string.rate) + "</b>: " + DecimalFormatter.to2Decimal(percent.toDouble()) + "% " +
                 "(" + DecimalFormatter.to2Decimal(percent * pump.baseBasalRate / 100.0) + " U/h)<br>" +
-                "<b>" + resourceHelper.gs(R.string.duration) + "</b>: " + DecimalFormatter.to2Decimal(duration.toDouble()) + " min<br>" else "<b>" + resourceHelper.gs(R.string.rate) + "</b>: " + DecimalFormatter.to2Decimal(rate) + " U/h " +
+                "<b>" + rh.gs(R.string.duration) + "</b>: " + DecimalFormatter.to2Decimal(duration.toDouble()) + " min<br>" else "<b>" + rh.gs(R.string.rate) + "</b>: " + DecimalFormatter.to2Decimal(rate) + " U/h " +
                 "(" + DecimalFormatter.to2Decimal(rate / pump.baseBasalRate * 100.0) + "%) <br>" +
-                "<b>" + resourceHelper.gs(R.string.duration) + "</b>: " + DecimalFormatter.to2Decimal(duration.toDouble()) + " min<br>"
+                "<b>" + rh.gs(R.string.duration) + "</b>: " + DecimalFormatter.to2Decimal(duration.toDouble()) + " min<br>"
 
             // smb
-            if (smb != 0.0) ret += "<b>" + "SMB" + "</b>: " + DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.activePump, resourceHelper) + "<br>"
+            if (smb != 0.0) ret += "<b>" + "SMB" + "</b>: " + DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.activePump, rh) + "<br>"
             if (isCarbsRequired) {
                 ret += "$carbsRequiredText<br>"
             }
 
             // reason
-            ret += "<b>" + resourceHelper.gs(R.string.reason) + "</b>: " + reason.replace("<", "&lt;").replace(">", "&gt;")
+            ret += "<b>" + rh.gs(R.string.reason) + "</b>: " + reason.replace("<", "&lt;").replace(">", "&gt;")
             return fromHtml(ret)
         }
         return if (isCarbsRequired) {
             fromHtml(carbsRequiredText)
-        } else fromHtml(resourceHelper.gs(R.string.nochangerequested))
+        } else fromHtml(rh.gs(R.string.nochangerequested))
     }
 
     open fun newAndClone(injector: HasAndroidInjector): APSResult {
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt b/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt
similarity index 75%
rename from core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt
index d844d69c858..33fb1f1dcb5 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt
@@ -2,6 +2,8 @@ package info.nightscout.androidaps.plugins.bus
 
 import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
@@ -10,13 +12,15 @@ import javax.inject.Singleton
 
 @OpenForTesting
 @Singleton
-class RxBusWrapper @Inject constructor(
-    val aapsSchedulers: AapsSchedulers
+class RxBus @Inject constructor(
+    val aapsSchedulers: AapsSchedulers,
+    val aapsLogger: AAPSLogger
 ) {
 
     private val publisher = PublishSubject.create<Event>()
 
     fun send(event: Event) {
+        aapsLogger.debug(LTag.EVENTS, "Sending $event")
         publisher.onNext(event)
     }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt
index 3b47c4670a5..0aa41d107ee 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt
@@ -63,7 +63,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constraint = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constraint.isLoopInvocationAllowed(value)
         }
         return value
@@ -73,7 +73,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constraint = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constraint.isClosedLoopAllowed(value)
         }
         return value
@@ -83,7 +83,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constraint = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constraint.isLgsAllowed(value)
         }
         return value
@@ -93,7 +93,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constraint = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constraint.isAutosensModeEnabled(value)
         }
         return value
@@ -103,7 +103,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constraint = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constraint.isSMBModeEnabled(value)
         }
         return value
@@ -113,7 +113,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constraint = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constraint.isUAMEnabled(value)
         }
         return value
@@ -123,7 +123,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constraint = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constraint.isAdvancedFilteringEnabled(value)
         }
         return value
@@ -133,7 +133,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constraint = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constraint.isSuperBolusEnabled(value)
         }
         return value
@@ -143,7 +143,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constraint = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constraint.applyBasalConstraints(absoluteRate, profile)
         }
         return absoluteRate
@@ -153,7 +153,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constrain = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constrain.applyBasalPercentConstraints(percentRate, profile)
         }
         return percentRate
@@ -163,7 +163,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constrain = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constrain.applyBolusConstraints(insulin)
         }
         return insulin
@@ -173,7 +173,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constrain = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constrain.applyExtendedBolusConstraints(insulin)
         }
         return insulin
@@ -183,7 +183,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constrain = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constrain.applyCarbsConstraints(carbs)
         }
         return carbs
@@ -193,7 +193,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constrain = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constrain.applyMaxIOBConstraints(maxIob)
         }
         return maxIob
@@ -203,7 +203,7 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
             val constraint = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
+            if (!p.isEnabled()) continue
             constraint.isAutomationEnabled(value)
         }
         return value
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt
index 709ed1b71eb..5ce9eb1fdae 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt
@@ -1,15 +1,16 @@
 package info.nightscout.androidaps.plugins.configBuilder
 
 import info.nightscout.androidaps.core.R
-import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.ConfigBuilder
-import info.nightscout.androidaps.interfaces.Insulin
-import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.Sensitivity
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientNewLog
+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.defs.PumpType
 import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONException
 import org.json.JSONObject
@@ -21,20 +22,26 @@ class RunningConfiguration @Inject constructor(
     private val activePlugin: ActivePlugin,
     private val configBuilder: ConfigBuilder,
     private val sp: SP,
-    private val aapsLogger: AAPSLogger
+    private val aapsLogger: AAPSLogger,
+    private val config: Config,
+    private val rh: ResourceHelper,
+    private val rxBus: RxBus,
+    private val pumpSync: PumpSync
 ) {
 
     private var counter = 0
-    private val every = 20 // Send only every 20 device status to save traffic
+    private val every = 12 // Send only every 12 device status to save traffic
 
     // called in AAPS mode only
     fun configuration(): JSONObject {
         val json = JSONObject()
+        val pumpInterface = activePlugin.activePump
+
+        if (!pumpInterface.isInitialized()) return json
         if (counter++ % every == 0)
             try {
                 val insulinInterface = activePlugin.activeInsulin
                 val sensitivityInterface = activePlugin.activeSensitivity
-                val pumpInterface = activePlugin.activePump
                 val overviewInterface = activePlugin.activeOverview
                 val safetyInterface = activePlugin.activeSafety
 
@@ -45,6 +52,7 @@ class RunningConfiguration @Inject constructor(
                 json.put("overviewConfiguration", overviewInterface.configuration())
                 json.put("safetyConfiguration", safetyInterface.configuration())
                 json.put("pump", pumpInterface.model().description)
+                json.put("version", config.VERSION_NAME)
             } catch (e: JSONException) {
                 aapsLogger.error("Unhandled exception", e)
             }
@@ -53,6 +61,14 @@ class RunningConfiguration @Inject constructor(
 
     // called in NSClient mode only
     fun apply(configuration: JSONObject) {
+        assert(config.NSCLIENT)
+
+        if (configuration.has("version")) {
+            rxBus.send(EventNSClientNewLog("VERSION", "Received AndroidAPS version  ${configuration.getString("version")}"))
+            if (config.VERSION_NAME.startsWith(configuration.getString("version")).not()) {
+                rxBus.send(EventNewNotification(Notification(Notification.NSCLIENT_VERSION_DOES_NOT_MATCH, rh.gs(R.string.nsclient_version_does_not_match), Notification.NORMAL)))
+            }
+        }
         if (configuration.has("insulin")) {
             val insulin = Insulin.InsulinType.fromInt(JsonHelper.safeGetInt(configuration, "insulin", Insulin.InsulinType.UNKNOWN.value))
             for (p in activePlugin.getSpecificPluginsListByInterface(Insulin::class.java)) {
@@ -83,9 +99,12 @@ class RunningConfiguration @Inject constructor(
 
         if (configuration.has("pump")) {
             val pumpType = JsonHelper.safeGetString(configuration, "pump", PumpType.GENERIC_AAPS.description)
-            sp.putString(R.string.key_virtualpump_type, pumpType)
-            activePlugin.activePump.pumpDescription.fillFor(PumpType.getByDescription(pumpType))
-            aapsLogger.debug(LTag.CORE, "Changing pump type to $pumpType")
+            if (sp.getString(R.string.key_virtualpump_type, "fake") != pumpType) {
+                sp.putString(R.string.key_virtualpump_type, pumpType)
+                activePlugin.activePump.pumpDescription.fillFor(PumpType.getByDescription(pumpType))
+                pumpSync.connectNewPump(endRunning = false) // do not end running TBRs, we call this only to accept data properly
+                aapsLogger.debug(LTag.CORE, "Changing pump type to $pumpType")
+            }
         }
 
         if (configuration.has("overviewConfiguration"))
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/AllowedVersions.kt b/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/AllowedVersions.kt
index ae320cf9297..6d6c1e945a3 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/AllowedVersions.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/AllowedVersions.kt
@@ -1,13 +1,16 @@
 package info.nightscout.androidaps.plugins.constraints.versionChecker
 
+import org.joda.time.LocalDate
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
+import java.lang.Exception
 
 class AllowedVersions {
 
     fun generateSupportedVersions(): String =
         JSONArray()
+            // Android API versions
             .put(JSONObject().apply {
                 put("minAndroid", 1) // 1.0
                 put("maxAndroid", 23) // 6.0.1
@@ -27,6 +30,15 @@ class AllowedVersions {
                 put("maxAndroid", 99)
                 put("supported", "2.8.2")
             })
+            // Version time limitation
+            .put(JSONObject().apply {
+                put("endDate", "2021-11-07")
+                put("version", "2.9.0-beta1")
+            })
+            .put(JSONObject().apply {
+                put("endDate", "2021-11-07")
+                put("version", "3.0-beta1")
+            })
             .toString()
 
     fun findByApi(definition: String?, api: Int): JSONObject? {
@@ -35,11 +47,34 @@ class AllowedVersions {
             val array = JSONArray(definition)
             for (i in 0 until array.length()) {
                 val record = array[i] as JSONObject
-                if (api in record.getInt("minAndroid")..record.getInt("maxAndroid")) return record
+                if (record.has("minAndroid") && record.has("maxAndroid"))
+                    if (api in record.getInt("minAndroid")..record.getInt("maxAndroid")) return record
             }
         } catch (e: JSONException) {
         }
         return null
     }
 
+    fun findByVersion(definition: String?, version: String): JSONObject? {
+        if (definition == null) return null
+        try {
+            val array = JSONArray(definition)
+            for (i in 0 until array.length()) {
+                val record = array[i] as JSONObject
+                if (record.has("endDate") && record.has("version"))
+                    if (version == record.getString("version")) return record
+            }
+        } catch (e: JSONException) {
+        }
+        return null
+    }
+
+    fun endDateToMilliseconds(endDate: String): Long? {
+        try {
+            val dateTime = LocalDate.parse(endDate)
+            return dateTime.toDate().time
+        } catch (ignored: Exception) {
+        }
+        return null
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt b/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
index 9d8d720d98f..ce9d6a7ab1f 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
@@ -1,15 +1,16 @@
 package info.nightscout.androidaps.plugins.constraints.versionChecker
 
-import android.content.Context
 import android.os.Build
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.io.IOException
@@ -20,13 +21,13 @@ import javax.inject.Singleton
 
 @Singleton
 class VersionCheckerUtils @Inject constructor(
-    val aapsLogger: AAPSLogger,
-    val sp: SP,
-    val resourceHelper: ResourceHelper,
-    val rxBus: RxBusWrapper,
+    private val aapsLogger: AAPSLogger,
+    private val sp: SP,
+    private val rh: ResourceHelper,
+    private val rxBus: RxBus,
     private val config: Config,
-    val context: Context,
-    val receiverStatusStore: ReceiverStatusStore
+    private val receiverStatusStore: ReceiverStatusStore,
+    private val dateUtil: DateUtil
 ) {
 
     fun isConnected(): Boolean = receiverStatusStore.isConnected
@@ -37,12 +38,12 @@ class VersionCheckerUtils @Inject constructor(
             // On a new installation, set it as 30 days old in order to warn that there is a new version.
             sp.putLong(
                 R.string.key_last_time_this_version_detected,
-                System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30)
+                dateUtil.now() - TimeUnit.DAYS.toMillis(30)
             )
         }
 
         // If we are good, only check once every day.
-        if (System.currentTimeMillis() > sp.getLong(
+        if (dateUtil.now() > sp.getLong(
                 R.string.key_last_time_this_version_detected,
                 0
             ) + CHECK_EVERY
@@ -51,18 +52,30 @@ class VersionCheckerUtils @Inject constructor(
         }
     }
 
-    private fun checkVersion() = if (isConnected()) {
-        Thread {
-            try {
-                val definition: String = URL("https://raw.githubusercontent.com/nightscout/AndroidAPS/versions/definition.json").readText()
-                val version: String? = AllowedVersions().findByApi(definition, Build.VERSION.SDK_INT)?.optString("supported")
-                compareWithCurrentVersion(version, config.VERSION_NAME)
-            } catch (e: IOException) {
-                aapsLogger.error(LTag.CORE, "Github master version check error: $e")
-            }
-        }.start()
-    } else
-        aapsLogger.debug(LTag.CORE, "Github master version not checked. No connectivity")
+    private fun checkVersion() =
+        if (isConnected()) {
+            Thread {
+                try {
+                    val definition: String = URL("https://raw.githubusercontent.com/nightscout/AndroidAPS/versions/definition.json").readText()
+                    val version: String? = AllowedVersions().findByApi(definition, Build.VERSION.SDK_INT)?.optString("supported")
+                    compareWithCurrentVersion(version, config.VERSION_NAME)
+
+                    // App expiration
+                    var endDate = sp.getLong(rh.gs(R.string.key_app_expiration) + "_" + config.VERSION_NAME, 0)
+                    AllowedVersions().findByVersion(definition, config.VERSION_NAME)?.let { expirationJson ->
+                        AllowedVersions().endDateToMilliseconds(expirationJson.getString("endDate"))?.let { ed ->
+                            endDate = ed + T.days(1).msecs()
+                            sp.putLong(rh.gs(R.string.key_app_expiration) + "_" + config.VERSION_NAME, endDate)
+                        }
+                    }
+                    if (endDate != 0L) onExpiredVersionDetected(config.VERSION_NAME, dateUtil.dateString(endDate))
+
+                } catch (e: IOException) {
+                    aapsLogger.error(LTag.CORE, "Github master version check error: $e")
+                }
+            }.start()
+        } else
+            aapsLogger.debug(LTag.CORE, "Github master version not checked. No connectivity")
 
     @Suppress("SameParameterValue")
     fun compareWithCurrentVersion(newVersion: String?, currentVersion: String) {
@@ -87,8 +100,8 @@ class VersionCheckerUtils @Inject constructor(
 
             (newElem - currElem).let {
                 when {
-                    it > 0 -> return onNewVersionDetected(currentVersion, newVersion)
-                    it < 0 -> return onOlderVersionDetected()
+                    it > 0  -> return onNewVersionDetected(currentVersion, newVersion)
+                    it < 0  -> return onOlderVersionDetected()
                     it == 0 -> Unit
                 }
             }
@@ -98,11 +111,11 @@ class VersionCheckerUtils @Inject constructor(
 
     private fun onOlderVersionDetected() {
         aapsLogger.debug(LTag.CORE, "Version newer than master. Are you developer?")
-        sp.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis())
+        sp.putLong(R.string.key_last_time_this_version_detected, dateUtil.now())
     }
 
     private fun onSameVersionDetected() {
-        sp.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis())
+        sp.putLong(R.string.key_last_time_this_version_detected, dateUtil.now())
     }
 
     private fun onVersionNotDetectable() {
@@ -110,12 +123,12 @@ class VersionCheckerUtils @Inject constructor(
     }
 
     private fun onNewVersionDetected(currentVersion: String, newVersion: String?) {
-        val now = System.currentTimeMillis()
+        val now = dateUtil.now()
         if (now > sp.getLong(R.string.key_last_versionchecker_warning, 0) + WARN_EVERY) {
             aapsLogger.debug(LTag.CORE, "Version $currentVersion outdated. Found $newVersion")
             val notification = Notification(
                 Notification.NEW_VERSION_DETECTED,
-                resourceHelper.gs(R.string.versionavailable, newVersion.toString()),
+                rh.gs(R.string.versionavailable, newVersion.toString()),
                 Notification.LOW
             )
             rxBus.send(EventNewNotification(notification))
@@ -123,6 +136,20 @@ class VersionCheckerUtils @Inject constructor(
         }
     }
 
+    private fun onExpiredVersionDetected(currentVersion: String, endDate: String?) {
+        val now = dateUtil.now()
+        if (now > sp.getLong(R.string.key_last_expired_versionchecker_warning, 0) + WARN_EVERY) {
+            aapsLogger.debug(LTag.CORE, "Version $currentVersion expired.")
+            val notification = Notification(
+                Notification.VERSION_EXPIRE,
+                rh.gs(R.string.version_expire, currentVersion, endDate),
+                Notification.LOW
+            )
+            rxBus.send(EventNewNotification(notification))
+            sp.putLong(R.string.key_last_expired_versionchecker_warning, now)
+        }
+    }
+
     private fun String?.toNumberList() =
         this?.numericVersionPart().takeIf { !it.isNullOrBlank() }?.split(".")?.map { it.toInt() }
 
@@ -156,15 +183,3 @@ fun String.numericVersionPart(): String =
     return file?.lines()?.filter { regex.matches(it) }
         ?.mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }?.firstOrNull()
 }
-
-@Deprecated(
-    replaceWith = ReplaceWith("numericVersionPart()"),
-    message = "Will not work if RCs have another index number in it."
-)
-fun String.versionStrip() = this.mapNotNull {
-    when (it) {
-        in '0'..'9' -> it
-        '.'         -> it
-        else        -> null
-    }
-}.joinToString(separator = "")
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt
index 92c3fc4b08b..e7234602b04 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt
@@ -22,9 +22,8 @@ import kotlin.math.abs
 @OpenForTesting
 @Singleton
 class PrefFileListProvider @Inject constructor(
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val config: Config,
-    private val classicPrefsFormat: ClassicPrefsFormat,
     private val encryptedPrefsFormat: EncryptedPrefsFormat,
     private val storage: Storage,
     private val versionCheckerUtils: VersionCheckerUtils
@@ -55,10 +54,8 @@ class PrefFileListProvider @Inject constructor(
         path.walk().maxDepth(1).filter { it.isFile && (it.name.endsWith(".json") || it.name.contains("Preferences")) }.forEach {
             val contents = storage.getFileContents(it)
             val detectedNew = encryptedPrefsFormat.isPreferencesFile(it, contents)
-            val detectedOld = !detectedNew && classicPrefsFormat.isPreferencesFile(it, contents)
-            if (detectedNew || detectedOld) {
-                val formatHandler = if (detectedNew) PrefsFormatsHandler.ENCRYPTED else PrefsFormatsHandler.CLASSIC
-                prefFiles.add(PrefsFile(it.name, it, path, PrefsImportDir.ROOT_DIR, formatHandler, metadataFor(loadMetadata, formatHandler, contents)))
+            if (detectedNew) {
+                prefFiles.add(PrefsFile(it.name, it, path, PrefsImportDir.ROOT_DIR, metadataFor(loadMetadata, contents)))
             }
         }
 
@@ -66,15 +63,14 @@ 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.name, it, aapsPath, PrefsImportDir.AAPS_DIR, PrefsFormatsHandler.ENCRYPTED, metadataFor(loadMetadata, PrefsFormatsHandler.ENCRYPTED, contents)))
+                prefFiles.add(PrefsFile(it.name, it, aapsPath, PrefsImportDir.AAPS_DIR, metadataFor(loadMetadata, contents)))
             }
         }
 
         // we sort only if we have metadata to be used for that
         if (loadMetadata) {
             prefFiles.sortWith(
-                compareByDescending<PrefsFile> { it.handler }
-                    .thenBy { it.metadata[PrefsMetadataKey.AAPS_FLAVOUR]?.status }
+                compareByDescending<PrefsFile> { it.metadata[PrefsMetadataKey.AAPS_FLAVOUR]?.status }
                     .thenByDescending { it.metadata[PrefsMetadataKey.CREATED_AT]?.value }
             )
         }
@@ -82,18 +78,15 @@ class PrefFileListProvider @Inject constructor(
         return prefFiles
     }
 
-    private fun metadataFor(loadMetadata: Boolean, formatHandler: PrefsFormatsHandler, contents: String): PrefMetadataMap {
+    private fun metadataFor(loadMetadata: Boolean, contents: String): PrefMetadataMap {
         if (!loadMetadata) {
             return mapOf()
         }
-        return checkMetadata(when (formatHandler) {
-            PrefsFormatsHandler.CLASSIC   -> classicPrefsFormat.loadMetadata(contents)
-            PrefsFormatsHandler.ENCRYPTED -> encryptedPrefsFormat.loadMetadata(contents)
-        })
+        return checkMetadata(encryptedPrefsFormat.loadMetadata(contents))
     }
 
     fun legacyFile(): File {
-        return File(path, resourceHelper.gs(R.string.app_name) + "Preferences")
+        return File(path, rh.gs(R.string.app_name) + "Preferences")
     }
 
     fun ensureExportDirExists(): File {
@@ -138,14 +131,14 @@ class PrefFileListProvider @Inject constructor(
             val flavourOfPrefs = flavour.value
             if (flavour.value != config.FLAVOR) {
                 flavour.status = PrefsStatus.WARN
-                flavour.info = resourceHelper.gs(R.string.metadata_warning_different_flavour, flavourOfPrefs, config.FLAVOR)
+                flavour.info = rh.gs(R.string.metadata_warning_different_flavour, flavourOfPrefs, config.FLAVOR)
             }
         }
 
         meta[PrefsMetadataKey.DEVICE_MODEL]?.let { model ->
             if (model.value != config.currentDeviceModelString) {
                 model.status = PrefsStatus.WARN
-                model.info = resourceHelper.gs(R.string.metadata_warning_different_device)
+                model.info = rh.gs(R.string.metadata_warning_different_device)
             }
         }
 
@@ -158,11 +151,11 @@ class PrefFileListProvider @Inject constructor(
 
                 if (daysOld > IMPORT_AGE_NOT_YET_OLD_DAYS) {
                     createdAt.status = PrefsStatus.WARN
-                    createdAt.info = resourceHelper.gs(R.string.metadata_warning_old_export, daysOld.toString())
+                    createdAt.info = rh.gs(R.string.metadata_warning_old_export, daysOld.toString())
                 }
             } catch (e: Exception) {
                 createdAt.status = PrefsStatus.WARN
-                createdAt.info = resourceHelper.gs(R.string.metadata_warning_date_format)
+                createdAt.info = rh.gs(R.string.metadata_warning_date_format)
             }
         }
 
@@ -172,12 +165,12 @@ class PrefFileListProvider @Inject constructor(
 
             if ((currentAppVer.size >= 2) && (metadataVer.size >= 2) && (abs(currentAppVer[1] - metadataVer[1]) > 1)) {
                 version.status = PrefsStatus.WARN
-                version.info = resourceHelper.gs(R.string.metadata_warning_different_version)
+                version.info = rh.gs(R.string.metadata_warning_different_version)
             }
 
             if ((currentAppVer.isNotEmpty()) && (metadataVer.isNotEmpty()) && (currentAppVer[0] != metadataVer[0])) {
                 version.status = PrefsStatus.WARN
-                version.info = resourceHelper.gs(R.string.metadata_urgent_different_version)
+                version.info = rh.gs(R.string.metadata_urgent_different_version)
             }
         }
 
@@ -191,13 +184,13 @@ class PrefFileListProvider @Inject constructor(
         val hours = Hours.hoursBetween(itTime, refTime).hours
 
         return if (hours == 0) {
-            resourceHelper.gs(R.string.exported_less_than_hour_ago)
+            rh.gs(R.string.exported_less_than_hour_ago)
         } else if ((hours < 24) && (hours > 0)) {
-            resourceHelper.gs(R.string.exported_ago, resourceHelper.gq(R.plurals.hours, hours, hours))
+            rh.gs(R.string.exported_ago, rh.gq(R.plurals.hours, hours, hours))
         } else if ((days < IMPORT_AGE_NOT_YET_OLD_DAYS) && (days > 0)) {
-            resourceHelper.gs(R.string.exported_ago, resourceHelper.gq(R.plurals.days, days, days))
+            rh.gs(R.string.exported_ago, rh.gq(R.plurals.days, days, days))
         } else {
-            resourceHelper.gs(R.string.exported_at, utcTime.substring(0, 10))
+            rh.gs(R.string.exported_at, utcTime.substring(0, 10))
         }
     }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFile.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFile.kt
index 7caf7791f02..18a1de7c15b 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFile.kt
@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.general.maintenance
 import android.os.Parcelable
 import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefMetadata
 import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsMetadataKey
-import kotlinx.parcelize.RawValue
 import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.RawValue
 import java.io.File
 
 @Parcelize
@@ -13,7 +13,6 @@ data class PrefsFile(
     val file: File,
     val baseDir: File,
     val dirKind: PrefsImportDir,
-    val handler: PrefsFormatsHandler,
 
     // metadata here is used only for list display
     val metadata: @RawValue Map<PrefsMetadataKey, PrefMetadata>
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFormatsHandler.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFormatsHandler.kt
deleted file mode 100644
index 6908c794df4..00000000000
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFormatsHandler.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package info.nightscout.androidaps.plugins.general.maintenance
-
-enum class PrefsFormatsHandler {
-    CLASSIC,
-    ENCRYPTED
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
index 9a8f8a588be..ead45005beb 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.MenuItem
+import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -16,17 +17,15 @@ import info.nightscout.androidaps.core.databinding.MaintenanceImportListItemBind
 import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
 import info.nightscout.androidaps.plugins.general.maintenance.PrefsFile
 import info.nightscout.androidaps.plugins.general.maintenance.PrefsFileContract
-import info.nightscout.androidaps.plugins.general.maintenance.PrefsFormatsHandler
 import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsMetadataKey
 import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsStatus
-import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.utils.locale.LocaleHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
 class PrefImportListActivity : DaggerAppCompatActivity() {
 
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var prefFileListProvider: PrefFileListProvider
 
     private lateinit var binding: MaintenanceImportListActivityBinding
@@ -38,7 +37,7 @@ class PrefImportListActivity : DaggerAppCompatActivity() {
         val view = binding.root
         setContentView(view)
 
-        title = resourceHelper.gs(R.string.preferences_import_list_title)
+        title = rh.gs(R.string.preferences_import_list_title)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
         supportActionBar?.setDisplayShowTitleEnabled(true)
@@ -81,40 +80,32 @@ class PrefImportListActivity : DaggerAppCompatActivity() {
                 filelistName.text = prefFile.file.name
                 filelistName.tag = prefFile
 
-                filelistDir.text = resourceHelper.gs(R.string.in_directory, prefFile.file.parentFile?.absolutePath)
+                filelistDir.text = rh.gs(R.string.in_directory, prefFile.file.parentFile?.absolutePath)
 
-                val visible = (prefFile.handler != PrefsFormatsHandler.CLASSIC).toVisibility()
-                metalineName.visibility = visible
-                metaDateTimeIcon.visibility = visible
-                metaAppVersion.visibility = visible
+                metalineName.visibility = View.VISIBLE
+                metaDateTimeIcon.visibility = View.VISIBLE
+                metaAppVersion.visibility = View.VISIBLE
 
-                if (prefFile.handler == PrefsFormatsHandler.CLASSIC) {
-                    metaVariantFormat.text = resourceHelper.gs(R.string.metadata_format_old)
-                    metaVariantFormat.setTextColor(resourceHelper.gc(R.color.metadataTextWarning))
-                    metaDateTime.text = " "
-                } else {
-
-                    prefFile.metadata[PrefsMetadataKey.AAPS_FLAVOUR]?.let {
-                        metaVariantFormat.text = it.value
-                        val color = if (it.status == PrefsStatus.OK) R.color.metadataOk else R.color.metadataTextWarning
-                        metaVariantFormat.setTextColor(resourceHelper.gc(color))
-                    }
-
-                    prefFile.metadata[PrefsMetadataKey.CREATED_AT]?.let {
-                        metaDateTime.text = prefFileListProvider.formatExportedAgo(it.value)
-                    }
+                prefFile.metadata[PrefsMetadataKey.AAPS_FLAVOUR]?.let {
+                    metaVariantFormat.text = it.value
+                    val color = if (it.status == PrefsStatus.OK) R.color.metadataOk else R.color.metadataTextWarning
+                    metaVariantFormat.setTextColor(rh.gc(color))
+                }
 
-                    prefFile.metadata[PrefsMetadataKey.AAPS_VERSION]?.let {
-                        metaAppVersion.text = it.value
-                        val color = if (it.status == PrefsStatus.OK) R.color.metadataOk else R.color.metadataTextWarning
-                        metaAppVersion.setTextColor(resourceHelper.gc(color))
-                    }
+                prefFile.metadata[PrefsMetadataKey.CREATED_AT]?.let {
+                    metaDateTime.text = prefFileListProvider.formatExportedAgo(it.value)
+                }
 
-                    prefFile.metadata[PrefsMetadataKey.DEVICE_NAME]?.let {
-                        metaDeviceName.text = it.value
-                    }
+                prefFile.metadata[PrefsMetadataKey.AAPS_VERSION]?.let {
+                    metaAppVersion.text = it.value
+                    val color = if (it.status == PrefsStatus.OK) R.color.metadataOk else R.color.metadataTextWarning
+                    metaAppVersion.setTextColor(rh.gc(color))
+                }
 
+                prefFile.metadata[PrefsMetadataKey.DEVICE_NAME]?.let {
+                    metaDeviceName.text = it.value
                 }
+
             }
         }
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt
deleted file mode 100644
index 83d699015d0..00000000000
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package info.nightscout.androidaps.plugins.general.maintenance.formats
-
-import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.core.R
-import info.nightscout.androidaps.database.entities.UserEntry
-import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import info.nightscout.androidaps.utils.storage.Storage
-import java.io.File
-import java.io.FileNotFoundException
-import java.io.IOException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ClassicPrefsFormat @Inject constructor(
-    private var resourceHelper: ResourceHelper,
-    private var userEntryPresentationHelper: UserEntryPresentationHelper,
-    private var storage: Storage
-) : PrefsFormat {
-
-    companion object {
-
-        val FORMAT_KEY = "aaps_old"
-    }
-
-    override fun isPreferencesFile(file: File, preloadedContents: String?): Boolean {
-        val contents = preloadedContents ?: storage.getFileContents(file)
-        return contents.contains("units::" + Constants.MGDL) || contents.contains("units::" + Constants.MMOL) || contents.contains("language::") || contents.contains("I_understand::")
-    }
-
-    override fun savePreferences(file: File, prefs: Prefs, masterPassword: String?) {
-        try {
-            val contents = prefs.values.entries.joinToString("\n") { entry ->
-                "${entry.key}::${entry.value}"
-            }
-            storage.putFileContents(file, contents)
-        } catch (e: FileNotFoundException) {
-            throw PrefFileNotFoundError(file.absolutePath)
-        } catch (e: IOException) {
-            throw PrefIOError(file.absolutePath)
-        }
-    }
-
-    override fun loadPreferences(file: File, masterPassword: String?): Prefs {
-        var lineParts: Array<String>
-        val entries: MutableMap<String, String> = mutableMapOf()
-        try {
-
-            val rawLines = storage.getFileContents(file).split("\n")
-            rawLines.forEach { line ->
-                lineParts = line.split("::").toTypedArray()
-                if (lineParts.size == 2) {
-                    entries[lineParts[0]] = lineParts[1]
-                }
-            }
-
-            return Prefs(entries, loadMetadata())
-
-        } catch (e: FileNotFoundException) {
-            throw PrefFileNotFoundError(file.absolutePath)
-        } catch (e: IOException) {
-            throw PrefIOError(file.absolutePath)
-        }
-    }
-
-    override fun loadMetadata(contents: String?): PrefMetadataMap {
-        val metadata: MutableMap<PrefsMetadataKey, PrefMetadata> = mutableMapOf()
-        metadata[PrefsMetadataKey.FILE_FORMAT] = PrefMetadata(FORMAT_KEY, PrefsStatus.WARN, resourceHelper.gs(R.string.metadata_warning_outdated_format))
-        return metadata
-    }
-
-    fun saveCsv(file: File, userEntries: List<UserEntry>) {
-        try {
-            val contents = userEntryPresentationHelper.userEntriesToCsv(userEntries)
-            storage.putFileContents(file, contents)
-        } catch (e: FileNotFoundException) {
-            throw PrefFileNotFoundError(file.absolutePath)
-        } catch (e: IOException) {
-            throw PrefIOError(file.absolutePath)
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt
index 6afeb854b5f..bb82a9f251b 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt
@@ -17,7 +17,7 @@ import javax.inject.Singleton
 
 @Singleton
 class EncryptedPrefsFormat @Inject constructor(
-    private var resourceHelper: ResourceHelper,
+    private var rh: ResourceHelper,
     private var cryptoUtil: CryptoUtil,
     private var storage: Storage
 ) : PrefsFormat {
@@ -124,16 +124,16 @@ class EncryptedPrefsFormat @Inject constructor(
                 var secure: PrefsStatus = PrefsStatus.OK
                 var decryptedOk = false
                 var contentJsonObj: JSONObject? = null
-                var insecurityReason = resourceHelper.gs(R.string.prefdecrypt_settings_tampered)
+                var insecurityReason = rh.gs(R.string.prefdecrypt_settings_tampered)
 
                 if (security.has("file_hash")) {
                     if (calculatedFileHash != security.getString("file_hash")) {
                         secure = PrefsStatus.ERROR
-                        issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_modified))
+                        issues.add(rh.gs(R.string.prefdecrypt_issue_modified))
                     }
                 } else {
                     secure = PrefsStatus.ERROR
-                    issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_missing_file_hash))
+                    issues.add(rh.gs(R.string.prefdecrypt_issue_missing_file_hash))
                 }
 
                 if (encrypted) {
@@ -152,27 +152,27 @@ class EncryptedPrefsFormat @Inject constructor(
                                         decryptedOk = true
                                     } else {
                                         secure = PrefsStatus.ERROR
-                                        issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_modified))
+                                        issues.add(rh.gs(R.string.prefdecrypt_issue_modified))
                                     }
 
                                 } catch (e: JSONException) {
                                     secure = PrefsStatus.ERROR
-                                    issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_parsing))
+                                    issues.add(rh.gs(R.string.prefdecrypt_issue_parsing))
                                 }
 
                             } else {
                                 secure = PrefsStatus.ERROR
-                                issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_wrong_pass))
-                                insecurityReason = resourceHelper.gs(R.string.prefdecrypt_wrong_password)
+                                issues.add(rh.gs(R.string.prefdecrypt_issue_wrong_pass))
+                                insecurityReason = rh.gs(R.string.prefdecrypt_wrong_password)
                             }
 
                         } else {
                             secure = PrefsStatus.ERROR
-                            issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_wrong_format))
+                            issues.add(rh.gs(R.string.prefdecrypt_issue_wrong_format))
                         }
                     } else {
                         secure = PrefsStatus.ERROR
-                        issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_wrong_algorithm))
+                        issues.add(rh.gs(R.string.prefdecrypt_issue_wrong_algorithm))
                     }
 
                 } else {
@@ -183,7 +183,7 @@ class EncryptedPrefsFormat @Inject constructor(
 
                     if (!(security.has("algorithm") && security.get("algorithm") == "none")) {
                         secure = PrefsStatus.ERROR
-                        issues.add(resourceHelper.gs(R.string.prefdecrypt_issue_wrong_algorithm))
+                        issues.add(rh.gs(R.string.prefdecrypt_issue_wrong_algorithm))
                     }
 
                     contentJsonObj = container.getJSONObject("content")
@@ -198,9 +198,9 @@ class EncryptedPrefsFormat @Inject constructor(
 
                 val issuesStr: String? = if (issues.size > 0) issues.joinToString("\n") else null
                 val encryptionDescStr = if (encrypted) {
-                    if (secure == PrefsStatus.OK) resourceHelper.gs(R.string.prefdecrypt_settings_secure) else insecurityReason
+                    if (secure == PrefsStatus.OK) rh.gs(R.string.prefdecrypt_settings_secure) else insecurityReason
                 } else {
-                    if (secure != PrefsStatus.ERROR) resourceHelper.gs(R.string.prefdecrypt_settings_unencrypted) else resourceHelper.gs(R.string.prefdecrypt_settings_tampered)
+                    if (secure != PrefsStatus.ERROR) rh.gs(R.string.prefdecrypt_settings_unencrypted) else rh.gs(R.string.prefdecrypt_settings_tampered)
                 }
 
                 metadata[PrefsMetadataKey.ENCRYPTION] = PrefMetadata(encryptionDescStr, secure, issuesStr)
@@ -230,7 +230,7 @@ class EncryptedPrefsFormat @Inject constructor(
         if (container.has(PrefsMetadataKey.FILE_FORMAT.key) && container.has("security") && container.has("content") && container.has("metadata")) {
             val fileFormat = container.getString(PrefsMetadataKey.FILE_FORMAT.key)
             if ((fileFormat != FORMAT_KEY_ENC) && (fileFormat != FORMAT_KEY_NOENC)) {
-                metadata[PrefsMetadataKey.FILE_FORMAT] = PrefMetadata(resourceHelper.gs(R.string.metadata_format_other), PrefsStatus.ERROR)
+                metadata[PrefsMetadataKey.FILE_FORMAT] = PrefMetadata(rh.gs(R.string.metadata_format_other), PrefsStatus.ERROR)
             } else {
                 val meta = container.getJSONObject("metadata")
                 metadata[PrefsMetadataKey.FILE_FORMAT] = PrefMetadata(fileFormat, PrefsStatus.OK)
@@ -242,7 +242,7 @@ class EncryptedPrefsFormat @Inject constructor(
                 }
             }
         } else {
-            metadata[PrefsMetadataKey.FILE_FORMAT] = PrefMetadata(resourceHelper.gs(R.string.prefdecrypt_wrong_json), PrefsStatus.ERROR)
+            metadata[PrefsMetadataKey.FILE_FORMAT] = PrefMetadata(rh.gs(R.string.prefdecrypt_wrong_json), PrefsStatus.ERROR)
         }
 
         return metadata
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/PrefsFormat.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/PrefsFormat.kt
index 42cfa18f1e8..b5f1273f877 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/PrefsFormat.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/PrefsFormat.kt
@@ -19,28 +19,25 @@ enum class PrefsMetadataKey(val key: String, @DrawableRes val icon: Int, @String
     ENCRYPTION("encryption", R.drawable.ic_meta_encryption, R.string.metadata_label_encryption);
 
     companion object {
+
         private val keyToEnumMap = HashMap<String, PrefsMetadataKey>()
 
         init {
-            for (value in values()) {
-                keyToEnumMap.put(value.key, value)
-            }
+            for (value in values()) keyToEnumMap[value.key] = value
         }
 
-        fun fromKey(key: String): PrefsMetadataKey? {
+        fun fromKey(key: String): PrefsMetadataKey? =
             if (keyToEnumMap.containsKey(key)) {
-                return keyToEnumMap.get(key)
+                keyToEnumMap[key]
             } else {
-                return null
+                null
             }
-        }
 
     }
 
     fun formatForDisplay(context: Context, value: String): String {
         return when (this) {
             FILE_FORMAT -> when (value) {
-                ClassicPrefsFormat.FORMAT_KEY         -> context.getString(R.string.metadata_format_old)
                 EncryptedPrefsFormat.FORMAT_KEY_ENC   -> context.getString(R.string.metadata_format_new)
                 EncryptedPrefsFormat.FORMAT_KEY_NOENC -> context.getString(R.string.metadata_format_debug)
                 else                                  -> context.getString(R.string.metadata_format_other)
@@ -60,6 +57,7 @@ typealias PrefMetadataMap = Map<PrefsMetadataKey, PrefMetadata>
 data class Prefs(val values: Map<String, String>, var metadata: PrefMetadataMap)
 
 interface PrefsFormat {
+
     fun savePreferences(file: File, prefs: Prefs, masterPassword: String? = null)
     fun loadPreferences(file: File, masterPassword: String? = null): Prefs
     fun loadMetadata(contents: String? = null): PrefMetadataMap
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientNewLog.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientNewLog.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientNewLog.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientNewLog.kt
index 38d6bcfd0f1..72d36e4a84e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientNewLog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/events/EventNSClientNewLog.kt
@@ -19,4 +19,4 @@ class EventNSClientNewLog(var action: String, var logText: String) : Event() {
         stringBuilder.append("<br>")
         return stringBuilder
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt
index 53ab699d9c2..dfde13b9325 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt
@@ -3,4 +3,4 @@ package info.nightscout.androidaps.plugins.general.overview.events
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.events.Event
 
-class EventDismissBolusProgressIfRunning(val result: PumpEnactResult?) : Event()
\ No newline at end of file
+class EventDismissBolusProgressIfRunning(val result: PumpEnactResult?, val bolusTimestamp: Long?) : Event()
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
index 8c950b774a5..43f83607f60 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
@@ -370,22 +370,12 @@ public void draw(GraphView graphView, Canvas canvas, boolean isSecondScale) {
      * @param paint paint object
      */
     private void drawArrows(Point[] point, Canvas canvas, Paint paint) {
-        float[] points = new float[8];
-        points[0] = point[0].x;
-        points[1] = point[0].y;
-        points[2] = point[1].x;
-        points[3] = point[1].y;
-        points[4] = point[2].x;
-        points[5] = point[2].y;
-        points[6] = point[0].x;
-        points[7] = point[0].y;
-
         canvas.save();
-        canvas.drawVertices(Canvas.VertexMode.TRIANGLES, 8, points, 0, null, 0, null, 0, null, 0, 0, paint);
         Path path = new Path();
         path.moveTo(point[0].x, point[0].y);
         path.lineTo(point[1].x, point[1].y);
         path.lineTo(point[2].x, point[2].y);
+        path.close();
         canvas.drawPath(path, paint);
         canvas.restore();
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt
index ea2e753fb57..c7b55e93aec 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.overview.notifications
 
+import android.content.Context
 import androidx.annotation.RawRes
 import info.nightscout.androidaps.utils.T
 
@@ -14,6 +15,8 @@ open class Notification {
     var action: Runnable? = null
     var buttonText = 0
 
+    var contextForAction: Context? = null
+
     constructor()
     constructor(id: Int, date: Long, text: String, level: Int, validTo: Long) {
         this.id = id
@@ -55,6 +58,7 @@ open class Notification {
         const val LOW = 2
         const val INFO = 3
         const val ANNOUNCEMENT = 4
+
         const val PROFILE_SET_FAILED = 0
         const val PROFILE_SET_OK = 1
         const val EASY_MODE_ENABLED = 2
@@ -84,9 +88,6 @@ open class Notification {
         const val UNSUPPORTED_FIRMWARE = 28
         const val MINIMAL_BASAL_VALUE_REPLACED = 29
         const val BASAL_PROFILE_NOT_ALIGNED_TO_HOURS = 30
-        const val ZERO_VALUE_IN_PROFILE = 31
-        const val PROFILE_SWITCH_MISSING = 32
-        @Suppress("unused") const val NOT_ENG_MODE_OR_RELEASE = 33
         const val WRONG_PUMP_PASSWORD = 34
         const val PERMISSION_STORAGE = 35
         const val PERMISSION_LOCATION = 36
@@ -122,7 +123,10 @@ open class Notification {
         const val OMNIPOD_STARTUP_STATUS_REFRESH_FAILED = 69
         const val OMNIPOD_TIME_OUT_OF_SYNC = 70
         const val UNSUPPORTED_ACTION_IN_PUMP = 71
-        const val WRONG_PUMP_DATA = 71
+        const val WRONG_PUMP_DATA = 72
+        const val NSCLIENT_VERSION_DOES_NOT_MATCH = 73
+        const val VERSION_EXPIRE = 74
+        const val INVALID_PROFILE_NOT_ACCEPTED = 75
 
         const val USER_MESSAGE = 1000
 
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt
index e1b9401ad8a..52d95110950 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventBucketedDataCreated
 import info.nightscout.androidaps.utils.DateUtil
@@ -19,7 +19,7 @@ import kotlin.math.roundToLong
 class AutosensDataStore {
 
     private val dataLock = Any()
-    private var lastUsed5minCalculation: Boolean? = null // true if used 5min bucketed data
+    var lastUsed5minCalculation: Boolean? = null // true if used 5min bucketed data
 
     // we need to make sure that bucketed_data will always have the same timestamp for correct use of cached values
     // once referenceTime != null all bucketed data should be (x * 5min) from referenceTime
@@ -155,7 +155,7 @@ class AutosensDataStore {
         return someTime + diff
     }
 
-    fun loadBgData(to: Long, repository: AppRepository, aapsLogger: AAPSLogger, dateUtil: DateUtil, rxBus: RxBusWrapper) {
+    fun loadBgData(to: Long, repository: AppRepository, aapsLogger: AAPSLogger, dateUtil: DateUtil, rxBus: RxBus) {
         synchronized(dataLock) {
             val start = to - T.hours((24 + 10 /* max dia */).toLong()).msecs()
             // there can be some readings with time in close future (caused by wrong time setting on sensor)
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt
index 59d9bc11114..7f83f953d69 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt
@@ -19,12 +19,12 @@ class CobInfo(val timestamp: Long, val displayCob: Double?, val futureCarbs: Dou
         return cobStringResult
     }
 
-    fun displayText(resourceHelper: ResourceHelper, dateUtil: DateUtil, isDev: Boolean): String? =
+    fun displayText(rh: ResourceHelper, dateUtil: DateUtil, isDev: Boolean): String? =
         if (displayCob != null) {
-            var cobText = resourceHelper.gs(R.string.format_carbs, displayCob.toInt())
+            var cobText = rh.gs(R.string.format_carbs, displayCob.toInt())
             if (futureCarbs > 0) cobText += "(" + DecimalFormatter.to0Decimal(futureCarbs) + ")"
             // This is only temporary for debugging
-            if (isDev) cobText += "\n" + dateUtil.timeStringWithSeconds(timestamp)
+            if (isDev) cobText += "\n" + dateUtil.timeString(timestamp)
             cobText
         } else null
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
index bad39f92892..2745a06f492 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
@@ -29,7 +29,7 @@ public class AutosensData implements DataPointWithLabelInterface {
 
     @Inject AAPSLogger aapsLogger;
     @Inject SP sp;
-    @Inject ResourceHelper resourceHelper;
+    @Inject ResourceHelper rh;
     @Inject ProfileFunction profileFunction;
     @Inject DateUtil dateUtil;
 
@@ -51,9 +51,9 @@ public CarbsInPast(Carbs t, boolean isAAPSOrWeighted) {
             time = t.getTimestamp();
             carbs = t.getAmount();
             remaining = t.getAmount();
-            if (isAAPSOrWeighted) {
+            Profile profile = profileFunction.getProfile(t.getTimestamp());
+            if (isAAPSOrWeighted && profile != null) {
                 double maxAbsorptionHours = sp.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME);
-                Profile profile = profileFunction.getProfile(t.getTimestamp());
                 double sens = profile.getIsfMgdl(t.getTimestamp());
                 double ic = profile.getIc(t.getTimestamp());
                 min5minCarbImpact = t.getAmount() / (maxAbsorptionHours * 60 / 5) * sens / ic;
@@ -197,7 +197,7 @@ public float getSize() {
 
     @Override
     public int getColor() {
-        return resourceHelper.gc(R.color.cob);
+        return rh.gc(R.color.cob);
     }
 
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
index 9bef19b5c2f..66b7112b964 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
@@ -12,7 +12,7 @@ import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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.defs.PumpType
@@ -28,8 +28,8 @@ class PumpSyncImplementation @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val dateUtil: DateUtil,
     private val sp: SP,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
+    private val rxBus: RxBus,
+    private val rh: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val repository: AppRepository,
     private val uel: UserEntryLogger
@@ -37,7 +37,15 @@ class PumpSyncImplementation @Inject constructor(
 
     private val disposable = CompositeDisposable()
 
-    override fun connectNewPump() {
+    override fun connectNewPump(endRunning: Boolean) {
+        if (endRunning) {
+            expectedPumpState().temporaryBasal?.let {
+                syncStopTemporaryBasalWithPumpId(dateUtil.now(), dateUtil.now(), it.pumpType, it.pumpSerial)
+            }
+            expectedPumpState().extendedBolus?.let {
+                syncStopExtendedBolusWithPumpId(dateUtil.now(), dateUtil.now(), it.pumpType, it.pumpSerial)
+            }
+        }
         sp.remove(R.string.key_active_pump_type)
         sp.remove(R.string.key_active_pump_serial_number)
         sp.remove(R.string.key_active_pump_change_timestamp)
@@ -51,7 +59,7 @@ class PumpSyncImplementation @Inject constructor(
      * @param serialNumber  serial number  of of pump
      * @return true if data is allowed
      */
-    private fun confirmActivePump(timestamp: Long, type: PumpType, serialNumber: String): Boolean {
+    private fun confirmActivePump(timestamp: Long, type: PumpType, serialNumber: String, showNotification: Boolean = true): Boolean {
         val storedType = sp.getString(R.string.key_active_pump_type, "")
         val storedSerial = sp.getString(R.string.key_active_pump_serial_number, "")
         val storedTimestamp = sp.getLong(R.string.key_active_pump_change_timestamp, 0L)
@@ -70,14 +78,14 @@ class PumpSyncImplementation @Inject constructor(
             return true
         }
 
-        if ((type.description != storedType || serialNumber != storedSerial) && timestamp >= storedTimestamp)
-            rxBus.send(EventNewNotification(Notification(Notification.WRONG_PUMP_DATA, resourceHelper.gs(R.string.wrong_pump_data), Notification.URGENT)))
+        if (showNotification && (type.description != storedType || serialNumber != storedSerial) && timestamp >= storedTimestamp)
+            rxBus.send(EventNewNotification(Notification(Notification.WRONG_PUMP_DATA, rh.gs(R.string.wrong_pump_data), Notification.URGENT)))
         aapsLogger.error(LTag.PUMP, "Ignoring pump history record  Allowed: ${dateUtil.dateAndTimeAndSecondsString(storedTimestamp)} $storedType $storedSerial Received: $timestamp ${dateUtil.dateAndTimeAndSecondsString(timestamp)} ${type.description} $serialNumber")
         return false
     }
 
     override fun expectedPumpState(): PumpSync.PumpState {
-        val bolus = repository.getLastBolusRecord()
+        val bolus = repository.getLastBolusRecordWrapped().blockingGet()
         val temporaryBasal = repository.getTemporaryBasalActiveAt(dateUtil.now()).blockingGet()
         val extendedBolus = repository.getExtendedBolusActiveAt(dateUtil.now()).blockingGet()
 
@@ -91,7 +99,9 @@ class PumpSyncImplementation @Inject constructor(
                     rate = temporaryBasal.value.rate,
                     isAbsolute = temporaryBasal.value.isAbsolute,
                     type = PumpSync.TemporaryBasalType.fromDbType(temporaryBasal.value.type),
-                    pumpId = temporaryBasal.value.interfaceIDs.pumpId
+                    pumpId = temporaryBasal.value.interfaceIDs.pumpId,
+                    pumpType = temporaryBasal.value.interfaceIDs.pumpType?.let { PumpType.fromDbPumpType(it)} ?: PumpType.USER,
+                    pumpSerial = temporaryBasal.value.interfaceIDs.pumpSerial ?: "",
                 )
             else null,
             extendedBolus =
@@ -100,16 +110,20 @@ class PumpSyncImplementation @Inject constructor(
                     timestamp = extendedBolus.value.timestamp,
                     duration = extendedBolus.value.duration,
                     amount = extendedBolus.value.amount,
-                    rate = extendedBolus.value.rate
+                    rate = extendedBolus.value.rate,
+                    pumpType = extendedBolus.value.interfaceIDs.pumpType?.let { PumpType.fromDbPumpType(it)} ?: PumpType.USER,
+                    pumpSerial = extendedBolus.value.interfaceIDs.pumpSerial ?: ""
                 )
             else null,
             bolus =
-            bolus?.let {
-                PumpSync.PumpState.Bolus(
-                    timestamp = bolus.timestamp,
-                    amount = bolus.amount
-                )
-            },
+            if (bolus is ValueWrapper.Existing)
+                bolus.value.let {
+                    PumpSync.PumpState.Bolus(
+                        timestamp = bolus.value.timestamp,
+                        amount = bolus.value.amount
+                    )
+                }
+            else null,
             profile = profileFunction.getProfile()
         )
     }
@@ -395,7 +409,8 @@ class PumpSyncImplementation @Inject constructor(
     }
 
     override fun createOrUpdateTotalDailyDose(timestamp: Long, bolusAmount: Double, basalAmount: Double, totalAmount: Double, pumpId: Long?, pumpType: PumpType, pumpSerial: String): Boolean {
-        if (!confirmActivePump(timestamp, pumpType, pumpSerial)) return false
+        // there are probably old data in pump -> do not show notification, just ignore
+        if (!confirmActivePump(timestamp, pumpType, pumpSerial, showNotification = false)) return false
         val tdd = TotalDailyDose(
             timestamp = timestamp,
             bolusAmount = bolusAmount,
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt
index 6af48de6672..02bcec2e0ba 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt
@@ -18,7 +18,7 @@ import javax.inject.Singleton
 
 @Singleton
 class BlePreCheck @Inject constructor(
-    val resourceHelper: ResourceHelper
+    val rh: ResourceHelper
 ) {
 
     companion object {
@@ -27,7 +27,7 @@ class BlePreCheck @Inject constructor(
 
     fun prerequisitesCheck(activity: AppCompatActivity): Boolean {
         if (!activity.packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
-            OKDialog.show(activity, resourceHelper.gs(R.string.message), resourceHelper.gs(R.string.ble_not_supported))
+            OKDialog.show(activity, rh.gs(R.string.message), rh.gs(R.string.ble_not_supported))
             return false
         } else {
             // Use this check to determine whether BLE is supported on the device. Then
@@ -41,7 +41,7 @@ class BlePreCheck @Inject constructor(
             // Ensures Bluetooth is available on the device and it is enabled. If not,
             // displays a dialog requesting user permission to enable Bluetooth.
             if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled) {
-                OKDialog.show(activity, resourceHelper.gs(R.string.message), resourceHelper.gs(R.string.ble_not_enabled))
+                OKDialog.show(activity, rh.gs(R.string.message), rh.gs(R.string.ble_not_enabled))
                 return false
             } else {
                 // Will request that GPS be enabled for devices running Marshmallow or newer.
@@ -80,7 +80,7 @@ class BlePreCheck @Inject constructor(
         }
 
         // Shamelessly borrowed from http://stackoverflow.com/a/10311877/868533
-        OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.location_not_found_title), resourceHelper.gs(R.string.location_not_found_message), Runnable {
+        OKDialog.showConfirmation(activity, rh.gs(R.string.location_not_found_title), rh.gs(R.string.location_not_found_message), Runnable {
             activity.startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS))
         })
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt
index daadd2dc78a..a36883adae2 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt
@@ -297,14 +297,14 @@ enum class PumpType {
         source = Sources.MDI),
 
     //Diaconn Pump
-    DIACONN_G8(description = "DiaconnG8",
+    DIACONN_G8(description = "Diaconn G8",
         manufacturer = ManufacturerType.G2e,
-        model = "Diaconn G8",
+        model = "DiaconnG8",
         bolusSize = 0.01,
         specialBolusSize = null,
         extendedBolusSettings = DoseSettings(0.05, 10, 5 * 60, 0.05),
         pumpTempBasalType = PumpTempBasalType.Absolute,
-        tbrSettings = DoseSettings(0.01, 30, 24 * 60, 0.0, 6.0),
+        tbrSettings = DoseSettings(0.01, 30, 24 * 60, 0.0, 15.0),
         specialBasalDurations = PumpCapability.BasalRate_Duration30minAllowed,
         baseBasalMinValue = 0.05,
         baseBasalMaxValue = 3.0,
@@ -359,6 +359,41 @@ enum class PumpType {
 
         fun getByDescription(desc: String): PumpType =
             values().firstOrNull { it.description == desc } ?: GENERIC_AAPS
+
+        fun fromDbPumpType(pt: InterfaceIDs.PumpType): PumpType =
+            when (pt) {
+                InterfaceIDs.PumpType.GENERIC_AAPS                -> GENERIC_AAPS
+                InterfaceIDs.PumpType.CELLNOVO                    -> CELLNOVO
+                InterfaceIDs.PumpType.ACCU_CHEK_COMBO             -> ACCU_CHEK_COMBO
+                InterfaceIDs.PumpType.ACCU_CHEK_SPIRIT            -> ACCU_CHEK_SPIRIT
+                InterfaceIDs.PumpType.ACCU_CHEK_INSIGHT           -> ACCU_CHEK_INSIGHT_VIRTUAL
+                InterfaceIDs.PumpType.ACCU_CHEK_INSIGHT_BLUETOOTH -> ACCU_CHEK_INSIGHT
+                InterfaceIDs.PumpType.ACCU_CHEK_SOLO              -> ACCU_CHEK_SOLO
+                InterfaceIDs.PumpType.ANIMAS_VIBE                 -> ANIMAS_VIBE
+                InterfaceIDs.PumpType.ANIMAS_PING                 -> ANIMAS_PING
+                InterfaceIDs.PumpType.DANA_R                      -> DANA_R
+                InterfaceIDs.PumpType.DANA_R_KOREAN               -> DANA_R_KOREAN
+                InterfaceIDs.PumpType.DANA_RS                     -> DANA_RS
+                InterfaceIDs.PumpType.DANA_RS_KOREAN              -> DANA_RS_KOREAN
+                InterfaceIDs.PumpType.DANA_RV2                    -> DANA_RV2
+                InterfaceIDs.PumpType.DANA_I                      -> DANA_I
+                InterfaceIDs.PumpType.OMNIPOD_EROS                -> OMNIPOD_EROS
+                InterfaceIDs.PumpType.OMNIPOD_DASH                -> OMNIPOD_DASH
+                InterfaceIDs.PumpType.MEDTRONIC_512_517           -> MEDTRONIC_512_712
+                InterfaceIDs.PumpType.MEDTRONIC_515_715           -> MEDTRONIC_515_715
+                InterfaceIDs.PumpType.MEDTRONIC_522_722           -> MEDTRONIC_522_722
+                InterfaceIDs.PumpType.MEDTRONIC_523_723_REVEL     -> MEDTRONIC_523_723_REVEL
+                InterfaceIDs.PumpType.MEDTRONIC_554_754_VEO       -> MEDTRONIC_554_754_VEO
+                InterfaceIDs.PumpType.MEDTRONIC_640G              -> MEDTRONIC_640G
+                InterfaceIDs.PumpType.TANDEM_T_SLIM               -> TANDEM_T_SLIM
+                InterfaceIDs.PumpType.TANDEM_T_SLIM_G4            -> TANDEM_T_SLIM_G4
+                InterfaceIDs.PumpType.TANDEM_T_FLEX               -> TANDEM_T_FLEX
+                InterfaceIDs.PumpType.TANDEM_T_SLIM_X2            -> TANDEM_T_SLIM_X2
+                InterfaceIDs.PumpType.YPSOPUMP                    -> YPSOPUMP
+                InterfaceIDs.PumpType.MDI                         -> MDI
+                InterfaceIDs.PumpType.USER                        -> USER
+                InterfaceIDs.PumpType.DIACONN_G8                  -> DIACONN_G8
+            }
     }
 
     constructor(description: String, model: String, parent: PumpType, pumpCapability: PumpCapability? = null, source: Sources? = null) {
@@ -403,11 +438,11 @@ enum class PumpType {
         this.source = source
     }
 
-    fun getFullDescription(i18nTemplate: String, hasExtendedBasals: Boolean, resourceHelper: ResourceHelper): String {
+    fun getFullDescription(i18nTemplate: String, hasExtendedBasals: Boolean, rh: ResourceHelper): String {
         val unit = if (pumpTempBasalType == PumpTempBasalType.Percent) "%" else ""
         val eb = extendedBolusSettings ?: return "INVALID"
         val tbr = tbrSettings ?: return "INVALID"
-        val extendedNote = if (hasExtendedBasals) resourceHelper.gs(R.string.def_extended_note) else ""
+        val extendedNote = if (hasExtendedBasals) rh.gs(R.string.def_extended_note) else ""
         return String.format(i18nTemplate,
             getStep("" + bolusSize, specialBolusSize),
             eb.step, eb.durationStep, eb.maxDuration / 60,
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
index 2f37f541a68..eee40443e28 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
@@ -265,11 +265,11 @@ public static long getMillisFromATDWithAddedMinutes(long atd, int minutesDiff) {
     }
 
 
-    public static long getATDWithAddedMinutes(long atd, int minutesDiff) {
+    public static long getATDWithAddedSeconds(Long atd, int addedSeconds) {
         GregorianCalendar oldestEntryTime = DateTimeUtil.toGregorianCalendar(atd);
-        oldestEntryTime.add(Calendar.MINUTE, minutesDiff);
+        oldestEntryTime.add(Calendar.SECOND, addedSeconds);
 
-        return oldestEntryTime.getTimeInMillis();
+        return toATechDate(oldestEntryTime.getTimeInMillis());
     }
 
 
@@ -279,7 +279,6 @@ public static long getATDWithAddedMinutes(GregorianCalendar oldestEntryTime, int
         return toATechDate(oldestEntryTime);
     }
 
-
     public static long getTimeInFutureFromMinutes(long startTime, int minutes) {
         return startTime + getTimeInMs(minutes);
     }
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 0692ac68e33..14596e50fe1 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
@@ -17,7 +17,7 @@ abstract class Command(
 ) {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var repository: AppRepository
 
     enum class CommandType {
@@ -49,7 +49,7 @@ abstract class Command(
     fun cancel() {
         val result = PumpEnactResult(injector)
         result.success = false
-        result.comment = resourceHelper.gs(R.string.connectiontimedout)
+        result.comment = rh.gs(R.string.connectiontimedout)
         aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel")
         callback?.result(result)?.run()
     }
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
index d0c5c26d510..e2fdd9fdb9e 100644
--- a/core/src/main/java/info/nightscout/androidaps/queue/commands/CustomCommand.kt
+++ b/core/src/main/java/info/nightscout/androidaps/queue/commands/CustomCommand.kt
@@ -4,7 +4,7 @@ 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.
+ * See [info.nightscout.androidaps.interfaces.CommandQueue.customCommand] for queuing a custom command.
  */
 interface CustomCommand : Serializable {
 
diff --git a/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt b/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
index 8ac514a213e..a1abaaf13ee 100644
--- a/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
+++ b/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
@@ -11,12 +11,12 @@ import dagger.android.DaggerBroadcastReceiver
 import info.nightscout.androidaps.events.EventNetworkChange
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.StringUtils
 import javax.inject.Inject
 
 class NetworkChangeReceiver : DaggerBroadcastReceiver() {
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var receiverStatusStore: ReceiverStatusStore
 
diff --git a/core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt b/core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt
index 01bf231324a..5a7bf617aa0 100644
--- a/core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt
+++ b/core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt
@@ -5,13 +5,13 @@ import android.content.Context
 import android.content.Intent
 import info.nightscout.androidaps.events.EventChargingState
 import info.nightscout.androidaps.events.EventNetworkChange
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @OpenForTesting
 @Singleton
-class ReceiverStatusStore @Inject constructor(val context: Context, val rxBus: RxBusWrapper) {
+class ReceiverStatusStore @Inject constructor(val context: Context, val rxBus: RxBus) {
 
     var lastNetworkEvent: EventNetworkChange? = null
 
diff --git a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
index 7af82b750de..35bc4ca8156 100644
--- a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
+++ b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
@@ -23,7 +23,7 @@ import kotlin.math.pow
 class AlarmSoundService : DaggerService() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var notificationHolder: NotificationHolder
     @Inject lateinit var sp: SP
 
@@ -74,7 +74,7 @@ class AlarmSoundService : DaggerService() {
         if (intent?.hasExtra(ErrorHelperActivity.SOUND_ID) == true) resourceId = intent.getIntExtra(ErrorHelperActivity.SOUND_ID, R.raw.error)
         player = MediaPlayer()
         try {
-            val afd = resourceHelper.openRawResourceFd(resourceId) ?: return START_STICKY
+            val afd = rh.openRawResourceFd(resourceId) ?: return START_STICKY
             player?.setDataSource(afd.fileDescriptor, afd.startOffset, afd.length)
             afd.close()
             player?.isLooping = true
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.kt b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.kt
index 6f0a2f66559..d2d9feef7b5 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.kt
@@ -138,10 +138,10 @@ class DateUtil @Inject constructor(private val context: Context) {
         return if (mills == 0L) "" else dateString(mills) + " " + timeStringWithSeconds(mills)
     }
 
-    fun minAgo(resourceHelper: ResourceHelper, time: Long?): String {
+    fun minAgo(rh: ResourceHelper, time: Long?): String {
         if (time == null) return ""
         val mins = ((now() - time) / 1000 / 60).toInt()
-        return resourceHelper.gs(R.string.minago, mins)
+        return rh.gs(R.string.minago, mins)
     }
 
     fun minAgoShort(time: Long?): String {
@@ -150,9 +150,9 @@ class DateUtil @Inject constructor(private val context: Context) {
         return (if (mins > 0) "+" else "") + mins
     }
 
-    fun hourAgo(time: Long, resourceHelper: ResourceHelper): String {
+    fun hourAgo(time: Long, rh: ResourceHelper): String {
         val hours = (now() - time) / 1000.0 / 60 / 60
-        return resourceHelper.gs(R.string.hoursago, hours)
+        return rh.gs(R.string.hoursago, hours)
     }
 
     fun timeStringFromSeconds(seconds: Int): String {
@@ -163,19 +163,19 @@ class DateUtil @Inject constructor(private val context: Context) {
         return t
     }
 
-    fun timeFrameString(timeInMillis: Long, resourceHelper: ResourceHelper): String {
+    fun timeFrameString(timeInMillis: Long, rh: ResourceHelper): String {
         var remainingTimeMinutes = timeInMillis / (1000 * 60)
         val remainingTimeHours = remainingTimeMinutes / 60
         remainingTimeMinutes %= 60
-        return "(" + (if (remainingTimeHours > 0) remainingTimeHours.toString() + resourceHelper.gs(R.string.shorthour) + " " else "") + remainingTimeMinutes + "')"
+        return "(" + (if (remainingTimeHours > 0) remainingTimeHours.toString() + rh.gs(R.string.shorthour) + " " else "") + remainingTimeMinutes + "')"
     }
 
-    fun sinceString(timestamp: Long, resourceHelper: ResourceHelper): String {
-        return timeFrameString(System.currentTimeMillis() - timestamp, resourceHelper)
+    fun sinceString(timestamp: Long, rh: ResourceHelper): String {
+        return timeFrameString(System.currentTimeMillis() - timestamp, rh)
     }
 
-    fun untilString(timestamp: Long, resourceHelper: ResourceHelper): String {
-        return timeFrameString(timestamp - System.currentTimeMillis(), resourceHelper)
+    fun untilString(timestamp: Long, rh: ResourceHelper): String {
+        return timeFrameString(timestamp - System.currentTimeMillis(), rh)
     }
 
     fun now(): Long {
@@ -221,15 +221,15 @@ class DateUtil @Inject constructor(private val context: Context) {
         return result
     }
 
-    fun age(milliseconds: Long, useShortText: Boolean, resourceHelper: ResourceHelper): String {
+    fun age(milliseconds: Long, useShortText: Boolean, rh: ResourceHelper): String {
         val diff = computeDiff(0L, milliseconds)
-        var days = " " + resourceHelper.gs(R.string.days) + " "
-        var hours = " " + resourceHelper.gs(R.string.hours) + " "
-        var minutes = " " + resourceHelper.gs(R.string.unit_minutes) + " "
+        var days = " " + rh.gs(R.string.days) + " "
+        var hours = " " + rh.gs(R.string.hours) + " "
+        var minutes = " " + rh.gs(R.string.unit_minutes) + " "
         if (useShortText) {
-            days = resourceHelper.gs(R.string.shortday)
-            hours = resourceHelper.gs(R.string.shorthour)
-            minutes = resourceHelper.gs(R.string.shortminute)
+            days = rh.gs(R.string.shortday)
+            hours = rh.gs(R.string.shorthour)
+            minutes = rh.gs(R.string.shortminute)
         }
         var result = ""
         if (diff[TimeUnit.DAYS]!! > 0) result += diff[TimeUnit.DAYS].toString() + days
@@ -238,27 +238,27 @@ class DateUtil @Inject constructor(private val context: Context) {
         return result
     }
 
-    fun niceTimeScalar(time: Long, resourceHelper: ResourceHelper): String {
+    fun niceTimeScalar(time: Long, rh: ResourceHelper): String {
         var t = time
-        var unit = resourceHelper.gs(R.string.unit_second)
+        var unit = rh.gs(R.string.unit_second)
         t /= 1000
-        if (t != 1L) unit = resourceHelper.gs(R.string.unit_seconds)
+        if (t != 1L) unit = rh.gs(R.string.unit_seconds)
         if (t > 59) {
-            unit = resourceHelper.gs(R.string.unit_minute)
+            unit = rh.gs(R.string.unit_minute)
             t /= 60
-            if (t != 1L) unit = resourceHelper.gs(R.string.unit_minutes)
+            if (t != 1L) unit = rh.gs(R.string.unit_minutes)
             if (t > 59) {
-                unit = resourceHelper.gs(R.string.unit_hour)
+                unit = rh.gs(R.string.unit_hour)
                 t /= 60
-                if (t != 1L) unit = resourceHelper.gs(R.string.unit_hours)
+                if (t != 1L) unit = rh.gs(R.string.unit_hours)
                 if (t > 24) {
-                    unit = resourceHelper.gs(R.string.unit_day)
+                    unit = rh.gs(R.string.unit_day)
                     t /= 24
-                    if (t != 1L) unit = resourceHelper.gs(R.string.unit_days)
+                    if (t != 1L) unit = rh.gs(R.string.unit_days)
                     if (t > 28) {
-                        unit = resourceHelper.gs(R.string.unit_week)
+                        unit = rh.gs(R.string.unit_week)
                         t /= 7
-                        if (t != 1L) unit = resourceHelper.gs(R.string.unit_weeks)
+                        if (t != 1L) unit = rh.gs(R.string.unit_weeks)
                     }
                 }
             }
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.kt b/core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.kt
index 280e8a348e5..7c2a96f46b2 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.kt
@@ -21,6 +21,6 @@ object DecimalFormatter {
     fun to3Decimal(value: Double): String = format3dec.format(value)
     fun to3Decimal(value: Double, unit: String): String = format3dec.format(value) + unit
     fun toPumpSupportedBolus(value: Double, pump: Pump): String = if (pump.pumpDescription.bolusStep <= 0.051) to2Decimal(value) else to1Decimal(value)
-    fun toPumpSupportedBolus(value: Double, pump: Pump, resourceHelper: ResourceHelper): String = if (pump.pumpDescription.bolusStep <= 0.051) resourceHelper.gs(R.string.formatinsulinunits, value) else resourceHelper.gs(R.string.formatinsulinunits1, value)
+    fun toPumpSupportedBolus(value: Double, pump: Pump, rh: ResourceHelper): String = if (pump.pumpDescription.bolusStep <= 0.051) rh.gs(R.string.formatinsulinunits, value) else rh.gs(R.string.formatinsulinunits1, value)
     fun pumpSupportedBolusFormat(pump: Pump): DecimalFormat = if (pump.pumpDescription.bolusStep <= 0.051) DecimalFormat("0.00") else DecimalFormat("0.0")
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt b/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
index 67118d09089..6a892a9ecb7 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
@@ -20,9 +20,9 @@ import kotlin.math.min
 @Singleton
 class HardLimits @Inject constructor(
     private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val sp: SP,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val context: Context,
     private val repository: AppRepository
 ) {
@@ -40,9 +40,9 @@ class HardLimits @Inject constructor(
 
         // Very Hard Limits Ranges
         // First value is the Lowest and second value is the Highest a Limit can define
-        val VERY_HARD_LIMIT_MIN_BG = intArrayOf(72, 180)
-        val VERY_HARD_LIMIT_MAX_BG = intArrayOf(90, 270)
-        val VERY_HARD_LIMIT_TARGET_BG = intArrayOf(80, 200)
+        val VERY_HARD_LIMIT_MIN_BG = doubleArrayOf(80.0, 180.0)
+        val VERY_HARD_LIMIT_MAX_BG = doubleArrayOf(90.0, 200.0)
+        val VERY_HARD_LIMIT_TARGET_BG = doubleArrayOf(80.0, 200.0)
 
         // Very Hard Limits Ranges for Temp Targets
         val VERY_HARD_LIMIT_TEMP_MIN_BG = intArrayOf(72, 180)
@@ -65,11 +65,11 @@ class HardLimits @Inject constructor(
     }
 
     private fun loadAge(): Int = when (sp.getString(R.string.key_age, "")) {
-        resourceHelper.gs(R.string.key_child)          -> CHILD
-        resourceHelper.gs(R.string.key_teenage)        -> TEENAGE
-        resourceHelper.gs(R.string.key_adult)          -> ADULT
-        resourceHelper.gs(R.string.key_resistantadult) -> RESISTANT_ADULT
-        resourceHelper.gs(R.string.key_pregnant)       -> PREGNANT
+        rh.gs(R.string.key_child)          -> CHILD
+        rh.gs(R.string.key_teenage)        -> TEENAGE
+        rh.gs(R.string.key_adult)          -> ADULT
+        rh.gs(R.string.key_resistantadult) -> RESISTANT_ADULT
+        rh.gs(R.string.key_pregnant)       -> PREGNANT
         else                                           -> ADULT
     }
 
@@ -94,9 +94,9 @@ class HardLimits @Inject constructor(
         if (newValue < lowLimit || newValue > highLimit) {
             newValue = max(newValue, lowLimit)
             newValue = min(newValue, highLimit)
-            var msg = String.format(resourceHelper.gs(R.string.valueoutofrange), resourceHelper.gs(valueName))
+            var msg = String.format(rh.gs(R.string.valueoutofrange), rh.gs(valueName))
             msg += ".\n"
-            msg += String.format(resourceHelper.gs(R.string.valuelimitedto), value, newValue)
+            msg += String.format(rh.gs(R.string.valuelimitedto), value, newValue)
             aapsLogger.error(msg)
             disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(msg)).subscribe()
             ToastUtils.showToastInUiThread(context, rxBus, msg, R.raw.error)
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
index d592a180b7f..5f411115fbc 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
@@ -150,4 +150,15 @@ object JsonHelper {
         }
         return result
     }
+
+    fun safeGetBooleanAllowNull(json: JSONObject?, fieldName: String, defaultValue: Boolean? = null): Boolean? {
+        var result = defaultValue
+        if (json != null && json.has(fieldName)) {
+            try {
+                result = json.getBoolean(fieldName)
+            } catch (ignored: JSONException) {
+            }
+        }
+        return result
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/TimerUtil.kt b/core/src/main/java/info/nightscout/androidaps/utils/TimerUtil.kt
index d1977090ac0..34ce548ce86 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/TimerUtil.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/TimerUtil.kt
@@ -11,7 +11,7 @@ import javax.inject.Singleton
 @Singleton
 class TimerUtil @Inject constructor(
     private val context: Context,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val dateUtil: DateUtil
 ) {
 
@@ -21,7 +21,7 @@ class TimerUtil @Inject constructor(
             flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK
             putExtra(AlarmClock.EXTRA_LENGTH, length)
             putExtra(AlarmClock.EXTRA_SKIP_UI, true)
-            putExtra(AlarmClock.EXTRA_MESSAGE, text ?: resourceHelper.gs(R.string.app_name))
+            putExtra(AlarmClock.EXTRA_MESSAGE, text ?: rh.gs(R.string.app_name))
             context.startActivity(this)
         }
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java b/core/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
index 8074b38cc69..994998ef90b 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
@@ -15,13 +15,15 @@
 import androidx.appcompat.view.ContextThemeWrapper;
 
 import info.nightscout.androidaps.core.R;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 
 
 public class ToastUtils {
 
+    private static Toast lastToast = null;
+
     public static class Long {
 
         public static void warnToast(final Context ctx, final String string) {
@@ -76,10 +78,11 @@ public static void graphicalToast(final Context ctx, final String string, @Drawa
             ImageView toastIcon = toastRoot.findViewById(android.R.id.icon);
             toastIcon.setImageResource(iconId);
 
-            Toast toast = new Toast(ctx);
-            toast.setDuration(isShort ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG);
-            toast.setView(toastRoot);
-            toast.show();
+            if (lastToast != null) lastToast.cancel();
+            lastToast = new Toast(ctx);
+            lastToast.setDuration(isShort ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG);
+            lastToast.setView(toastRoot);
+            lastToast.show();
         });
     }
 
@@ -88,7 +91,7 @@ public static void showToastInUiThread(final Context ctx, final String string) {
         mainThread.post(() -> Toast.makeText(ctx, string, Toast.LENGTH_SHORT).show());
     }
 
-    public static void showToastInUiThread(final Context ctx, final RxBusWrapper rxBus,
+    public static void showToastInUiThread(final Context ctx, final RxBus rxBus,
                                            final String string, int soundID) {
 
         showToastInUiThread(ctx, string);
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
index fa71db66b44..39593aa8d09 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
@@ -13,141 +13,143 @@ import javax.inject.Singleton
 
 @Singleton
 class Translator @Inject internal constructor(
-    private val resourceHelper: ResourceHelper
+    private val rh: ResourceHelper
 ) {
 
     fun translate(action: Action): String = when (action) {
-        Action.BOLUS                     -> resourceHelper.gs(R.string.uel_bolus)
-        Action.SMB                       -> resourceHelper.gs(R.string.smb_shortname)
-        Action.BOLUS_ADVISOR             -> resourceHelper.gs(R.string.uel_bolus_advisor)
-        Action.EXTENDED_BOLUS            -> resourceHelper.gs(R.string.uel_extended_bolus)
-        Action.SUPERBOLUS_TBR            -> resourceHelper.gs(R.string.uel_superbolus_tbr)
-        Action.CARBS                     -> resourceHelper.gs(R.string.uel_carbs)
-        Action.EXTENDED_CARBS            -> resourceHelper.gs(R.string.uel_extended_carbs)
-        Action.TEMP_BASAL                -> resourceHelper.gs(R.string.uel_temp_basal)
-        Action.TT                        -> resourceHelper.gs(R.string.uel_tt)
-        Action.NEW_PROFILE               -> resourceHelper.gs(R.string.uel_new_profile)
-        Action.CLONE_PROFILE             -> resourceHelper.gs(R.string.uel_clone_profile)
-        Action.STORE_PROFILE             -> resourceHelper.gs(R.string.uel_store_profile)
-        Action.PROFILE_SWITCH            -> resourceHelper.gs(R.string.uel_profile_switch)
-        Action.PROFILE_SWITCH_CLONED     -> resourceHelper.gs(R.string.uel_profile_switch_cloned)
-        Action.CLOSED_LOOP_MODE          -> resourceHelper.gs(R.string.uel_closed_loop_mode)
-        Action.LGS_LOOP_MODE             -> resourceHelper.gs(R.string.uel_lgs_loop_mode)
-        Action.OPEN_LOOP_MODE            -> resourceHelper.gs(R.string.uel_open_loop_mode)
-        Action.LOOP_DISABLED             -> resourceHelper.gs(R.string.uel_loop_disabled)
-        Action.LOOP_ENABLED              -> resourceHelper.gs(R.string.uel_loop_enabled)
-        Action.RECONNECT                 -> resourceHelper.gs(R.string.uel_reconnect)
-        Action.DISCONNECT                -> resourceHelper.gs(R.string.uel_disconnect)
-        Action.RESUME                    -> resourceHelper.gs(R.string.uel_resume)
-        Action.SUSPEND                   -> resourceHelper.gs(R.string.uel_suspend)
-        Action.HW_PUMP_ALLOWED           -> resourceHelper.gs(R.string.uel_hw_pump_allowed)
-        Action.CLEAR_PAIRING_KEYS        -> resourceHelper.gs(R.string.uel_clear_pairing_keys)
-        Action.ACCEPTS_TEMP_BASAL        -> resourceHelper.gs(R.string.uel_accepts_temp_basal)
-        Action.CANCEL_TEMP_BASAL         -> resourceHelper.gs(R.string.uel_cancel_temp_basal)
-        Action.CANCEL_BOLUS              -> resourceHelper.gs(R.string.uel_cancel_bolus)
-        Action.CANCEL_EXTENDED_BOLUS     -> resourceHelper.gs(R.string.uel_cancel_extended_bolus)
-        Action.CANCEL_TT                 -> resourceHelper.gs(R.string.uel_cancel_tt)
-        Action.CAREPORTAL                -> resourceHelper.gs(R.string.uel_careportal)
-        Action.SITE_CHANGE               -> resourceHelper.gs(R.string.uel_site_change)
-        Action.RESERVOIR_CHANGE          -> resourceHelper.gs(R.string.uel_reservoir_change)
-        Action.CALIBRATION               -> resourceHelper.gs(R.string.uel_calibration)
-        Action.PRIME_BOLUS               -> resourceHelper.gs(R.string.uel_prime_bolus)
-        Action.TREATMENT                 -> resourceHelper.gs(R.string.uel_treatment)
-        Action.CAREPORTAL_NS_REFRESH     -> resourceHelper.gs(R.string.uel_careportal_ns_refresh)
-        Action.PROFILE_SWITCH_NS_REFRESH -> resourceHelper.gs(R.string.uel_profile_switch_ns_refresh)
-        Action.TREATMENTS_NS_REFRESH     -> resourceHelper.gs(R.string.uel_treatments_ns_refresh)
-        Action.TT_NS_REFRESH             -> resourceHelper.gs(R.string.uel_tt_ns_refresh)
-        Action.AUTOMATION_REMOVED        -> resourceHelper.gs(R.string.uel_automation_removed)
-        Action.BG_REMOVED                -> resourceHelper.gs(R.string.uel_bg_removed)
-        Action.CAREPORTAL_REMOVED        -> resourceHelper.gs(R.string.uel_careportal_removed)
-        Action.BOLUS_REMOVED             -> resourceHelper.gs(R.string.uel_bolus_removed)
-        Action.CARBS_REMOVED             -> resourceHelper.gs(R.string.uel_carbs_removed)
-        Action.TEMP_BASAL_REMOVED        -> resourceHelper.gs(R.string.uel_temp_basal_removed)
-        Action.EXTENDED_BOLUS_REMOVED    -> resourceHelper.gs(R.string.uel_extended_bolus_removed)
-        Action.FOOD                      -> resourceHelper.gs(R.string.uel_food)
-        Action.FOOD_REMOVED              -> resourceHelper.gs(R.string.uel_food_removed)
-        Action.PROFILE_REMOVED           -> resourceHelper.gs(R.string.uel_profile_removed)
-        Action.PROFILE_SWITCH_REMOVED    -> resourceHelper.gs(R.string.uel_profile_switch_removed)
-        Action.RESTART_EVENTS_REMOVED    -> resourceHelper.gs(R.string.uel_restart_events_removed)
-        Action.TREATMENT_REMOVED         -> resourceHelper.gs(R.string.uel_treatment_removed)
-        Action.TT_REMOVED                -> resourceHelper.gs(R.string.uel_tt_removed)
-        Action.NS_PAUSED                 -> resourceHelper.gs(R.string.uel_ns_paused)
-        Action.NS_RESUME                 -> resourceHelper.gs(R.string.uel_ns_resume)
-        Action.NS_QUEUE_CLEARED          -> resourceHelper.gs(R.string.uel_ns_queue_cleared)
-        Action.NS_SETTINGS_COPIED        -> resourceHelper.gs(R.string.uel_ns_settings_copied)
-        Action.ERROR_DIALOG_OK           -> resourceHelper.gs(R.string.uel_error_dialog_ok)
-        Action.ERROR_DIALOG_MUTE         -> resourceHelper.gs(R.string.uel_error_dialog_mute)
-        Action.ERROR_DIALOG_MUTE_5MIN    -> resourceHelper.gs(R.string.uel_error_dialog_mute_5min)
-        Action.OBJECTIVE_STARTED         -> resourceHelper.gs(R.string.uel_objective_started)
-        Action.OBJECTIVE_UNSTARTED       -> resourceHelper.gs(R.string.uel_objective_unstarted)
-        Action.OBJECTIVES_SKIPPED        -> resourceHelper.gs(R.string.uel_objectives_skipped)
-        Action.STAT_RESET                -> resourceHelper.gs(R.string.uel_stat_reset)
-        Action.DELETE_LOGS               -> resourceHelper.gs(R.string.uel_delete_logs)
-        Action.DELETE_FUTURE_TREATMENTS  -> resourceHelper.gs(R.string.uel_delete_future_treatments)
-        Action.EXPORT_SETTINGS           -> resourceHelper.gs(R.string.uel_export_settings)
-        Action.IMPORT_SETTINGS           -> resourceHelper.gs(R.string.uel_import_settings)
-        Action.RESET_DATABASES           -> resourceHelper.gs(R.string.uel_reset_databases)
-        Action.EXPORT_DATABASES          -> resourceHelper.gs(R.string.uel_export_databases)
-        Action.IMPORT_DATABASES          -> resourceHelper.gs(R.string.uel_import_databases)
-        Action.OTP_EXPORT                -> resourceHelper.gs(R.string.uel_otp_export)
-        Action.OTP_RESET                 -> resourceHelper.gs(R.string.uel_otp_reset)
-        Action.EXPORT_CSV                -> resourceHelper.gs(R.string.uel_export_csv)
-        Action.STOP_SMS                  -> resourceHelper.gs(R.string.uel_stop_sms)
-        Action.START_AAPS                -> resourceHelper.gs(R.string.uel_start_aaps)
-        Action.EXIT_AAPS                 -> resourceHelper.gs(R.string.uel_exit_aaps)
-        Action.PLUGIN_ENABLED            -> resourceHelper.gs(R.string.uel_plugin_enabled)
-        Action.PLUGIN_DISABLED           -> resourceHelper.gs(R.string.uel_plugin_disabled)
-        Action.LOOP_CHANGE               -> resourceHelper.gs(R.string.uel_loop_change)
-        Action.LOOP_REMOVED              -> resourceHelper.gs(R.string.uel_loop_removed)
-        Action.UNKNOWN                   -> resourceHelper.gs(R.string.unknown)
+        Action.BOLUS                           -> rh.gs(R.string.uel_bolus)
+        Action.BOLUS_CALCULATOR_RESULT         -> rh.gs(R.string.uel_bolus_calculator)
+        Action.BOLUS_CALCULATOR_RESULT_REMOVED -> rh.gs(R.string.uel_bolus_calculator)
+        Action.SMB                             -> rh.gs(R.string.smb_shortname)
+        Action.BOLUS_ADVISOR                   -> rh.gs(R.string.uel_bolus_advisor)
+        Action.EXTENDED_BOLUS                  -> rh.gs(R.string.uel_extended_bolus)
+        Action.SUPERBOLUS_TBR                  -> rh.gs(R.string.uel_superbolus_tbr)
+        Action.CARBS                           -> rh.gs(R.string.uel_carbs)
+        Action.EXTENDED_CARBS                  -> rh.gs(R.string.uel_extended_carbs)
+        Action.TEMP_BASAL                      -> rh.gs(R.string.uel_temp_basal)
+        Action.TT                              -> rh.gs(R.string.uel_tt)
+        Action.NEW_PROFILE                     -> rh.gs(R.string.uel_new_profile)
+        Action.CLONE_PROFILE                   -> rh.gs(R.string.uel_clone_profile)
+        Action.STORE_PROFILE                   -> rh.gs(R.string.uel_store_profile)
+        Action.PROFILE_SWITCH                  -> rh.gs(R.string.uel_profile_switch)
+        Action.PROFILE_SWITCH_CLONED           -> rh.gs(R.string.uel_profile_switch_cloned)
+        Action.CLOSED_LOOP_MODE                -> rh.gs(R.string.uel_closed_loop_mode)
+        Action.LGS_LOOP_MODE                   -> rh.gs(R.string.uel_lgs_loop_mode)
+        Action.OPEN_LOOP_MODE                  -> rh.gs(R.string.uel_open_loop_mode)
+        Action.LOOP_DISABLED                   -> rh.gs(R.string.uel_loop_disabled)
+        Action.LOOP_ENABLED                    -> rh.gs(R.string.uel_loop_enabled)
+        Action.RECONNECT                       -> rh.gs(R.string.uel_reconnect)
+        Action.DISCONNECT                      -> rh.gs(R.string.uel_disconnect)
+        Action.RESUME                          -> rh.gs(R.string.uel_resume)
+        Action.SUSPEND                         -> rh.gs(R.string.uel_suspend)
+        Action.HW_PUMP_ALLOWED                 -> rh.gs(R.string.uel_hw_pump_allowed)
+        Action.CLEAR_PAIRING_KEYS              -> rh.gs(R.string.uel_clear_pairing_keys)
+        Action.ACCEPTS_TEMP_BASAL              -> rh.gs(R.string.uel_accepts_temp_basal)
+        Action.CANCEL_TEMP_BASAL               -> rh.gs(R.string.uel_cancel_temp_basal)
+        Action.CANCEL_BOLUS                    -> rh.gs(R.string.uel_cancel_bolus)
+        Action.CANCEL_EXTENDED_BOLUS           -> rh.gs(R.string.uel_cancel_extended_bolus)
+        Action.CANCEL_TT                       -> rh.gs(R.string.uel_cancel_tt)
+        Action.CAREPORTAL                      -> rh.gs(R.string.uel_careportal)
+        Action.SITE_CHANGE                     -> rh.gs(R.string.uel_site_change)
+        Action.RESERVOIR_CHANGE                -> rh.gs(R.string.uel_reservoir_change)
+        Action.CALIBRATION                     -> rh.gs(R.string.uel_calibration)
+        Action.PRIME_BOLUS                     -> rh.gs(R.string.uel_prime_bolus)
+        Action.TREATMENT                       -> rh.gs(R.string.uel_treatment)
+        Action.CAREPORTAL_NS_REFRESH           -> rh.gs(R.string.uel_careportal_ns_refresh)
+        Action.PROFILE_SWITCH_NS_REFRESH       -> rh.gs(R.string.uel_profile_switch_ns_refresh)
+        Action.TREATMENTS_NS_REFRESH           -> rh.gs(R.string.uel_treatments_ns_refresh)
+        Action.TT_NS_REFRESH                   -> rh.gs(R.string.uel_tt_ns_refresh)
+        Action.AUTOMATION_REMOVED              -> rh.gs(R.string.uel_automation_removed)
+        Action.BG_REMOVED                      -> rh.gs(R.string.uel_bg_removed)
+        Action.CAREPORTAL_REMOVED              -> rh.gs(R.string.uel_careportal_removed)
+        Action.BOLUS_REMOVED                   -> rh.gs(R.string.uel_bolus_removed)
+        Action.CARBS_REMOVED                   -> rh.gs(R.string.uel_carbs_removed)
+        Action.TEMP_BASAL_REMOVED              -> rh.gs(R.string.uel_temp_basal_removed)
+        Action.EXTENDED_BOLUS_REMOVED          -> rh.gs(R.string.uel_extended_bolus_removed)
+        Action.FOOD                            -> rh.gs(R.string.uel_food)
+        Action.FOOD_REMOVED                    -> rh.gs(R.string.uel_food_removed)
+        Action.PROFILE_REMOVED                 -> rh.gs(R.string.uel_profile_removed)
+        Action.PROFILE_SWITCH_REMOVED          -> rh.gs(R.string.uel_profile_switch_removed)
+        Action.RESTART_EVENTS_REMOVED          -> rh.gs(R.string.uel_restart_events_removed)
+        Action.TREATMENT_REMOVED               -> rh.gs(R.string.uel_treatment_removed)
+        Action.TT_REMOVED                      -> rh.gs(R.string.uel_tt_removed)
+        Action.NS_PAUSED                       -> rh.gs(R.string.uel_ns_paused)
+        Action.NS_RESUME                       -> rh.gs(R.string.uel_ns_resume)
+        Action.NS_QUEUE_CLEARED                -> rh.gs(R.string.uel_ns_queue_cleared)
+        Action.NS_SETTINGS_COPIED              -> rh.gs(R.string.uel_ns_settings_copied)
+        Action.ERROR_DIALOG_OK                 -> rh.gs(R.string.uel_error_dialog_ok)
+        Action.ERROR_DIALOG_MUTE               -> rh.gs(R.string.uel_error_dialog_mute)
+        Action.ERROR_DIALOG_MUTE_5MIN          -> rh.gs(R.string.uel_error_dialog_mute_5min)
+        Action.OBJECTIVE_STARTED               -> rh.gs(R.string.uel_objective_started)
+        Action.OBJECTIVE_UNSTARTED             -> rh.gs(R.string.uel_objective_unstarted)
+        Action.OBJECTIVES_SKIPPED              -> rh.gs(R.string.uel_objectives_skipped)
+        Action.STAT_RESET                      -> rh.gs(R.string.uel_stat_reset)
+        Action.DELETE_LOGS                     -> rh.gs(R.string.uel_delete_logs)
+        Action.DELETE_FUTURE_TREATMENTS        -> rh.gs(R.string.uel_delete_future_treatments)
+        Action.EXPORT_SETTINGS                 -> rh.gs(R.string.uel_export_settings)
+        Action.IMPORT_SETTINGS                 -> rh.gs(R.string.uel_import_settings)
+        Action.RESET_DATABASES                 -> rh.gs(R.string.uel_reset_databases)
+        Action.EXPORT_DATABASES                -> rh.gs(R.string.uel_export_databases)
+        Action.IMPORT_DATABASES                -> rh.gs(R.string.uel_import_databases)
+        Action.OTP_EXPORT                      -> rh.gs(R.string.uel_otp_export)
+        Action.OTP_RESET                       -> rh.gs(R.string.uel_otp_reset)
+        Action.EXPORT_CSV                      -> rh.gs(R.string.uel_export_csv)
+        Action.STOP_SMS                        -> rh.gs(R.string.uel_stop_sms)
+        Action.START_AAPS                      -> rh.gs(R.string.uel_start_aaps)
+        Action.EXIT_AAPS                       -> rh.gs(R.string.uel_exit_aaps)
+        Action.PLUGIN_ENABLED                  -> rh.gs(R.string.uel_plugin_enabled)
+        Action.PLUGIN_DISABLED                 -> rh.gs(R.string.uel_plugin_disabled)
+        Action.LOOP_CHANGE                     -> rh.gs(R.string.uel_loop_change)
+        Action.LOOP_REMOVED                    -> rh.gs(R.string.uel_loop_removed)
+        Action.UNKNOWN                         -> rh.gs(R.string.unknown)
     }
 
     fun translate(units: ValueWithUnit?): String = when (units) {
-        is ValueWithUnit.Gram        -> resourceHelper.gs(R.string.shortgram)
-        is ValueWithUnit.Hour        -> resourceHelper.gs(R.string.shorthour)
-        is ValueWithUnit.Insulin     -> resourceHelper.gs(R.string.insulin_unit_shortname)
-        is ValueWithUnit.Mgdl        -> resourceHelper.gs(R.string.mgdl)
-        is ValueWithUnit.Minute      -> resourceHelper.gs(R.string.shortminute)
-        is ValueWithUnit.Mmoll       -> resourceHelper.gs(R.string.mmol)
-        is ValueWithUnit.Percent     -> resourceHelper.gs(R.string.shortpercent)
-        is ValueWithUnit.UnitPerHour -> resourceHelper.gs(R.string.profile_ins_units_per_hour)
+        is ValueWithUnit.Gram        -> rh.gs(R.string.shortgram)
+        is ValueWithUnit.Hour        -> rh.gs(R.string.shorthour)
+        is ValueWithUnit.Insulin     -> rh.gs(R.string.insulin_unit_shortname)
+        is ValueWithUnit.Mgdl        -> rh.gs(R.string.mgdl)
+        is ValueWithUnit.Minute      -> rh.gs(R.string.shortminute)
+        is ValueWithUnit.Mmoll       -> rh.gs(R.string.mmol)
+        is ValueWithUnit.Percent     -> rh.gs(R.string.shortpercent)
+        is ValueWithUnit.UnitPerHour -> rh.gs(R.string.profile_ins_units_per_hour)
         else                         -> ""
     }
 
-    fun translate(meterType: TherapyEvent.MeterType): String = when (meterType) {
-        TherapyEvent.MeterType.FINGER -> resourceHelper.gs(R.string.glucosetype_finger)
-        TherapyEvent.MeterType.SENSOR -> resourceHelper.gs(R.string.glucosetype_sensor)
-        TherapyEvent.MeterType.MANUAL -> resourceHelper.gs(R.string.manual)
+    fun translate(meterType: TherapyEvent.MeterType?): String = when (meterType) {
+        TherapyEvent.MeterType.FINGER -> rh.gs(R.string.glucosetype_finger)
+        TherapyEvent.MeterType.SENSOR -> rh.gs(R.string.glucosetype_sensor)
+        TherapyEvent.MeterType.MANUAL -> rh.gs(R.string.manual)
 
-        else                          -> resourceHelper.gs(R.string.unknown)
+        else                          -> rh.gs(R.string.unknown)
     }
 
-    fun translate(type: TherapyEvent.Type): String = when (type) {
-        TherapyEvent.Type.FINGER_STICK_BG_VALUE   -> resourceHelper.gs(R.string.careportal_bgcheck)
-        TherapyEvent.Type.SNACK_BOLUS             -> resourceHelper.gs(R.string.careportal_snackbolus)
-        TherapyEvent.Type.MEAL_BOLUS              -> resourceHelper.gs(R.string.careportal_mealbolus)
-        TherapyEvent.Type.CORRECTION_BOLUS        -> resourceHelper.gs(R.string.careportal_correctionbolus)
-        TherapyEvent.Type.CARBS_CORRECTION        -> resourceHelper.gs(R.string.careportal_carbscorrection)
-        TherapyEvent.Type.BOLUS_WIZARD            -> resourceHelper.gs(R.string.boluswizard)
-        TherapyEvent.Type.COMBO_BOLUS             -> resourceHelper.gs(R.string.careportal_combobolus)
-        TherapyEvent.Type.ANNOUNCEMENT            -> resourceHelper.gs(R.string.careportal_announcement)
-        TherapyEvent.Type.NOTE                    -> resourceHelper.gs(R.string.careportal_note)
-        TherapyEvent.Type.QUESTION                -> resourceHelper.gs(R.string.careportal_question)
-        TherapyEvent.Type.EXERCISE                -> resourceHelper.gs(R.string.careportal_exercise)
-        TherapyEvent.Type.CANNULA_CHANGE          -> resourceHelper.gs(R.string.careportal_pumpsitechange)
-        TherapyEvent.Type.PUMP_BATTERY_CHANGE     -> resourceHelper.gs(R.string.careportal_pumpbatterychange)
-        TherapyEvent.Type.SENSOR_STARTED          -> resourceHelper.gs(R.string.careportal_cgmsensorstart)
-        TherapyEvent.Type.SENSOR_STOPPED          -> resourceHelper.gs(R.string.careportal_cgm_sensor_stop)
-        TherapyEvent.Type.SENSOR_CHANGE           -> resourceHelper.gs(R.string.careportal_cgmsensorinsert)
-        TherapyEvent.Type.INSULIN_CHANGE          -> resourceHelper.gs(R.string.careportal_insulincartridgechange)
-        TherapyEvent.Type.DAD_ALERT               -> resourceHelper.gs(R.string.careportal_dad_alert)
-        TherapyEvent.Type.TEMPORARY_BASAL_START   -> resourceHelper.gs(R.string.careportal_tempbasalstart)
-        TherapyEvent.Type.TEMPORARY_BASAL_END     -> resourceHelper.gs(R.string.careportal_tempbasalend)
-        TherapyEvent.Type.PROFILE_SWITCH          -> resourceHelper.gs(R.string.careportal_profileswitch)
-        TherapyEvent.Type.TEMPORARY_TARGET        -> resourceHelper.gs(R.string.careportal_temporarytarget)
-        TherapyEvent.Type.TEMPORARY_TARGET_CANCEL -> resourceHelper.gs(R.string.careportal_temporarytargetcancel)
-        TherapyEvent.Type.APS_OFFLINE             -> resourceHelper.gs(R.string.careportal_openapsoffline)
-        TherapyEvent.Type.NS_MBG                  -> resourceHelper.gs(R.string.careportal_mbg)
+    fun translate(type: TherapyEvent.Type?): String = when (type) {
+        TherapyEvent.Type.FINGER_STICK_BG_VALUE   -> rh.gs(R.string.careportal_bgcheck)
+        TherapyEvent.Type.SNACK_BOLUS             -> rh.gs(R.string.careportal_snackbolus)
+        TherapyEvent.Type.MEAL_BOLUS              -> rh.gs(R.string.careportal_mealbolus)
+        TherapyEvent.Type.CORRECTION_BOLUS        -> rh.gs(R.string.careportal_correctionbolus)
+        TherapyEvent.Type.CARBS_CORRECTION        -> rh.gs(R.string.careportal_carbscorrection)
+        TherapyEvent.Type.BOLUS_WIZARD            -> rh.gs(R.string.boluswizard)
+        TherapyEvent.Type.COMBO_BOLUS             -> rh.gs(R.string.careportal_combobolus)
+        TherapyEvent.Type.ANNOUNCEMENT            -> rh.gs(R.string.careportal_announcement)
+        TherapyEvent.Type.NOTE                    -> rh.gs(R.string.careportal_note)
+        TherapyEvent.Type.QUESTION                -> rh.gs(R.string.careportal_question)
+        TherapyEvent.Type.EXERCISE                -> rh.gs(R.string.careportal_exercise)
+        TherapyEvent.Type.CANNULA_CHANGE          -> rh.gs(R.string.careportal_pumpsitechange)
+        TherapyEvent.Type.PUMP_BATTERY_CHANGE     -> rh.gs(R.string.careportal_pumpbatterychange)
+        TherapyEvent.Type.SENSOR_STARTED          -> rh.gs(R.string.careportal_cgmsensorstart)
+        TherapyEvent.Type.SENSOR_STOPPED          -> rh.gs(R.string.careportal_cgm_sensor_stop)
+        TherapyEvent.Type.SENSOR_CHANGE           -> rh.gs(R.string.careportal_cgmsensorinsert)
+        TherapyEvent.Type.INSULIN_CHANGE          -> rh.gs(R.string.careportal_insulincartridgechange)
+        TherapyEvent.Type.DAD_ALERT               -> rh.gs(R.string.careportal_dad_alert)
+        TherapyEvent.Type.TEMPORARY_BASAL_START   -> rh.gs(R.string.careportal_tempbasalstart)
+        TherapyEvent.Type.TEMPORARY_BASAL_END     -> rh.gs(R.string.careportal_tempbasalend)
+        TherapyEvent.Type.PROFILE_SWITCH          -> rh.gs(R.string.careportal_profileswitch)
+        TherapyEvent.Type.TEMPORARY_TARGET        -> rh.gs(R.string.careportal_temporarytarget)
+        TherapyEvent.Type.TEMPORARY_TARGET_CANCEL -> rh.gs(R.string.careportal_temporarytargetcancel)
+        TherapyEvent.Type.APS_OFFLINE             -> rh.gs(R.string.careportal_openapsoffline)
+        TherapyEvent.Type.NS_MBG                  -> rh.gs(R.string.careportal_mbg)
 /*
         TherapyEvent.Type.TEMPORARY_BASAL         -> TODO()
         TherapyEvent.Type.TUBE_CHANGE             -> TODO()
@@ -168,29 +170,29 @@ class Translator @Inject internal constructor(
         TherapyEvent.Type.FEELING_HIGH            -> TODO()
         TherapyEvent.Type.LEAKING_INFUSION_SET    -> TODO()
  */
-        TherapyEvent.Type.NONE                    -> resourceHelper.gs(R.string.unknown)
+        TherapyEvent.Type.NONE                    -> rh.gs(R.string.unknown)
 
-        else                                      -> resourceHelper.gs(R.string.unknown)
+        else                                      -> rh.gs(R.string.unknown)
     }
 
-    fun translate(reason: TemporaryTarget.Reason): String = when (reason) {
-        TemporaryTarget.Reason.CUSTOM       -> resourceHelper.gs(R.string.custom)
-        TemporaryTarget.Reason.HYPOGLYCEMIA -> resourceHelper.gs(R.string.hypo)
-        TemporaryTarget.Reason.EATING_SOON  -> resourceHelper.gs(R.string.eatingsoon)
-        TemporaryTarget.Reason.ACTIVITY     -> resourceHelper.gs(R.string.activity)
-        TemporaryTarget.Reason.AUTOMATION   -> resourceHelper.gs(R.string.automation)
-        TemporaryTarget.Reason.WEAR         -> resourceHelper.gs(R.string.wear)
+    fun translate(reason: TemporaryTarget.Reason?): String = when (reason) {
+        TemporaryTarget.Reason.CUSTOM       -> rh.gs(R.string.custom)
+        TemporaryTarget.Reason.HYPOGLYCEMIA -> rh.gs(R.string.hypo)
+        TemporaryTarget.Reason.EATING_SOON  -> rh.gs(R.string.eatingsoon)
+        TemporaryTarget.Reason.ACTIVITY     -> rh.gs(R.string.activity)
+        TemporaryTarget.Reason.AUTOMATION   -> rh.gs(R.string.automation)
+        TemporaryTarget.Reason.WEAR         -> rh.gs(R.string.wear)
 
-        else                                -> resourceHelper.gs(R.string.unknown)
+        else                                -> rh.gs(R.string.unknown)
     }
 
-    fun translate(reason: OfflineEvent.Reason): String = when (reason) {
-        OfflineEvent.Reason.SUSPEND         -> resourceHelper.gs(R.string.uel_suspend)
-        OfflineEvent.Reason.DISABLE_LOOP    -> resourceHelper.gs(R.string.disableloop)
-        OfflineEvent.Reason.DISCONNECT_PUMP -> resourceHelper.gs(R.string.uel_disconnect)
-        OfflineEvent.Reason.OTHER           -> resourceHelper.gs(R.string.uel_other)
+    fun translate(reason: OfflineEvent.Reason?): String = when (reason) {
+        OfflineEvent.Reason.SUSPEND         -> rh.gs(R.string.uel_suspend)
+        OfflineEvent.Reason.DISABLE_LOOP    -> rh.gs(R.string.disableloop)
+        OfflineEvent.Reason.DISCONNECT_PUMP -> rh.gs(R.string.uel_disconnect)
+        OfflineEvent.Reason.OTHER           -> rh.gs(R.string.uel_other)
 
-        else                                -> resourceHelper.gs(R.string.unknown)
+        else                                -> rh.gs(R.string.unknown)
     }
 
     fun translate(source: Sources): String = when (source) {
@@ -281,13 +283,13 @@ class Translator @Inject internal constructor(
         Sources.Stats                              -> TODO()
         Sources.Aaps                               -> TODO()
         */
-        Sources.Automation -> resourceHelper.gs(R.string.automation)
-        Sources.Loop       -> resourceHelper.gs(R.string.loop)
-        Sources.NSClient   -> resourceHelper.gs(R.string.ns)
-        Sources.Pump       -> resourceHelper.gs(R.string.pump)
-        Sources.SMS        -> resourceHelper.gs(R.string.smb_shortname)
-        Sources.Wear       -> resourceHelper.gs(R.string.wear)
-        Sources.Unknown    -> resourceHelper.gs(R.string.unknown)
+        Sources.Automation -> rh.gs(R.string.automation)
+        Sources.Loop       -> rh.gs(R.string.loop)
+        Sources.NSClient   -> rh.gs(R.string.ns)
+        Sources.Pump       -> rh.gs(R.string.pump)
+        Sources.SMS        -> rh.gs(R.string.smb_shortname)
+        Sources.Wear       -> rh.gs(R.string.wear)
+        Sources.Unknown    -> rh.gs(R.string.unknown)
 
         else               -> source.name
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt b/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt
index e61b6bd3274..0114d516015 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt
@@ -10,7 +10,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class WarnColors @Inject constructor(val resourceHelper: ResourceHelper) {
+class WarnColors @Inject constructor(val rh: ResourceHelper) {
 
     private val normalColor = Color.WHITE
     private val warnColor = Color.YELLOW
@@ -32,8 +32,8 @@ class WarnColors @Inject constructor(val resourceHelper: ResourceHelper) {
 
     fun setColorByAge(view: TextView?, therapyEvent: TherapyEvent, warnThreshold: Double, urgentThreshold: Double) =
         view?.setTextColor(when {
-            therapyEvent.isOlderThan(urgentThreshold) -> resourceHelper.gc(R.color.low)
-            therapyEvent.isOlderThan(warnThreshold)   -> resourceHelper.gc(R.color.high)
+            therapyEvent.isOlderThan(urgentThreshold) -> rh.gc(R.color.low)
+            therapyEvent.isOlderThan(warnThreshold)   -> rh.gc(R.color.high)
             else                                      -> Color.WHITE
         })
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
index 41825387817..520b293238b 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
@@ -14,11 +14,11 @@ object OKDialog {
     @SuppressLint("InflateParams")
     fun show(context: Context, title: String, message: String, runnable: Runnable? = null) {
         var okClicked = false
-        var notEmptytitle = title
-        if (notEmptytitle.isEmpty()) notEmptytitle = context.getString(R.string.message)
+        var notEmptyTitle = title
+        if (notEmptyTitle.isEmpty()) notEmptyTitle = context.getString(R.string.message)
 
         AlertDialogHelper.Builder(context)
-            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, notEmptytitle))
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, notEmptyTitle))
             .setMessage(message)
             .setPositiveButton(context.getString(R.string.ok)) { dialog: DialogInterface, _: Int ->
                 if (okClicked) return@setPositiveButton
@@ -36,11 +36,11 @@ object OKDialog {
     @SuppressLint("InflateParams")
     fun show(activity: FragmentActivity, title: String, message: Spanned, runnable: Runnable? = null) {
         var okClicked = false
-        var notEmptytitle = title
-        if (notEmptytitle.isEmpty()) notEmptytitle = activity.getString(R.string.message)
+        var notEmptyTitle = title
+        if (notEmptyTitle.isEmpty()) notEmptyTitle = activity.getString(R.string.message)
 
         AlertDialogHelper.Builder(activity)
-            .setCustomTitle(AlertDialogHelper.buildCustomTitle(activity, notEmptytitle))
+            .setCustomTitle(AlertDialogHelper.buildCustomTitle(activity, notEmptyTitle))
             .setMessage(message)
             .setPositiveButton(activity.getString(R.string.ok)) { dialog: DialogInterface, _: Int ->
                 if (okClicked) return@setPositiveButton
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt b/core/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt
index fe46155c8ba..f3b8083baa9 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt
@@ -72,7 +72,9 @@ object BiometricCheck {
 //            .setDeviceCredentialAllowed(true) // setDeviceCredentialAllowed creates new activity when PIN is requested, activity.fragmentManager crash afterwards
             .build()
 
-        biometricPrompt.authenticate(promptInfo)
+        runOnUiThread {
+            biometricPrompt.authenticate(promptInfo)
+        }
     }
 
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelper.kt
index 7a068c57ee2..8f6379d6579 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelper.kt
@@ -21,5 +21,6 @@ interface ResourceHelper {
     fun decodeResource(id : Int) : Bitmap
     fun getDisplayMetrics(): DisplayMetrics
     fun dpToPx(dp: Int): Int
+    fun dpToPx(dp: Float): Int
     fun shortTextMode(): Boolean
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt b/core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt
index 214ccc8b53d..c05693684d5 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt
@@ -26,7 +26,7 @@ class ResourceHelperImplementation @Inject constructor(private val context: Cont
     override fun gq(@PluralsRes id: Int, quantity: Int, vararg args: Any?): String =
         context.resources.getQuantityString(id, quantity, *args)
 
-    override fun gsNotLocalised(@StringRes id: Int, vararg args: Any?) : String =
+    override fun gsNotLocalised(@StringRes id: Int, vararg args: Any?): String =
         with(Configuration(context.resources.configuration)) {
             setLocale(Locale.ENGLISH)
             context.createConfigurationContext(this).getString(id, args)
@@ -51,7 +51,7 @@ class ResourceHelperImplementation @Inject constructor(private val context: Cont
     override fun decodeResource(id: Int): Bitmap =
         BitmapFactory.decodeResource(context.resources, id)
 
-    override fun getDisplayMetrics():DisplayMetrics =
+    override fun getDisplayMetrics(): DisplayMetrics =
         context.resources.displayMetrics
 
     override fun dpToPx(dp: Int): Int {
@@ -59,5 +59,10 @@ class ResourceHelperImplementation @Inject constructor(private val context: Cont
         return (dp * scale + 0.5f).toInt()
     }
 
-    override fun shortTextMode() : Boolean = !gb(R.bool.isTablet)
+    override fun dpToPx(dp: Float): Int {
+        val scale = context.resources.displayMetrics.density
+        return (dp * scale + 0.5f).toInt()
+    }
+
+    override fun shortTextMode(): Boolean = !gb(R.bool.isTablet)
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SP.kt b/core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SP.kt
index 44a31193824..cd698c96e04 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SP.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SP.kt
@@ -26,6 +26,7 @@ interface SP {
     fun getInt(key: String, defaultValue: Int): Int
     fun getLong(@StringRes resourceID: Int, defaultValue: Long): Long
     fun getLong(key: String, defaultValue: Long): Long
+    fun incLong(@StringRes resourceID: Int)
     fun putBoolean(key: String, value: Boolean)
     fun putBoolean(@StringRes resourceID: Int, value: Boolean)
     fun putDouble(key: String, value: Double)
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt b/core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt
index 52f5c61f267..6592ece693f 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt
@@ -12,7 +12,7 @@ import javax.inject.Singleton
 @Singleton
 class SPImplementation @Inject constructor(
     private val sharedPreferences: SharedPreferences,
-    private val resourceHelper: ResourceHelper) : SP {
+    private val rh: ResourceHelper) : SP {
 
     override fun getAll(): Map<String, *> = sharedPreferences.all
 
@@ -20,19 +20,19 @@ class SPImplementation @Inject constructor(
 
     override fun contains(key: String): Boolean = sharedPreferences.contains(key)
 
-    override fun contains(resourceId: Int): Boolean = sharedPreferences.contains(resourceHelper.gs(resourceId))
+    override fun contains(resourceId: Int): Boolean = sharedPreferences.contains(rh.gs(resourceId))
 
     override fun remove(resourceID: Int) =
-        sharedPreferences.edit().remove(resourceHelper.gs(resourceID)).apply()
+        sharedPreferences.edit().remove(rh.gs(resourceID)).apply()
 
     override fun remove(key: String) =
         sharedPreferences.edit().remove(key).apply()
 
     override fun getString(resourceID: Int, defaultValue: String): String =
-        sharedPreferences.getString(resourceHelper.gs(resourceID), defaultValue) ?: defaultValue
+        sharedPreferences.getString(rh.gs(resourceID), defaultValue) ?: defaultValue
 
     override fun getStringOrNull(resourceID: Int, defaultValue: String?): String? =
-        sharedPreferences.getString(resourceHelper.gs(resourceID), defaultValue) ?: defaultValue
+        sharedPreferences.getString(rh.gs(resourceID), defaultValue) ?: defaultValue
 
     override fun getStringOrNull(key: String, defaultValue: String?): String? =
         sharedPreferences.getString(key, defaultValue)
@@ -42,7 +42,7 @@ class SPImplementation @Inject constructor(
 
     override fun getBoolean(resourceID: Int, defaultValue: Boolean): Boolean {
         return try {
-            sharedPreferences.getBoolean(resourceHelper.gs(resourceID), defaultValue)
+            sharedPreferences.getBoolean(rh.gs(resourceID), defaultValue)
         } catch (e: Exception) {
             defaultValue
         }
@@ -57,16 +57,16 @@ class SPImplementation @Inject constructor(
     }
 
     override fun getDouble(resourceID: Int, defaultValue: Double): Double =
-        SafeParse.stringToDouble(sharedPreferences.getString(resourceHelper.gs(resourceID), defaultValue.toString()))
+        SafeParse.stringToDouble(sharedPreferences.getString(rh.gs(resourceID), defaultValue.toString()))
 
     override fun getDouble(key: String, defaultValue: Double): Double =
         SafeParse.stringToDouble(sharedPreferences.getString(key, defaultValue.toString()))
 
     override fun getInt(resourceID: Int, defaultValue: Int): Int {
         return try {
-            sharedPreferences.getInt(resourceHelper.gs(resourceID), defaultValue)
+            sharedPreferences.getInt(rh.gs(resourceID), defaultValue)
         } catch (e: Exception) {
-            SafeParse.stringToInt(sharedPreferences.getString(resourceHelper.gs(resourceID), defaultValue.toString()))
+            SafeParse.stringToInt(sharedPreferences.getString(rh.gs(resourceID), defaultValue.toString()))
         }
     }
 
@@ -80,9 +80,13 @@ class SPImplementation @Inject constructor(
 
     override fun getLong(resourceID: Int, defaultValue: Long): Long {
         return try {
-            sharedPreferences.getLong(resourceHelper.gs(resourceID), defaultValue)
+            sharedPreferences.getLong(rh.gs(resourceID), defaultValue)
         } catch (e: Exception) {
-            SafeParse.stringToLong(sharedPreferences.getString(resourceHelper.gs(resourceID), defaultValue.toString()))
+            try {
+                SafeParse.stringToLong(sharedPreferences.getString(rh.gs(resourceID), defaultValue.toString()))
+            } catch (e: Exception) {
+                defaultValue
+            }
         }
     }
 
@@ -98,37 +102,42 @@ class SPImplementation @Inject constructor(
         }
     }
 
+    override fun incLong(resourceID: Int) {
+        val value = getLong(resourceID, 0) + 1L
+        sharedPreferences.edit().putLong(rh.gs(resourceID), value).apply()
+    }
+
     override fun putBoolean(key: String, value: Boolean) = sharedPreferences.edit().putBoolean(key, value).apply()
 
     override fun putBoolean(resourceID: Int, value: Boolean) =
-        sharedPreferences.edit().putBoolean(resourceHelper.gs(resourceID), value).apply()
+        sharedPreferences.edit().putBoolean(rh.gs(resourceID), value).apply()
 
     override fun putDouble(key: String, value: Double) =
         sharedPreferences.edit().putString(key, value.toString()).apply()
 
     override fun putDouble(resourceID: Int, value: Double) {
-        sharedPreferences.edit().putString(resourceHelper.gs(resourceID), value.toString()).apply()
+        sharedPreferences.edit().putString(rh.gs(resourceID), value.toString()).apply()
     }
 
     override fun putLong(key: String, value: Long) =
         sharedPreferences.edit().putLong(key, value).apply()
 
     override fun putLong(resourceID: Int, value: Long) =
-        sharedPreferences.edit().putLong(resourceHelper.gs(resourceID), value).apply()
+        sharedPreferences.edit().putLong(rh.gs(resourceID), value).apply()
 
     override fun putInt(key: String, value: Int) =
         sharedPreferences.edit().putInt(key, value).apply()
 
     override fun putInt(resourceID: Int, value: Int) =
-        sharedPreferences.edit().putInt(resourceHelper.gs(resourceID), value).apply()
+        sharedPreferences.edit().putInt(rh.gs(resourceID), value).apply()
 
     override fun incInt(resourceID: Int) {
         val value = getInt(resourceID, 0) + 1
-        sharedPreferences.edit().putInt(resourceHelper.gs(resourceID), value).apply()
+        sharedPreferences.edit().putInt(rh.gs(resourceID), value).apply()
     }
 
     override fun putString(resourceID: Int, value: String) =
-        sharedPreferences.edit().putString(resourceHelper.gs(resourceID), value).apply()
+        sharedPreferences.edit().putString(rh.gs(resourceID), value).apply()
 
     override fun putString(key: String, value: String) =
         sharedPreferences.edit().putString(key, value).apply()
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/VerticalTextView.kt b/core/src/main/java/info/nightscout/androidaps/utils/ui/VerticalTextView.kt
new file mode 100644
index 00000000000..b771b4073cd
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ui/VerticalTextView.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.utils.ui
+
+import android.content.Context
+import android.graphics.Canvas
+import android.util.AttributeSet
+import android.view.Gravity
+import androidx.appcompat.widget.AppCompatTextView
+
+class VerticalTextView(context: Context, attrs: AttributeSet? = null) : AppCompatTextView(context, attrs) {
+
+    private var topDown = false
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(heightMeasureSpec, widthMeasureSpec)
+        setMeasuredDimension(measuredHeight, measuredWidth)
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        val textPaint = paint
+        textPaint.color = currentTextColor
+        textPaint.drawableState = drawableState
+        canvas.save()
+        if (topDown) {
+            canvas.translate(width.toFloat(), 0f)
+            canvas.rotate(90f)
+        } else {
+            canvas.translate(0f, height.toFloat())
+            canvas.rotate(-90f)
+        }
+        canvas.translate(compoundPaddingLeft.toFloat(), extendedPaddingTop.toFloat())
+        layout.draw(canvas)
+        canvas.restore()
+    }
+
+    init {
+        val gravity = gravity
+        topDown = if (Gravity.isVertical(gravity) && gravity and Gravity.VERTICAL_GRAVITY_MASK == Gravity.BOTTOM) {
+            setGravity(gravity and Gravity.HORIZONTAL_GRAVITY_MASK or Gravity.TOP)
+            false
+        } else {
+            true
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt
index f2627a3d551..615a0be902c 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt
@@ -23,7 +23,7 @@ import javax.inject.Inject
 class UserEntryPresentationHelper @Inject constructor(
     private val translator: Translator,
     private val profileFunction: ProfileFunction,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val dateUtil: DateUtil
 ) {
 
@@ -70,6 +70,7 @@ class UserEntryPresentationHelper @Inject constructor(
         Sources.NSClientSource      -> R.drawable.ic_nsclient_bg
         Sources.PocTech             -> R.drawable.ic_poctech
         Sources.Tomato              -> R.drawable.ic_sensor
+        Sources.Glunovo             -> R.drawable.ic_glunovo
         Sources.Xdrip               -> R.drawable.ic_blooddrop_48
         Sources.LocalProfile        -> R.drawable.ic_local_profile
         Sources.Loop                -> R.drawable.ic_loop_closed_white
@@ -109,7 +110,7 @@ class UserEntryPresentationHelper @Inject constructor(
         else             -> HtmlHelper.fromHtml(coloredAction(action))
     }
 
-    private fun coloredAction(action: Action): String = "<font color='${resourceHelper.gc(colorId(action.colorGroup))}'>${translator.translate(action)}</font>"
+    private fun coloredAction(action: Action): String = "<font color='${rh.gc(colorId(action.colorGroup))}'>${translator.translate(action)}</font>"
 
     fun listToPresentationString(list: List<ValueWithUnit?>) =
         list.joinToString(separator = "  ", transform = this::toPresentationString)
@@ -131,12 +132,12 @@ class UserEntryPresentationHelper @Inject constructor(
 
         is ValueWithUnit.Mgdl                  -> {
             if (profileFunction.getUnits() == GlucoseUnit.MGDL) DecimalFormatter.to0Decimal(valueWithUnit.value) + translator.translate(valueWithUnit)
-            else DecimalFormatter.to1Decimal(valueWithUnit.value / Constants.MMOLL_TO_MGDL) + translator.translate(valueWithUnit)
+            else DecimalFormatter.to1Decimal(valueWithUnit.value * Constants.MGDL_TO_MMOLL) + translator.translate(valueWithUnit)
         }
 
         is ValueWithUnit.Mmoll                 -> {
-            if (profileFunction.getUnits() == GlucoseUnit.MGDL) DecimalFormatter.to0Decimal(valueWithUnit.value) + translator.translate(valueWithUnit)
-            else DecimalFormatter.to1Decimal(valueWithUnit.value * Constants.MMOLL_TO_MGDL) + translator.translate(valueWithUnit)
+            if (profileFunction.getUnits() == GlucoseUnit.MMOL) DecimalFormatter.to1Decimal(valueWithUnit.value) + translator.translate(valueWithUnit)
+            else DecimalFormatter.to0Decimal(valueWithUnit.value * Constants.MMOLL_TO_MGDL) + translator.translate(valueWithUnit)
         }
 
         ValueWithUnit.UNKNOWN                  -> ""
@@ -147,7 +148,7 @@ class UserEntryPresentationHelper @Inject constructor(
         return getCsvHeader() + userEntries.joinToString("\n") { entry -> getCsvEntry(entry) }
     }
 
-    private fun getCsvHeader() = resourceHelper.gs(R.string.ue_csv_header,
+    private fun getCsvHeader() = rh.gs(R.string.ue_csv_header,
         csvString(R.string.ue_timestamp),
         csvString(R.string.date),
         csvString(R.string.ue_utc_offset),
@@ -220,7 +221,7 @@ class UserEntryPresentationHelper @Inject constructor(
     }
 
     private fun csvString(action: Action): String = "\"" + translator.translate(action).replace("\"", "\"\"").replace("\n", " / ") + "\""
-    private fun csvString(id: Int): String = if (id != 0) "\"" + resourceHelper.gs(id).replace("\"", "\"\"").replace("\n", " / ") + "\"" else ""
+    private fun csvString(id: Int): String = if (id != 0) "\"" + rh.gs(id).replace("\"", "\"\"").replace("\n", " / ") + "\"" else ""
     private fun csvString(s: String): String = if (s != "") "\"" + s.replace("\"", "\"\"").replace("\n", " / ") + "\"" else ""
 
     private fun String.addWithSeparator(add: Any) =
diff --git a/core/src/main/res/drawable/ic_glunovo.xml b/core/src/main/res/drawable/ic_glunovo.xml
new file mode 100644
index 00000000000..6fe7de817b6
--- /dev/null
+++ b/core/src/main/res/drawable/ic_glunovo.xml
@@ -0,0 +1,85 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M51.787,23.533c-0.01,-10.925 -8.888,-19.787 -19.813,-19.777c-10.925,0.01 -19.787,8.889 -19.777,19.814l0.016,16.897c0.01,10.925 8.888,19.787 19.813,19.777c10.925,-0.01 19.787,-8.889 19.777,-19.814l-0.016,-16.897Z"
+      android:fillColor="#ebeae3"/>
+  <path
+      android:pathData="M46.353,25.52c-0.007,-7.925 -6.447,-14.353 -14.372,-14.346c-7.925,0.008 -14.353,6.448 -14.346,14.373l0.015,16.092c0.006,6.181 5.029,11.195 11.21,11.19l6.318,-0.006c6.182,-0.006 11.196,-5.029 11.19,-11.211l-0.015,-16.092Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="31.4229"
+          android:startX="17.6405"
+          android:endY="30.819769"
+          android:endX="58.322098"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FFB3B3B3"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M22.928,44.362l-0.021,-22.414c-0.004,-4.01 3.249,-7.27 7.26,-7.273l3.634,-0.004c4.011,-0.003 7.27,3.25 7.274,7.261l0.02,22.413c-0.638,2.068 -1.683,3.934 -3.208,5.56l-11.85,0.011c-1.578,-1.46 -2.517,-3.384 -3.119,-5.554l0.01,-0Z"
+      android:strokeWidth="0.56"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M28.826,46.02l-2.759,0.002l-0.001,-0.899c-0,-0.158 0.008,-0.279 0.026,-0.362c0.022,-0.117 0.065,-0.216 0.129,-0.295c0.063,-0.079 0.152,-0.143 0.266,-0.191c0.114,-0.048 0.239,-0.073 0.376,-0.073c0.235,0 0.434,0.064 0.596,0.193c0.163,0.129 0.244,0.362 0.245,0.699l0,0.611l1.122,-0.001l0,0.316ZM27.378,45.706l-0,-0.616c-0,-0.204 -0.044,-0.349 -0.132,-0.434c-0.088,-0.086 -0.212,-0.129 -0.371,-0.129c-0.116,0.001 -0.214,0.026 -0.297,0.076c-0.082,0.051 -0.136,0.117 -0.162,0.2c-0.017,0.053 -0.025,0.151 -0.025,0.294l0.001,0.61l0.986,-0.001Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M27.48,43.896c-0.458,0.001 -0.816,-0.105 -1.076,-0.317c-0.259,-0.213 -0.389,-0.487 -0.389,-0.823c-0,-0.22 0.06,-0.418 0.182,-0.595c0.122,-0.177 0.291,-0.311 0.509,-0.404c0.217,-0.093 0.464,-0.14 0.74,-0.14c0.28,-0 0.531,0.048 0.752,0.146c0.221,0.097 0.388,0.235 0.502,0.414c0.114,0.179 0.171,0.371 0.171,0.578c-0,0.225 -0.063,0.425 -0.188,0.602c-0.125,0.177 -0.297,0.311 -0.514,0.402c-0.217,0.091 -0.446,0.137 -0.689,0.137ZM27.486,43.571c0.332,-0 0.594,-0.078 0.786,-0.232c0.191,-0.155 0.286,-0.349 0.286,-0.582c-0,-0.237 -0.097,-0.432 -0.29,-0.585c-0.194,-0.154 -0.468,-0.23 -0.823,-0.23c-0.225,0 -0.421,0.033 -0.588,0.099c-0.168,0.066 -0.298,0.162 -0.39,0.288c-0.092,0.127 -0.138,0.268 -0.138,0.425c0,0.224 0.089,0.416 0.267,0.576c0.178,0.161 0.474,0.241 0.89,0.241Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M27.853,39.51l0.092,-0.316c0.3,0.066 0.529,0.185 0.687,0.357c0.157,0.171 0.236,0.381 0.236,0.629c0.001,0.257 -0.06,0.466 -0.181,0.627c-0.121,0.161 -0.296,0.284 -0.526,0.368c-0.229,0.084 -0.476,0.127 -0.739,0.127c-0.288,0 -0.538,-0.047 -0.752,-0.142c-0.215,-0.094 -0.377,-0.229 -0.488,-0.404c-0.112,-0.175 -0.167,-0.368 -0.168,-0.578c0,-0.238 0.07,-0.439 0.211,-0.602c0.14,-0.162 0.338,-0.276 0.593,-0.34l0.085,0.311c-0.201,0.055 -0.347,0.135 -0.439,0.24c-0.091,0.106 -0.137,0.238 -0.137,0.397c0,0.183 0.051,0.336 0.153,0.459c0.102,0.123 0.238,0.21 0.41,0.259c0.171,0.05 0.348,0.075 0.53,0.075c0.234,-0.001 0.439,-0.03 0.614,-0.089c0.175,-0.06 0.306,-0.152 0.392,-0.276c0.087,-0.125 0.13,-0.26 0.13,-0.405c-0,-0.177 -0.059,-0.326 -0.177,-0.449c-0.118,-0.122 -0.294,-0.205 -0.526,-0.248Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M28.82,38.199l-2.434,0.002l0,0.785l-0.325,0l-0.002,-1.889l0.326,0l0,0.789l2.434,-0.003l0.001,0.316Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M28.174,36.055l0.043,-0.302c0.205,0.047 0.363,0.135 0.477,0.264c0.113,0.129 0.169,0.294 0.169,0.494c0.001,0.253 -0.089,0.453 -0.269,0.601c-0.18,0.148 -0.433,0.222 -0.758,0.223c-0.336,-0 -0.597,-0.075 -0.783,-0.224c-0.186,-0.149 -0.279,-0.343 -0.279,-0.582c-0,-0.231 0.09,-0.419 0.272,-0.566c0.182,-0.146 0.438,-0.22 0.768,-0.22c0.02,0 0.05,0.001 0.091,0.002l0.001,1.287c0.219,-0.011 0.387,-0.065 0.504,-0.161c0.117,-0.097 0.175,-0.217 0.175,-0.361c-0,-0.107 -0.033,-0.199 -0.098,-0.275c-0.066,-0.076 -0.17,-0.136 -0.313,-0.18ZM27.627,37.016l-0.001,-0.964c-0.168,0.013 -0.294,0.05 -0.378,0.111c-0.131,0.093 -0.196,0.214 -0.196,0.363c0,0.134 0.053,0.247 0.157,0.339c0.104,0.091 0.244,0.142 0.418,0.151Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M28.084,34.259l0.043,-0.288c0.23,0.031 0.41,0.112 0.54,0.241c0.13,0.129 0.195,0.288 0.195,0.477c0,0.236 -0.089,0.426 -0.268,0.57c-0.179,0.144 -0.435,0.216 -0.769,0.216c-0.216,0 -0.405,-0.031 -0.567,-0.092c-0.161,-0.062 -0.283,-0.156 -0.364,-0.282c-0.081,-0.126 -0.122,-0.263 -0.122,-0.412c0,-0.187 0.055,-0.341 0.164,-0.46c0.11,-0.119 0.266,-0.196 0.468,-0.23l0.051,0.285c-0.134,0.027 -0.235,0.075 -0.303,0.144c-0.067,0.069 -0.101,0.152 -0.101,0.249c-0,0.148 0.061,0.268 0.184,0.36c0.122,0.092 0.316,0.137 0.581,0.137c0.268,-0 0.463,-0.045 0.585,-0.134c0.122,-0.089 0.182,-0.205 0.182,-0.348c0,-0.115 -0.041,-0.21 -0.122,-0.287c-0.082,-0.077 -0.208,-0.126 -0.377,-0.146Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M28.816,33.72l-2.76,0.002l-0,-0.292l0.99,-0.001c-0.183,-0.136 -0.275,-0.309 -0.275,-0.517c-0,-0.128 0.029,-0.239 0.087,-0.333c0.058,-0.094 0.139,-0.162 0.242,-0.203c0.102,-0.04 0.252,-0.061 0.448,-0.061l1.267,-0.001l-0,0.292l-1.267,0.002c-0.17,-0 -0.293,0.032 -0.37,0.095c-0.077,0.063 -0.116,0.153 -0.116,0.269c0.001,0.087 0.027,0.168 0.079,0.245c0.052,0.076 0.123,0.13 0.212,0.163c0.089,0.032 0.212,0.048 0.369,0.048l1.094,-0.001l-0,0.293Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M27.844,29.206l0.092,-0.315c0.3,0.066 0.529,0.185 0.687,0.356c0.157,0.172 0.236,0.382 0.237,0.63c-0,0.257 -0.061,0.466 -0.182,0.627c-0.121,0.161 -0.296,0.283 -0.525,0.368c-0.23,0.084 -0.477,0.126 -0.74,0.126c-0.288,0.001 -0.538,-0.047 -0.752,-0.141c-0.214,-0.095 -0.377,-0.23 -0.488,-0.405c-0.112,-0.175 -0.167,-0.367 -0.167,-0.577c-0.001,-0.239 0.069,-0.439 0.21,-0.602c0.14,-0.163 0.338,-0.276 0.593,-0.34l0.085,0.31c-0.201,0.056 -0.347,0.136 -0.439,0.241c-0.091,0.105 -0.137,0.237 -0.137,0.397c0,0.183 0.051,0.336 0.153,0.459c0.102,0.123 0.238,0.209 0.41,0.259c0.171,0.05 0.348,0.074 0.53,0.074c0.234,-0 0.439,-0.03 0.614,-0.089c0.175,-0.059 0.306,-0.151 0.393,-0.276c0.086,-0.125 0.129,-0.26 0.129,-0.405c-0,-0.176 -0.059,-0.326 -0.177,-0.448c-0.118,-0.123 -0.294,-0.205 -0.526,-0.249Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M28.811,27.895l-2.434,0.002l0,0.786l-0.325,-0l-0.002,-1.889l0.326,-0l0,0.788l2.434,-0.002l0.001,0.315Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M27.982,26.833l-0.341,-0l-0.001,-0.899l0.341,-0l0.001,0.899Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M28.808,24.589l0,0.292l-2.159,0.002c0.078,0.07 0.156,0.163 0.234,0.277c0.077,0.114 0.136,0.217 0.175,0.308l-0.328,0c-0.089,-0.163 -0.197,-0.306 -0.324,-0.429c-0.127,-0.122 -0.25,-0.209 -0.369,-0.259l-0,-0.189l2.771,-0.002Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M27.446,23.84c-0.326,0.001 -0.589,-0.028 -0.788,-0.086c-0.199,-0.058 -0.352,-0.144 -0.46,-0.258c-0.108,-0.114 -0.162,-0.258 -0.163,-0.431c0,-0.128 0.03,-0.241 0.09,-0.337c0.059,-0.097 0.145,-0.176 0.257,-0.239c0.113,-0.063 0.249,-0.113 0.411,-0.149c0.161,-0.035 0.378,-0.054 0.652,-0.054c0.324,-0 0.585,0.028 0.784,0.086c0.199,0.057 0.353,0.143 0.461,0.257c0.109,0.114 0.163,0.259 0.164,0.433c-0,0.23 -0.095,0.41 -0.286,0.542c-0.23,0.157 -0.604,0.236 -1.122,0.236ZM27.446,23.54c0.453,-0.001 0.754,-0.047 0.904,-0.139c0.15,-0.091 0.225,-0.204 0.225,-0.339c-0,-0.134 -0.075,-0.247 -0.226,-0.338c-0.151,-0.092 -0.452,-0.137 -0.904,-0.137c-0.454,0 -0.756,0.046 -0.905,0.138c-0.15,0.092 -0.224,0.206 -0.224,0.343c0,0.134 0.066,0.241 0.198,0.321c0.168,0.101 0.479,0.151 0.932,0.151Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M27.445,21.989c-0.327,0 -0.589,-0.029 -0.788,-0.087c-0.199,-0.057 -0.353,-0.143 -0.461,-0.258c-0.108,-0.114 -0.162,-0.258 -0.162,-0.431c-0,-0.128 0.029,-0.24 0.089,-0.337c0.059,-0.096 0.145,-0.176 0.258,-0.239c0.112,-0.063 0.249,-0.112 0.41,-0.148c0.161,-0.036 0.379,-0.054 0.652,-0.054c0.324,-0.001 0.585,0.028 0.784,0.085c0.199,0.057 0.353,0.143 0.462,0.257c0.108,0.115 0.163,0.259 0.163,0.433c0,0.23 -0.095,0.411 -0.286,0.542c-0.229,0.157 -0.603,0.236 -1.121,0.237ZM27.444,21.688c0.453,-0 0.755,-0.046 0.905,-0.138c0.15,-0.092 0.225,-0.205 0.224,-0.339c0,-0.135 -0.075,-0.248 -0.226,-0.339c-0.15,-0.091 -0.452,-0.137 -0.904,-0.137c-0.454,0.001 -0.756,0.047 -0.905,0.139c-0.149,0.091 -0.224,0.205 -0.224,0.342c0,0.134 0.066,0.242 0.198,0.322c0.169,0.1 0.479,0.15 0.932,0.15Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M27.307,19.687c-0.051,0.121 -0.125,0.211 -0.22,0.27c-0.095,0.059 -0.21,0.088 -0.343,0.088c-0.2,0 -0.369,-0.062 -0.506,-0.186c-0.137,-0.125 -0.206,-0.291 -0.206,-0.498c0,-0.208 0.07,-0.375 0.21,-0.502c0.14,-0.127 0.31,-0.191 0.511,-0.191c0.128,0 0.239,0.029 0.334,0.087c0.095,0.058 0.168,0.146 0.219,0.264c0.056,-0.147 0.145,-0.258 0.267,-0.334c0.123,-0.077 0.27,-0.115 0.441,-0.115c0.236,-0.001 0.434,0.071 0.595,0.215c0.161,0.144 0.241,0.334 0.241,0.569c0.001,0.235 -0.08,0.425 -0.241,0.569c-0.161,0.144 -0.362,0.217 -0.603,0.217c-0.18,0 -0.33,-0.039 -0.451,-0.118c-0.121,-0.078 -0.204,-0.19 -0.248,-0.335ZM26.733,19.746c0.13,-0 0.237,-0.037 0.32,-0.109c0.083,-0.073 0.124,-0.167 0.124,-0.283c-0,-0.113 -0.041,-0.205 -0.124,-0.277c-0.082,-0.072 -0.183,-0.108 -0.302,-0.108c-0.124,0 -0.229,0.037 -0.313,0.112c-0.085,0.074 -0.127,0.166 -0.127,0.277c-0,0.111 0.041,0.204 0.124,0.278c0.083,0.073 0.182,0.11 0.298,0.11ZM28.007,19.839c0.097,0 0.191,-0.02 0.281,-0.059c0.09,-0.04 0.16,-0.099 0.21,-0.177c0.049,-0.078 0.074,-0.162 0.074,-0.252c-0,-0.14 -0.052,-0.255 -0.157,-0.346c-0.104,-0.091 -0.236,-0.136 -0.397,-0.136c-0.163,-0 -0.298,0.047 -0.405,0.141c-0.106,0.093 -0.16,0.211 -0.159,0.352c-0,0.137 0.053,0.251 0.158,0.342c0.106,0.09 0.237,0.135 0.395,0.135Z"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/core/src/main/res/layout/activity_tdd_stats.xml b/core/src/main/res/layout/activity_tdd_stats.xml
index f7967bfebfc..772859ccd2e 100644
--- a/core/src/main/res/layout/activity_tdd_stats.xml
+++ b/core/src/main/res/layout/activity_tdd_stats.xml
@@ -167,7 +167,7 @@
 
         <TextView
             android:id="@+id/message"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:background="@drawable/pillborder"
diff --git a/core/src/main/res/layout/dialog_alert_custom.xml b/core/src/main/res/layout/dialog_alert_custom.xml
index c7818b902a9..3c2df5b99ba 100644
--- a/core/src/main/res/layout/dialog_alert_custom.xml
+++ b/core/src/main/res/layout/dialog_alert_custom.xml
@@ -3,6 +3,7 @@
   Please use AlertDialogHelper or wrap inflater context with ContextThemeWrapper(context, R.style.AppTheme)
 -->
 <LinearLayout 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:orientation="vertical">
@@ -19,7 +20,7 @@
             android:id="@+id/alertdialog_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:tint="?dialogTitleIconTint" />
+            app:tint="?dialogTitleIconTint" />
 
         <TextView
             android:id="@+id/alertdialog_title"
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index 659c20aba18..9a4cc937858 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">Свързана</string>
     <string name="disconnected">Не е сврзана</string>
     <string name="disconnecting">Разкачане</string>
+    <string name="waiting_for_disconnection">Изчакване за разкачане</string>
     <string name="androidaps_start">Стартиран AndroidAPS</string>
     <string name="formatinsulinunits1">%1$.1fЕ</string>
     <string name="formatinsulinunits">%1$.2fЕ</string>
@@ -63,6 +64,7 @@
     <string name="mgdl">мг/дл</string>
     <string name="mmol">ммол/л</string>
     <string name="shortgram">гр.</string>
+    <string name="shortpercent">%</string>
     <string name="advancedsettings_title">Допълнителни настройки</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="btwatchdog_title">BT ограничения</string>
@@ -103,6 +105,7 @@
     <string name="notes_label">Бележки</string>
     <string name="remove_button">Изтрий</string>
     <string name="addnew">Добави нов</string>
+    <string name="wrong_pump_data">Данните идват от различна помпа. Сменете драйвера на помпата и за да възстановите състоянието на помпата.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Ограничаване на макс. базална стойност до %1$.2f Е/ч поради %2$s</string>
     <string name="pumplimit">лимит на помпата</string>
@@ -118,6 +121,7 @@
     <string name="dismiss">Разбрах</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth Low Energy не се поддържа.</string>
+    <string name="ble_not_supported_or_not_paired">Нискоенергиен Bluetooth не се потдържа или устройството не е сдвоено.</string>
     <string name="ble_not_enabled">Bluetooth не е включен.</string>
     <string name="location_not_found_title">Локацията не е включена</string>
     <string name="location_not_found_message">За да работи откриването на нови устройсва чрез Bluetooth, трябва да включите локацията. AAPS не проследява вашето местоположение и ще можете да я изключите след успешното свързване.</string>
@@ -168,7 +172,9 @@
     <!--    TDD-->
     <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fЕ</b> Бол: <b>%3$.2fЕ</b> Баз: <b>%4$.2fЕ(%5$.0f%%)</b>]]></string>
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fЕ</b> Бол: <b>%3$.2fЕ</b> Баз: <b>%4$.2fЕ(%5$.0f%%)</b> Въгл: <b>%6$.0fгр</b>]]></string>
+    <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> in <b>%3$d</b> days<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Careportal</string>
     <string name="careportal_bgcheck">Проверка на КЗ</string>
     <string name="careportal_mbg">Калибрация или ръчна КЗ</string>
     <string name="careportal_announcement">Известие</string>
@@ -244,7 +250,6 @@
     <string name="metadata_label_device_name">Име на пациента</string>
     <string name="metadata_label_device_model">Модел на телефона:</string>
     <string name="metadata_label_encryption">Криптиране</string>
-    <string name="metadata_format_old">Стар формат</string>
     <string name="metadata_format_new">Нов формат</string>
     <string name="metadata_format_debug">Нов формат (незащитен)</string>
     <string name="metadata_format_other">Непознат формат</string>
@@ -286,10 +291,15 @@
     <string name="saturday_short">С</string>
     <string name="sunday_short">Н</string>
     <!-- User Entry -->
+    <string name="uel_disconnect">Разкачане</string>
     <string name="uel_cancel_bolus">СПРИ БОЛУС</string>
     <string name="ue_source">Източник</string>
     <string name="ue_action">Действие</string>
     <!-- HardLimits -->
+    <plurals name="days">
+        <item quantity="one">%1$d дeн</item>
+        <item quantity="other">%1$d дни</item>
+    </plurals>
     <plurals name="hours">
         <item quantity="one">%1$d час</item>
         <item quantity="other">%1$d часа</item>
diff --git a/core/src/main/res/values-ca-rES/strings.xml b/core/src/main/res/values-ca-rES/strings.xml
index 1a5baa3b018..c4eef25aa86 100644
--- a/core/src/main/res/values-ca-rES/strings.xml
+++ b/core/src/main/res/values-ca-rES/strings.xml
@@ -29,7 +29,6 @@
     <string name="metadata_label_device_name">Exportant nom del pacient del dispositiu</string>
     <string name="metadata_label_device_model">Exportant model del dispositiu</string>
     <string name="metadata_label_encryption">Encriptació d\'arxius</string>
-    <string name="metadata_format_old">Format d\'exportació antic</string>
     <string name="metadata_format_new">Format nou d\'encriptació</string>
     <string name="metadata_format_debug">Nou format de debug (no encriptat)</string>
     <string name="metadata_format_other">Format d\'exportació desconegut</string>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index 33289e55b3b..481d7eea06d 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">Připojeno</string>
     <string name="disconnected">Odpojeno</string>
     <string name="disconnecting">Odpojuji</string>
+    <string name="waiting_for_disconnection">Čekám na odpojení</string>
     <string name="androidaps_start">AndroidAPS restartován</string>
     <string name="formatinsulinunits1">%1$.1f U</string>
     <string name="formatinsulinunits">%1$.2f U</string>
@@ -173,12 +174,17 @@
     <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> Sach.: <b>%6$.0f g</b>]]></string>
     <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> ve <b>%3$d</b> dnech<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Péče</string>
     <string name="careportal_bgcheck">Kontrola glykémie</string>
     <string name="careportal_mbg">Ruční glykémie nebo kalibrace</string>
     <string name="careportal_announcement">Oznámení</string>
     <string name="careportal_note">Poznámka</string>
     <string name="careportal_question">Otázka</string>
     <string name="careportal_exercise">Cvičení</string>
+    <string name="careportal_announcement_message">Oznámení: %1$s</string>
+    <string name="careportal_note_message">Poznámka : %1$s</string>
+    <string name="careportal_question_message">Otázka: %1$s</string>
+    <string name="careportal_exercise_message">Cvičení : %1$s</string>
     <string name="careportal_pumpsitechange">Výměna setu</string>
     <string name="careportal_cgmsensorinsert">Výměna senzoru</string>
     <string name="careportal_cgmsensorstart">Znovu spuštění senzoru</string>
@@ -213,6 +219,8 @@
     <string name="loop">Smyčka</string>
     <string name="ns">NS</string>
     <string name="record">Záznam</string>
+    <string name="reading_pump_history">Načítání historie pumpy</string>
+    <string name="pump_icon">Ikona pumpy</string>
     <!--    Command-->
     <string name="connectiontimedout">Vypršel čas připojování</string>
     <!--    PumpEnactResult-->
@@ -253,7 +261,6 @@
     <string name="metadata_label_device_name">Jméno pacienta použité při exportu</string>
     <string name="metadata_label_device_model">Model zaříení použitý při exportu</string>
     <string name="metadata_label_encryption">Šifrování souboru</string>
-    <string name="metadata_format_old">Starý formát exportu</string>
     <string name="metadata_format_new">Nový zašifrovaný formát</string>
     <string name="metadata_format_debug">Nový formát pro ladění (nešifrovaný)</string>
     <string name="metadata_format_other">Neznámý formát souboru</string>
@@ -284,6 +291,7 @@
     <string name="signature_verifier">Ověření podpisu</string>
     <string name="running_invalid_version">Zjistili jsme, že používáte neplatnou verzi, smyčka zakázána!</string>
     <string name="versionavailable">Verze %1$s je k dispozici</string>
+    <string name="version_expire">Platnost verze %1$s vyprší dne %2$s</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Prosím restartujte Váš telefon nebo restartujte AndroidAPS z nastavení systému\njinak nebude AndroidAPS zaznamenával logy (důležité pro sledování a kontrolu, zda algoritmus pracuje správně)!</string>
     <!-- WeekdayPicker -->
@@ -296,6 +304,7 @@
     <string name="sunday_short">Ne</string>
     <!-- User Entry -->
     <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_calculator">BOLUS KALKULÁTOR</string>
     <string name="uel_bolus_advisor">POMOCNÍK S BOLUSEM</string>
     <string name="uel_extended_bolus">PRODLOUŽENÝ BOLUS</string>
     <string name="uel_superbolus_tbr">SUPERBOLUS TBR</string>
@@ -400,6 +409,7 @@
     <string name="valueoutofrange">»%1$s« je mimo pevně nastavené limity</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f je mimo pevně nastavené limity</string>
     <string name="basal_value">Hodnota bazálu</string>
+    <string name="nsclient_version_does_not_match">Verze NSClient se neshoduje s AndroidAPS. Aktualizujte prosím.</string>
     <plurals name="days">
         <item quantity="one">%1$d den</item>
         <item quantity="few">%1$d dnů</item>
diff --git a/core/src/main/res/values-da-rDK/strings.xml b/core/src/main/res/values-da-rDK/strings.xml
index 94b2e3b8e74..d077210c058 100644
--- a/core/src/main/res/values-da-rDK/strings.xml
+++ b/core/src/main/res/values-da-rDK/strings.xml
@@ -41,7 +41,6 @@
     <string name="metadata_label_device_name">Eksporterer enhedens patientnavn</string>
     <string name="metadata_label_device_model">Eksporterer enhedsmodel</string>
     <string name="metadata_label_encryption">Filkryptering</string>
-    <string name="metadata_format_old">Gammelt eksportformat</string>
     <string name="metadata_format_new">Nyt krypteret format</string>
     <string name="metadata_format_debug">Nyt debug format (ukrypteret)</string>
     <string name="metadata_format_other">Ukendt eksportformat</string>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 70ba734fdd8..eb7bc51d4d4 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">Verbunden</string>
     <string name="disconnected">Getrennt</string>
     <string name="disconnecting">Verbindung wird getrennt</string>
+    <string name="waiting_for_disconnection">Warte auf Trennung der Verbindung</string>
     <string name="androidaps_start">AndroidAPS gestartet</string>
     <string name="formatinsulinunits1">%1$.1f IE</string>
     <string name="formatinsulinunits">%1$.2f IE</string>
@@ -173,12 +174,17 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f IE</b> Bol: <b>%3$.2f U</b> Bas: <b>%4$.2f IE(%5$.0f%%)</b> KH: <b>%6$.0f g</b>]]></string>
     <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> in <b>%3$d</b> Tagen<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Careportal</string>
     <string name="careportal_bgcheck">BZ-Test</string>
     <string name="careportal_mbg">Manueller BZ oder Kalibrierung</string>
     <string name="careportal_announcement">Ankündigung</string>
     <string name="careportal_note">Notiz</string>
     <string name="careportal_question">Frage</string>
     <string name="careportal_exercise">Bewegung</string>
+    <string name="careportal_announcement_message">Ankündigung : %1$s</string>
+    <string name="careportal_note_message">Hinweis : %1$s</string>
+    <string name="careportal_question_message">Frage : %1$s</string>
+    <string name="careportal_exercise_message">Bewegung : %1$s</string>
     <string name="careportal_pumpsitechange">Pumpenkatheter-Wechsel</string>
     <string name="careportal_cgmsensorinsert">CGM-Sensor gesetzt</string>
     <string name="careportal_cgmsensorstart">CGM-Sensor Start</string>
@@ -213,6 +219,8 @@
     <string name="loop">Loop</string>
     <string name="ns">NS</string>
     <string name="record">Eintrag</string>
+    <string name="reading_pump_history">Pumpen-Historie wird gelesen</string>
+    <string name="pump_icon">Pumpen-Symbol</string>
     <!--    Command-->
     <string name="connectiontimedout">Zeitüberschreitung bei Verbindung</string>
     <!--    PumpEnactResult-->
@@ -253,7 +261,6 @@
     <string name="metadata_label_device_name">Patientenname des exportierenden Geräts</string>
     <string name="metadata_label_device_model">Modell des exportierenden Geräts</string>
     <string name="metadata_label_encryption">Dateiverschlüsselung</string>
-    <string name="metadata_format_old">Altes Exportformat</string>
     <string name="metadata_format_new">Neues verschlüsseltes Format</string>
     <string name="metadata_format_debug">Neues Debugformat (unverschlüsselt)</string>
     <string name="metadata_format_other">Unbekanntes Export-Format</string>
@@ -284,6 +291,7 @@
     <string name="signature_verifier">Signaturprüfung</string>
     <string name="running_invalid_version">Wir haben festgestellt, dass Du eine ungültige Version verwendest. Loop deaktiviert!</string>
     <string name="versionavailable">Version %1$s ist verfügbar.</string>
+    <string name="version_expire">Version %1$s läuft am %2$s ab</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Bitte starte dein Telefon neu oder starte AndroidAPS in den System-Einstellungen neu.\nAndernfalls wird AndroidAPS nichts protokollieren (wichtig zum Nachverfolgen und Verifizieren, dass der Algorithmus korrekt funktioniert)!</string>
     <!-- WeekdayPicker -->
@@ -296,6 +304,7 @@
     <string name="sunday_short">So</string>
     <!-- User Entry -->
     <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_calculator">BOLUS-KALKULATOR</string>
     <string name="uel_bolus_advisor">BOLUS RATGEBER</string>
     <string name="uel_extended_bolus">VERLÄNGERTER BOLUS</string>
     <string name="uel_superbolus_tbr">SUPERBOLUS TBR</string>
@@ -400,6 +409,7 @@
     <string name="valueoutofrange">»%1$s« ist außerhalb der fest programmierten Grenzen</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f ist außerhalb der fest programmierten Grenzen</string>
     <string name="basal_value">Basal-Wert</string>
+    <string name="nsclient_version_does_not_match">Die Versionen von NSClient und AndroidAPS passen nicht zueinander. Führe bitte ein Update durch.</string>
     <plurals name="days">
         <item quantity="one">%1$d Tag</item>
         <item quantity="other">%1$d Tage</item>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index abacc666001..11ab72c05c3 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!--    Keys-->
     <!--    General-->
+    <string name="refresh">Actualizar</string>
     <string name="error">Error</string>
     <string name="not_set_short">No configurado</string>
     <string name="failedupdatebasalprofile">Error al actualizar el perfil basal</string>
@@ -17,6 +18,7 @@
     <string name="connected">Conectado</string>
     <string name="disconnected">Desconectado</string>
     <string name="disconnecting">Desconectando</string>
+    <string name="waiting_for_disconnection">Esperando la desconexión</string>
     <string name="androidaps_start">AndroidAPS iniciado</string>
     <string name="formatinsulinunits1">%1$.1f U</string>
     <string name="formatinsulinunits">%1$.2f U</string>
@@ -61,6 +63,8 @@
     <string name="eventtype">Tipo de evento</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
+    <string name="shortgram">g</string>
+    <string name="shortpercent">%</string>
     <string name="advancedsettings_title">Ajustes avanzados</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="btwatchdog_title">Vigilante de BT</string>
@@ -68,24 +72,40 @@
     <string name="pairing">Emparejando</string>
     <string name="yes">Si</string>
     <string name="no">No</string>
+    <string name="loopdisabled">LAZO DESACTIVADO POR RESTRICCIONES</string>
     <string name="bolusdelivered">Bolo %1$.2fU enviado correctamente</string>
+    <string name="virtualpump_resultok">OK</string>
     <string name="novalidbasalrate">Tasa Basal no valida en la bomba</string>
     <string name="limitingmaxiob">Limitando max IOB a %1$.1f U debido a %2$s</string>
     <string name="unsafeusage">uso no seguro</string>
     <string name="pump_unreachable">Bomba no alcanzable</string>
+    <string name="extended_bolus">Bolo extendido</string>
+    <string name="pump_time_updated">Hora de infusora actualizada</string>
+    <string name="exit">Salir</string>
+    <string name="removerecord">Eliminar registro</string>
+    <string name="loopisdisabled">Lazo inactivo</string>
+    <string name="alarm">Alarma</string>
     <string name="disableloop">Desactivar lazo</string>
     <string name="enableloop">Activar lazo</string>
     <string name="resumeloop">Reactivar el lazo</string>
     <string name="suspendloop">Suspender lazo</string>
+    <string name="duration_min_label">Duración [min]</string>
     <string name="notification">Notificación</string>
     <string name="noprofile">Pendiente carga perfil NS</string>
+    <string name="exists">existe</string>
     <string name="notexists">no existe</string>
+    <string name="glucose">Glucosa</string>
     <string name="iob">IOB</string>
+    <string name="cob">COB</string>
     <string name="name_short">Nombre:</string>
     <string name="time">Tiempo</string>
     <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="loading">Cargando …</string>
     <string name="event_time_label">Hora del evento</string>
+    <string name="notes_label">Notas</string>
+    <string name="remove_button">Eliminar</string>
     <string name="addnew">Añadir nuevo</string>
+    <string name="wrong_pump_data">Los datos proceden de una bomba diferente. Cambia el controlador de la bomba para resetear su estado.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Limitando max basal rate a %1$.2f U/h debido a %2$s</string>
     <string name="pumplimit">límite de la bomba</string>
@@ -101,6 +121,7 @@
     <string name="dismiss">DESCARTAR</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth de baja energía no soportado.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy no compatible o dispositivo no emparejado.</string>
     <string name="ble_not_enabled">Bluetooth no activado.</string>
     <string name="location_not_found_title">Ubicación no habilitada</string>
     <string name="location_not_found_message">Para activar la visibilidad Bluetooth en nuevos dispositivos, la ubicación debe estar habilitada. AAPS no hace un seguimiento de su ubicación y se puede desactivar después de realizar la vinculación.</string>
@@ -151,16 +172,24 @@
     <!--    TDD-->
     <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b> Carbs: <b>%6$.0fg</b>]]></string>
+    <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> en <b>%3$d</b> días<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Portal de Tratamientos</string>
     <string name="careportal_bgcheck">Medir glucosa</string>
     <string name="careportal_mbg">Calibración o BG Manual</string>
     <string name="careportal_announcement">Aviso</string>
     <string name="careportal_note">Nota</string>
     <string name="careportal_question">Pregunta</string>
     <string name="careportal_exercise">Ejercicio</string>
+    <string name="careportal_announcement_message">Anuncio: %1$s</string>
+    <string name="careportal_note_message">Nota : %1$s</string>
+    <string name="careportal_question_message">Pregunta : %1$s</string>
+    <string name="careportal_exercise_message">Ejercicio : %1$s</string>
     <string name="careportal_pumpsitechange">Cambio Cánula de Bomba</string>
     <string name="careportal_cgmsensorinsert">Inserción de sensor</string>
     <string name="careportal_cgmsensorstart">Inicio de Sensor</string>
+    <string name="careportal_cgm_sensor_stop">Detener sensor MCG</string>
+    <string name="careportal_dad_alert">D.A.D Alerta</string>
     <string name="careportal_insulincartridgechange">Cambio Cartucho insulina</string>
     <string name="careportal_profileswitch">Cambio de perfil</string>
     <string name="careportal_snackbolus">Bolo de aperitivo</string>
@@ -173,11 +202,25 @@
     <string name="careportal_openapsoffline">OpenAPS sin conexión</string>
     <string name="careportal_pumpbatterychange">Cambio batería bomba</string>
     <string name="careportal_temporarytarget">Objetivo temporal</string>
+    <string name="careportal_temporarytargetvalue">Valor objetivo temporal</string>
     <string name="careportal_temporarytargetcancel">Cancelar Objetivo temporal</string>
+    <string name="boluswizard">Asistente Bolo</string>
     <string name="glucosetype_finger">Dedo</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manualmente</string>
     <string name="unknown">desconocido</string>
+    <string name="eatingsoon">Comiendo Pronto</string>
+    <string name="hypo">Hipo</string>
+    <string name="activity">Actividad</string>
+    <string name="wear">Reloj</string>
+    <string name="automation">Automatización</string>
+    <string name="custom">Personalizado</string>
+    <string name="pump">Bomba</string>
+    <string name="loop">Lazo</string>
+    <string name="ns">NS</string>
+    <string name="record">Registro</string>
+    <string name="reading_pump_history">Leyendo historia bomba</string>
+    <string name="pump_icon">Icono de bomba</string>
     <!--    Command-->
     <string name="connectiontimedout">Tiempo de conexión agotado</string>
     <!--    PumpEnactResult-->
@@ -218,7 +261,6 @@
     <string name="metadata_label_device_name">Exportar el nombre del paciente del dispositivo</string>
     <string name="metadata_label_device_model">Exportar modelo de dispositivo</string>
     <string name="metadata_label_encryption">Encriptación de archivos</string>
-    <string name="metadata_format_old">Formato de exportación antiguo</string>
     <string name="metadata_format_new">Nuevo formato cifrado</string>
     <string name="metadata_format_debug">Nuevo formato de depuración (sin cifrar)</string>
     <string name="metadata_format_other">Formato de exportación desconocido</string>
@@ -249,11 +291,125 @@
     <string name="signature_verifier">Verificador de firma</string>
     <string name="running_invalid_version">Hemos detectado que está ejecutando una versión no válida. ¡Bucle desactivado!</string>
     <string name="versionavailable">Versión %1$s disponible</string>
+    <string name="version_expire">Versión %1$s expira en %2$s</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Por favor reinicia el teléfono o AndroidAPS desde ajustes de sistema, sino AndroidAPS no guardará registros (importante para trazar y verificar que el algoritmo funcione correctamente)!</string>
     <!-- WeekdayPicker -->
+    <string name="monday_short">L</string>
+    <string name="tuesday_short">M</string>
+    <string name="wednesday_short">M</string>
+    <string name="thursday_short">J</string>
+    <string name="friday_short">V</string>
+    <string name="saturday_short">S</string>
+    <string name="sunday_short">D</string>
     <!-- User Entry -->
+    <string name="uel_bolus">BOLO</string>
+    <string name="uel_bolus_calculator">CALCULADOR DE BOLO</string>
+    <string name="uel_bolus_advisor">RECOMENDADOR BOLO</string>
+    <string name="uel_extended_bolus">BOLO EXTENDIDO</string>
+    <string name="uel_superbolus_tbr">SUPERBOLO TBR</string>
+    <string name="uel_carbs">CARBOHIDRATOS</string>
+    <string name="uel_extended_carbs">CARBOHIDRATOS EXTENDIDOS</string>
+    <string name="uel_temp_basal">BASAL TEMP</string>
+    <string name="uel_tt">OBJETIVO TEMPORAL</string>
+    <string name="uel_new_profile">Perfil NUEVO</string>
+    <string name="uel_clone_profile">COPIAR PERFIL</string>
+    <string name="uel_store_profile">GUARDAR PERFIL</string>
+    <string name="uel_profile_switch">CAMBIO PERFIL</string>
+    <string name="uel_profile_switch_cloned">CAMBIO PERFIL COPIADO</string>
+    <string name="uel_closed_loop_mode">MODO LAZO CERRADO</string>
+    <string name="uel_lgs_loop_mode">MODO LAZO LGS</string>
+    <string name="uel_open_loop_mode">MODO LAZO ABIERTO</string>
+    <string name="uel_loop_disabled">LAZO DESACTIVADO</string>
+    <string name="uel_loop_enabled">LAZO ACTIVADO</string>
+    <string name="uel_reconnect">RECONEXIÓN</string>
+    <string name="uel_disconnect">DESCONECTAR</string>
+    <string name="uel_resume">REANUDAR</string>
+    <string name="uel_suspend">SUSPENDER</string>
+    <string name="uel_hw_pump_allowed">SISTEMA DE BOMBA SOPORTADA</string>
+    <string name="uel_clear_pairing_keys">BORRAR CLAVES DE EMPAREJAMIENTO</string>
+    <string name="uel_accepts_temp_basal">ACEPTA TEMP BASAL</string>
+    <string name="uel_cancel_temp_basal">CANCELAR TEMP BASAL</string>
+    <string name="uel_cancel_bolus">CANCELAR BOLO</string>
+    <string name="uel_cancel_extended_bolus">CANCELAR BOLO EXTENDIDO</string>
+    <string name="uel_cancel_tt">CANCELAR OBJETIVO TEMPORAL</string>
+    <string name="uel_careportal">PORTAL DEL CUIDADOR</string>
+    <string name="uel_site_change">CAMBIAR SITIO</string>
+    <string name="uel_reservoir_change">CAMBIAR RESERVORIO</string>
+    <string name="uel_calibration">CALIBRACIÓN</string>
+    <string name="uel_prime_bolus">CEBAR BOLO</string>
+    <string name="uel_treatment">TRATAMIENTO</string>
+    <string name="uel_careportal_ns_refresh">ACTUALIZAR PORTAL DEL CUIDADOR NS</string>
+    <string name="uel_profile_switch_ns_refresh">ACTUALIZAR CAMBIO DE PERFIL NS</string>
+    <string name="uel_treatments_ns_refresh">ACTUALIZAR TRATAMIENTOS NS</string>
+    <string name="uel_tt_ns_refresh">ACTUALIZAR OBJETIVO TEMPORAL NS</string>
+    <string name="uel_automation_removed">AUTOMACIÓN ELIMINADA</string>
+    <string name="uel_bg_removed">BG ELIMINADO</string>
+    <string name="uel_careportal_removed">PORTAL DEL CUIDADOR ELIMINADO</string>
+    <string name="uel_bolus_removed">BOLO ELIMINADO</string>
+    <string name="uel_carbs_removed">CARBOHIDRATOS ELIMINADOS</string>
+    <string name="uel_temp_basal_removed">BASAL TEMPORAL ELIMINADA</string>
+    <string name="uel_extended_bolus_removed">BOLO EXTENDIDO ELIMINADO</string>
+    <string name="uel_food">ALIMENTOS</string>
+    <string name="uel_food_removed">ALIMENTO ELIMINADO</string>
+    <string name="uel_profile_removed">PERFIL ELIMINADO</string>
+    <string name="uel_profile_switch_removed">CAMBIO PERFIL ELIMINADO</string>
+    <string name="uel_restart_events_removed">REINICIO DE EVENTOS ELIMINADO</string>
+    <string name="uel_treatment_removed">TRATAMIENTO ELIMINADO</string>
+    <string name="uel_tt_removed">OBJETIVO TEMPORAL ELIMINADO</string>
+    <string name="uel_ns_paused">NS PAUSADO</string>
+    <string name="uel_ns_resume">REANUDAR NS</string>
+    <string name="uel_ns_queue_cleared">COLA NS LIMPIADA</string>
+    <string name="uel_ns_settings_copied">CONFIGURACIONES NS COPIADAS</string>
+    <string name="uel_error_dialog_ok">DIÁLOGO DE ERROR OK</string>
+    <string name="uel_error_dialog_mute">SILENCIAR ERROR DE DIÁLOGO </string>
+    <string name="uel_error_dialog_mute_5min">SILENCIAR ERROR DE DIÁLOGO DURANTE 5 MINUTOS</string>
+    <string name="uel_objective_started">OBJETIVO INICIADO</string>
+    <string name="uel_objective_unstarted">OBJETIVO NO INICIADO</string>
+    <string name="uel_objectives_skipped">OBJETIVOS OMITIDOS</string>
+    <string name="uel_stat_reset">RESTABLECER ESTADÍSTICAS</string>
+    <string name="uel_delete_logs">ELIMINAR REGISTROS</string>
+    <string name="uel_delete_future_treatments">ELIMINAR TRATAMIENTOS FUTUROS</string>
+    <string name="uel_export_settings">EXPORTAR AJUSTES</string>
+    <string name="uel_import_settings">IMPORTAR AJUSTES</string>
+    <string name="uel_reset_databases">RESTABLECER BASES DE DATOS</string>
+    <string name="uel_export_databases">EXPORTAR BASES DE DATOS</string>
+    <string name="uel_import_databases">IMPORTAR BASES DE DATOS</string>
+    <string name="uel_otp_export">EXPORTAR OTP</string>
+    <string name="uel_otp_reset">RESTABLECER OTP</string>
+    <string name="uel_stop_sms">PARAR SMS</string>
+    <string name="uel_export_csv">EXPORTAR REGISTROS DE USUARIO</string>
+    <string name="uel_start_aaps">INICIAR AAPS</string>
+    <string name="uel_exit_aaps">SALIR DE APPS</string>
+    <string name="uel_plugin_enabled">PLUGIN HABILITADO</string>
+    <string name="uel_plugin_disabled">PLUGIN DESHABILITADO</string>
+    <string name="uel_unknown">DESCONOCIDO</string>
+    <string name="ue_string">Cadena</string>
+    <string name="ue_source">Fuente</string>
+    <string name="ue_utc_offset">DESFASE UTC</string>
+    <string name="ue_action">Acción</string>
+    <string name="ue_timestamp">Fecha y hora</string>
+    <string name="ue_none">Sin Unidad</string>
+    <string name="ue_export_to_csv">Exportar entradas de usuario a Excel (csv)</string>
+    <string name="uel_loop_change">LAZO CAMBIADO</string>
+    <string name="uel_loop_removed">LAZO ELIMINADO</string>
+    <string name="uel_other">OTROS</string>
     <!-- HardLimits -->
+    <string name="profile_low_target">Perfil de objetivo bajo</string>
+    <string name="profile_high_target">Perfil de objetivo alto</string>
+    <string name="temp_target_low_target">Valor inferior objetivo temporal</string>
+    <string name="temp_target_high_target">Valor superior objetivo temporal</string>
+    <string name="temp_target_value">Valor objetivo temporal</string>
+    <string name="profile_dia">Valor DIA del perfil</string>
+    <string name="profile_sensitivity_value">Valor de sensibilidad del perfil</string>
+    <string name="profile_max_daily_basal_value">Valor basal máximo del perfil</string>
+    <string name="current_basal_value">Valor basal actual</string>
+    <string name="profile_carbs_ratio_value">Valor del ratio de carbohidratos de perfil</string>
+    <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
+    <string name="valueoutofrange">»%1$s« está fuera de límite</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f está fuera de límites duros</string>
+    <string name="basal_value">Valor basal</string>
+    <string name="nsclient_version_does_not_match">La versión de NSClient no coincide con AndroidAPS. Actualízala.</string>
     <plurals name="days">
         <item quantity="one">%1$d día</item>
         <item quantity="other">%1$d días</item>
diff --git a/core/src/main/res/values-es-rES/validator.xml b/core/src/main/res/values-es-rES/validator.xml
index dd7ef290d95..05218f493fe 100644
--- a/core/src/main/res/values-es-rES/validator.xml
+++ b/core/src/main/res/values-es-rES/validator.xml
@@ -16,6 +16,9 @@
     <string name="error_date_not_valid">Formato no válido</string>
     <string name="error_mustbe4digitnumber">Debe ser un número de 4 dígitos</string>
     <string name="error_mustbe6digitnumber">Debe ser un número de 6 dígitos</string>
+    <string name="error_mustbe12hexadidits">Debe contener 12 caracteres de ABCDEF0123456789</string>
+    <string name="error_mustbe8hexadidits">Debe contener 8 caracteres de ABCDEF0123456789</string>
+    <string name="error_mustbe4hexadidits">Debe contener 4 caracteres de ABCDEF0123456789</string>
     <string name="error_not_a_minimum_length">No supera la longitud mínima</string>
     <string name="error_pin_not_valid">El Pin debe tener de 3 a 6 dígitos, no el mismo ni en serie</string>
 </resources>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 756cafcab69..9603df10a3c 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">Connectée</string>
     <string name="disconnected">Déconnectée</string>
     <string name="disconnecting">Déconnexion en cours</string>
+    <string name="waiting_for_disconnection">Attente de déconnexion</string>
     <string name="androidaps_start">AndroidAPS est lancé</string>
     <string name="formatinsulinunits1">%1$.1f U</string>
     <string name="formatinsulinunits">%1$.2f U</string>
@@ -173,12 +174,17 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU (%5$.0f%%)</b> Gluc: <b>%6$.0fg</b>]]></string>
     <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> en <b>%3$d</b> jours<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Careportal</string>
     <string name="careportal_bgcheck">Contrôle Glycémie</string>
     <string name="careportal_mbg">Gly manuelle/Calib.</string>
     <string name="careportal_announcement">Notification</string>
     <string name="careportal_note">Remarque</string>
     <string name="careportal_question">Question</string>
     <string name="careportal_exercise">Activité Physique</string>
+    <string name="careportal_announcement_message">Annonce : %1$s</string>
+    <string name="careportal_note_message">Note : %1$s</string>
+    <string name="careportal_question_message">Question : %1$s</string>
+    <string name="careportal_exercise_message">Exercice : %1$s</string>
     <string name="careportal_pumpsitechange">Changement de site</string>
     <string name="careportal_cgmsensorinsert">Insertion Capteur MGC</string>
     <string name="careportal_cgmsensorstart">Démarrage Capteur MGC</string>
@@ -213,6 +219,8 @@
     <string name="loop">Boucle</string>
     <string name="ns">NS</string>
     <string name="record">Enregistrement</string>
+    <string name="reading_pump_history">Lecture historique pompe</string>
+    <string name="pump_icon">Icône Pompe</string>
     <!--    Command-->
     <string name="connectiontimedout">Connexion expirée</string>
     <!--    PumpEnactResult-->
@@ -253,7 +261,6 @@
     <string name="metadata_label_device_name">Export du nom du patient de l\'appareil</string>
     <string name="metadata_label_device_model">Export du modèle de l\'appareil</string>
     <string name="metadata_label_encryption">Cryptage du fichier</string>
-    <string name="metadata_format_old">Ancien format d\'export</string>
     <string name="metadata_format_new">Nouveau format crypté</string>
     <string name="metadata_format_debug">Nouveau format de débug (non crypté)</string>
     <string name="metadata_format_other">Format d\'export inconnu</string>
@@ -284,6 +291,7 @@
     <string name="signature_verifier">Vérificateur de signature</string>
     <string name="running_invalid_version">Nous avons détecté que vous utilisez une version invalide. Boucle désactivée !</string>
     <string name="versionavailable">Version %1$s disponible</string>
+    <string name="version_expire">La version %1$s expire le %2$s</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Redémarrez votre smartphone ou redémarrez AndroidAPS depuis les paramètres système\nsinon AndroidAPS n\'aura pas de fichiers log (il est important de suivre et vérifier que les algorithmes fonctionnent correctement)!</string>
     <!-- WeekdayPicker -->
@@ -296,6 +304,7 @@
     <string name="sunday_short">D</string>
     <!-- User Entry -->
     <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_calculator">ASSISTANT BOLUS</string>
     <string name="uel_bolus_advisor">ASSISTANT BOLUS</string>
     <string name="uel_extended_bolus">BOLUS ÉTENDU</string>
     <string name="uel_superbolus_tbr">DBT SUPERBOLUS</string>
@@ -400,6 +409,7 @@
     <string name="valueoutofrange">\"%1$s\" est en dehors des limites</string>
     <string name="value_out_of_hard_limits">\"%1$s\" %2$.2f est en dehors des limites</string>
     <string name="basal_value">Valeur de Basal</string>
+    <string name="nsclient_version_does_not_match">La version NSClient ne correspond pas à AndroidAPS. Faites une mise à jour.</string>
     <plurals name="days">
         <item quantity="one">%1$d jour</item>
         <item quantity="other">%1$d jours</item>
diff --git a/core/src/main/res/values-hu-rHU/strings.xml b/core/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..0a9e749b51b
--- /dev/null
+++ b/core/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    Keys-->
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Protection-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+    <!-- Maintenance -->
+    <!-- VersionChecker -->
+    <!-- Permissions -->
+    <!-- WeekdayPicker -->
+    <!-- User Entry -->
+    <!-- HardLimits -->
+</resources>
diff --git a/core/src/main/res/values-hu-rHU/validator.xml b/core/src/main/res/values-hu-rHU/validator.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/core/src/main/res/values-hu-rHU/validator.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 8ee67e1382f..1daa37f44ed 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">Connesso</string>
     <string name="disconnected">Disconnesso</string>
     <string name="disconnecting">Disconnessione</string>
+    <string name="waiting_for_disconnection">In attesa della disconnessione</string>
     <string name="androidaps_start">AndroidAPS avviato</string>
     <string name="formatinsulinunits1">%1$.1f U</string>
     <string name="formatinsulinunits">%1$.2f U</string>
@@ -173,12 +174,17 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f U</b> Bol: <b>%3$.2f U</b> Bas: <b>%4$.2f U(%5$.0f%%)</b> CHO: <b>%6$.0f g</b>]]></string>
     <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> in <b>%3$d</b> giorni<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Portale</string>
     <string name="careportal_bgcheck">Controllo BG</string>
     <string name="careportal_mbg">BG manuale o Calibrazione</string>
     <string name="careportal_announcement">Avviso</string>
     <string name="careportal_note">Nota</string>
     <string name="careportal_question">Domanda</string>
     <string name="careportal_exercise">Esercizio fisico</string>
+    <string name="careportal_announcement_message">Avviso: %1$s</string>
+    <string name="careportal_note_message">Nota : %1$s</string>
+    <string name="careportal_question_message">Domanda : %1$s</string>
+    <string name="careportal_exercise_message">Esercizio : %1$s</string>
     <string name="careportal_pumpsitechange">Cambio posizione cannula</string>
     <string name="careportal_cgmsensorinsert">Inserimento sensore</string>
     <string name="careportal_cgmsensorstart">Avvio sensore</string>
@@ -196,6 +202,7 @@
     <string name="careportal_openapsoffline">OpenAPS Offline</string>
     <string name="careportal_pumpbatterychange">Cambio batteria micro</string>
     <string name="careportal_temporarytarget">Target temporaneo</string>
+    <string name="careportal_temporarytargetvalue">Valore target temporaneo</string>
     <string name="careportal_temporarytargetcancel">Cancellazione temp-target</string>
     <string name="boluswizard">Calcolatore</string>
     <string name="glucosetype_finger">Dito</string>
@@ -212,6 +219,8 @@
     <string name="loop">Loop</string>
     <string name="ns">NS</string>
     <string name="record">Record</string>
+    <string name="reading_pump_history">Lettura storico micro</string>
+    <string name="pump_icon">Icona micro</string>
     <!--    Command-->
     <string name="connectiontimedout">Time out connessione</string>
     <!--    PumpEnactResult-->
@@ -252,7 +261,6 @@
     <string name="metadata_label_device_name">Esportazione nome dispositivo paziente</string>
     <string name="metadata_label_device_model">Esportazione modello dispositivo</string>
     <string name="metadata_label_encryption">Crittografia file</string>
-    <string name="metadata_format_old">Vecchio formato esportazione</string>
     <string name="metadata_format_new">Nuovo formato crittografato</string>
     <string name="metadata_format_debug">Nuovo formato di debug (non crittografato)</string>
     <string name="metadata_format_other">Formato esportazione sconosciuto</string>
@@ -283,6 +291,7 @@
     <string name="signature_verifier">Verificatore firma</string>
     <string name="running_invalid_version">Abbiamo rilevato che stai eseguendo una versione non valida. Loop disabilitato!</string>
     <string name="versionavailable">Versione %1$s disponibile</string>
+    <string name="version_expire">Versione: %1$s | Scadenza: %2$s</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Per favore riavvia il tuo telefono oppure fai ripartire AndroidAPS dalle impostazioni di sistema \naltrimenti Android APS non farà il log (è importante monitorare e verificare che gli algoritmi stiano funzionando correttamente)!</string>
     <!-- WeekdayPicker -->
@@ -295,6 +304,7 @@
     <string name="sunday_short">D</string>
     <!-- User Entry -->
     <string name="uel_bolus">BOLO</string>
+    <string name="uel_bolus_calculator">CALCOLATORE BOLO</string>
     <string name="uel_bolus_advisor">CONSIGLIO BOLO</string>
     <string name="uel_extended_bolus">BOLO ESTESO</string>
     <string name="uel_superbolus_tbr">TBR SUPERBOLO</string>
@@ -375,7 +385,7 @@
     <string name="uel_plugin_disabled">PLUGIN DISABILITATO</string>
     <string name="uel_unknown">SCONOSCIUTO</string>
     <string name="ue_string">Stringa</string>
-    <string name="ue_source">Fonte</string>
+    <string name="ue_source">Origine</string>
     <string name="ue_utc_offset">Offset UTC</string>
     <string name="ue_action">Azione</string>
     <string name="ue_timestamp">Data e ora</string>
@@ -399,6 +409,7 @@
     <string name="valueoutofrange">»%1$s« è fuori dai limiti consentiti</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f è fuori dai limiti consentiti</string>
     <string name="basal_value">Valore basale</string>
+    <string name="nsclient_version_does_not_match">La versione di NSClient non corrisponde ad AndroidAPS. Aggiorna.</string>
     <plurals name="days">
         <item quantity="one">%1$d giorno</item>
         <item quantity="other">%1$d giorni</item>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
index c62d2a2dfed..1f48ff2e51f 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">מחובר</string>
     <string name="disconnected">מנותק</string>
     <string name="disconnecting">מתנתק</string>
+    <string name="waiting_for_disconnection">ממתין לניתוק</string>
     <string name="androidaps_start">AndroidAPS הופעל</string>
     <string name="formatinsulinunits1">%1$.1f יח\'</string>
     <string name="formatinsulinunits">%1$.2f יח\'</string>
@@ -29,7 +30,7 @@
     <string name="format_mins">%1$d דק\'</string>
     <string name="pumpbusy">המשאבה אינה פנויה</string>
     <string name="connectionerror">שגיאה בחיבור המשאבה</string>
-    <string name="youareonallowedlimit">הגיעתם למגבלה המותרת</string>
+    <string name="youareonallowedlimit">הגעתם למגבלה המותרת</string>
     <string name="objectives">משימות</string>
     <string name="close">סגור</string>
     <string name="please_wait">נא להמתין…</string>
@@ -53,7 +54,7 @@
     <string name="lastconnection_label">התחברות אחרונה</string>
     <string name="lastbolus_label">בולוס אחרון</string>
     <string name="dailyunits">יחידות יומיות</string>
-    <string name="basebasalrate_label">בזאלי בסיסי</string>
+    <string name="basebasalrate_label">מינון בזאלי בסיסי</string>
     <string name="tempbasal_label">בזאלי זמני</string>
     <string name="virtualpump_extendedbolus_label">בולוס ממושך</string>
     <string name="reservoir_label">מכל</string>
@@ -173,12 +174,17 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f יחידות</b> בולוס: <b>%3$.2f יחידות</b> בזאלי: <b>%4$.2f יחידות(%5$.0f%%)</b> פחמ: <b>%6$.0f גרם</b>]]></string>
     <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> ב- <b>%3$d</b> ימים<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">פורטל טיפולים</string>
     <string name="careportal_bgcheck">בדיקת רמת סוכר בדם</string>
     <string name="careportal_mbg">רמת סוכר ידנית או כיול</string>
-    <string name="careportal_announcement">הודעה</string>
+    <string name="careportal_announcement">הכרזה</string>
     <string name="careportal_note">הערה</string>
     <string name="careportal_question">שאלה</string>
     <string name="careportal_exercise">פעילות גופנית</string>
+    <string name="careportal_announcement_message">הכרזה: %1$s</string>
+    <string name="careportal_note_message">הערה: %1$s</string>
+    <string name="careportal_question_message">שאלה: %1$s</string>
+    <string name="careportal_exercise_message">פעילות גופנית: %1$s</string>
     <string name="careportal_pumpsitechange">החלפת פרפרית</string>
     <string name="careportal_cgmsensorinsert">חיבור סנסור</string>
     <string name="careportal_cgmsensorstart">התחלת סנסור חדש</string>
@@ -213,6 +219,8 @@
     <string name="loop">לולאה</string>
     <string name="ns">נייטסקאוט</string>
     <string name="record">הקלטה</string>
+    <string name="reading_pump_history">קורא היסטוריית משאבה</string>
+    <string name="pump_icon">צלמית משאבה</string>
     <!--    Command-->
     <string name="connectiontimedout">החיבור חרג ממגבלת הזמן</string>
     <!--    PumpEnactResult-->
@@ -237,7 +245,7 @@
     <string name="ratio">יחס</string>
     <string name="amount_days"># ימים</string>
     <string name="weight">משקל</string>
-    <string name="warning_Message">שימוש בבולוס למילוי / פריימינג עשוי לגרום לחוסר דיוק!</string>
+    <string name="warning_Message">שימוש בבולוס למילוי \\ תיחול עשוי לגרום לחוסר דיוק!</string>
     <string name="olddata_Message">הנתונים ישנים. לרענון לחצו \"טען מחדש\"</string>
     <string name="tbb">סה\"כ בזאלי בסיסי</string>
     <string name="tbb2">סה\"כ בזאלי בסיסי * 2</string>
@@ -253,7 +261,6 @@
     <string name="metadata_label_device_name">מייצא את שם מכשיר המטופל\\ת</string>
     <string name="metadata_label_device_model">מייצא את דגם המכשיר</string>
     <string name="metadata_label_encryption">הצפנת קבצים</string>
-    <string name="metadata_format_old">פורמט ייצוא ישן</string>
     <string name="metadata_format_new">פורמט הצפנה חדש</string>
     <string name="metadata_format_debug">פורמט דיבאג חדש (בלתי מוצפן)</string>
     <string name="metadata_format_other">פורמט ייצוא לא ידוע</string>
@@ -284,6 +291,7 @@
     <string name="signature_verifier">מאמת חתימה</string>
     <string name="running_invalid_version">זיהינו שאתם משתמשים בגרסה לא תקפה. הלולאה מושבתת!</string>
     <string name="versionavailable">גרסה %1$s זמינה</string>
+    <string name="version_expire">גרסה: %1$s תפוג תוקפה: %2$s</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">נא לאתחל את הסמרטפון שלכם או הפעילו מחדש את אפלקציית AndroidAPS בהגדרות המערכת \nאחרת AndroidAPS לא יוכל לבצע רישום (חשוב לעקוב ולוודא כי האלגוריתמים פועלים כראוי!)</string>
     <!-- WeekdayPicker -->
@@ -296,6 +304,7 @@
     <string name="sunday_short">א\'</string>
     <!-- User Entry -->
     <string name="uel_bolus">בולוס</string>
+    <string name="uel_bolus_calculator">מחשבון הבולוסים</string>
     <string name="uel_bolus_advisor">יועץ בולוס</string>
     <string name="uel_extended_bolus">בולוס ממושך</string>
     <string name="uel_superbolus_tbr">בזאלי זמני של סופר בולוס</string>
@@ -400,6 +409,7 @@
     <string name="valueoutofrange">»הערך %1$s« מחוץ לתחום הקשיח</string>
     <string name="value_out_of_hard_limits">»הערך %1$s« %2$.2f מחוץ לתחום הקשיח</string>
     <string name="basal_value">ערך בזאלי</string>
+    <string name="nsclient_version_does_not_match">גרסת NSClient לא תואמת את גרסת AndroidAPS. נא לעדכן.</string>
     <plurals name="days">
         <item quantity="one">%1$d יום</item>
         <item quantity="two">%1$d ימים</item>
diff --git a/core/src/main/res/values-ko-rKR/strings.xml b/core/src/main/res/values-ko-rKR/strings.xml
index b86cec36ae2..1b3ae3c1046 100644
--- a/core/src/main/res/values-ko-rKR/strings.xml
+++ b/core/src/main/res/values-ko-rKR/strings.xml
@@ -252,7 +252,6 @@
     <string name="metadata_label_device_name">장치의 환자 이름 내보내기</string>
     <string name="metadata_label_device_model">장치 모델 내보내기</string>
     <string name="metadata_label_encryption">파일 암호화</string>
-    <string name="metadata_format_old">오래된 내보내기 형식</string>
     <string name="metadata_format_new">암호화된 새로운 형식</string>
     <string name="metadata_format_debug">오류가 제거된 새로운 형식 (암호화되지 않음)</string>
     <string name="metadata_format_other">알려지지 않은 내보내기 형식</string>
diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
index e22a9abecdb..b0dcc4b8cbc 100644
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">Prisijungta</string>
     <string name="disconnected">Atsijungta</string>
     <string name="disconnecting">Atsijungiama</string>
+    <string name="waiting_for_disconnection">Laukiama atsijungimo</string>
     <string name="androidaps_start">AndroidAPS paleista</string>
     <string name="formatinsulinunits1">%1$.1f vv</string>
     <string name="formatinsulinunits">%1$.2f vv</string>
@@ -62,6 +63,8 @@
     <string name="eventtype">Įvykio tipas</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
+    <string name="shortgram">g</string>
+    <string name="shortpercent">%</string>
     <string name="advancedsettings_title">Papildomi nustatymai</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="btwatchdog_title">BT Watchdog</string>
@@ -71,24 +74,38 @@
     <string name="no">Ne</string>
     <string name="loopdisabled">CIKLAS NEAKTYVUS DĖL APRIBOJIMŲ</string>
     <string name="bolusdelivered">%1$.2f vv bolusas sėkmingai suleistas</string>
+    <string name="virtualpump_resultok">Gerai</string>
     <string name="novalidbasalrate">Jokio tinkamo bazės kiekio nenuskaityta iš pompos</string>
     <string name="limitingmaxiob">Ribojamas maks AIO iki %1$.1f vv dėl %2$s</string>
     <string name="unsafeusage">Nesaugus naudojimas</string>
     <string name="pump_unreachable">Pompa nepasiekiama</string>
+    <string name="extended_bolus">Ištęstas bolusas</string>
     <string name="pump_time_updated">Pompos laikas pakeistas</string>
+    <string name="exit">Išeiti</string>
+    <string name="removerecord">Ištrinti įrašą</string>
+    <string name="loopisdisabled">Ciklas išjungtas</string>
+    <string name="alarm">Aliarmas</string>
     <string name="disableloop">Išjungti Ciklą</string>
     <string name="enableloop">Įjungti Ciklą</string>
     <string name="resumeloop">Atnaujinti ciklą</string>
     <string name="suspendloop">Sustabdyti ciklą</string>
+    <string name="duration_min_label">Trukmė [min]</string>
     <string name="notification">Pranešimas</string>
     <string name="noprofile">Dar negautas joks profilis iš NS</string>
     <string name="exists">egzistuoja</string>
     <string name="notexists">neegzistuoja</string>
     <string name="glucose">Gliukozė</string>
+    <string name="iob">AIO</string>
+    <string name="cob">AAO</string>
     <string name="name_short">Vardas:</string>
     <string name="time">Laikas</string>
     <string name="ns_wifi_ssids">WiFi pavadinimas</string>
+    <string name="loading">Kraunama …</string>
+    <string name="event_time_label">Įvykio laikas</string>
+    <string name="notes_label">Pastabos</string>
+    <string name="remove_button">Pašalinti</string>
     <string name="addnew">Pridėti naują</string>
+    <string name="wrong_pump_data">Duomenys gaunami iš kitos pompos. Pakeiskite pompos valdiklį.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Ribojamas maksimalus bazės dydis%1$.2f vv/val dėl %2$s</string>
     <string name="pumplimit">pompos limitas</string>
@@ -104,6 +121,7 @@
     <string name="dismiss">ATMESTI</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth Low Energy nepalaikoma.</string>
+    <string name="ble_not_supported_or_not_paired">Nepalaikomas Bluetooth Low Energy arba įrenginys nesuporuotas.</string>
     <string name="ble_not_enabled">Bluetooth neįjungta.</string>
     <string name="location_not_found_title">Vietovės nustatymas neįjungtas</string>
     <string name="location_not_found_message">Vietos nustatymo paslauga turi būti įjungta, kad Bluetooth aptikimas veiktų naujesniuose įrenginiuose. AAPS neseka Jūsų lokacijos, o vietos nustatymo paslauga gali būti išjungta po sėkmingo įrenginių suporavimo.</string>
@@ -154,16 +172,24 @@
     <!--    TDD-->
     <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f vv</b> Boluso: <b>%3$.2f vv</b> Bazės: <b>%4$.2f vv(%5$.0f%%)</b>]]></string>
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f vv</b> Boluso: <b>%3$.2f vv</b> Bazės: <b>%4$.2f vv(%5$.0f%%)</b> AV: <b>%6$.0f g</b>]]></string>
+    <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> už <b>%3$d</b> dienos(-ų)<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Priežiūra</string>
     <string name="careportal_bgcheck">KG testas</string>
     <string name="careportal_mbg">KG iš kraujo arba kalibracija</string>
     <string name="careportal_announcement">Pranešimas</string>
     <string name="careportal_note">Pastaba</string>
     <string name="careportal_question">Klausimas</string>
     <string name="careportal_exercise">Aktyvumas</string>
+    <string name="careportal_announcement_message">Pranešimas: %1$s</string>
+    <string name="careportal_note_message">Pastaba: %1$s</string>
+    <string name="careportal_question_message">Klausimas: %1$s</string>
+    <string name="careportal_exercise_message">Aktyvumas: %1$s</string>
     <string name="careportal_pumpsitechange">Kateterio keitimas</string>
     <string name="careportal_cgmsensorinsert">NGJ įvedimas</string>
     <string name="careportal_cgmsensorstart">NGJ paleidimas</string>
+    <string name="careportal_cgm_sensor_stop">NGJ stabdymas</string>
+    <string name="careportal_dad_alert">D.A.D. įspėjimas</string>
     <string name="careportal_insulincartridgechange">Rezervuaro keitimas</string>
     <string name="careportal_profileswitch">Profilio keitimas</string>
     <string name="careportal_snackbolus">Bolusas užkandžiui</string>
@@ -176,6 +202,7 @@
     <string name="careportal_openapsoffline">OpenAPS neprisijungus</string>
     <string name="careportal_pumpbatterychange">Baterijos keitimas</string>
     <string name="careportal_temporarytarget">Laikinas tikslas</string>
+    <string name="careportal_temporarytargetvalue">Laikino tikslo reikšmė</string>
     <string name="careportal_temporarytargetcancel">Laikino tikslo atšaukimas</string>
     <string name="boluswizard">Boluso patarėjas</string>
     <string name="glucosetype_finger">Iš piršto</string>
@@ -184,9 +211,16 @@
     <string name="unknown">nežinoma</string>
     <string name="eatingsoon">Netrukus valgysiu</string>
     <string name="hypo">Hipo</string>
+    <string name="activity">Aktyvumas</string>
     <string name="wear">Išmanieji laikrodžiai</string>
     <string name="automation">Automatiškai</string>
     <string name="custom">Pasirinktinis</string>
+    <string name="pump">Pompa</string>
+    <string name="loop">Ciklas</string>
+    <string name="ns">NS</string>
+    <string name="record">Įrašas</string>
+    <string name="reading_pump_history">Skaitoma pompos istorija</string>
+    <string name="pump_icon">Pompos ikonėlė</string>
     <!--    Command-->
     <string name="connectiontimedout">Prijungimo laikas baigėsi</string>
     <!--    PumpEnactResult-->
@@ -220,13 +254,13 @@
     <string name="format_hour_minute">%1$dh %2$dm</string>
     <string name="mute5min">Nutildyti 5 minutėms</string>
     <!-- Maintenance -->
+    <string name="metadata_label_format">Failo formatas</string>
     <string name="metadata_label_created_at">Sukurta</string>
     <string name="metadata_label_aaps_version">AAPS versija</string>
     <string name="metadata_label_aaps_flavour">Versijos variantas</string>
     <string name="metadata_label_device_name">Eksportuojamas paciento vardas</string>
     <string name="metadata_label_device_model">Eksportuojamas prietaiso modelis</string>
     <string name="metadata_label_encryption">Failo šifravimas</string>
-    <string name="metadata_format_old">Senas eksporto formatas</string>
     <string name="metadata_format_new">Naujas šifruotas formatas</string>
     <string name="metadata_format_debug">Naujas derinimo formatas (nešifruotas)</string>
     <string name="metadata_format_other">Nežinomas eksporto formatas</string>
@@ -257,7 +291,9 @@
     <string name="signature_verifier">Parašo tikrinimas</string>
     <string name="running_invalid_version">Nustatyta, kad naudojate neteisingą versiją. Ciklas išjungtas!</string>
     <string name="versionavailable">Versiją %1$s jau galima naudoti</string>
+    <string name="version_expire">Versija %1$s baigia galioti %2$s</string>
     <!-- Permissions -->
+    <string name="alert_dialog_storage_permission_text">Prašome iš naujo paleisti telefoną arba sistemos nustatymuose iš naujo paleisti AndroidAPS \nkitaip AndroidAPS negalės registruoti prisijungimų (svarbu stebėti ir tikrinti, ar algoritmai veikia tinkamai)!</string>
     <!-- WeekdayPicker -->
     <string name="monday_short">P</string>
     <string name="tuesday_short">A</string>
@@ -267,7 +303,112 @@
     <string name="saturday_short">Š</string>
     <string name="sunday_short">S</string>
     <!-- User Entry -->
+    <string name="uel_bolus">BOLUSAS</string>
+    <string name="uel_bolus_advisor">BOLUSO SKAIČIUOTUVAS</string>
+    <string name="uel_extended_bolus">IŠTĘSTAS BOLUSAS</string>
+    <string name="uel_superbolus_tbr">SUPERBOLUSO LB</string>
+    <string name="uel_carbs">AV</string>
+    <string name="uel_extended_carbs">IŠTĘSTI AV</string>
+    <string name="uel_temp_basal">LAIKINA BAZĖ</string>
+    <string name="uel_tt">LAIKINAS TIKSLAS</string>
+    <string name="uel_new_profile">NAUJAS PROFILIS</string>
+    <string name="uel_clone_profile">KLONUOTI PROFILĮ</string>
+    <string name="uel_store_profile">IŠSAUGOTI PROFILĮ</string>
+    <string name="uel_profile_switch">PROFILIO KEITIMAS</string>
+    <string name="uel_profile_switch_cloned">KLONUOTO PROFILIO KEITIMAS</string>
+    <string name="uel_closed_loop_mode">UŽDARO CIKLO REŽIMAS</string>
+    <string name="uel_lgs_loop_mode">STABDYMAS PRIE ŽEMO</string>
+    <string name="uel_open_loop_mode">ATVIRO CIKLO REŽIMAS</string>
+    <string name="uel_loop_disabled">CIKLAS IŠJUNGTAS</string>
+    <string name="uel_loop_enabled">CIKLAS ĮJUNGTAS</string>
+    <string name="uel_reconnect">VĖL PRISIJUNGTI</string>
+    <string name="uel_disconnect">ATSIJUNGTI</string>
+    <string name="uel_resume">ATNAUJINTI</string>
+    <string name="uel_suspend">SUSTABDYTI</string>
+    <string name="uel_hw_pump_allowed">HW POMPA LEIDŽIAMA</string>
+    <string name="uel_clear_pairing_keys">IŠVALYTI PORAVIMO KODUS</string>
+    <string name="uel_accepts_temp_basal">PRIIMTI LAIKINĄ BAZĘ</string>
+    <string name="uel_cancel_temp_basal">ATŠAUKTI LAIKINĄ BAZĘ</string>
+    <string name="uel_cancel_bolus">ATŠAUKTI BOLUSĄ</string>
+    <string name="uel_cancel_extended_bolus">ATŠAUKTI IŠTĘSTĄ BOLUSĄ</string>
+    <string name="uel_cancel_tt">ATŠAUKTI LAIKINĄ TIKSLĄ</string>
+    <string name="uel_careportal">TERAPIJOS PORTALAS</string>
+    <string name="uel_site_change">KANIULĖS KEITIMAS</string>
+    <string name="uel_reservoir_change">REZERVUARO KEITIMAS</string>
+    <string name="uel_calibration">KALIBRACIJA</string>
+    <string name="uel_prime_bolus">PIRMINIS UŽPILDYMAS</string>
+    <string name="uel_treatment">TERAPIJA</string>
+    <string name="uel_careportal_ns_refresh">ATJAUNTI TERAPIJOS PORTALĄ NS</string>
+    <string name="uel_profile_switch_ns_refresh">ATNAUJINTI PROFILIO KEITIMĄ NS</string>
+    <string name="uel_treatments_ns_refresh">ATNAUJINTI TERAPIJĄ NS</string>
+    <string name="uel_tt_ns_refresh">ATNAUJINTI LAIKINĄ TIKSLĄ NS</string>
+    <string name="uel_automation_removed">AUTOMATIZAVIMAS PAŠALINTAS</string>
+    <string name="uel_bg_removed">KG PAŠALINTA</string>
+    <string name="uel_careportal_removed">TERAPIJOS PORTALAS PAŠALINTAS</string>
+    <string name="uel_bolus_removed">BOLUSAS PAŠALINTAS</string>
+    <string name="uel_carbs_removed">AV PAŠALINTI</string>
+    <string name="uel_temp_basal_removed">LAIKINA BAZĖ PAŠALINTA</string>
+    <string name="uel_extended_bolus_removed">IŠTĘSTAS BOLUSAS PAŠALINTAS</string>
+    <string name="uel_food">MAISTAS</string>
+    <string name="uel_food_removed">MAISTAS PAŠALINTAS</string>
+    <string name="uel_profile_removed">PROFILIS PAŠALINTAS</string>
+    <string name="uel_profile_switch_removed">PROFILIO KEITIMAS PAŠALINTAS</string>
+    <string name="uel_restart_events_removed">PERKROVIMO ĮVYKIAI PAŠALINTI</string>
+    <string name="uel_treatment_removed">TERAPIJA PAŠALINTA</string>
+    <string name="uel_tt_removed">LAIKINAS TIKSLAS PAŠALINTAS</string>
+    <string name="uel_ns_paused">NS PRISTABDYTA</string>
+    <string name="uel_ns_resume">NS ATNAUJINTA</string>
+    <string name="uel_ns_queue_cleared">NS EILĖ IŠVALYTA</string>
+    <string name="uel_ns_settings_copied">NS NUSTATYMAI KOPIJUOTI</string>
+    <string name="uel_error_dialog_ok">DIALOGO KLAIDA OK</string>
+    <string name="uel_error_dialog_mute">DIALOGO KLAIDA NUTILDYTI </string>
+    <string name="uel_error_dialog_mute_5min">DIALOGO KLAIDA NUTILDYTI 5MIN</string>
+    <string name="uel_objective_started">TIKSLAS PRADĖTAS</string>
+    <string name="uel_objective_unstarted">TIKSLAS NEPRADĖTAS</string>
+    <string name="uel_objectives_skipped">TIKSLAS PRALEISTAS</string>
+    <string name="uel_stat_reset">IŠVALYTI STATISTIKĄ</string>
+    <string name="uel_delete_logs">IŠTRINTI ĮRAŠUS</string>
+    <string name="uel_delete_future_treatments">IŠTRINTI ATEITIES TERAPIJĄ</string>
+    <string name="uel_export_settings">EKSPORTUOTI NUSTATYMUS</string>
+    <string name="uel_import_settings">IMPORTUOTI NUSTATYMUS</string>
+    <string name="uel_reset_databases">IŠVALYTI DUOMENŲ BAZES</string>
+    <string name="uel_export_databases">EKSPORTUOTI DUOMENŲ BAZES</string>
+    <string name="uel_import_databases">IMPORTUOTI DUOMENŲ BAZES</string>
+    <string name="uel_otp_export">EKSPORTUOTI OTP</string>
+    <string name="uel_otp_reset">IŠVALYTI OTP</string>
+    <string name="uel_stop_sms">STABDYTI SMS</string>
+    <string name="uel_export_csv">EKSPORTUOTI VARTOTOJO ĮRAŠUS</string>
+    <string name="uel_start_aaps">PALEISTI AAPS</string>
+    <string name="uel_exit_aaps">IŠEITI IŠ AAPS</string>
+    <string name="uel_plugin_enabled">ĮSKIEPIS ĮGALINTAS</string>
+    <string name="uel_plugin_disabled">ĮSKIEPIS IŠJUNGTAS</string>
+    <string name="uel_unknown">NEŽINOMAS</string>
+    <string name="ue_string">Eilutė</string>
+    <string name="ue_source">Šaltinis</string>
+    <string name="ue_utc_offset">Laiko skirtumas</string>
+    <string name="ue_action">Veiksmas</string>
+    <string name="ue_timestamp">Laiko žyma</string>
+    <string name="ue_none">Nėra vienetų</string>
+    <string name="ue_export_to_csv">Eksportuoti vartotojo įrašus į Excel (csv)</string>
+    <string name="uel_loop_change">CIKLAS PAKEISTAS</string>
+    <string name="uel_loop_removed">CIKLAS PAŠALINTAS</string>
+    <string name="uel_other">KITA</string>
     <!-- HardLimits -->
+    <string name="profile_low_target">Profilio tikslo žemoji riba</string>
+    <string name="profile_high_target">Profilio tikslo aukštoji riba</string>
+    <string name="temp_target_low_target">Laikino tikslo žemoji riba</string>
+    <string name="temp_target_high_target">Laikino tikslo viršutinė riba</string>
+    <string name="temp_target_value">Laikino tikslo reikšmė</string>
+    <string name="profile_dia">Profilio IVT reikšmė</string>
+    <string name="profile_sensitivity_value">Profilio JIF reikšmė</string>
+    <string name="profile_max_daily_basal_value">Maksimali profilio VB reikšmė</string>
+    <string name="current_basal_value">Dabartinė bazė</string>
+    <string name="profile_carbs_ratio_value">Profilio IA reikšmė</string>
+    <string name="valuelimitedto">%1$.2f apribota iki %2$.2f</string>
+    <string name="valueoutofrange">»%1$s« viršija griežtą limitą</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f viršija griežtą limitą</string>
+    <string name="basal_value">Valandinė bazė</string>
+    <string name="nsclient_version_does_not_match">NSClient ir AndroidAPS versijos nesutampa. Atnaujinkite.</string>
     <plurals name="days">
         <item quantity="one">%1$d d.</item>
         <item quantity="few">%1$d d.</item>
diff --git a/core/src/main/res/values-lt-rLT/validator.xml b/core/src/main/res/values-lt-rLT/validator.xml
index 74729daf5b3..ad9b62bd3f2 100644
--- a/core/src/main/res/values-lt-rLT/validator.xml
+++ b/core/src/main/res/values-lt-rLT/validator.xml
@@ -2,6 +2,23 @@
 <resources>
     <string name="error_only_numeric_digits_allowed">Galimi tik skaičiai.</string>
     <string name="error_only_numeric_digits_range_allowed">Galimi tik skaičiai intervale %1$s - %2$s.</string>
+    <string name="error_this_field_cannot_contain_special_character">Šiame laukelyje negali būti specialių simbolių</string>
+    <string name="error_only_standard_letters_are_allowed">Galimos tik standartinės raidės</string>
     <string name="error_field_must_not_be_empty">Laukas negali būti tuščias</string>
+    <string name="error_email_address_not_valid">El. pašto adresas netinkamas</string>
+    <string name="error_creditcard_number_not_valid">Kredito kortelės Nr. netinkamas</string>
     <string name="error_phone_not_valid">Telefono numeris negalioja</string>
+    <string name="error_domain_not_valid">Netinkamas domeno vardas</string>
+    <string name="error_ip_not_valid">Netinkamas IP adresas</string>
+    <string name="error_url_not_valid">Netinkamas interneto adresas</string>
+    <string name="error_notvalid_personname">Netinkamas vardas ar pavardė.</string>
+    <string name="error_notvalid_personfullname">Netinkamas pilnas vardas.</string>
+    <string name="error_date_not_valid">Netinkamas formatas</string>
+    <string name="error_mustbe4digitnumber">Turi būti 4 skaitmenys</string>
+    <string name="error_mustbe6digitnumber">Turi būti 6 skaitmenys</string>
+    <string name="error_mustbe12hexadidits">Turi būti 12 simbolių iš ABCDEF0123456789</string>
+    <string name="error_mustbe8hexadidits">Turi būti 8 simboliai iš ABCDEF0123456789</string>
+    <string name="error_mustbe4hexadidits">Turi būti 4 simboliai iš ABCDEF0123456789</string>
+    <string name="error_not_a_minimum_length">Neatitinka minimalaus ilgio</string>
+    <string name="error_pin_not_valid">Pin turi būti 3-6 skaitmenų, ne tokių pačių ir ne iš eilės</string>
 </resources>
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
index 289793a18cf..d9bc9025d3a 100644
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">Verbonden</string>
     <string name="disconnected">Verbinding verbroken</string>
     <string name="disconnecting">Verbinding aan het verbreken</string>
+    <string name="waiting_for_disconnection">Wachten op het loskoppelen</string>
     <string name="androidaps_start">AndroidAPS gestart</string>
     <string name="formatinsulinunits1">%1$.1f E</string>
     <string name="formatinsulinunits">%1$.2f E</string>
@@ -72,6 +73,39 @@
     <string name="yes">Ja</string>
     <string name="no">Nee</string>
     <string name="loopdisabled">LOOP UITGESCHAKELD DOOR BEPERKINGEN</string>
+    <string name="bolusdelivered">Bolus van %1$.2f E succesvol toegediend</string>
+    <string name="virtualpump_resultok">OK</string>
+    <string name="novalidbasalrate">Geen correcte basale snelheid van pomp kunnen lezen</string>
+    <string name="limitingmaxiob">Max IOB wordt beperkt tot %1$.1f E doordat %2$s</string>
+    <string name="unsafeusage">onveilig gebruik</string>
+    <string name="pump_unreachable">Pomp niet beschikbaar</string>
+    <string name="extended_bolus">Vertraagde bolus</string>
+    <string name="pump_time_updated">Pomp tijd bijgewerkt</string>
+    <string name="exit">Afsluiten</string>
+    <string name="removerecord">Verwijder record</string>
+    <string name="loopisdisabled">Loop is uitgeschakeld</string>
+    <string name="alarm">Alarm</string>
+    <string name="disableloop">Loop deactiveren</string>
+    <string name="enableloop">Activeer loop</string>
+    <string name="resumeloop">Hervat loop</string>
+    <string name="suspendloop">Onderbreek loop</string>
+    <string name="duration_min_label">Duur [min]</string>
+    <string name="notification">Notificatie</string>
+    <string name="noprofile">Nog geen profiel geladen van NS</string>
+    <string name="exists">bestaand</string>
+    <string name="notexists">niet bestaand</string>
+    <string name="glucose">Glucose</string>
+    <string name="iob">IOB</string>
+    <string name="cob">COB</string>
+    <string name="name_short">Naam:</string>
+    <string name="time">Tijd</string>
+    <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="loading">Bezig met laden …</string>
+    <string name="event_time_label">Tijdstip</string>
+    <string name="notes_label">Notities</string>
+    <string name="remove_button">Verwijder</string>
+    <string name="addnew">Voeg nieuw toe</string>
+    <string name="wrong_pump_data">Data komt van een andere pomp. Wijzig de pomp driver om de pomp status te resetten.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Beperken van basaal tot max %1$.2f E/uur wegens de %2$s</string>
     <string name="pumplimit">Pomp limiet</string>
@@ -87,6 +121,7 @@
     <string name="dismiss">AFWIJZEN</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth Low Energy wordt niet ondersteund.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy wordt niet ondersteund of het apparaat is niet gekoppeld.</string>
     <string name="ble_not_enabled">Bluetooth niet ingeschakeld.</string>
     <string name="location_not_found_title">Locatie is niet ingeschakeld</string>
     <string name="location_not_found_message">Om Bluetooth discovery met nieuwere apparaten te laten werken moet locatie worden ingeschakeld. AAPS volgt je locatie niet en locatie kan ook weer worden uitgeschakeld nadat het koppelen is gelukt.</string>
@@ -120,6 +155,7 @@
     <string name="profile_carbs_per_unit">g/E</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Geen profiel geselecteerd</string>
+    <string name="startprofile">Start profiel %1$d%% voor %2$d min</string>
     <!--    PumpType-->
     <string name="def_extended_note">* Alleen absolute waardes (geen van-tot bereik) worden ondersteund voor basaal / bolus in virtuele pomp.</string>
     <!--    APSResult-->
@@ -136,16 +172,24 @@
     <!--    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> Koolh. <b>%6$.0f g</b>]]></string>
+    <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> in <b>%3$d</b> dagen<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Zorgportaal</string>
     <string name="careportal_bgcheck">BG Controle</string>
     <string name="careportal_mbg">Handmatige BG of calibratie</string>
     <string name="careportal_announcement">Mededeling</string>
     <string name="careportal_note">Notitie</string>
     <string name="careportal_question">Vraag</string>
     <string name="careportal_exercise">Sport</string>
+    <string name="careportal_announcement_message">Mededeling : %1$s</string>
+    <string name="careportal_note_message">Notitie : %1$s</string>
+    <string name="careportal_question_message">Vraag : %1$s</string>
+    <string name="careportal_exercise_message">Bewegen : %1$s</string>
     <string name="careportal_pumpsitechange">Infuus wissel</string>
     <string name="careportal_cgmsensorinsert">CGM Sens. ingebracht</string>
     <string name="careportal_cgmsensorstart">CGM Sens. Start</string>
+    <string name="careportal_cgm_sensor_stop">CGM Sensor Stoppen</string>
+    <string name="careportal_dad_alert">Hulphond waarschuwing</string>
     <string name="careportal_insulincartridgechange">Insulinereservoir wissel</string>
     <string name="careportal_profileswitch">Profiel wissel</string>
     <string name="careportal_snackbolus">Snack bolus</string>
@@ -158,11 +202,25 @@
     <string name="careportal_openapsoffline">OpenAPS Offline</string>
     <string name="careportal_pumpbatterychange">Pomp bat. wissel</string>
     <string name="careportal_temporarytarget">Tijdelijk streefdoel</string>
+    <string name="careportal_temporarytargetvalue">Tijdelijk streefdoel</string>
     <string name="careportal_temporarytargetcancel">Tijdelijk streefdoel annuleren</string>
+    <string name="boluswizard">Bolus wizard</string>
     <string name="glucosetype_finger">Vingerprik</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manueel</string>
     <string name="unknown">onbekend</string>
+    <string name="eatingsoon">Eet Binnenkort</string>
+    <string name="hypo">Hypo</string>
+    <string name="activity">Activiteit</string>
+    <string name="wear">Wear</string>
+    <string name="automation">Automatisering</string>
+    <string name="custom">Aangepast</string>
+    <string name="pump">Pomp</string>
+    <string name="loop">Loop</string>
+    <string name="ns">NS</string>
+    <string name="record">Opnemen</string>
+    <string name="reading_pump_history">Lezen van pomp historie</string>
+    <string name="pump_icon">Pomp icoon</string>
     <!--    Command-->
     <string name="connectiontimedout">Connectie verlopen</string>
     <!--    PumpEnactResult-->
@@ -203,7 +261,6 @@
     <string name="metadata_label_device_name">Patiëntnaam van exporterend apparaat</string>
     <string name="metadata_label_device_model">Modelnaam/nr van exporterend apparaat</string>
     <string name="metadata_label_encryption">Bestandsversleuteling</string>
-    <string name="metadata_format_old">Oude export indeling</string>
     <string name="metadata_format_new">Nieuwe versleutelde indeling</string>
     <string name="metadata_format_debug">Nieuwe debug indeling (onversleuteld)</string>
     <string name="metadata_format_other">Onbekende export indeling</string>
@@ -234,11 +291,125 @@
     <string name="signature_verifier">Handtekening controle</string>
     <string name="running_invalid_version">We hebben gedetecteerd dat je een ongeldige versie gebruikt. Loop is uitgeschakeld!</string>
     <string name="versionavailable">Versie %1$s is beschikbaar</string>
+    <string name="version_expire">Versie %1$s verloopt op %2$s</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Herstart je telefoon of herstart AndroidAPS vanuit de systeem instellingen. \nAnders zullen er voor AndroidAPS geen logs worden aangemaakt (dit is belangrijk voor de ontwikkelaars, zo kunnen zij controleren of de algoritmes correct werken)!</string>
     <!-- WeekdayPicker -->
+    <string name="monday_short">M</string>
+    <string name="tuesday_short">T</string>
+    <string name="wednesday_short">W</string>
+    <string name="thursday_short">T</string>
+    <string name="friday_short">F</string>
+    <string name="saturday_short">S</string>
+    <string name="sunday_short">S</string>
     <!-- User Entry -->
+    <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_calculator">BOLUS CALCULATOR</string>
+    <string name="uel_bolus_advisor">BOLUS ADVISEUR</string>
+    <string name="uel_extended_bolus">VERLENGDE BOLUS</string>
+    <string name="uel_superbolus_tbr">SUPERBOLUS TBR</string>
+    <string name="uel_carbs">KOOLHYDRATEN</string>
+    <string name="uel_extended_carbs">VERLENGDE KOOLHYDRATEN</string>
+    <string name="uel_temp_basal">TIJDELIJK BASAAL</string>
+    <string name="uel_tt">TIJDELIJK DOEL</string>
+    <string name="uel_new_profile">NIEUW PROFIEL</string>
+    <string name="uel_clone_profile">PROFIEL KLONEN</string>
+    <string name="uel_store_profile">PROFIEL OPSLAAN</string>
+    <string name="uel_profile_switch">PROFIEL WISSELEN</string>
+    <string name="uel_profile_switch_cloned">PROFIEL WISSEL GEKLOOND</string>
+    <string name="uel_closed_loop_mode">CLOSED LOOP MODUS</string>
+    <string name="uel_lgs_loop_mode">LGS LOOP MODUS</string>
+    <string name="uel_open_loop_mode">OPEN LOOP MODUS</string>
+    <string name="uel_loop_disabled">LOOP UITGESCHAKELD</string>
+    <string name="uel_loop_enabled">LOOP INGESCHAKELD</string>
+    <string name="uel_reconnect">VERBIND OPNIEW</string>
+    <string name="uel_disconnect">VERBINDING VERBREKEN</string>
+    <string name="uel_resume">HERVATTEN</string>
+    <string name="uel_suspend">ONDERBREKEN</string>
+    <string name="uel_hw_pump_allowed">HW PUMP TOEGESTAAN</string>
+    <string name="uel_clear_pairing_keys">VERWIJDER VERBINDINGSSLEUTEL</string>
+    <string name="uel_accepts_temp_basal">ACCEPTEERT TIJDELIJK BASAAL</string>
+    <string name="uel_cancel_temp_basal">ANNULEER TIJDELIJK BASAAL</string>
+    <string name="uel_cancel_bolus">STOP BOLUS</string>
+    <string name="uel_cancel_extended_bolus">ANNULEER VERLENGDE BOLUS</string>
+    <string name="uel_cancel_tt">STOP TIJDELIJK DOEL</string>
+    <string name="uel_careportal">CAREPORTAL</string>
+    <string name="uel_site_change">INFUSIEPLEK WIJZIGING</string>
+    <string name="uel_reservoir_change">RESERVOIRWISSEL</string>
+    <string name="uel_calibration">KALIBREREN</string>
+    <string name="uel_prime_bolus">VUL BOLUS</string>
+    <string name="uel_treatment">BEHANDELING</string>
+    <string name="uel_careportal_ns_refresh">CAREPORTAL NS VERVERSEN</string>
+    <string name="uel_profile_switch_ns_refresh">PROFIEL WISSEL NS VERVERSEN</string>
+    <string name="uel_treatments_ns_refresh">BEHANDELINGEN NS VERVERSEN</string>
+    <string name="uel_tt_ns_refresh">TIJDELIJK DOEL NS VERVERSEN</string>
+    <string name="uel_automation_removed">AUTOMATISERING VERWIJDERD</string>
+    <string name="uel_bg_removed">BG VERWIJDERD</string>
+    <string name="uel_careportal_removed">CAREPORTAL VERWIJDERD</string>
+    <string name="uel_bolus_removed">BOLUS VERWIJDERD</string>
+    <string name="uel_carbs_removed">KOOLHYDRATEN VERWIJDERD</string>
+    <string name="uel_temp_basal_removed">TIJDELIJK BASAAL VERWIJDERD</string>
+    <string name="uel_extended_bolus_removed">VERLENGDE BOLUS VERWIJDERD</string>
+    <string name="uel_food">VOEDSEL</string>
+    <string name="uel_food_removed">VOEDING VERWIJDERD</string>
+    <string name="uel_profile_removed">PROFIEL VERWIJDERD</string>
+    <string name="uel_profile_switch_removed">PROFIEL WISSEL VERWIJDERD</string>
+    <string name="uel_restart_events_removed">HERSTART GEBEURTENIS VERWIJDERD</string>
+    <string name="uel_treatment_removed">BEHANDELING VERWIJDERD</string>
+    <string name="uel_tt_removed">TIJDELIJK DOEL VERWIJDERD</string>
+    <string name="uel_ns_paused">NS GEPAUZEERD</string>
+    <string name="uel_ns_resume">NS HERVAT</string>
+    <string name="uel_ns_queue_cleared">NS WACHTRIJ GELEEGD</string>
+    <string name="uel_ns_settings_copied">NS INSTELLINGEN GEKOPIEERD</string>
+    <string name="uel_error_dialog_ok">FOUTMELDING DIALOOG OK</string>
+    <string name="uel_error_dialog_mute">ERROR DIALOOG DEMPEN </string>
+    <string name="uel_error_dialog_mute_5min">FOUTMELDING DIALOOG 5MIN DEMPEN</string>
+    <string name="uel_objective_started">DOELSTELLING GESTART</string>
+    <string name="uel_objective_unstarted">DOELSTELLING NIET GESTART</string>
+    <string name="uel_objectives_skipped">DOELSTELLING OVERGESLAGEN</string>
+    <string name="uel_stat_reset">STATISTIEKEN RESET</string>
+    <string name="uel_delete_logs">VERWIJDER LOGS</string>
+    <string name="uel_delete_future_treatments">VERWIJDER TOEKOMSTIGE BEHANDELINGEN</string>
+    <string name="uel_export_settings">EXPORTEER INSTELLINGEN</string>
+    <string name="uel_import_settings">IMPORT INSTELLINGEN</string>
+    <string name="uel_reset_databases">RESET DATABASES</string>
+    <string name="uel_export_databases">EXPORTEER DATABASES</string>
+    <string name="uel_import_databases">IMPORT DATABASES</string>
+    <string name="uel_otp_export">OTP EXPORTEREN</string>
+    <string name="uel_otp_reset">OTP HERSTELLEN</string>
+    <string name="uel_stop_sms">STOP SMS</string>
+    <string name="uel_export_csv">EXPORTEER GEBRUIKER INVOER</string>
+    <string name="uel_start_aaps">START AAPS</string>
+    <string name="uel_exit_aaps">AAPS AFSLUITEN</string>
+    <string name="uel_plugin_enabled">PLUGIN INGESCHAKELD</string>
+    <string name="uel_plugin_disabled">PLUGIN UITGESCHAKELD</string>
+    <string name="uel_unknown">ONBEKEND</string>
+    <string name="ue_string">Tekst</string>
+    <string name="ue_source">Bron</string>
+    <string name="ue_utc_offset">Utc Compensatie</string>
+    <string name="ue_action">Actie</string>
+    <string name="ue_timestamp">Tijdsstempel</string>
+    <string name="ue_none">Geen Eenheid</string>
+    <string name="ue_export_to_csv">Exporteer gebruikersinvoer naar Excel (csv)</string>
+    <string name="uel_loop_change">LOOP VERANDERD</string>
+    <string name="uel_loop_removed">LOOP VERWIJDERD</string>
+    <string name="uel_other">OVERIGE</string>
     <!-- HardLimits -->
+    <string name="profile_low_target">Profiel laag doel</string>
+    <string name="profile_high_target">Profiel hoog doel</string>
+    <string name="temp_target_low_target">Tijdelijk streefdoel ondergrens</string>
+    <string name="temp_target_high_target">Tijdelijk streefdoel bovengrens</string>
+    <string name="temp_target_value">Tijdelijk streefdoel waarde</string>
+    <string name="profile_dia">Profiel DIA waarde</string>
+    <string name="profile_sensitivity_value">Profiel gevoeligheidswaarde</string>
+    <string name="profile_max_daily_basal_value">Maximale basaal waarde van het profiel</string>
+    <string name="current_basal_value">Huidige basaal waarde</string>
+    <string name="profile_carbs_ratio_value">Profiel koolhydraten ratio waarde</string>
+    <string name="valuelimitedto">%1$.2f gelimiteerd tot %2$.2f</string>
+    <string name="valueoutofrange">»%1$s« is buiten de harde limiet</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f is buiten de harde limiet</string>
+    <string name="basal_value">Basaal waarde</string>
+    <string name="nsclient_version_does_not_match">NSClient versie werkt niet samen met AndroidAPS. Update gewenst.</string>
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dagen</item>
diff --git a/core/src/main/res/values-nl-rNL/validator.xml b/core/src/main/res/values-nl-rNL/validator.xml
index cc43f525491..a7ba42791c5 100644
--- a/core/src/main/res/values-nl-rNL/validator.xml
+++ b/core/src/main/res/values-nl-rNL/validator.xml
@@ -11,7 +11,9 @@
     <string name="error_domain_not_valid">Domeinnaam is niet geldig</string>
     <string name="error_ip_not_valid">IP-adres is niet geldig</string>
     <string name="error_url_not_valid">Website-URL is niet geldig</string>
+    <string name="error_notvalid_personname">Geen geldige voor of achternaam.</string>
     <string name="error_notvalid_personfullname">Geen geldige volledige naam.</string>
+    <string name="error_date_not_valid">Formaat niet geldig</string>
     <string name="error_mustbe4digitnumber">Moet uit 4 cijfers bestaan</string>
     <string name="error_mustbe6digitnumber">Moet uit 6 cijfers bestaan</string>
     <string name="error_mustbe12hexadidits">Moet 12 tekens bevatten uit ABCDEF0123456789</string>
diff --git a/core/src/main/res/values-no-rNO/strings.xml b/core/src/main/res/values-no-rNO/strings.xml
index 69d7f3835eb..368df9e88d4 100644
--- a/core/src/main/res/values-no-rNO/strings.xml
+++ b/core/src/main/res/values-no-rNO/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">Tilkoblet</string>
     <string name="disconnected">Frakoblet</string>
     <string name="disconnecting">Frakobler</string>
+    <string name="waiting_for_disconnection">Venter på frakobling</string>
     <string name="androidaps_start">AndroidAPS startet</string>
     <string name="formatinsulinunits1">%1$.1f E</string>
     <string name="formatinsulinunits">%1$.2f E</string>
@@ -173,12 +174,17 @@
     <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>
     <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> i <b>%3$d</b> dager<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Careportal</string>
     <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_announcement_message">Kunngjøring: %1$s</string>
+    <string name="careportal_note_message">Notat: %1$s</string>
+    <string name="careportal_question_message">Spørsmål: %1$s</string>
+    <string name="careportal_exercise_message">Aktivitet: %1$s</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>
@@ -196,6 +202,7 @@
     <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_temporarytargetvalue">Temp target verdi</string>
     <string name="careportal_temporarytargetcancel">Avbryt temp mål</string>
     <string name="boluswizard">Bolus assistent</string>
     <string name="glucosetype_finger">Finger</string>
@@ -212,6 +219,8 @@
     <string name="loop">Loop</string>
     <string name="ns">NS</string>
     <string name="record">Registrer</string>
+    <string name="reading_pump_history">Leser pumpehistorikk</string>
+    <string name="pump_icon">Pumpe ikon</string>
     <!--    Command-->
     <string name="connectiontimedout">Tilkoblingen ble tidsavbrutt</string>
     <!--    PumpEnactResult-->
@@ -252,7 +261,6 @@
     <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>
@@ -283,6 +291,7 @@
     <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="versionavailable">Versjon %1$s er tilgjengelig</string>
+    <string name="version_expire">Versjon %1$s utløper den %2$s</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Vennligst start mobilen på nytt eller restart AndroidAPS fra Innstillinger \nellers vil ikke AndroidAPS ha aktivert loggføring (viktig for å spore og kontrollere at algoritmene fungerer riktig!)</string>
     <!-- WeekdayPicker -->
@@ -295,6 +304,7 @@
     <string name="sunday_short">S</string>
     <!-- User Entry -->
     <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_calculator">BOLUS KALKULATOR</string>
     <string name="uel_bolus_advisor">BOLUS ASSISTENT</string>
     <string name="uel_extended_bolus">FORLENGET BOLUS</string>
     <string name="uel_superbolus_tbr">SUPERBOLUS TBR</string>
@@ -385,6 +395,21 @@
     <string name="uel_loop_removed">LOOP FJERNET</string>
     <string name="uel_other">ANNET</string>
     <!-- HardLimits -->
+    <string name="profile_low_target">Profil lavt blodsukkermål</string>
+    <string name="profile_high_target">Profil høyt blodsukkermål</string>
+    <string name="temp_target_low_target">Midlertidig mål nedre grense</string>
+    <string name="temp_target_high_target">Midlertidig mål øvre grense</string>
+    <string name="temp_target_value">Midlertidig målverdi</string>
+    <string name="profile_dia">Profil DIA verdi</string>
+    <string name="profile_sensitivity_value">Profil insulin følsomhet (IF)</string>
+    <string name="profile_max_daily_basal_value">Maksimal profil basalverdi</string>
+    <string name="current_basal_value">Nåværende basalverdi</string>
+    <string name="profile_carbs_ratio_value">Profil karbohydratfaktor (IK)</string>
+    <string name="valuelimitedto">%1$.2f begrenset til %2$.2f</string>
+    <string name="valueoutofrange">»%1$s« er utenfor lovlige grenseverdier</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f er utenfor lovlige grenseverdier</string>
+    <string name="basal_value">Basal verdi</string>
+    <string name="nsclient_version_does_not_match">NSKlient versjonen samsvarer ikke med AndroidAPS. Vennligst oppdater.</string>
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dager</item>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index ca320d647be..f5a10a5689f 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!--    Keys-->
     <!--    General-->
+    <string name="refresh">Odśwież</string>
     <string name="error">Błąd</string>
     <string name="not_set_short">Nie ustawiono</string>
     <string name="failedupdatebasalprofile">Nieudane uaktualnienie profilu bazy</string>
@@ -17,6 +18,7 @@
     <string name="connected">Połączono</string>
     <string name="disconnected">Rozłączono</string>
     <string name="disconnecting">Rozłączanie</string>
+    <string name="waiting_for_disconnection">Oczekiwanie na rozłączenie</string>
     <string name="androidaps_start">AndroidAPS uruchomiony</string>
     <string name="formatinsulinunits1">%1$.1f U</string>
     <string name="formatinsulinunits">%1$.2f U</string>
@@ -61,6 +63,8 @@
     <string name="eventtype">Typ zdarzenia</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
+    <string name="shortgram">g</string>
+    <string name="shortpercent">%</string>
     <string name="advancedsettings_title">Ustawienia zaawansowane</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="btwatchdog_title">BT Watchdog</string>
@@ -70,25 +74,38 @@
     <string name="no">Nie</string>
     <string name="loopdisabled">PĘTLA WYLĄCZONA Z UWAGI NA OGRANICZENIA</string>
     <string name="bolusdelivered">Bolus %1$.2f U podany prawidłowo</string>
+    <string name="virtualpump_resultok">OK</string>
     <string name="novalidbasalrate">Brak prawidłowej dawki bazowej odczytanej z pompy</string>
     <string name="limitingmaxiob">Ograniczam max IOB do %1$.1f U z uwagi na %2$s</string>
     <string name="unsafeusage">niebezpieczne użycie</string>
     <string name="pump_unreachable">Pompa nieosiągalna</string>
+    <string name="extended_bolus">Bolus Przedłużony</string>
     <string name="pump_time_updated">Czas pompy uaktualniony</string>
+    <string name="exit">Wyjście</string>
     <string name="removerecord">Usuń wpis</string>
+    <string name="loopisdisabled">Pętla jest wyłączona</string>
+    <string name="alarm">Alarm</string>
     <string name="disableloop">Wyłącz pętle</string>
     <string name="enableloop">Włącz pętle</string>
     <string name="resumeloop">Wznów pętlę</string>
     <string name="suspendloop">Wstrzymaj pętle</string>
+    <string name="duration_min_label">Czas trwania [min]</string>
     <string name="notification">Powiadomienie</string>
     <string name="noprofile">Nie załadowano profilu z NS</string>
     <string name="exists">istnieje</string>
     <string name="notexists">nie istnieje</string>
     <string name="glucose">Glukoza</string>
+    <string name="iob">IOB</string>
+    <string name="cob">COB</string>
     <string name="name_short">Nazwa:</string>
     <string name="time">Czas</string>
     <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="loading">Ładowanie…</string>
+    <string name="event_time_label">Czas zdarzenia</string>
+    <string name="notes_label">Notatki</string>
+    <string name="remove_button">Usuń</string>
     <string name="addnew">Dodaj nowy</string>
+    <string name="wrong_pump_data">Dane pochodzą z innej pompy. Zmień sterownik pompy, aby zresetować stan pompy.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Ograniczam maks. dawkę bazową do %1$.2f U/h z uwagi na %2$s</string>
     <string name="pumplimit">ograniczenie pompy</string>
@@ -104,6 +121,7 @@
     <string name="dismiss">ODRZUĆ</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth Low Energy nie jest obsługiwany.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy nie jest obsługiwany lub urządzenie nie jest sparowane.</string>
     <string name="ble_not_enabled">Bluetooth nie jest włączony.</string>
     <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>
@@ -154,16 +172,24 @@
     <!--    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>
+    <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> w <b>%3$d</b> dni<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">PortalOpieki</string>
     <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>
     <string name="careportal_exercise">Ćwiczenia</string>
+    <string name="careportal_announcement_message">Ogłoszenie: %1$s</string>
+    <string name="careportal_note_message">Wskazówka: %1$s</string>
+    <string name="careportal_question_message">Pytanie : %1$s</string>
+    <string name="careportal_exercise_message">Ćwiczenie: %1$s</string>
     <string name="careportal_pumpsitechange">Zmiana wkłucia</string>
     <string name="careportal_cgmsensorinsert">Założenie sensora CGM</string>
     <string name="careportal_cgmsensorstart">Uruchomienie sensora CGM</string>
+    <string name="careportal_cgm_sensor_stop">Zatrzymanie sensora CGM</string>
+    <string name="careportal_dad_alert">Alarm D.A.D.</string>
     <string name="careportal_insulincartridgechange">Zmiana zasobnika insuliny</string>
     <string name="careportal_profileswitch">Zmiana profilu</string>
     <string name="careportal_snackbolus">Bolus na przekąskę</string>
@@ -176,6 +202,7 @@
     <string name="careportal_openapsoffline">OpenAPS Rozłączony (Offline)</string>
     <string name="careportal_pumpbatterychange">Zmiana baterii pompy</string>
     <string name="careportal_temporarytarget">Cel tymczasowy (TT)</string>
+    <string name="careportal_temporarytargetvalue">Wartość celu tymczasowego</string>
     <string name="careportal_temporarytargetcancel">Odrzuć Cel tymczasowy</string>
     <string name="boluswizard">Kalkulator bolusa</string>
     <string name="glucosetype_finger">Palec</string>
@@ -188,6 +215,12 @@
     <string name="wear">Oprogramowanie Wear (Smartwatch)</string>
     <string name="automation">Automatyzacja</string>
     <string name="custom">Niestandardowe</string>
+    <string name="pump">Pompa</string>
+    <string name="loop">Pętla</string>
+    <string name="ns">NS</string>
+    <string name="record">Wpis</string>
+    <string name="reading_pump_history">Wczytywanie historii pompy</string>
+    <string name="pump_icon">Ikona pompy</string>
     <!--    Command-->
     <string name="connectiontimedout">Przekroczono limit czasu połączenia</string>
     <!--    PumpEnactResult-->
@@ -221,13 +254,13 @@
     <string name="format_hour_minute">%1$dh %2$dm</string>
     <string name="mute5min">Wycisz na 5 minut</string>
     <!-- Maintenance -->
+    <string name="metadata_label_format">Format pliku</string>
     <string name="metadata_label_created_at">Data utworzenia</string>
     <string name="metadata_label_aaps_version">Wersja AAPS</string>
     <string name="metadata_label_aaps_flavour">Wariant kompilacji</string>
     <string name="metadata_label_device_name">Eksportowanie nazwy urządzenia pacjenta</string>
     <string name="metadata_label_device_model">Eksportowanie modelu urządzenia</string>
     <string name="metadata_label_encryption">Szyfrowanie pliku</string>
-    <string name="metadata_format_old">Stary format eksportu</string>
     <string name="metadata_format_new">Nowy zaszyfrowany format</string>
     <string name="metadata_format_debug">Nowy format testowy (niezaszyfrowany)</string>
     <string name="metadata_format_other">Nieznany format eksportu</string>
@@ -259,7 +292,138 @@
     <string name="running_invalid_version">Wykryliśmy, że używasz nieprawidlowej wersji. Pętla wyłączona!</string>
     <string name="versionavailable">Wersja %1$s dostępna</string>
     <!-- Permissions -->
+    <string name="alert_dialog_storage_permission_text">Proszę uruchomić ponownie telefon lub zrestartować AndroidAPS w ustawieniach systemu telefonu \ninaczej AndroidAPS nie będzie otrzymywał logowań (ważne ze względu na śledzenie i sprawdzanie poprawności działania algorytmów)!</string>
     <!-- WeekdayPicker -->
+    <string name="monday_short">P</string>
+    <string name="tuesday_short">W</string>
+    <string name="wednesday_short">Ś</string>
+    <string name="thursday_short">C</string>
+    <string name="friday_short">P</string>
+    <string name="saturday_short">S</string>
+    <string name="sunday_short">N</string>
     <!-- User Entry -->
+    <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_advisor">KALKULATOR BOLUSA</string>
+    <string name="uel_extended_bolus">BOLUS PRZEDŁUŻONY</string>
+    <string name="uel_superbolus_tbr">SUPERBOLUS TBR</string>
+    <string name="uel_carbs">WĘGLOWODANY</string>
+    <string name="uel_extended_carbs">PRZEDŁUŻONE WĘGLOWODANY</string>
+    <string name="uel_temp_basal">BAZA TYMCZASOWA</string>
+    <string name="uel_tt">CEL TYMCZASOWY</string>
+    <string name="uel_new_profile">NOWY PROFIL</string>
+    <string name="uel_clone_profile">KLON PROFILU</string>
+    <string name="uel_store_profile">ZAPIS PROFILU</string>
+    <string name="uel_profile_switch">ZMIANA PROFILU</string>
+    <string name="uel_profile_switch_cloned">ZMIANA PROFILU SKLONOWANA</string>
+    <string name="uel_closed_loop_mode">TRYB ZAMKNIĘTEJ PĘTLI</string>
+    <string name="uel_lgs_loop_mode">TRYB ZAWIESZENIA PRZY NISKIEJ GLIKEMI (LGS)</string>
+    <string name="uel_open_loop_mode">TRYB OTWARTEJ PĘTLI</string>
+    <string name="uel_loop_disabled">PĘTLA WYŁĄCZONA</string>
+    <string name="uel_loop_enabled">PĘTLA WŁĄCZONA</string>
+    <string name="uel_reconnect">POŁĄCZ PONOWNIE</string>
+    <string name="uel_disconnect">ROZŁĄCZ</string>
+    <string name="uel_resume">WZNÓW</string>
+    <string name="uel_suspend">ZAWIEŚ</string>
+    <string name="uel_hw_pump_allowed">POMPA SPRZĘTOWA DOZWOLONA</string>
+    <string name="uel_clear_pairing_keys">WYCZYŚĆ KLUCZE PAROWANIA</string>
+    <string name="uel_accepts_temp_basal">AKCEPTUJE BAZĘ TYMCZASOWĄ</string>
+    <string name="uel_cancel_temp_basal">ANULUJ BAZĘ TYMCZASOWĄ</string>
+    <string name="uel_cancel_bolus">ANULUJ BOLUS</string>
+    <string name="uel_cancel_extended_bolus">ANULUJ ROZSZERZONY BOLUS</string>
+    <string name="uel_cancel_tt">ANULUJ CEL TYMCZASOWY</string>
+    <string name="uel_careportal">PORTALOPIEKI</string>
+    <string name="uel_site_change">ZMIANA MIEJSCA WKŁUCIA</string>
+    <string name="uel_reservoir_change">ZMIANA ZBIORNIKA</string>
+    <string name="uel_calibration">KALIBRACJA</string>
+    <string name="uel_prime_bolus">BOLUS NA WYPEŁNIENIE</string>
+    <string name="uel_treatment">WPIS TERAPII</string>
+    <string name="uel_careportal_ns_refresh">ODŚWIEŻENIE PORTALUOPIEKI NS</string>
+    <string name="uel_profile_switch_ns_refresh">ODŚWIEŻENIE ZMIANY PROFILU NS</string>
+    <string name="uel_treatments_ns_refresh">ODŚWIEŻENIE WPISÓW TERAPII NS</string>
+    <string name="uel_tt_ns_refresh">ODŚWIEŻENIE CELU TMCZASOWEGO NS</string>
+    <string name="uel_automation_removed">USUNIĘTO AUTOMATYZACJĘ</string>
+    <string name="uel_bg_removed">USUNIĘTO WPIS GLIKEMII</string>
+    <string name="uel_careportal_removed">USUNIĘTO WPIS PORTALU OPIEKI</string>
+    <string name="uel_bolus_removed">USUNIĘTO BOLUS</string>
+    <string name="uel_carbs_removed">USUNIĘTO WĘGLOWODANY</string>
+    <string name="uel_temp_basal_removed">USUNIĘTO BAZĘ TYMCZASOWĄ</string>
+    <string name="uel_extended_bolus_removed">USUNIĘTO BOLUS ROZSZERZONY</string>
+    <string name="uel_food">POSIŁEK</string>
+    <string name="uel_food_removed">USUNIĘTO POSIŁEK</string>
+    <string name="uel_profile_removed">USUNIĘTO PROFIL</string>
+    <string name="uel_profile_switch_removed">USUNIĘTO ZMIENĘ PROFILU</string>
+    <string name="uel_restart_events_removed">USUNIĘTO INFORMACJE O PONOWNYM URUCHOMIENIU</string>
+    <string name="uel_treatment_removed">USUNIĘTO WPIS TERAPII</string>
+    <string name="uel_tt_removed">USUNIĘTO CEL TYMCZASOWY</string>
+    <string name="uel_ns_paused">PAUZA NS</string>
+    <string name="uel_ns_resume">WZNOWIENIE NS</string>
+    <string name="uel_ns_queue_cleared">KOLEJKA NS WYCZYSZCZONA</string>
+    <string name="uel_ns_settings_copied">USTAWIENIA NS SKOPIOWANE</string>
+    <string name="uel_error_dialog_ok">DIALOG BŁĘDU OK</string>
+    <string name="uel_error_dialog_mute">DIALOG BŁĘDU WYCISZ </string>
+    <string name="uel_error_dialog_mute_5min">DIALOG BŁĘDU WYCISZ NA 5 MINUT</string>
+    <string name="uel_objective_started">ZADANIE ROZPOCZĘTE</string>
+    <string name="uel_objective_unstarted">ZADANIE NIE ROZPOCZĘTE</string>
+    <string name="uel_objectives_skipped">ZADANIE POMINIĘTE</string>
+    <string name="uel_stat_reset">WYCZYSZCZENIE STATYSTYK</string>
+    <string name="uel_delete_logs">USUŃ LOGI</string>
+    <string name="uel_delete_future_treatments">USUŃ PRZYSZŁE WPIS TERAPII</string>
+    <string name="uel_export_settings">EXPORT USTAWIEŃ</string>
+    <string name="uel_import_settings">IMPORT USTAWIEŃ</string>
+    <string name="uel_reset_databases">RESET BAZ DANYCH</string>
+    <string name="uel_export_databases">EKSPORT BAZ DANYCH</string>
+    <string name="uel_import_databases">IMPORT BAZ DANCH</string>
+    <string name="uel_otp_export">EXPORT OTP</string>
+    <string name="uel_otp_reset">RESET OTP</string>
+    <string name="uel_stop_sms">STOP SMS</string>
+    <string name="uel_export_csv">EKSPORT WPISÓW UŻYTKOWNIKA</string>
+    <string name="uel_start_aaps">START AAPS</string>
+    <string name="uel_exit_aaps">WYŁĄCZENIE AAPS</string>
+    <string name="uel_plugin_enabled">WŁĄCZENIE PLUGINU</string>
+    <string name="uel_plugin_disabled">WYŁĄCZENIE PLUGINU</string>
+    <string name="uel_unknown">NIEZNANE</string>
+    <string name="ue_string">Ciąg znaków</string>
+    <string name="ue_source">Źródło</string>
+    <string name="ue_utc_offset">Przesunięcie UTC</string>
+    <string name="ue_action">Działanie</string>
+    <string name="ue_timestamp">Sygnatura czasowa</string>
+    <string name="ue_none">Brak jednostki</string>
+    <string name="ue_export_to_csv">Eksportuj wpisy użytkownika do Excel-a (csv)</string>
+    <string name="uel_loop_change">PĘTLA ZMIENIONA</string>
+    <string name="uel_loop_removed">PĘTLA USUNIĘTA</string>
+    <string name="uel_other">INNE</string>
     <!-- HardLimits -->
+    <string name="profile_low_target">Dolna granica celu profilu</string>
+    <string name="profile_high_target">Górna granica celu profilu</string>
+    <string name="temp_target_low_target">Dolna wartość celu tymczasowego</string>
+    <string name="temp_target_high_target">Górna wartość celu tymczasowego</string>
+    <string name="temp_target_value">Wartość celu tymczasowego</string>
+    <string name="profile_dia">Wartość DIA profilu</string>
+    <string name="profile_sensitivity_value">Wartość wrażliwości profilu</string>
+    <string name="profile_max_daily_basal_value">Maksymalna wartość bazowa profilu</string>
+    <string name="current_basal_value">Bieżąca wartość bazowa</string>
+    <string name="profile_carbs_ratio_value">Stosunek węglowodanów profilu</string>
+    <string name="valuelimitedto">%1$.2f ograniczone do %2$.2f</string>
+    <string name="valueoutofrange">Wartość »%1$s« jest poza dopuszczalną granicą</string>
+    <string name="value_out_of_hard_limits">Wartość »%1$s« %2$.2f jest poza dopuszczalną granicą</string>
+    <string name="basal_value">Wartość bazy</string>
+    <string name="nsclient_version_does_not_match">Wersja NSClient nie jest zgodna z AndroidAPS. Proszę zaktualizować.</string>
+    <plurals name="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="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="minutes">
+        <item quantity="one">%1$d minuta</item>
+        <item quantity="few">%1$d minuty</item>
+        <item quantity="many">%1$d minuty</item>
+        <item quantity="other">%1$d minuty</item>
+    </plurals>
 </resources>
diff --git a/core/src/main/res/values-pl-rPL/validator.xml b/core/src/main/res/values-pl-rPL/validator.xml
index e7f12e53eac..b71d740d62c 100644
--- a/core/src/main/res/values-pl-rPL/validator.xml
+++ b/core/src/main/res/values-pl-rPL/validator.xml
@@ -3,7 +3,7 @@
     <string name="error_only_numeric_digits_allowed">Dozwolone są tylko cyfry.</string>
     <string name="error_only_numeric_digits_range_allowed">Dozwolone są tylko cyfry w zakresie %1$s - %2$s.</string>
     <string name="error_this_field_cannot_contain_special_character">To pole nie może zawierać znaków specjalnych</string>
-    <string name="error_only_standard_letters_are_allowed">Dozwolone są tylko standardowe litery</string>
+    <string name="error_only_standard_letters_are_allowed">Dozwolone są tylko standardowe litery (łacińskie, bez polskich znaków)</string>
     <string name="error_field_must_not_be_empty">Pole nie może być puste</string>
     <string name="error_email_address_not_valid">Nieprawidłowy adres e-mail</string>
     <string name="error_creditcard_number_not_valid">Numer karty kredytowej nie jest prawidłowy</string>
@@ -16,5 +16,9 @@
     <string name="error_date_not_valid">Nieprawidłowy format</string>
     <string name="error_mustbe4digitnumber">Trzeba podać 4-cyfrowy numer</string>
     <string name="error_mustbe6digitnumber">Trzeba podać 6-cyfrowy numer</string>
-    <string name="error_pin_not_valid">Pin powinien być od 3 do 6 cyfr, nie takich samych ani kolejnych</string>
+    <string name="error_mustbe12hexadidits">Musi składać się z 12 znaków w systemie szesnastkowym (ABCDEF0123456789)</string>
+    <string name="error_mustbe8hexadidits">Musi składać się z 8 znaków w systemie szesnastkowym (ABCDEF0123456789)</string>
+    <string name="error_mustbe4hexadidits">Musi składać się z 4 znaków w systemie szesnastkowym (ABCDEF0123456789)</string>
+    <string name="error_not_a_minimum_length">Wartość za krótka</string>
+    <string name="error_pin_not_valid">Pin powinien zawierać od 3 do 6 cyfr, nie takich samych ani kolejnych</string>
 </resources>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index 06f743e9c23..c489cf6f50f 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -206,7 +206,6 @@
     <string name="metadata_label_device_name">Exportando nome do paciente do dispositivo</string>
     <string name="metadata_label_device_model">Exportando modelo do dispositivo</string>
     <string name="metadata_label_encryption">Criptografia do arquivo</string>
-    <string name="metadata_format_old">Antigo Formato de Exportação</string>
     <string name="metadata_format_new">Novo formato de encriptação</string>
     <string name="metadata_format_debug">Novo formato de depuração (não encriptado)</string>
     <string name="metadata_format_other">Formato de exportação desconhecido</string>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index c3ef38543e9..6bebada0066 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -247,7 +247,6 @@
     <string name="metadata_label_device_name">A exportar nome do paciente do dispositivo</string>
     <string name="metadata_label_device_model">A exportar modelo do dispositivo</string>
     <string name="metadata_label_encryption">Encriptação do Ficheiro</string>
-    <string name="metadata_format_old">Antigo Formato de Exportação</string>
     <string name="metadata_format_new">Novo formato de encriptação</string>
     <string name="metadata_format_debug">Novo formato de depuração (não encriptado)</string>
     <string name="metadata_format_other">Formato de exportação desconhecido</string>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index 5f887266f29..df5ec3aa834 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">Conectat</string>
     <string name="disconnected">Deconectat</string>
     <string name="disconnecting">Se deconectează</string>
+    <string name="waiting_for_disconnection">Se așteaptă deconectarea</string>
     <string name="androidaps_start">AndroidAPS a pornit</string>
     <string name="formatinsulinunits1">%1$.1f U</string>
     <string name="formatinsulinunits">%1$.2f U</string>
@@ -62,6 +63,8 @@
     <string name="eventtype">Tip eveniment</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
+    <string name="shortgram">g</string>
+    <string name="shortpercent">%</string>
     <string name="advancedsettings_title">Setări avansate</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="btwatchdog_title">BT Watchdog</string>
@@ -102,6 +105,7 @@
     <string name="notes_label">Note</string>
     <string name="remove_button">Șterge</string>
     <string name="addnew">Adăugare</string>
+    <string name="wrong_pump_data">Datele vin de la o pompa diferita. Schimba driver-ul de pompa pentru a reseta starea pompei.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Se limitează maximul ratei bazale la %1$.2f U/o datorită %2$s</string>
     <string name="pumplimit">limită pompă</string>
@@ -117,6 +121,7 @@
     <string name="dismiss">RENUNȚĂ</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">BLE nu este suportat.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy nu este acceptat sau dispozitivul nu este asociat.</string>
     <string name="ble_not_enabled">Bluetooth-ul este dezactivat.</string>
     <string name="location_not_found_title">Localizarea este dezactivată</string>
     <string name="location_not_found_message">Pentru a putea căuta dispozitive Bluetooth noi, trebuie să activați localizarea. AAPS nu folosește datele dumneavoastră de localizare și acestea pot fi dezactivate după stabilirea conexiunii cu pompa.</string>
@@ -168,16 +173,24 @@
     <!--    TDD-->
     <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bolus: <b>%3$.2fU</b> Bazală: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bolus: <b>%3$.2fU</b> Bazală: <b>%4$.2fU(%5$.0f%%)</b> CH: <b>%6$.0f g</b>]]></string>
+    <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> in <b>%3$d</b> zile<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Careportal</string>
     <string name="careportal_bgcheck">Verificare glicemie</string>
     <string name="careportal_mbg">Test glicemie manual sau Calibrare</string>
     <string name="careportal_announcement">Anunț</string>
     <string name="careportal_note">Notă</string>
     <string name="careportal_question">Întrebare</string>
     <string name="careportal_exercise">Activitate fizică</string>
+    <string name="careportal_announcement_message">Anunț : %1$s</string>
+    <string name="careportal_note_message">Notă: %1$s</string>
+    <string name="careportal_question_message">Întrebare : %1$s</string>
+    <string name="careportal_exercise_message">Exercițiu fizic: %1$s</string>
     <string name="careportal_pumpsitechange">Schimbare loc pompă</string>
     <string name="careportal_cgmsensorinsert">Inserare senzor</string>
     <string name="careportal_cgmsensorstart">Start senzor</string>
+    <string name="careportal_cgm_sensor_stop">Stop senzor CGM</string>
+    <string name="careportal_dad_alert">Alertă D.A.D.</string>
     <string name="careportal_insulincartridgechange">Schimbare cartuș insulină</string>
     <string name="careportal_profileswitch">Schimbare de profil</string>
     <string name="careportal_snackbolus">Bolus Gustare</string>
@@ -190,6 +203,7 @@
     <string name="careportal_openapsoffline">OpenAPS Offline</string>
     <string name="careportal_pumpbatterychange">Schimbare baterie pompă</string>
     <string name="careportal_temporarytarget">Ţintă temporară</string>
+    <string name="careportal_temporarytargetvalue">Valoare țintă temporară</string>
     <string name="careportal_temporarytargetcancel">Oprire ţintă temporară</string>
     <string name="boluswizard">Asistent bolusare</string>
     <string name="glucosetype_finger">Deget</string>
@@ -198,9 +212,16 @@
     <string name="unknown">necunoscută</string>
     <string name="eatingsoon">Mănânc în curând</string>
     <string name="hypo">Hipo</string>
+    <string name="activity">Exercițiu fizic</string>
     <string name="wear">Ceas</string>
     <string name="automation">Automatizare</string>
     <string name="custom">Personalizat</string>
+    <string name="pump">Pompă</string>
+    <string name="loop">Buclă</string>
+    <string name="ns">NS</string>
+    <string name="record">Înregistrare</string>
+    <string name="reading_pump_history">Se citește istoricul din pompă</string>
+    <string name="pump_icon">Pictogramă pompă</string>
     <!--    Command-->
     <string name="connectiontimedout">Conectare eșuată</string>
     <!--    PumpEnactResult-->
@@ -241,7 +262,6 @@
     <string name="metadata_label_device_name">Exporta numele dispozitivului pacientului</string>
     <string name="metadata_label_device_model">Exportarea modelului dispozitivului</string>
     <string name="metadata_label_encryption">Criptarea fișierului</string>
-    <string name="metadata_format_old">Format vechi de export</string>
     <string name="metadata_format_new">Format nou criptat</string>
     <string name="metadata_format_debug">Format nou pentru debug (necriptat)</string>
     <string name="metadata_format_other">Format de export necunoscut</string>
@@ -272,6 +292,7 @@
     <string name="signature_verifier">Verificare semnătură</string>
     <string name="running_invalid_version">S-a detectat rularea unei versiuni invalide. Buclă dezactivată!</string>
     <string name="versionavailable">Versiunea %1$s este disponibilă</string>
+    <string name="version_expire">Versiunea %1$s expiră pe %2$s</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Restartați telefonul sau reporniți aplicația AndroidAPS din Setările de sistem \naltfel AndroidAPS nu va avea jurnalizare (importanta pentru monitorizare si verifica funcționarea corecta a algoritmilor)!</string>
     <!-- WeekdayPicker -->
@@ -283,7 +304,113 @@
     <string name="saturday_short">S</string>
     <string name="sunday_short">D</string>
     <!-- User Entry -->
+    <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_calculator">CALCULATOR DE BOLUS</string>
+    <string name="uel_bolus_advisor">ASISTENT BOLUS</string>
+    <string name="uel_extended_bolus">BOLUS EXTINS</string>
+    <string name="uel_superbolus_tbr">RBT SUPERBOLUS</string>
+    <string name="uel_carbs">CARBO</string>
+    <string name="uel_extended_carbs">CARBO EXTINSI</string>
+    <string name="uel_temp_basal">BAZALA TEMPORARA</string>
+    <string name="uel_tt">TINTA TEMPORARA</string>
+    <string name="uel_new_profile">PROFIL NOW</string>
+    <string name="uel_clone_profile">CLONEAZA PROFILUL</string>
+    <string name="uel_store_profile">PĂSTREAZĂ PROFILUL</string>
+    <string name="uel_profile_switch">SCHIMBARE PROFIL</string>
+    <string name="uel_profile_switch_cloned">SCHIMBARE PROFIL CLONATA</string>
+    <string name="uel_closed_loop_mode">MOD BUCLA ÎNCHISĂ</string>
+    <string name="uel_lgs_loop_mode">MOD BUCLA LGS</string>
+    <string name="uel_open_loop_mode">MOD BUCLA DESCHISA</string>
+    <string name="uel_loop_disabled">BUCLA DEZACTIVATA</string>
+    <string name="uel_loop_enabled">BUCLA ACTIVATA</string>
+    <string name="uel_reconnect">RECONECTARE</string>
+    <string name="uel_disconnect">DECONECTARE</string>
+    <string name="uel_resume">REPORNIRE</string>
+    <string name="uel_suspend">SUSPENDARE</string>
+    <string name="uel_hw_pump_allowed">HW POMPA PERMIS</string>
+    <string name="uel_clear_pairing_keys">ȘTERGE CHEILE DE ASOCIERE</string>
+    <string name="uel_accepts_temp_basal">ACCEPTA BAZALA TEMPORARA</string>
+    <string name="uel_cancel_temp_basal">ANULEAZĂ BAZALA TEMPORARA</string>
+    <string name="uel_cancel_bolus">ANULARE BOLUS</string>
+    <string name="uel_cancel_extended_bolus">ANULEAZĂ BOLUS EXTINS</string>
+    <string name="uel_cancel_tt">ANULEAZĂ TINTA TEMPORARA</string>
+    <string name="uel_careportal">CAREPORTAL</string>
+    <string name="uel_site_change">SCHIMBARE CANULA</string>
+    <string name="uel_reservoir_change">SCHIMBARE REZERVOR</string>
+    <string name="uel_calibration">CALIBRARE</string>
+    <string name="uel_prime_bolus">BOLUS DE AMORSARE</string>
+    <string name="uel_treatment">TRATAMENT</string>
+    <string name="uel_careportal_ns_refresh">ACTUALIZARE CAREPORTAL NS</string>
+    <string name="uel_profile_switch_ns_refresh">ACTUALIZARE NS SCHIMBARE PROFIL</string>
+    <string name="uel_treatments_ns_refresh">ACTUALIZARE NS TRATAMENTE</string>
+    <string name="uel_tt_ns_refresh">ACTUALIZARE NS TINTE TEMPORARE</string>
+    <string name="uel_automation_removed">AUTOMATIZARE ȘTEARSĂ</string>
+    <string name="uel_bg_removed">GLICEMIE ELIMINATA</string>
+    <string name="uel_careportal_removed">CAREPORTAL ELIMINAT</string>
+    <string name="uel_bolus_removed">BOLUS ELIMINAT</string>
+    <string name="uel_carbs_removed">CARBO ELIMINAȚI</string>
+    <string name="uel_temp_basal_removed">BAZALA TEMPORARA ELIMINATA</string>
+    <string name="uel_extended_bolus_removed">BOLUS EXTINS ELIMINAT</string>
+    <string name="uel_food">MÂNCARE</string>
+    <string name="uel_food_removed">MÂNCARE ELIMINATA</string>
+    <string name="uel_profile_removed">PROFIL ELIMINAT</string>
+    <string name="uel_profile_switch_removed">SCHIMBARE PROFIL ELIMINATA</string>
+    <string name="uel_restart_events_removed">EVENIMENT RESTART ELIMINAT</string>
+    <string name="uel_treatment_removed">TRATAMENT ELIMINAT</string>
+    <string name="uel_tt_removed">TINTA TEMPORARA ELIMINATA</string>
+    <string name="uel_ns_paused">NS IN PAUZA</string>
+    <string name="uel_ns_resume">NS REPORNIT</string>
+    <string name="uel_ns_queue_cleared">CURATARE COADA NS</string>
+    <string name="uel_ns_settings_copied">COPIERE SETARI NS</string>
+    <string name="uel_error_dialog_ok">DIALOG EROARE OK</string>
+    <string name="uel_error_dialog_mute">OPRIRE DIALOG EROARE </string>
+    <string name="uel_error_dialog_mute_5min">OPRIRE DIALOG EROARE 5MIN</string>
+    <string name="uel_objective_started">OBIECTIV ÎNCEPUT</string>
+    <string name="uel_objective_unstarted">OBIECTIV NEÎNCEPUT</string>
+    <string name="uel_objectives_skipped">OBIECTIV SĂRIT</string>
+    <string name="uel_stat_reset">RESET STATISTICI</string>
+    <string name="uel_delete_logs">STERGERE JURNAL</string>
+    <string name="uel_delete_future_treatments">STERGERE TRATAMENTE VIITOARE</string>
+    <string name="uel_export_settings">EXPORT SETARI</string>
+    <string name="uel_import_settings">IMPORT SETARI</string>
+    <string name="uel_reset_databases">RESETARE BAZE DE DATE</string>
+    <string name="uel_export_databases">EXPORT BAZE DE DATE</string>
+    <string name="uel_import_databases">IMPORT BAZE DE DATE</string>
+    <string name="uel_otp_export">EXPORT OTP</string>
+    <string name="uel_otp_reset">RESETARE OTP</string>
+    <string name="uel_stop_sms">STOP SMS</string>
+    <string name="uel_export_csv">EXPORT ÎNREGISTRĂRI UTILIZATOR</string>
+    <string name="uel_start_aaps">START AAPS</string>
+    <string name="uel_exit_aaps">IESIRE AAPS</string>
+    <string name="uel_plugin_enabled">ACTIVARE PLUGIN</string>
+    <string name="uel_plugin_disabled">DEZACTIVARE PLUGIN</string>
+    <string name="uel_unknown">NECUNOSCUT</string>
+    <string name="ue_string">Şir de caractere</string>
+    <string name="ue_source">Sursă</string>
+    <string name="ue_utc_offset">Decalaj UTC</string>
+    <string name="ue_action">Acțiune</string>
+    <string name="ue_timestamp">Timp</string>
+    <string name="ue_none">Nicio unitate</string>
+    <string name="ue_export_to_csv">Exportă înregistrările utilizatorului în Excel (csv)</string>
+    <string name="uel_loop_change">BUCLA SCHIMBATA</string>
+    <string name="uel_loop_removed">BUCLA ELIMINATA</string>
+    <string name="uel_other">ALTELE</string>
     <!-- HardLimits -->
+    <string name="profile_low_target">Profil ținta joasa</string>
+    <string name="profile_high_target">Profil țintă ridicata</string>
+    <string name="temp_target_low_target">Limita inferioara a țintei temporare</string>
+    <string name="temp_target_high_target">Limita superioara a țintei temporare</string>
+    <string name="temp_target_value">Valoare ținta temporară</string>
+    <string name="profile_dia">Valoare profil DIA</string>
+    <string name="profile_sensitivity_value">Valoare sensibilitate profil</string>
+    <string name="profile_max_daily_basal_value">Valoare bazală maximă a profilului</string>
+    <string name="current_basal_value">Valoare bazală curentă</string>
+    <string name="profile_carbs_ratio_value">Valoarea raportului carbohidrați din profil</string>
+    <string name="valuelimitedto">%1$.2f limitat la %2$.2f</string>
+    <string name="valueoutofrange">»%1$s« este in afara limitelor stabilite</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f este in afara limitelor stabilite</string>
+    <string name="basal_value">Valoare rata bazală</string>
+    <string name="nsclient_version_does_not_match">Versiunea NSClient nu se potrivește cu versiunea AndroidAPS. Vă rugăm să o actualizați.</string>
     <plurals name="days">
         <item quantity="one">%1$d zi</item>
         <item quantity="few">%1$d zile</item>
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 0e32949ffc3..9c3600cd0a9 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">соединение установлено</string>
     <string name="disconnected">Разъединено</string>
     <string name="disconnecting">разъединение</string>
+    <string name="waiting_for_disconnection">Ожидание разъединения</string>
     <string name="androidaps_start">AndroidAPS запущен</string>
     <string name="formatinsulinunits1">%1$.1f ед</string>
     <string name="formatinsulinunits">%1$.2f ед</string>
@@ -173,12 +174,17 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s</b>∑: <b>%2$.2fед</b> Бол: <b>%3$.2fед</b> Баз: <b>%4$.2fед(%5$.0f%%)</b> Угл: <b>%6$.0fг</b>]]></string>
     <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s</span></b> <b>%2$s</b>через<b>%3$d</b> дней<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Портал терапии</string>
     <string name="careportal_bgcheck">Проверка ГК</string>
     <string name="careportal_mbg">Ввести значение ГК или калибровку</string>
     <string name="careportal_announcement">Оповещение</string>
     <string name="careportal_note">Примечание</string>
     <string name="careportal_question">Вопрос</string>
-    <string name="careportal_exercise">Нгрузка</string>
+    <string name="careportal_exercise">Нагрузка</string>
+    <string name="careportal_announcement_message">Оповещение: %1$s</string>
+    <string name="careportal_note_message">Примечание: %1$s</string>
+    <string name="careportal_question_message">Вопрос: %1$s</string>
+    <string name="careportal_exercise_message">Нагрузка: %1$s</string>
     <string name="careportal_pumpsitechange">Смена места катетера помпы</string>
     <string name="careportal_cgmsensorinsert">Установка сенсора мониторинга глюкозы</string>
     <string name="careportal_cgmsensorstart">Сарт сенсора</string>
@@ -196,6 +202,7 @@
     <string name="careportal_openapsoffline">OpenAPS в автономном режиме</string>
     <string name="careportal_pumpbatterychange">Замена батареи помпы</string>
     <string name="careportal_temporarytarget">Временная цель</string>
+    <string name="careportal_temporarytargetvalue">Временное целевое значение</string>
     <string name="careportal_temporarytargetcancel">Отмена временной цели</string>
     <string name="boluswizard">Мастер Болюса</string>
     <string name="glucosetype_finger">Палец</string>
@@ -212,6 +219,8 @@
     <string name="loop">Замкнутый цикл</string>
     <string name="ns">NS</string>
     <string name="record">Запись</string>
+    <string name="reading_pump_history">Чтение истории помпы</string>
+    <string name="pump_icon">Пиктограмма помпы</string>
     <!--    Command-->
     <string name="connectiontimedout">Истекло время ожидания соединения</string>
     <!--    PumpEnactResult-->
@@ -252,7 +261,6 @@
     <string name="metadata_label_device_name">Имя пациента экспортируемого устройства</string>
     <string name="metadata_label_device_model">Модель экспортируемого устройства</string>
     <string name="metadata_label_encryption">Шифрование файла</string>
-    <string name="metadata_format_old">Старый формат экспорта</string>
     <string name="metadata_format_new">Новый зашифрованный формат</string>
     <string name="metadata_format_debug">Новый формат отладки (незашифрованный)</string>
     <string name="metadata_format_other">Неизвестный формат экспорта</string>
@@ -283,6 +291,7 @@
     <string name="signature_verifier">Верификатор подписи</string>
     <string name="running_invalid_version">Мы обнаружили, что вы используете недопустимую версию. Цикл отключен!</string>
     <string name="versionavailable">Доступна версия %1$s</string>
+    <string name="version_expire">Версия: %1$s истекает %2$s</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Перезагрузите телефон или перезапустите AndroidAPS из системных настроек \n иначе AndroidAPS не будет вести лог (важно для отслеживания и проверки алгоритмов)!</string>
     <!-- WeekdayPicker -->
@@ -295,6 +304,7 @@
     <string name="sunday_short">Вс</string>
     <!-- User Entry -->
     <string name="uel_bolus">БОЛЮС</string>
+    <string name="uel_bolus_calculator">КАЛЬКУЛЯТОР БОЛЮСА</string>
     <string name="uel_bolus_advisor">ПОМОЩНИК БОЛЮСА</string>
     <string name="uel_extended_bolus">ПРОЛОНГИРОВАННЫЙ БОЛЮС</string>
     <string name="uel_superbolus_tbr">СУПЕРБОЛЮС ВБС/TBR</string>
@@ -399,6 +409,7 @@
     <string name="valueoutofrange">»%1$s« за пределами жестких ограничений</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f за пределами жестких ограничений</string>
     <string name="basal_value">Величина базала</string>
+    <string name="nsclient_version_does_not_match">Версия NSClient не совпадает с версией AndroidAPS. Пожалуйста, обновите.</string>
     <plurals name="days">
         <item quantity="one">%1$d день</item>
         <item quantity="few">%1$d дня</item>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 10c4e30f107..77d63816af4 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -18,6 +18,7 @@
     <string name="connected">Pripojené</string>
     <string name="disconnected">Odpojené</string>
     <string name="disconnecting">Odpájanie</string>
+    <string name="waiting_for_disconnection">Čakám na odpojenie</string>
     <string name="androidaps_start">AndroidAPS spustený</string>
     <string name="formatinsulinunits1">%1$.1f JI</string>
     <string name="formatinsulinunits">%1$.2f JI</string>
@@ -173,12 +174,17 @@
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f JI</b> Bol: <b>%3$.2f JI</b> Baz: <b>%4$.2f JI(%5$.0f%%)</b> Sach.: <b>%6$.0f g</b>]]></string>
     <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> v <b>%3$d</b> dňoch<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Starostlivosť</string>
     <string name="careportal_bgcheck">Kontrola glykémie</string>
     <string name="careportal_mbg">Ručné meranie, alebo kalibrácia</string>
     <string name="careportal_announcement">Oznámenie</string>
     <string name="careportal_note">Poznámka</string>
     <string name="careportal_question">Otázka</string>
     <string name="careportal_exercise">Pohyb</string>
+    <string name="careportal_announcement_message">Oznámenie: %1$s</string>
+    <string name="careportal_note_message">Poznámka : %1$s</string>
+    <string name="careportal_question_message">Otázka: %1$s</string>
+    <string name="careportal_exercise_message">Cvičenie : %1$s</string>
     <string name="careportal_pumpsitechange">Výmena setu</string>
     <string name="careportal_cgmsensorinsert">Výmena senzora</string>
     <string name="careportal_cgmsensorstart">Spustenie senzora</string>
@@ -213,6 +219,8 @@
     <string name="loop">Uzavretý okruh</string>
     <string name="ns">NS</string>
     <string name="record">Záznam</string>
+    <string name="reading_pump_history">Načítavam históriu z pumpy</string>
+    <string name="pump_icon">Ikona pumpy</string>
     <!--    Command-->
     <string name="connectiontimedout">Vypršal čas na pripojenie</string>
     <!--    PumpEnactResult-->
@@ -253,7 +261,6 @@
     <string name="metadata_label_device_name">Meno pacienta použité pri exporte</string>
     <string name="metadata_label_device_model">Model zariadenia použitý pri exporte</string>
     <string name="metadata_label_encryption">Šifrovanie súborov</string>
-    <string name="metadata_format_old">Zastaralý formát exportu</string>
     <string name="metadata_format_new">Nový šifrovaný formát</string>
     <string name="metadata_format_debug">Nový formát pre ladenie (nešifrovaný)</string>
     <string name="metadata_format_other">Neznámy formát exportu</string>
@@ -284,6 +291,7 @@
     <string name="signature_verifier">Overenie podpisu</string>
     <string name="running_invalid_version">Zistili sme, že používate neplatnú verziu. Uzavretý okruh zakázaný!</string>
     <string name="versionavailable">Verzia %1$s je k dispozícii</string>
+    <string name="version_expire">Verzia %1$s expiruje dňa %2$s</string>
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Prosím reštartujte Váš telefón, alebo reštartujte AndroidAPS z nastavení \nv opačnom prípade AndroidAPS nebude mocť zaznamenávať logy (dôležité kvôli sledovaniu a overovaniu, že algoritmus pracuje správne)!</string>
     <!-- WeekdayPicker -->
@@ -296,6 +304,7 @@
     <string name="sunday_short">Ne</string>
     <!-- User Entry -->
     <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_calculator">BOLUSOVÝ KALKULÁTOR</string>
     <string name="uel_bolus_advisor">BOLUSOVÝ PORADCA</string>
     <string name="uel_extended_bolus">PREDĹŽENÝ BOLUS</string>
     <string name="uel_superbolus_tbr">SUPERBOLUS TBR</string>
@@ -400,6 +409,7 @@
     <string name="valueoutofrange">»%1$s« je mimo pevne nastavené limity</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f je mimo pevne nastavených limitov</string>
     <string name="basal_value">Hodnota bazálu</string>
+    <string name="nsclient_version_does_not_match">Verzia NSClienta nesúhlasí z verziou AndroidAPS. Prosím aktualizujte si ju.</string>
     <plurals name="days">
         <item quantity="one">%1$d deň</item>
         <item quantity="few">%1$d dní</item>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index 4c9a90f99a6..e0099aba4a7 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!--    Keys-->
     <!--    General-->
+    <string name="refresh">Uppdatera</string>
     <string name="error">Fel</string>
     <string name="not_set_short">Ej vald</string>
     <string name="failedupdatebasalprofile">Lyckades inte uppdatera basalprofilen</string>
@@ -17,6 +18,7 @@
     <string name="connected">Ansluten</string>
     <string name="disconnected">Frånkopplad</string>
     <string name="disconnecting">Kopplar från</string>
+    <string name="waiting_for_disconnection">Väntar på frånkoppling</string>
     <string name="androidaps_start">AndroidAPS startad</string>
     <string name="formatinsulinunits1">%1$.1fU</string>
     <string name="formatinsulinunits">%1$.2fU</string>
@@ -61,6 +63,8 @@
     <string name="eventtype">Händelsetyp</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
+    <string name="shortgram">g</string>
+    <string name="shortpercent">%</string>
     <string name="advancedsettings_title">Avancerade inställningar</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="btwatchdog_title">Bluetooth-övervakare</string>
@@ -70,26 +74,38 @@
     <string name="no">Nej</string>
     <string name="loopdisabled">LOOP INAKTIVERAD PGA BEGRÄNSNINGAR</string>
     <string name="bolusdelivered">Bolus %1$.2f enheter levererat</string>
+    <string name="virtualpump_resultok">OK</string>
     <string name="novalidbasalrate">Ingen giltig data om temp basaler fanns i pumpen</string>
     <string name="limitingmaxiob">Begränsar max IOB till %1$.1f pga %2$s</string>
     <string name="unsafeusage">osäker användning</string>
     <string name="pump_unreachable">Pumpen kan inte nås</string>
+    <string name="extended_bolus">Förlängd bolus</string>
     <string name="pump_time_updated">Tiden uppdaterad i pumpen</string>
+    <string name="exit">Avsluta</string>
     <string name="removerecord">Ta bort post</string>
+    <string name="loopisdisabled">Loop är inaktiverad</string>
+    <string name="alarm">Larm</string>
     <string name="disableloop">Inaktivera loop</string>
     <string name="enableloop">Aktivera loop</string>
     <string name="resumeloop">Återuppta loop</string>
     <string name="suspendloop">Pausa loop</string>
+    <string name="duration_min_label">Duration [min]</string>
     <string name="notification">Avisering</string>
     <string name="noprofile">Ingen profil laddad från Nightscout ännu</string>
     <string name="exists">finns</string>
     <string name="notexists">finns inte</string>
     <string name="glucose">Glukos</string>
+    <string name="iob">IOB</string>
+    <string name="cob">COB</string>
     <string name="name_short">Namn:</string>
     <string name="time">Tid</string>
     <string name="ns_wifi_ssids">WiFi nätverksnamn</string>
+    <string name="loading">Laddar…</string>
     <string name="event_time_label">När</string>
+    <string name="notes_label">Anteckning</string>
+    <string name="remove_button">Ta bort</string>
     <string name="addnew">Lägg till</string>
+    <string name="wrong_pump_data">Data kommer från en annan pump. Byt pumpdrivrutin för att återställa.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Max basal: %1$.2f E/h pga %2$s</string>
     <string name="pumplimit">pumpbegränsning</string>
@@ -105,6 +121,7 @@
     <string name="dismiss">TA BORT</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Enheten stöder inte BLE.</string>
+    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy stöds inte, eller så är enheten inte parkopplad.</string>
     <string name="ble_not_enabled">Bluetooth är avstängt.</string>
     <string name="location_not_found_title">Platsdata är inte aktiverat</string>
     <string name="location_not_found_message">För att Bluetooth ska fungera med nyare enheter, måste platsdata vara aktiverat. AAPS sparar inte din plats och det kan stängas av efter att enheten har parkopplats.</string>
@@ -155,16 +172,24 @@
     <!--    TDD-->
     <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
     <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b> KH: <b>%6$.0fg</b>]]></string>
+    <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> om <b>%3$d</b> dagar<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Careportal</string>
     <string name="careportal_bgcheck">BG-kontroll</string>
     <string name="careportal_mbg">Manuellt BG eller kalibrering</string>
     <string name="careportal_announcement">Meddelande</string>
     <string name="careportal_note">Anteckning</string>
     <string name="careportal_question">Fråga</string>
     <string name="careportal_exercise">Träning</string>
+    <string name="careportal_announcement_message">Meddelande: %1$s</string>
+    <string name="careportal_note_message">Anteckning: %1$s</string>
+    <string name="careportal_question_message">Fråga : %1$s</string>
+    <string name="careportal_exercise_message">Träning : %1$s</string>
     <string name="careportal_pumpsitechange">Byte pumpkanyl</string>
     <string name="careportal_cgmsensorinsert">Byte CGM-sensor</string>
     <string name="careportal_cgmsensorstart">Start CGM-sensor</string>
+    <string name="careportal_cgm_sensor_stop">Stoppa CGM-sensor</string>
+    <string name="careportal_dad_alert">Diabeteshundlarm</string>
     <string name="careportal_insulincartridgechange">Byte insulinreservoar</string>
     <string name="careportal_profileswitch">Profilbyte</string>
     <string name="careportal_snackbolus">Mellanmålsbolus</string>
@@ -177,6 +202,7 @@
     <string name="careportal_openapsoffline">OpenAPS Offline</string>
     <string name="careportal_pumpbatterychange">Byte pumpbatteri</string>
     <string name="careportal_temporarytarget">Temp mål</string>
+    <string name="careportal_temporarytargetvalue">Temp målvärde</string>
     <string name="careportal_temporarytargetcancel">Avbryt temp mål</string>
     <string name="boluswizard">Kalkylator</string>
     <string name="glucosetype_finger">Finger</string>
@@ -189,6 +215,12 @@
     <string name="wear">Klocka (Wear)</string>
     <string name="automation">Automation</string>
     <string name="custom">Anpassad</string>
+    <string name="pump">Pump</string>
+    <string name="loop">Loop</string>
+    <string name="ns">NS</string>
+    <string name="record">Post</string>
+    <string name="reading_pump_history">Läser historik från pumpen</string>
+    <string name="pump_icon">Pumpikon</string>
     <!--    Command-->
     <string name="connectiontimedout">Anslutningen tog för lång tid</string>
     <!--    PumpEnactResult-->
@@ -222,13 +254,13 @@
     <string name="format_hour_minute">%1$dh %2$dm</string>
     <string name="mute5min">Tysta i 5 minuter</string>
     <!-- Maintenance -->
+    <string name="metadata_label_format">Filformat</string>
     <string name="metadata_label_created_at">Skapad</string>
     <string name="metadata_label_aaps_version">AAPS-version</string>
     <string name="metadata_label_aaps_flavour">Build-variant</string>
     <string name="metadata_label_device_name">Exporterar patientens namn</string>
     <string name="metadata_label_device_model">Exporterar enhetsmodell</string>
     <string name="metadata_label_encryption">· Filkryptering</string>
-    <string name="metadata_format_old">Gammalt exportformat</string>
     <string name="metadata_format_new">Nytt krypterat format</string>
     <string name="metadata_format_debug">Nytt debug-format (okrypterat)</string>
     <string name="metadata_format_other">Okänt exportformat</string>
@@ -259,8 +291,135 @@
     <string name="signature_verifier">Signaturverifierare</string>
     <string name="running_invalid_version">Du kör en ogiltig version. Loop avstängd!</string>
     <string name="versionavailable">Version %1$s tillgänglig</string>
+    <string name="version_expire">Version %1$s upphör att gälla %2$s</string>
     <!-- Permissions -->
+    <string name="alert_dialog_storage_permission_text">Starta om telefonen eller AndroidAPS från systeminställningar,\nannars kommer AndroidAPS inte kunna logga fel (viktigt att kunna spåra och verifiera att algoritmerna fungerar korrekt)!</string>
     <!-- WeekdayPicker -->
+    <string name="monday_short">M</string>
+    <string name="tuesday_short">T</string>
+    <string name="wednesday_short">O</string>
+    <string name="thursday_short">T</string>
+    <string name="friday_short">F</string>
+    <string name="saturday_short">L</string>
+    <string name="sunday_short">S</string>
     <!-- User Entry -->
+    <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_calculator">BOLUS KALKYLATOR</string>
+    <string name="uel_bolus_advisor">BOLUS KALKYLATOR</string>
+    <string name="uel_extended_bolus">FÖRLÄNGD BOLUS</string>
+    <string name="uel_superbolus_tbr">SUPERBOLUS TEMPBASAL</string>
+    <string name="uel_carbs">KH</string>
+    <string name="uel_extended_carbs">FÖRLÄNGDA KH</string>
+    <string name="uel_temp_basal">TEMP BASAL</string>
+    <string name="uel_tt">TEMP MÅL</string>
+    <string name="uel_new_profile">NY PROFIL</string>
+    <string name="uel_clone_profile">KLONA PROFIL</string>
+    <string name="uel_store_profile">SPARA PROFIL</string>
+    <string name="uel_profile_switch">PROFILBYTE</string>
+    <string name="uel_profile_switch_cloned">PROFILBYTE KLONAT</string>
+    <string name="uel_closed_loop_mode">CLOSED LOOP-LÄGE</string>
+    <string name="uel_lgs_loop_mode">LGS LOOP-LÄGE</string>
+    <string name="uel_open_loop_mode">OPEN LOOP-LÄGE</string>
+    <string name="uel_loop_disabled">LOOP INAKTIVERAD</string>
+    <string name="uel_loop_enabled">LOOP AKTIVERAD</string>
+    <string name="uel_reconnect">ÅTERANSLUT</string>
+    <string name="uel_disconnect">KOPPLA IFRÅN</string>
+    <string name="uel_resume">ÅTERUPPTA</string>
+    <string name="uel_suspend">PAUSA</string>
+    <string name="uel_hw_pump_allowed">HW PUMP TILLÅTEN</string>
+    <string name="uel_clear_pairing_keys">RADERA PARKOPPLINGSNYCKLAR</string>
+    <string name="uel_accepts_temp_basal">TILLÅTER TEMP BASAL</string>
+    <string name="uel_cancel_temp_basal">AVBRYT TEMP BASAL</string>
+    <string name="uel_cancel_bolus">AVBRYT BOLUS</string>
+    <string name="uel_cancel_extended_bolus">AVBRYT FÖRLÄNGD BOLUS</string>
+    <string name="uel_cancel_tt">AVBRYT TEMP MÅL</string>
+    <string name="uel_careportal">CAREPORTAL</string>
+    <string name="uel_site_change">NÅLBYTE</string>
+    <string name="uel_reservoir_change">RESERVOARBYTE</string>
+    <string name="uel_calibration">KALIBRERING</string>
+    <string name="uel_prime_bolus">FÖRFYLLNINGSBOLUS</string>
+    <string name="uel_treatment">BEHANDLING</string>
+    <string name="uel_careportal_ns_refresh">HÄMTA CAREPORTAL NS</string>
+    <string name="uel_profile_switch_ns_refresh">HÄMTA PROFILBYTEN NS</string>
+    <string name="uel_treatments_ns_refresh">HÄMTA BEHANDLINGAR NS</string>
+    <string name="uel_tt_ns_refresh">HÄMTA TEMP MÅL NS</string>
+    <string name="uel_automation_removed">AUTOMATION BORTTAGEN</string>
+    <string name="uel_bg_removed">BG BORTTAGET</string>
+    <string name="uel_careportal_removed">CAREBORTAL BORTTAGEN</string>
+    <string name="uel_bolus_removed">BOLUS BORTTAGEN</string>
+    <string name="uel_carbs_removed">KH BORTTAGNA</string>
+    <string name="uel_temp_basal_removed">TEMP BASAL BORTTAGEN</string>
+    <string name="uel_extended_bolus_removed">FÖRLÄNGD BOLUS BORTTAGEN</string>
+    <string name="uel_food">MAT</string>
+    <string name="uel_food_removed">MAT BORTTAGEN</string>
+    <string name="uel_profile_removed">PROFIL BORTTAGEN</string>
+    <string name="uel_profile_switch_removed">PROFILBYTE BORTTAGET</string>
+    <string name="uel_restart_events_removed">OMSTARTER BORTTAGNA</string>
+    <string name="uel_treatment_removed">BEHANDLING BORTTAGEN</string>
+    <string name="uel_tt_removed">TEMP MÅL BORTTAGET</string>
+    <string name="uel_ns_paused">NS PAUSAT</string>
+    <string name="uel_ns_resume">ÅTERUPPTA NS</string>
+    <string name="uel_ns_queue_cleared">NS KÖ TÖMD</string>
+    <string name="uel_ns_settings_copied">NS INSTÄLLNINGAR KOPIERADE</string>
+    <string name="uel_error_dialog_ok">FELDIALOG OK</string>
+    <string name="uel_error_dialog_mute">FELDIALOG SNOOZAD </string>
+    <string name="uel_error_dialog_mute_5min">FELDIALOG SNOOZAD 5 MIN</string>
+    <string name="uel_objective_started">MÅL STARTAT</string>
+    <string name="uel_objective_unstarted">MÅL EJ STARTAT</string>
+    <string name="uel_objectives_skipped">MÅL SKIPPAT</string>
+    <string name="uel_stat_reset">ÅTERSTÄLL STATISTIK</string>
+    <string name="uel_delete_logs">RADERA LOGGAR</string>
+    <string name="uel_delete_future_treatments">RADERA FRAMTIDA BEHANDLINGAR</string>
+    <string name="uel_export_settings">EXPORTERA INSTÄLLNINGAR</string>
+    <string name="uel_import_settings">IMPORTERA INSTÄLLNINGAR</string>
+    <string name="uel_reset_databases">ÅTERSTÄLL DATABASERNA</string>
+    <string name="uel_export_databases">EXPORTERA DATABASERNA</string>
+    <string name="uel_import_databases">IMPORTERA DATABASER</string>
+    <string name="uel_otp_export">EXPORTERA OTP</string>
+    <string name="uel_otp_reset">ÅTERSTÄLL OTP</string>
+    <string name="uel_stop_sms">STOPPA SMS</string>
+    <string name="uel_export_csv">EXPORTERA ANVÄNDARINMATNINGAR</string>
+    <string name="uel_start_aaps">STARTA AAPS</string>
+    <string name="uel_exit_aaps">AVSLUTA AAPS</string>
+    <string name="uel_plugin_enabled">INSTICKSMODUL AKTIVERAD</string>
+    <string name="uel_plugin_disabled">INSTICKSMODUL INAKTIVERAD</string>
+    <string name="uel_unknown">OKÄND</string>
+    <string name="ue_string">Sträng</string>
+    <string name="ue_source">Källa</string>
+    <string name="ue_utc_offset">UTC Offset</string>
+    <string name="ue_action">Åtgärd</string>
+    <string name="ue_timestamp">Tidsstämpel</string>
+    <string name="ue_none">Ingen enhet</string>
+    <string name="ue_export_to_csv">Exportera användarposter till Excel (csv)</string>
+    <string name="uel_loop_change">LOOP ÄNDRAD</string>
+    <string name="uel_loop_removed">LOOP BORTTAGEN</string>
+    <string name="uel_other">ANNAT</string>
     <!-- HardLimits -->
+    <string name="profile_low_target">Nedre målvärde för profilen</string>
+    <string name="profile_high_target">Övre målvärde för profilen</string>
+    <string name="temp_target_low_target">Nedre värde för temp mål</string>
+    <string name="temp_target_high_target">Övre värde för temp mål</string>
+    <string name="temp_target_value">Temp målvärde</string>
+    <string name="profile_dia">Profilens DIA</string>
+    <string name="profile_sensitivity_value">Profilens insulinkänslighetsvärde</string>
+    <string name="profile_max_daily_basal_value">Maximal basaldos för profil</string>
+    <string name="current_basal_value">Nuvarande basaldos</string>
+    <string name="profile_carbs_ratio_value">Profilens KH-kvot</string>
+    <string name="valuelimitedto">%1$.2f begränsat till %2$.2f</string>
+    <string name="valueoutofrange">»%1$s« är utanför de hårda gränserna</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f är utanför hårda gränser</string>
+    <string name="basal_value">Basaldos</string>
+    <string name="nsclient_version_does_not_match">NS Client-versionen matchar inte Android APS. Vänligen uppdatera.</string>
+    <plurals name="days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dagar</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%1$d tim</item>
+        <item quantity="other">%1$d tim</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%1$d min</item>
+        <item quantity="other">%1$d min</item>
+    </plurals>
 </resources>
diff --git a/core/src/main/res/values-sv-rSE/validator.xml b/core/src/main/res/values-sv-rSE/validator.xml
index 3b2288d895a..7d2e89401e9 100644
--- a/core/src/main/res/values-sv-rSE/validator.xml
+++ b/core/src/main/res/values-sv-rSE/validator.xml
@@ -16,6 +16,9 @@
     <string name="error_date_not_valid">Ogiltigt format</string>
     <string name="error_mustbe4digitnumber">Måste vara fyra siffror</string>
     <string name="error_mustbe6digitnumber">Måste vara sex siffror</string>
+    <string name="error_mustbe12hexadidits">Måste vara 12 tecken med ABCDEF0123456789</string>
+    <string name="error_mustbe8hexadidits">Måste vara 8 tecken med ABCDEF0123456789</string>
+    <string name="error_mustbe4hexadidits">Måste vara 4 tecken med ABCDEF0123456789</string>
     <string name="error_not_a_minimum_length">För kort</string>
     <string name="error_pin_not_valid">Pin ska vara 3-6 siffror, inte samma eller efter varandra</string>
 </resources>
diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/src/main/res/values-tr-rTR/strings.xml
index 7a4d5e17256..f6812c767f0 100644
--- a/core/src/main/res/values-tr-rTR/strings.xml
+++ b/core/src/main/res/values-tr-rTR/strings.xml
@@ -2,50 +2,423 @@
 <resources>
     <!--    Keys-->
     <!--    General-->
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
+    <string name="refresh">Yenile</string>
+    <string name="error">Hata</string>
+    <string name="not_set_short">Ayarlanmadı</string>
+    <string name="failedupdatebasalprofile">Bazal profiliniz güncellenemedi</string>
+    <string name="profile_set_ok">Pompadaki Bazal profil güncellendi</string>
+    <string name="invalidinput">Geçersiz bilgi girişi</string>
+    <string name="tempbasaldeliveryerror">Geçici Bazal teslimat hatası</string>
+    <string name="goingtodeliver">%1$.2f Ü gönderilecek</string>
+    <string name="waitingforpump">Pompa bekleniyor</string>
+    <string name="connectingfor">%1$d bağlanıyor</string>
+    <string name="bolusdelivering">%1$.2f Ü gönderiliyor</string>
+    <string name="handshaking">El Sıkışma</string>
+    <string name="connecting">Bağlanıyor</string>
+    <string name="connected">Bağlanıldı</string>
+    <string name="disconnected">Bağlantı kesildi</string>
+    <string name="disconnecting">Bağlantı kesiliyor</string>
+    <string name="waiting_for_disconnection">Bağlantının kesilmesi bekleniyor</string>
+    <string name="androidaps_start">AndroidAPS başladı</string>
+    <string name="formatinsulinunits1">%1$.1f Ü</string>
+    <string name="formatinsulinunits">%1$.2f Ü</string>
+    <string name="formatsignedinsulinunits">%1$+.2f Ü</string>
+    <string name="format_carbs">%1$d g</string>
+    <string name="reservoirvalue">%1$.0f / %2$d Ü</string>
+    <string name="pump_basebasalrate">%1$.2f Ü/s</string>
+    <string name="format_hours">%1$.2f sa</string>
+    <string name="format_mins">%1$d dakika</string>
+    <string name="pumpbusy">Pompa meşgul</string>
+    <string name="connectionerror">Pompa bağlantı hatası</string>
+    <string name="youareonallowedlimit">İzin verilen sınıra ulaştınız</string>
+    <string name="objectives">Görevler</string>
+    <string name="close">Kapat</string>
+    <string name="please_wait">Lütfen bekleyin…</string>
+    <string name="mute">Sessiz</string>
+    <string name="reload">Yeniden yükle</string>
+    <string name="stoppressed">DURDUR BASILI</string>
+    <string name="stop">Dur</string>
+    <string name="carbs">Karbonhidrat</string>
+    <string name="invalidprofile">Geçersiz profil!!!</string>
+    <string name="noprofileset">PROFİL AYARLANMADI</string>
+    <string name="date">Tarih</string>
+    <string name="units_label">Birim</string>
+    <string name="dia_label">İES</string>
+    <string name="ic_label">IC Karbonhidrat İnsülin Oranı</string>
+    <string name="isf_label">İDF</string>
+    <string name="basal_label">Bazal</string>
+    <string name="target_label">Hedef</string>
+    <string name="initializing">Başlatılıyor ...</string>
+    <string name="serialnumber">Seri numarası</string>
+    <string name="battery_label">Pil</string>
+    <string name="lastconnection_label">Son bağlantı</string>
+    <string name="lastbolus_label">Son bolus</string>
+    <string name="dailyunits">Günlük ünite</string>
+    <string name="basebasalrate_label">Temel bazal oranı</string>
+    <string name="tempbasal_label">Geçici Bazal</string>
+    <string name="virtualpump_extendedbolus_label">Yayma Bolus</string>
+    <string name="reservoir_label">Rezervuar</string>
+    <string name="pumphistory">Pompa geçmişi</string>
+    <string name="viewprofile">Profili görüntüle</string>
+    <string name="eventtype">Etkinlik Türü</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="shortgram">gr</string>
+    <string name="shortpercent">%</string>
+    <string name="advancedsettings_title">Gelişmiş Ayarlar</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Pompa ile herhangi bir bağlantı sorunu yaşanıyorsa, Akıllı telefonunuzda Bluetooth bağlantısını kapatıp açın. Bu bluetooth bağlantı sorununu giderecektir.</string>
+    <string name="pairing">Eşleştirme</string>
     <string name="yes">Evet</string>
     <string name="no">Hayır</string>
-    <string name="loopdisabled">DÖNGÜ KISITLAMALARDAN İPTAL EDİLDİ</string>
+    <string name="loopdisabled">DÖNGÜ KISITLAMALARDAN DEVREDIŞI BIRAKILDI</string>
+    <string name="bolusdelivered">%1$.2f Ü bolus başarıyla gönderildi</string>
+    <string name="virtualpump_resultok">Tamam</string>
     <string name="novalidbasalrate">Pompadan okunan geçerli bir bazal oranı yok</string>
-    <string name="limitingmaxiob">%2$s\'den dolayı max IOB\'yi (Aktif İnsülin) %1$.1f U ile sınırlandırılıyor</string>
+    <string name="limitingmaxiob">%2$s\'den dolayı max IOB (Aktif İnsülin) %1$.1f Ü ile sınırlandırılıyor</string>
     <string name="unsafeusage">güvenli olmayan kullanım</string>
     <string name="pump_unreachable">Pompa ulaşılamıyor</string>
+    <string name="extended_bolus">Yayma Bolus</string>
     <string name="pump_time_updated">Pompa zamanı güncellendi</string>
-    <string name="disableloop">Döngü devre dışı bırak</string>
-    <string name="enableloop">Döngü etkinleştir</string>
-    <string name="resumeloop">Döngüyü başlat</string>
+    <string name="exit">Çıkış</string>
+    <string name="removerecord">Kaydı kaldır</string>
+    <string name="loopisdisabled">Döngü devre dışı</string>
+    <string name="alarm">Alarm</string>
+    <string name="disableloop">Döngüyü devre dışı bırak</string>
+    <string name="enableloop">Döngüyü etkinleştir</string>
+    <string name="resumeloop">Döngüyü devam ettir</string>
     <string name="suspendloop">Döngüyü duraklat</string>
-    <string name="noprofile">Henüz NightSout\'tan profil yüklenmedi</string>
+    <string name="duration_min_label">Süre [min]</string>
+    <string name="notification">Bildirim</string>
+    <string name="noprofile">Henüz NS\'tan profil yüklenmedi</string>
+    <string name="exists">var</string>
+    <string name="notexists">yok</string>
     <string name="glucose">Glikoz</string>
+    <string name="iob">IOB</string>
+    <string name="cob">COB</string>
+    <string name="name_short">İsim:</string>
     <string name="time">Zaman</string>
     <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="loading">Yükleniyor…</string>
+    <string name="event_time_label">Etkinlik saati</string>
+    <string name="notes_label">Notlar</string>
+    <string name="remove_button">Kaldır</string>
+    <string name="addnew">Yeni ekle</string>
+    <string name="wrong_pump_data">Veriler farklı pompadan geliyor. Pompa durumunu sıfırlamak için pompa sürücüsünü değiştirin.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">%2$s nedeniyle max bazal oranı %1$.2f Ü/s ile sınırlı</string>
+    <string name="pumplimit">pompa sınırı</string>
+    <string name="limitingpercentrate">%2$s\'den dolayı max yüzde oranı %1$d%% ile sınırlandırılıyor</string>
+    <string name="itmustbepositivevalue">pozitif bir değer olmalıdır</string>
+    <string name="limitingbolus">%2$s\'den dolayı bolus %1$.1f Ü ile sınırlandırılıyor</string>
+    <string name="pumpNotInitializedProfileNotSet">Pompa başlatılamadı, profil oluşturulmamış!</string>
     <!--    Dialogs-->
+    <string name="confirmation">Onay</string>
+    <string name="message">İleti</string>
+    <string name="ok">Tamam</string>
+    <string name="cancel">İptal</string>
+    <string name="dismiss">REDDET</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Düşük Enerji Bluetooth desteklenmez.</string>
+    <string name="ble_not_supported_or_not_paired">Düşük Enerji Bluetooth desteklenmiyor veya cihaz eşleştirilmedi.</string>
+    <string name="ble_not_enabled">Bluetooth etkin değil.</string>
+    <string name="location_not_found_title">Konum Etkin Değil</string>
+    <string name="location_not_found_message">Bluetooth cihaz bulmanın daha yeni cihazlarda çalışması için konum etkinleştirilmelidir. AAPS konumunuzu izlemez ve eşleştirme başarılı olduktan sonra devre dışı bırakılabilir.</string>
     <!--    DateUtil-->
+    <string name="minago">%1$d dak önce</string>
+    <string name="hoursago">%1$.1f sa önce</string>
+    <string name="shorthour">sa</string>
+    <string name="days">gün</string>
+    <string name="hours">saat</string>
+    <string name="unit_second">saniye</string>
+    <string name="unit_minute">dakika</string>
+    <string name="unit_hour">saat</string>
+    <string name="unit_day">gün</string>
+    <string name="unit_week">hafta</string>
+    <string name="unit_seconds">saniye</string>
+    <string name="unit_minutes">dakika</string>
+    <string name="unit_hours">saat</string>
+    <string name="unit_days">gün</string>
+    <string name="unit_weeks">hafta</string>
+    <string name="shortminute">dk</string>
+    <string name="shortday">gün</string>
     <!--    Protection-->
+    <string name="wrongpassword">Hatalı parola</string>
+    <string name="passwords_dont_match">Şifreler eşleşmiyor</string>
     <!--    Profile-->
+    <string name="basalprofilenotaligned">Bazal değerler saatlerle uyumlu değil: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Bazal değeri minimum desteklenen değerle değiştirilir: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Bazal değeri maksimum desteklenen değerle değiştirilir: %1$s</string>
+    <string name="profile_per_unit">/Ü</string>
+    <string name="profile_ins_units_per_hour">Ü/s</string>
+    <string name="profile_carbs_per_unit">g/Ü</string>
     <!--    ProfileFunction-->
+    <string name="startprofile">%2$d dakika için %1$d%% profilini başlat</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Sanal pompada bazal/bolus ayrıntı düzeyi için yalnızca ayrık değerler desteklenir. Aralıklar değil.</string>
     <!--    APSResult-->
+    <string name="canceltemp">Geçici bazali iptal et</string>
+    <string name="let_temp_basal_run">Geçici bazala izin ver</string>
+    <string name="rate">Oran</string>
+    <string name="duration">Süre</string>
+    <string name="reason">Sebep</string>
+    <string name="nochangerequested">Değişiklik yapılmadı</string>
     <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Geçersiz profil: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$d dak</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f Ü</b> Bol: <b>%3$.2f Ü</b> Baz: <b>%4$.2f Ü(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f Ü</b> Bol: <b>%3$.2f Ü</b> Baz: <b>%4$.2f Ü(%5$.0f%%)</b> Karbhr: <b>%6$.0f g</b>]]></string>
+    <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> içinde <b>%3$d</b> gün<br>]]></string>
     <!--    Translator-->
+    <string name="careportal">Bakım Portalı</string>
+    <string name="careportal_bgcheck">KŞ Kontrol</string>
+    <string name="careportal_mbg">Manuel KŞ veya Kalibrasyon</string>
+    <string name="careportal_announcement">Duyuru</string>
+    <string name="careportal_note">Not</string>
+    <string name="careportal_question">Soru</string>
+    <string name="careportal_exercise">Egzersiz</string>
+    <string name="careportal_announcement_message">Duyuru : %1$s</string>
+    <string name="careportal_note_message">Not : %1$s</string>
+    <string name="careportal_question_message">Soru : %1$s</string>
+    <string name="careportal_exercise_message">Alıştırma : %1$s</string>
+    <string name="careportal_pumpsitechange">Pompa Kanül Değişimi</string>
+    <string name="careportal_cgmsensorinsert">CGM Sensör Yerleştir</string>
+    <string name="careportal_cgmsensorstart">CGM sensörü Başlat</string>
+    <string name="careportal_cgm_sensor_stop">CGM Sensör Durdurma</string>
+    <string name="careportal_dad_alert">D.A.D Alarmı</string>
+    <string name="careportal_insulincartridgechange">İnsülin Kartuş Değişimi</string>
+    <string name="careportal_profileswitch">Profil değiştir</string>
+    <string name="careportal_snackbolus">Aperatif Bolusu</string>
+    <string name="careportal_mealbolus">Öğün Bolusu</string>
+    <string name="careportal_correctionbolus">Düzeltme Bolusu</string>
+    <string name="careportal_combobolus">Kombo Bolus</string>
+    <string name="careportal_tempbasalstart">Geçici Bazal Başlat</string>
+    <string name="careportal_tempbasalend">Geçici Bazal Bitimi</string>
+    <string name="careportal_carbscorrection">Karbonhidrat düzeltme</string>
+    <string name="careportal_openapsoffline">OpenAPS Çevrimdışı</string>
+    <string name="careportal_pumpbatterychange">Pompa Pil Değişimi</string>
+    <string name="careportal_temporarytarget">Geçici hedef</string>
+    <string name="careportal_temporarytargetvalue">Geçici hedef değeri</string>
+    <string name="careportal_temporarytargetcancel">Geçici hedef iptali</string>
+    <string name="boluswizard">Bolus sihirbazı</string>
+    <string name="glucosetype_finger">Parmak</string>
+    <string name="glucosetype_sensor">Sensör</string>
+    <string name="manual">Manuel</string>
+    <string name="unknown">bilinmiyor</string>
     <string name="eatingsoon">Yakında Öğün</string>
     <string name="hypo">Hipo</string>
+    <string name="activity">Aktivite</string>
     <string name="wear">Wear</string>
+    <string name="automation">Otomasyon</string>
     <string name="custom">Özel</string>
+    <string name="pump">Pompa</string>
+    <string name="loop">Döngü</string>
+    <string name="ns">NS</string>
+    <string name="record">Kayıt</string>
+    <string name="reading_pump_history">Pompa geçmişi okunuyor</string>
+    <string name="pump_icon">Pompa simgesi</string>
     <!--    Command-->
+    <string name="connectiontimedout">Bağlantı zaman aşımına uğradı</string>
     <!--    PumpEnactResult-->
+    <string name="enacted">Yürütüldü</string>
+    <string name="comment">Yorum</string>
+    <string name="success">Başarılı</string>
+    <string name="percent">Yüzde</string>
+    <string name="absolute">Mutlak</string>
+    <string name="configbuilder_insulin">İnsülin</string>
+    <string name="insulin_unit_shortname">Ü</string>
+    <string name="waitingforpumpresult">Sonuç bekleniyor...</string>
+    <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%2$d Dakika İçinde %1$d g Ek Karbonhidrat Gerekiyor</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">İstatistikler</string>
+    <string name="cumulative_tdd">Kümülatif GTD (Günlük Toplam Doz)</string>
+    <string name="expweight">Üstel Ağırlıklı TDD</string>
+    <string name="basalrate">Bazal</string>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">TGD</string>
+    <string name="ratio">Oran</string>
+    <string name="amount_days"># Gün</string>
+    <string name="weight">Ağırlık</string>
+    <string name="warning_Message">Hazırlama / doldurma için boluslar kullanılıyorsa muhtemelen yanlış!</string>
+    <string name="olddata_Message">Eski Veri Lütfen \"Yeniden Yükle\"ye Basın</string>
+    <string name="tbb">Günlük bazal miktarı</string>
+    <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Zaman algılama</string>
+    <string name="format_hour_minute">%1$dsa %2$ddk</string>
+    <string name="mute5min">5 dakika sessize al</string>
     <!-- Maintenance -->
+    <string name="metadata_label_format">Dosya formatı</string>
+    <string name="metadata_label_created_at">Oluşturuldu</string>
+    <string name="metadata_label_aaps_version">AAPS Versiyonu</string>
+    <string name="metadata_label_aaps_flavour">Yapı Varyantı</string>
+    <string name="metadata_label_device_name">Cihaz hasta adını dışa aktarma</string>
+    <string name="metadata_label_device_model">Cihaz modelini dışa aktarma</string>
+    <string name="metadata_label_encryption">Dosya şifreleme</string>
+    <string name="metadata_format_new">Yeni şifrelenmiş format</string>
+    <string name="metadata_format_debug">Yeni hata ayıklama formatı (şifrelenmemiş)</string>
+    <string name="metadata_format_other">Bilinmeyen dışa aktarma formatı</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">%1$s önce dışa aktarıldı</string>
+    <string name="exported_at" comment="at placeholder we add export date">%1$s\'de dışa aktarıldı</string>
+    <string name="exported_less_than_hour_ago">bir süre önce dışa aktarıldı</string>
+    <string name="in_directory" comment="placeholder is for exported file path">dizinde: %1$s</string>
+    <string name="preferences_import_list_title">İçe aktarılacak dosyayı seçin</string>
+    <string name="metadata_warning_different_flavour">Sizde: %2$s varken, farklı AAPS (%1$s) türeviyle tercihler oluşturuldu.\n\nBazı ayarlar eksik veya geçersiz olabilir - içe aktardıktan sonra lütfen tercihlerinizi kontrol edin ve güncelleyin.</string>
+    <string name="metadata_warning_different_device">Tercihler farklı bir cihazda oluşturuldu. Daha eski/farklı bir telefondan içe aktarıyorsanız sorun değil, ancak içe aktarılan tercihlerin doğru olduğundan emin olun!</string>
+    <string name="metadata_warning_outdated_format">Eski AAPS sürümünün güvenli olmayan eski dosya biçimini kullanıyorsunuz! Geçerli JSON formatında bir dosyanız yoksa son çare olarak kullanın.</string>
+    <string name="metadata_warning_old_export">İçe aktarılan tercihler zaten %1$s günlük! Belki daha güncel tercihleriniz var ya da yanlış dosyayı mı seçiyorsunuz? Tercihleri düzenli olarak dışa aktarmayı unutmayın!</string>
+    <string name="metadata_warning_date_format">Geçersiz tarih-saat biçimi!</string>
+    <string name="metadata_warning_different_version">Uygulamanın farklı alt sürümlerinden tercihler. Yükseltmeden sonra içe aktarıyorsanız sorun değil, ancak tercihlerin hala doğru olup olmadığını içe aktarmadan sonra kontrol edin!</string>
+    <string name="metadata_urgent_different_version">Uygulamanın farklı ana sürümünden tercihler. Ana sürümler önemli ölçüde farklılık gösterir ve uyumsuz tercihlere sahip olabilir! İçe aktardıktan sonra tercihlerin hala doğru olduğundan emin olun!</string>
+    <string name="prefdecrypt_settings_tampered">Ayarlar dosyası kurcalanmış</string>
+    <string name="prefdecrypt_settings_secure">Ayarlar dosyası güvenli</string>
+    <string name="prefdecrypt_settings_unencrypted">Güvenli olmayan, şifrelenmemiş ayar biçimi kullanma</string>
+    <string name="prefdecrypt_wrong_json">JSON biçim hatası, gerekli alan eksik (biçim, içerik, meta veri veya güvenlik)</string>
+    <string name="prefdecrypt_wrong_password">Şifre çözme hatası, verilen şifre dosyayı çözemiyor</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Dosya sağlama eksik, ayarların gerçekliğini doğrulayamıyor!</string>
+    <string name="prefdecrypt_issue_modified">Dosya dışa aktarıldıktan sonra değiştirildi!</string>
+    <string name="prefdecrypt_issue_parsing">Şifre çözme hatası, tercihler ayrıştırılamadı!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Şifre çözme hatası, sağlanan şifre geçersiz veya ayar dosyası değiştirildi! İçe aktarılan dosya farklı bir Ana parola ile dışa aktarılmış olabilir.</string>
+    <string name="prefdecrypt_issue_wrong_format">Şifreleme yapılandırması eksik, ayar formatı geçersiz!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Desteklenmeyen veya belirtilmeyen şifreleme algoritması!</string>
     <!-- VersionChecker -->
+    <string name="signature_verifier">İmza doğrulayıcı</string>
+    <string name="running_invalid_version">Geçersiz bir sürüm çalıştırdığınızı tespit ettik. Döngü devre dışı!</string>
     <string name="versionavailable">Sürüm %1$s mevcut</string>
+    <string name="version_expire">%1$s sürümünün süresi %2$s tarihinde sona eriyor</string>
     <!-- Permissions -->
+    <string name="alert_dialog_storage_permission_text">Lütfen telefonunu yeniden başlat, yada Android APS sistem ayarları üzerinden yeniden başlat.\nAksi taktirde Android APS hiç bir günlük tutmayacak (takip ve doğrulama, algoritmanın düzenli çalışmasi için önemli)!</string>
     <!-- WeekdayPicker -->
+    <string name="monday_short">P</string>
+    <string name="tuesday_short">S</string>
+    <string name="wednesday_short">Ç</string>
+    <string name="thursday_short">P</string>
+    <string name="friday_short">C</string>
+    <string name="saturday_short">C</string>
+    <string name="sunday_short">P</string>
     <!-- User Entry -->
+    <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_calculator">BOLUS HESAPLAYICI</string>
+    <string name="uel_bolus_advisor">BOLUS DANIŞMANI</string>
+    <string name="uel_extended_bolus">YAYMA BOLUS</string>
+    <string name="uel_superbolus_tbr">SURBOLUS TBR</string>
+    <string name="uel_carbs">KARBLR</string>
+    <string name="uel_extended_carbs">YAYMA KARBONHİDRAT</string>
+    <string name="uel_temp_basal">GEÇİCİ BAZAL</string>
+    <string name="uel_tt">GEÇİCİ HEDEF</string>
+    <string name="uel_new_profile">YENİ PROFİL</string>
+    <string name="uel_clone_profile">PROFİL KLONLA</string>
+    <string name="uel_store_profile">PROFİLİ DEPOLA</string>
+    <string name="uel_profile_switch">PROFİLİ DEĞİŞTİR</string>
+    <string name="uel_profile_switch_cloned">PROFİLİ KLONLA DEĞİŞTİR</string>
+    <string name="uel_closed_loop_mode">KAPALI DÖNGÜ MODU</string>
+    <string name="uel_lgs_loop_mode">LGS DÖNGÜ MODU</string>
+    <string name="uel_open_loop_mode">AÇIK DÖNGÜ MODU</string>
+    <string name="uel_loop_disabled">DÖNGÜ DEVRE DIŞI</string>
+    <string name="uel_loop_enabled">DÖNGÜ ETKİN</string>
+    <string name="uel_reconnect">YENİDEN BAĞLAN</string>
+    <string name="uel_disconnect">BAĞLANTIYI KES</string>
+    <string name="uel_resume">DEVAM ET</string>
+    <string name="uel_suspend">ASKIYA AL</string>
+    <string name="uel_hw_pump_allowed">HW POMPASINI KABUL ET</string>
+    <string name="uel_clear_pairing_keys">EŞLEŞTİRME ANAHTARLARINI TEMİZLE</string>
+    <string name="uel_accepts_temp_basal">GEÇİCİ BAZALI KABUL ET</string>
+    <string name="uel_cancel_temp_basal">GEÇİCİ BAZALI İPTAL ET</string>
+    <string name="uel_cancel_bolus">BOLUSU İPTAL ET</string>
+    <string name="uel_cancel_extended_bolus">YAYMA BOLUS İPTAL</string>
+    <string name="uel_cancel_tt">GEÇİCİ HEDEF İPTAL</string>
+    <string name="uel_careportal">BAKIM PORTALI</string>
+    <string name="uel_site_change">KANÜL DEĞİŞİMİ</string>
+    <string name="uel_reservoir_change">REZERVUAR DEĞİŞİMİ</string>
+    <string name="uel_calibration">KALİBRASYON</string>
+    <string name="uel_prime_bolus">BAŞLANGIÇ BOLUS</string>
+    <string name="uel_treatment">TEDAVİ</string>
+    <string name="uel_careportal_ns_refresh">BAKIM PORTALI NS YENİLEME</string>
+    <string name="uel_profile_switch_ns_refresh">PROFİL DEĞİŞTİRME NS YENİLEME</string>
+    <string name="uel_treatments_ns_refresh">TEDAVİLER NS YENİLEME</string>
+    <string name="uel_tt_ns_refresh">GEÇİCİ HEDEF NS YENİLEME</string>
+    <string name="uel_automation_removed">OTOMASYON KALDIRILDI</string>
+    <string name="uel_bg_removed">KŞ KALDIRILDI</string>
+    <string name="uel_careportal_removed">BAKIM PORTALI KALDIRILDI</string>
+    <string name="uel_bolus_removed">BOLUS KALDIRILDI</string>
+    <string name="uel_carbs_removed">KARBLAR KALDIRILDI</string>
+    <string name="uel_temp_basal_removed">GEÇİCİ BAZAL KALDIRILDI</string>
+    <string name="uel_extended_bolus_removed">YAYMA BOLUS KALDIRILDI</string>
+    <string name="uel_food">YEMEK</string>
+    <string name="uel_food_removed">YEMEK KALDIRILDI</string>
+    <string name="uel_profile_removed">PROFİL KALDIRILDI</string>
+    <string name="uel_profile_switch_removed">PROFİL DEĞİŞTİRİCİ KALDIRILDI</string>
+    <string name="uel_restart_events_removed">TEKRAR BAŞLAT ETKİNLİKLERİ KALDIRILDI</string>
+    <string name="uel_treatment_removed">TEDAVİ KALDIRILDI</string>
+    <string name="uel_tt_removed">GEÇİCİ HEDEF KALDIRILDI</string>
+    <string name="uel_ns_paused">NS DURAKLATILDI</string>
+    <string name="uel_ns_resume">NS DEVAM ET</string>
+    <string name="uel_ns_queue_cleared">NS KUYRUĞU TEMİZLENDİ</string>
+    <string name="uel_ns_settings_copied">NS AYARLARI KOPYALANDI</string>
+    <string name="uel_error_dialog_ok">HATA DİYALOGU TAMAM</string>
+    <string name="uel_error_dialog_mute">HATA DİYALOĞU SESSİZ </string>
+    <string name="uel_error_dialog_mute_5min">HATA DİYALOĞU 5DK SESSİZ</string>
+    <string name="uel_objective_started">GÖREV BAŞLADI</string>
+    <string name="uel_objective_unstarted">GÖREV BAŞLAMADI</string>
+    <string name="uel_objectives_skipped">GÖREV ATLANDI</string>
+    <string name="uel_stat_reset">İSTATİSK SIFIRLAMA</string>
+    <string name="uel_delete_logs">GÜNLÜKLERİ SİL</string>
+    <string name="uel_delete_future_treatments">GELECEK TEDAVİLERİ SİL</string>
+    <string name="uel_export_settings">AYARLARI DIŞA AKTAR</string>
+    <string name="uel_import_settings">AYARLARI İÇE AKTAR</string>
+    <string name="uel_reset_databases">VERİTABANLARINI SIFIRLA</string>
+    <string name="uel_export_databases">VERİTABANINI DIŞA AKTAR</string>
+    <string name="uel_import_databases">VERİTABANINI İÇE AKTAR</string>
+    <string name="uel_otp_export">OTP DIŞA AKTAR</string>
+    <string name="uel_otp_reset">OTP SIFIRLAMA</string>
+    <string name="uel_stop_sms">SMS\'İ DURDUR</string>
+    <string name="uel_export_csv">KULLANICI GİRİŞLERİNİ DIŞA AKTAR</string>
+    <string name="uel_start_aaps">AAPS\'i BAŞLAT</string>
+    <string name="uel_exit_aaps">AAPS\'DEN ÇIK</string>
+    <string name="uel_plugin_enabled">EKLENTİ ETKİN</string>
+    <string name="uel_plugin_disabled">EKLENTİ DEVRE DIŞI</string>
+    <string name="uel_unknown">BİLİNMEYEN</string>
+    <string name="ue_string">Dizi</string>
+    <string name="ue_source">Kaynak</string>
+    <string name="ue_utc_offset">UTC Denkleme</string>
+    <string name="ue_action">Eylem</string>
+    <string name="ue_timestamp">Zaman damgası</string>
+    <string name="ue_none">Birim Yok</string>
+    <string name="ue_export_to_csv">Kullanıcı Girişlerini Excel\'e Aktar (csv)</string>
+    <string name="uel_loop_change">DÖNGÜ DEĞİŞTİ</string>
+    <string name="uel_loop_removed">DÖNGÜ KALDIRILDI</string>
+    <string name="uel_other">DİĞER</string>
     <!-- HardLimits -->
+    <string name="profile_low_target">Düşük hedef profili</string>
+    <string name="profile_high_target">Yüksek hedef profili</string>
+    <string name="temp_target_low_target">Geçici hedef alt değeri</string>
+    <string name="temp_target_high_target">Geçici hedef üst değeri</string>
+    <string name="temp_target_value">Geçici hedef değeri</string>
+    <string name="profile_dia">Profil DIA değeri</string>
+    <string name="profile_sensitivity_value">Profil duyarlılık değeri</string>
+    <string name="profile_max_daily_basal_value">Azami profil bazal değeri</string>
+    <string name="current_basal_value">Mevcut bazal değer</string>
+    <string name="profile_carbs_ratio_value">Profil karbonhidrat oranı değeri</string>
+    <string name="valuelimitedto">%1$.2f, %2$.2f ile sınırlıdır</string>
+    <string name="valueoutofrange">»%1$s« sınırların dışında</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f sınırların dışında</string>
+    <string name="basal_value">Bazal değer</string>
+    <string name="nsclient_version_does_not_match">NSClient sürümü AndroidAPS ile eşleşmiyor. Lütfen güncelle.</string>
+    <plurals name="days">
+        <item quantity="one">%1$d gün</item>
+        <item quantity="other">%1$d gün</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%1$d saat</item>
+        <item quantity="other">%1$d saat</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%1$d dakika</item>
+        <item quantity="other">%1$d dakika</item>
+    </plurals>
 </resources>
diff --git a/core/src/main/res/values-tr-rTR/validator.xml b/core/src/main/res/values-tr-rTR/validator.xml
index 2ad874719e2..b1c2f999483 100644
--- a/core/src/main/res/values-tr-rTR/validator.xml
+++ b/core/src/main/res/values-tr-rTR/validator.xml
@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="error_only_numeric_digits_allowed">Yalnızca sayısal rakam girebilirsiniz.</string>
-    <string name="error_only_numeric_digits_range_allowed">%1$s - %2$s aralığında yalnızca sayısal rakamlar kullanılabilir.</string>
+    <string name="error_only_numeric_digits_allowed">Yalnızca rakam girebilirsiniz.</string>
+    <string name="error_only_numeric_digits_range_allowed">%1$s - %2$s aralığında yalnızca rakamlar kullanılabilir.</string>
+    <string name="error_this_field_cannot_contain_special_character">Bu alan herhangi bir özel karakter içeremez</string>
+    <string name="error_only_standard_letters_are_allowed">Yalnızca standart harflere izin verilir</string>
     <string name="error_field_must_not_be_empty">Alan boş olmamalı</string>
+    <string name="error_email_address_not_valid">E-posta adresi geçerli değil</string>
+    <string name="error_creditcard_number_not_valid">Kredi kartı numarası geçerli değil</string>
     <string name="error_phone_not_valid">Telefon numarası geçerli değil</string>
+    <string name="error_domain_not_valid">Alan adı geçerli değil</string>
+    <string name="error_ip_not_valid">IP Adresi geçerli değil</string>
+    <string name="error_url_not_valid">Web adresi geçerli değil</string>
+    <string name="error_notvalid_personname">Geçerli bir ad veya soyadı değil.</string>
+    <string name="error_notvalid_personfullname">Geçerli bir isim değil.</string>
+    <string name="error_date_not_valid">Fromat geçerli değil</string>
+    <string name="error_mustbe4digitnumber">4 haneli sayı olmalı</string>
+    <string name="error_mustbe6digitnumber">6 haneli sayı olmalı</string>
+    <string name="error_mustbe12hexadidits">12 karakter olmalı ve ABCDEF0123456789 kullanılmalıdır</string>
+    <string name="error_mustbe8hexadidits">8 karakter olmalı ve ABCDEF0123456789 kullanılmalıdır</string>
+    <string name="error_mustbe4hexadidits">4 karakter olmalı ve ABCDEF0123456789 kullanılmalıdır</string>
+    <string name="error_not_a_minimum_length">Minimum uzunlukta değil</string>
+    <string name="error_pin_not_valid">Pin 3- 6 rakamdan oluşmalı, aynı veya sıralı rakamlar kullanılmamalıdır</string>
 </resources>
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
index 2b6f47d568b..3df4eedbe66 100644
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -59,7 +59,6 @@
     <string name="metadata_label_device_name">导出设备的患者姓名</string>
     <string name="metadata_label_device_model">导出设备型号</string>
     <string name="metadata_label_encryption">文件加密密钥。</string>
-    <string name="metadata_format_old">无效的导出格式</string>
     <string name="metadata_format_new">新的加密格式</string>
     <string name="metadata_format_debug">新调试格式 (未加密)</string>
     <string name="metadata_format_other">未知的导出格式</string>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index ead398c2a61..312ed2df72a 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -11,6 +11,9 @@
     <color name="cardColorBackground">#121212</color>
     <color name="black_overlay">#66000000</color>
 
+    <color name="defaultbackground">#424242</color>
+    <color name="defaulttextcolor">#B3FFFFFF</color>
+
     <!--    Fragments-->
     <color name="pumpStatusBackground">#505050</color>
 
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 512cfec8eba..3ac720e134d 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -24,7 +24,6 @@
     <string name="key_pump_unreachable_threshold_minutes" translatable="false">pump_unreachable_threshold</string>
     <string name="key_missed_bg_readings_threshold_minutes" translatable="false">missed_bg_readings_threshold</string>
     <string name="key_gradually_increase_notification_volume" translatable="false">gradually_increase_notification_volume</string>
-    <string name="key_ns_sync_use_absolute" translatable="false">ns_sync_use_absolute</string>
     <string name="key_virtualpump_type" translatable="false">virtualpump_type</string>
     <string name="key_quickwizard" translatable="false">QuickWizard</string>
     <string name="key_wear_control" translatable="false">wearcontrol</string>
@@ -63,6 +62,7 @@
     <string name="key_adult" translatable="false">adult</string>
     <string name="key_resistantadult" translatable="false">resistantadult</string>
     <string name="key_pregnant" translatable="false">pregnant</string>
+    <string name="key_app_expiration" translatable="false">app_expiration</string>
 
     <!--    General-->
     <string name="refresh">Refresh</string>
@@ -224,7 +224,6 @@
     <string name="profile_carbs_per_unit">g/U</string>
 
     <!--    ProfileFunction-->
-    <string name="noprofileselected">No profile selected</string>
     <string name="startprofile">Start profile %1$d%% for %2$d min</string>
 
     <!--    PumpType-->
@@ -250,12 +249,17 @@
     <string name="activitymonitorformat"><![CDATA[<b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b> in <b>%3$d</b> days<br>]]></string>
 
     <!--    Translator-->
+    <string name="careportal">Careportal</string>
     <string name="careportal_bgcheck">BG Check</string>
     <string name="careportal_mbg">Manual BG or Calibration</string>
     <string name="careportal_announcement">Announcement</string>
     <string name="careportal_note">Note</string>
     <string name="careportal_question">Question</string>
     <string name="careportal_exercise">Exercise</string>
+    <string name="careportal_announcement_message">Announcement : %1$s</string>
+    <string name="careportal_note_message">Note : %1$s</string>
+    <string name="careportal_question_message">Question : %1$s</string>
+    <string name="careportal_exercise_message">Exercise : %1$s</string>
     <string name="careportal_pumpsitechange">Pump Site Change</string>
     <string name="careportal_cgmsensorinsert">CGM Sensor Insert</string>
     <string name="careportal_cgmsensorstart">CGM Sensor Start</string>
@@ -339,7 +343,6 @@
     <string name="metadata_label_device_name">Exporting device patient name</string>
     <string name="metadata_label_device_model">Exporting device model</string>
     <string name="metadata_label_encryption">File encryption</string>
-    <string name="metadata_format_old">Old export format</string>
     <string name="metadata_format_new">New encrypted format</string>
     <string name="metadata_format_debug">New debug format (unencrypted)</string>
     <string name="metadata_format_other">Unknown export format</string>
@@ -369,12 +372,14 @@
 
     <!-- VersionChecker -->
     <string name="key_last_time_this_version_detected" translatable="false">last_time_this_version_detected</string>
-    <string name="key_last_versionchecker_warning" translatable="false">last_versionchecker_waring</string>
+    <string name="key_last_versionchecker_warning" translatable="false">last_versionchecker_warning</string>
+    <string name="key_last_expired_versionchecker_warning" translatable="false">last_expired_version_checker_warning</string>
     <string name="key_last_versionchecker_plugin_warning" translatable="false">last_versionchecker_plugin_waring</string>
     <string name="key_last_revoked_certs_check" translatable="false">last_revoked_certs_check</string>
     <string name="signature_verifier">Signature verifier</string>
     <string name="running_invalid_version">We have detected that you are running an invalid version. Loop disabled!</string>
     <string name="versionavailable">Version %1$s available</string>
+    <string name="version_expire">Version %1$s expire on %2$s</string>
 
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">Please reboot your phone or restart AndroidAPS from the System Settings \notherwise Android APS will not have logging (important to track and verify that the algorithms are working correctly)!</string>
@@ -390,6 +395,7 @@
 
     <!-- User Entry -->
     <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_calculator">BOLUS CALCULATOR</string>
     <string name="uel_bolus_advisor">BOLUS ADVISOR</string>
     <string name="uel_extended_bolus">EXTENDED BOLUS</string>
     <string name="uel_superbolus_tbr">SUPERBOLUS TBR</string>
@@ -496,6 +502,7 @@
     <string name="valueoutofrange">»%1$s« is out of hard limits</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f is out of hard limits</string>
     <string name="basal_value">Basal value</string>
+    <string name="nsclient_version_does_not_match">NSClient version doesn\'t match to AndroidAPS. Please update.</string>
 
     <plurals name="days">
         <item quantity="one">%1$d day</item>
diff --git a/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index bd213d3c8e7..edc280d55eb 100644
--- a/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.ProfileStore
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -22,14 +22,14 @@ import org.mockito.Mock
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
     @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var config: Config
 
-    val rxBus = RxBusWrapper(aapsSchedulers)
+    val rxBus = RxBus(aapsSchedulers, aapsLogger)
 
     val profileInjector = HasAndroidInjector {
         AndroidInjector {
@@ -42,7 +42,9 @@ open class TestBaseWithProfile : TestBase() {
 
     @Before
     fun prepareMock() {
-        validProfileJSON = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+        validProfileJSON = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"3\"}," +
+            "{\"time\":\"2:00\",\"value\":\"3.4\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4.5\"}]," +
+            "\"target_high\":[{\"time\":\"00:00\",\"value\":\"7\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
         validProfile = ProfileSealed.Pure(pureProfileFromJson(JSONObject(validProfileJSON), dateUtil)!!)
     }
 
@@ -54,4 +56,4 @@ open class TestBaseWithProfile : TestBase() {
         json.put("store", store)
         return ProfileStore(profileInjector, json, dateUtil)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt b/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
index 3c1e6b57321..5f9a7a3f0e5 100644
--- a/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.Profile
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -34,18 +34,19 @@ import java.util.*
 class ProfileTest : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var context: Context
     @Mock lateinit var config: Config
     @Mock lateinit var sp: SP
     @Mock lateinit var repository: AppRepository
 
-    private lateinit var rxBus: RxBusWrapper
+    private lateinit var rxBus: RxBus
     private lateinit var dateUtil: DateUtil
     private lateinit var testPumpPlugin: TestPumpPlugin
     private lateinit var hardLimits: HardLimits
 
-    private var okProfile = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"sens\":[{\"time\":\"00:00\",\"value\":\"6\"},{\"time\":\"2:00\",\"value\":\"6.2\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+    private var okProfile = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}]," +
+        "\"sens\":[{\"time\":\"00:00\",\"value\":\"6\"},{\"time\":\"2:00\",\"value\":\"6.2\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
     private var belowLimitValidProfile = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.001\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
     private var notAlignedBasalValidProfile = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:30\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
     private var notStartingAtZeroValidProfile = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:30\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
@@ -58,13 +59,13 @@ class ProfileTest : TestBase() {
     fun prepare() {
         testPumpPlugin = TestPumpPlugin { AndroidInjector { } }
         dateUtil = DateUtil(context)
-        rxBus = RxBusWrapper(TestAapsSchedulers())
-        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, repository)
+        rxBus = RxBus(TestAapsSchedulers(), aapsLogger)
+        hardLimits = HardLimits(aapsLogger, rxBus, sp, rh, context, repository)
         `when`(activePluginProvider.activePump).thenReturn(testPumpPlugin)
-        `when`(resourceHelper.gs(R.string.profile_per_unit)).thenReturn("/U")
-        `when`(resourceHelper.gs(R.string.profile_carbs_per_unit)).thenReturn("g/U")
-        `when`(resourceHelper.gs(R.string.profile_ins_units_per_hour)).thenReturn("U/h")
-        `when`(resourceHelper.gs(anyInt(), anyString())).thenReturn("")
+        `when`(rh.gs(R.string.profile_per_unit)).thenReturn("/U")
+        `when`(rh.gs(R.string.profile_carbs_per_unit)).thenReturn("g/U")
+        `when`(rh.gs(R.string.profile_ins_units_per_hour)).thenReturn("U/h")
+        `when`(rh.gs(anyInt(), anyString())).thenReturn("")
     }
 
     @Test
@@ -72,7 +73,7 @@ class ProfileTest : TestBase() {
 
         // Test valid profile
         var p = ProfileSealed.Pure(pureProfileFromJson(JSONObject(okProfile), dateUtil)!!)
-        Assert.assertEquals(true, p.isValid("Test", testPumpPlugin, config, resourceHelper, rxBus, hardLimits).isValid)
+        Assert.assertEquals(true, p.isValid("Test", testPumpPlugin, config, rh, rxBus, hardLimits, false).isValid)
 //        Assert.assertEquals(true, p.log().contains("NS units: mmol"))
 //        JSONAssert.assertEquals(JSONObject(okProfile), p.toPureNsJson(dateUtil), false)
         Assert.assertEquals(5.0, p.dia, 0.01)
@@ -90,23 +91,23 @@ class ProfileTest : TestBase() {
         Assert.assertEquals("""
     00:00    6,0 mmol/U
     02:00    6,2 mmol/U
-    """.trimIndent(), p.getIsfList(resourceHelper, dateUtil).replace(".", ","))
+    """.trimIndent(), p.getIsfList(rh, dateUtil).replace(".", ","))
         Assert.assertEquals(30.0, p.getIc(c.timeInMillis), 0.01)
         Assert.assertEquals(30.0, p.getIcTimeFromMidnight(2 * 60 * 60), 0.01)
-        Assert.assertEquals("00:00    30,0 g/U", p.getIcList(resourceHelper, dateUtil).replace(".", ","))
+        Assert.assertEquals("00:00    30,0 g/U", p.getIcList(rh, dateUtil).replace(".", ","))
         Assert.assertEquals(0.1, p.getBasal(c.timeInMillis), 0.01)
         Assert.assertEquals(0.1, p.getBasalTimeFromMidnight(2 * 60 * 60), 0.01)
-        Assert.assertEquals("00:00    0,10 U/h", p.getBasalList(resourceHelper, dateUtil).replace(".", ","))
+        Assert.assertEquals("00:00    0,10 U/h", p.getBasalList(rh, dateUtil).replace(".", ","))
         Assert.assertEquals(0.1, p.getBasalValues()[0].value, 0.01)
         Assert.assertEquals(0.1, p.getMaxDailyBasal(), 0.01)
         Assert.assertEquals(2.4, p.percentageBasalSum(), 0.01)
         Assert.assertEquals(2.4, p.baseBasalSum(), 0.01)
 //        Assert.assertEquals(81.0, p.getTargetMgdl(2 * 60 * 60), 0.01)
-        Assert.assertEquals(72.0, p.getTargetLowMgdl(c.timeInMillis), 0.01)
+        Assert.assertEquals(90.0, p.getTargetLowMgdl(c.timeInMillis), 0.01)
 //        Assert.assertEquals(4.0, p.getTargetLowTimeFromMidnight(2 * 60 * 60), 0.01)
         Assert.assertEquals(90.0, p.getTargetHighMgdl(c.timeInMillis), 0.01)
 //        Assert.assertEquals(5.0, p.getTargetHighTimeFromMidnight(2 * 60 * 60), 0.01)
-        Assert.assertEquals("00:00    4,0 - 5,0 mmol", p.getTargetList(resourceHelper, dateUtil).replace(".", ","))
+        Assert.assertEquals("00:00    5,0 - 5,0 mmol", p.getTargetList(rh, dateUtil).replace(".", ","))
         Assert.assertEquals(100, p.percentage)
         Assert.assertEquals(0, p.timeshift)
         Assert.assertEquals(0.1, Profile.toMgdl(0.1, GlucoseUnit.MGDL), 0.01)
@@ -124,7 +125,7 @@ class ProfileTest : TestBase() {
 
         //Test basal profile below limit
         p = ProfileSealed.Pure(pureProfileFromJson(JSONObject(belowLimitValidProfile), dateUtil)!!)
-        p.isValid("Test", testPumpPlugin, config, resourceHelper, rxBus, hardLimits)
+        p.isValid("Test", testPumpPlugin, config, rh, rxBus, hardLimits, false)
 
         // Test profile w/o units
         Assert.assertNull(pureProfileFromJson(JSONObject(noUnitsValidProfile), dateUtil))
@@ -152,11 +153,11 @@ class ProfileTest : TestBase() {
                 00:00    6.2 mmol/U
                 01:00    6.0 mmol/U
                 03:00    6.2 mmol/U
-                """.trimIndent(), p.getIsfList(resourceHelper, dateUtil))
+                """.trimIndent(), p.getIsfList(rh, dateUtil))
 
         // Test hour alignment
         testPumpPlugin.pumpDescription.is30minBasalRatesCapable = false
         p = ProfileSealed.Pure(pureProfileFromJson(JSONObject(notAlignedBasalValidProfile), dateUtil)!!)
-        p.isValid("Test", testPumpPlugin, config, resourceHelper, rxBus, hardLimits)
+        p.isValid("Test", testPumpPlugin, config, rh, rxBus, hardLimits, false)
     }
 }
\ No newline at end of file
diff --git a/core/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt b/core/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt
index 687c9a64e86..0165075af48 100644
--- a/core/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt
@@ -16,23 +16,23 @@ class PumpEnactResultTest : TestBaseWithProfile() {
     val injector = HasAndroidInjector {
         AndroidInjector {
             if (it is PumpEnactResult) {
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
         }
     }
 
     @Before
     fun mock() {
-        `when`(resourceHelper.gs(R.string.success)).thenReturn("Success")
-        `when`(resourceHelper.gs(R.string.enacted)).thenReturn("Enacted")
-        `when`(resourceHelper.gs(R.string.comment)).thenReturn("Comment")
-        `when`(resourceHelper.gs(R.string.configbuilder_insulin)).thenReturn("Insulin")
-        `when`(resourceHelper.gs(R.string.smb_shortname)).thenReturn("SMB")
-        `when`(resourceHelper.gs(R.string.insulin_unit_shortname)).thenReturn("U")
-        `when`(resourceHelper.gs(R.string.canceltemp)).thenReturn("Cancel temp basal")
-        `when`(resourceHelper.gs(R.string.duration)).thenReturn("Duration")
-        `when`(resourceHelper.gs(R.string.percent)).thenReturn("Percent")
-        `when`(resourceHelper.gs(R.string.absolute)).thenReturn("Absolute")
+        `when`(rh.gs(R.string.success)).thenReturn("Success")
+        `when`(rh.gs(R.string.enacted)).thenReturn("Enacted")
+        `when`(rh.gs(R.string.comment)).thenReturn("Comment")
+        `when`(rh.gs(R.string.configbuilder_insulin)).thenReturn("Insulin")
+        `when`(rh.gs(R.string.smb_shortname)).thenReturn("SMB")
+        `when`(rh.gs(R.string.insulin_unit_shortname)).thenReturn("U")
+        `when`(rh.gs(R.string.canceltemp)).thenReturn("Cancel temp basal")
+        `when`(rh.gs(R.string.duration)).thenReturn("Duration")
+        `when`(rh.gs(R.string.percent)).thenReturn("Percent")
+        `when`(rh.gs(R.string.absolute)).thenReturn("Absolute")
     }
 
     @Test fun successTest() {
diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt b/core/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt
index 67d0c695f28..116d750da5c 100644
--- a/core/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt
@@ -40,7 +40,7 @@ class APSResultTest : TestBaseWithProfile() {
                 it.activePlugin = activePluginProvider
                 it.iobCobCalculator = iobCobCalculator
                 it.profileFunction = profileFunction
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
 
         // BASAL RATE IN TEST PROFILE IS 1U/h
@@ -161,7 +161,7 @@ class APSResultTest : TestBaseWithProfile() {
                 it.activePlugin = activePluginProvider
                 it.iobCobCalculator = iobCobCalculator
                 it.profileFunction = profileFunction
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
         apsResult.rate(10.0)
         val apsResult2 = apsResult.newAndClone(injector)
@@ -178,7 +178,7 @@ class APSResultTest : TestBaseWithProfile() {
                 it.activePlugin = activePluginProvider
                 it.iobCobCalculator = iobCobCalculator
                 it.profileFunction = profileFunction
-                it.resourceHelper = resourceHelper
+                it.rh = rh
             }
         apsResult.rate(20.0).tempBasalRequested(true)
         Assert.assertEquals(20.0, safeGetDouble(apsResult.json(), "rate"), 0.0)
diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt b/core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt
index 1f04d0c94ea..4b49a3a9a79 100644
--- a/core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt
@@ -3,31 +3,38 @@ package info.nightscout.androidaps.plugins.contraints.versionChecker
 import android.content.Context
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.Config
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
+import info.nightscout.androidaps.plugins.constraints.versionChecker.numericVersionPart
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.anyString
+import org.mockito.Mockito.times
+import org.mockito.Mockito.verify
 
-class VersionCheckerUtilsKtTest : TestBase() {
+@Suppress("SpellCheckingInspection") class VersionCheckerUtilsKtTest : TestBase() {
 
     private lateinit var versionCheckerUtils: VersionCheckerUtils
 
     @Mock lateinit var sp: SP
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var context: Context
     @Mock lateinit var receiverStatusStore: ReceiverStatusStore
     @Mock lateinit var config: Config
-
-    private val rxBus = RxBusWrapper(aapsSchedulers)
+    @Mock lateinit var dateUtil: DateUtil
+    @Mock lateinit var rxBus: RxBus
 
     @Before fun setup() {
-        versionCheckerUtils = VersionCheckerUtils(aapsLogger, sp, resourceHelper, rxBus, config, context, receiverStatusStore)
+        versionCheckerUtils = VersionCheckerUtils(aapsLogger, sp, rh, rxBus, config, receiverStatusStore, dateUtil)
     }
 
     @Test
@@ -65,68 +72,66 @@ class VersionCheckerUtilsKtTest : TestBase() {
         assertArrayEquals(intArrayOf(67, 8, 31, 5), versionCheckerUtils.versionDigits("67.8.31.5.153.4.2"))
     }
 
-    /*
-        @Test
-        fun `should keep 2 digit version`() {
-            assertEquals("1.2", "1.2".numericVersionPart())
-        }
-
-        @Test
-        fun `should keep 3 digit version`() {
-            assertEquals("1.2.3", "1.2.3".numericVersionPart())
-        }
-
-        @Test
-        fun `should keep 4 digit version`() {
-            assertEquals("1.2.3.4", "1.2.3.4".numericVersionPart())
-        }
-
-        @Test
-        fun `should strip 2 digit version RC`() {
-            assertEquals("1.2", "1.2-RC1".numericVersionPart())
-        }
-
-        @Test
-        fun `should strip 2 digit version RC old format`() {
-            assertEquals("1.2", "1.2RC1".numericVersionPart())
-        }
-
-        @Test
-        fun `should strip 2 digit version RC without digit`() {
-            assertEquals("1.2", "1.2-RC".numericVersionPart())
-        }
-
-        @Test
-        fun `should strip 2 digit version dev`() {
-            assertEquals("1.2", "1.2-dev".numericVersionPart())
-        }
-
-        @Test
-        fun `should strip 2 digit version dev old format 1`() {
-            assertEquals("1.2", "1.2dev".numericVersionPart())
-        }
-
-        @Test
-        fun `should strip 2 digit version dev old format 2`() {
-            assertEquals("1.2", "1.2dev-a3".numericVersionPart())
-        }
-
-        @Test
-        fun `should strip 3 digit version RC`() {
-            assertEquals("1.2.3", "1.2.3-RC1".numericVersionPart())
-        }
-
-        @Test
-        fun `should strip 4 digit version RC`() {
-            assertEquals("1.2.3.4", "1.2.3.4-RC5".numericVersionPart())
-        }
-
-        @Test
-        fun `should strip even with dot`() {
-            assertEquals("1.2", "1.2.RC5".numericVersionPart())
-        }
-
-    */
+    @Test
+    fun `should keep 2 digit version`() {
+        assertEquals("1.2", "1.2".numericVersionPart())
+    }
+
+    @Test
+    fun `should keep 3 digit version`() {
+        assertEquals("1.2.3", "1.2.3".numericVersionPart())
+    }
+
+    @Test
+    fun `should keep 4 digit version`() {
+        assertEquals("1.2.3.4", "1.2.3.4".numericVersionPart())
+    }
+
+    @Test
+    fun `should strip 2 digit version RC`() {
+        assertEquals("1.2", "1.2-RC1".numericVersionPart())
+    }
+
+    @Test
+    fun `should strip 2 digit version RC old format`() {
+        assertEquals("1.2", "1.2RC1".numericVersionPart())
+    }
+
+    @Test
+    fun `should strip 2 digit version RC without digit`() {
+        assertEquals("1.2", "1.2-RC".numericVersionPart())
+    }
+
+    @Test
+    fun `should strip 2 digit version dev`() {
+        assertEquals("1.2", "1.2-dev".numericVersionPart())
+    }
+
+    @Test
+    fun `should strip 2 digit version dev old format 1`() {
+        assertEquals("1.2", "1.2dev".numericVersionPart())
+    }
+
+    @Test
+    fun `should strip 2 digit version dev old format 2`() {
+        assertEquals("1.2", "1.2dev-a3".numericVersionPart())
+    }
+
+    @Test
+    fun `should strip 3 digit version RC`() {
+        assertEquals("1.2.3", "1.2.3-RC1".numericVersionPart())
+    }
+
+    @Test
+    fun `should strip 4 digit version RC`() {
+        assertEquals("1.2.3.4", "1.2.3.4-RC5".numericVersionPart())
+    }
+
+    @Test
+    fun `should strip even with dot`() {
+        assertEquals("1.2", "1.2.RC5".numericVersionPart())
+    }
+
     @Suppress("SpellCheckingInspection")
     @Test
     fun findVersionMatchesRegularVersion() {
@@ -141,7 +146,6 @@ class VersionCheckerUtilsKtTest : TestBase() {
         assertEquals("2.2.2", detectedVersion)
     }
 
-    /* TODO finish this tests
     // In case we merge a "x.x.x-dev" into master, don't see it as update.
     @Test
     fun `should return null on non-digit versions on master`() {
@@ -163,138 +167,55 @@ class VersionCheckerUtilsKtTest : TestBase() {
         assertEquals(null, detectedVersion)
     }
 
-    /*
-        @Test
-        fun testVersionStrip() {
-            assertEquals("2.2.2", "2.2.2".versionStrip())
-            assertEquals("2.2.2", "2.2.2-dev".versionStrip())
-            assertEquals("2.2.2", "2.2.2dev".versionStrip())
-            assertEquals("2.2.2", """"2.2.2"""".versionStrip())
-        }
-    */
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should find update1`() {
-        prepareMainApp()
-
         versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2.3", currentVersion = "2.2.1")
-
-        //verify(bus, times(1)).post(any())
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
-
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should find update2`() {
-        prepareMainApp()
-
         versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2.3", currentVersion = "2.2.1-dev")
-
-        //verify(bus, times(1)).post(any())
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should find update3`() {
-        prepareMainApp()
-
         versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2.3", currentVersion = "2.1")
-
-        //verify(bus, times(1)).post(any())
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should find update4`() {
-        prepareMainApp()
-
         versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2", currentVersion = "2.1.1")
-
-        //verify(bus, times(1)).post(any())
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should find update5`() {
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2.1", currentVersion = "2.2-dev")
-
-        //verify(bus, times(1)).post(any())
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should find update6`() {
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.2.1", currentVersion = "2.2dev")
-
-        //verify(bus, times(1)).post(any())
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should not find update on fourth version digit`() {
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.5.0", currentVersion = "2.5.0.1")
-
-        //verify(bus, times(0)).post(any())
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_time_this_version_detected), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(0)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `should not find update on personal version with same number`() {
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(newVersion = "2.5.0", currentVersion = "2.5.0-myversion")
-
-        //verify(bus, times(0)).post(any())
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_time_this_version_detected), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(0)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `find same version`() {
         val buildGradle = """blabla
             |   android {
@@ -303,18 +224,11 @@ class VersionCheckerUtilsKtTest : TestBase() {
             |   version = "2.2.2"
             |   appName = "Aaoeu"
         """.trimMargin()
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.2.2")
 
-        //verify(bus, times(0)).post(any())
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_time_this_version_detected), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(0)).send(anyObject())
     }
-
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `find higher version`() {
         val buildGradle = """blabla
             |   android {
@@ -323,18 +237,11 @@ class VersionCheckerUtilsKtTest : TestBase() {
             |   version = "3.0.0"
             |   appName = "Aaoeu"
         """.trimMargin()
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.2.2")
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `find higher version with longer number`() {
         val buildGradle = """blabla
             |   android {
@@ -343,18 +250,11 @@ class VersionCheckerUtilsKtTest : TestBase() {
             |   version = "3.0"
             |   appName = "Aaoeu"
         """.trimMargin()
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.2.2")
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `find higher version after RC`() {
         val buildGradle = """blabla
             |   android {
@@ -363,18 +263,11 @@ class VersionCheckerUtilsKtTest : TestBase() {
             |   version = "3.0.0"
             |   appName = "Aaoeu"
         """.trimMargin()
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "3.0-RC04")
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `find higher version after RC 2 - typo`() {
         val buildGradle = """blabla
             |   android {
@@ -383,18 +276,11 @@ class VersionCheckerUtilsKtTest : TestBase() {
             |   version = "3.0.0"
             |   appName = "Aaoeu"
         """.trimMargin()
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "3.0RC04")
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `find higher version after RC 3 - typo`() {
         val buildGradle = """blabla
             |   android {
@@ -403,18 +289,11 @@ class VersionCheckerUtilsKtTest : TestBase() {
             |   version = "3.0.0"
             |   appName = "Aaoeu"
         """.trimMargin()
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "3.RC04")
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `find higher version after RC 4 - typo`() {
         val buildGradle = """blabla
             |   android {
@@ -423,18 +302,11 @@ class VersionCheckerUtilsKtTest : TestBase() {
             |   version = "3.0.0"
             |   appName = "Aaoeu"
         """.trimMargin()
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "3.0.RC04")
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `find higher version on multi digit numbers`() {
         val buildGradle = """blabla
             |   android {
@@ -443,18 +315,11 @@ class VersionCheckerUtilsKtTest : TestBase() {
             |   version = "3.7.12"
             |   appName = "Aaoeu"
         """.trimMargin()
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "3.7.9")
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.getLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_versionchecker_warning), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(1)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `don't find higher version on higher but shorter version`() {
         val buildGradle = """blabla
             |   android {
@@ -463,18 +328,11 @@ class VersionCheckerUtilsKtTest : TestBase() {
             |   version = "2.2.2"
             |   appName = "Aaoeu"
         """.trimMargin()
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.3")
-
-        //verify(bus, times(0)).post(any())
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_time_this_version_detected), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(0)).send(anyObject())
     }
 
     @Test
-    @PrepareForTest(MainApp::class, L::class, SP::class)
     fun `don't find higher version if on next RC`() {
         val buildGradle = """blabla
             |   android {
@@ -483,40 +341,42 @@ class VersionCheckerUtilsKtTest : TestBase() {
             |   version = "2.2.2"
             |   appName = "Aaoeu"
         """.trimMargin()
-        prepareMainApp()
         versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.3-RC")
-
-        //verify(bus, times(0)).post(any())
-
-        PowerMockito.verifyStatic(SP::class.java, times(1))
-        SP.putLong(eq(R.string.key_last_time_this_version_detected), ArgumentMatchers.anyLong())
-        PowerMockito.verifyNoMoreInteractions(SP::class.java)
+        verify(rxBus, times(0)).send(anyObject())
     }
 
-    @Test
-    @PrepareForTest(System::class)
-    fun `set time`() {
-        PowerMockito.spy(System::class.java)
-        PowerMockito.`when`(System.currentTimeMillis()).thenReturn(100L)
-
-        assertEquals(100L, System.currentTimeMillis())
+   @Test
+    fun `warn on beta`() {
+        val buildGradle = """blabla
+            |   android {
+            |      aosenuthoae
+            |   }
+            |   version = "2.2.2"
+            |   appName = "Aaoeu"
+        """.trimMargin()
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.2-beta1")
+        verify(rxBus, times(1)).send(anyObject())
     }
 
-    private fun prepareMainApp() {
-        PowerMockito.mockStatic(MainApp::class.java)
-        val mainApp = mock<MainApp>(MainApp::class.java)
-        `when`(MainApp.instance()).thenReturn(mainApp)
-        `when`(MainApp.gs(ArgumentMatchers.anyInt())).thenReturn("some dummy string")
-        prepareSP()
+   @Test
+    fun `warn on rc`() {
+        val buildGradle = """blabla
+            |   android {
+            |      aosenuthoae
+            |   }
+            |   version = "2.2.0"
+            |   appName = "Aaoeu"
+        """.trimMargin()
+        versionCheckerUtils.compareWithCurrentVersion(versionCheckerUtils.findVersion(buildGradle), currentVersion = "2.2-rc1")
+        verify(rxBus, times(1)).send(anyObject())
     }
 
-    private fun prepareSP() {
-        PowerMockito.mockStatic(SP::class.java)
-    }
+    @Before
+    fun `set time`() {
+        `when`(dateUtil.now()).thenReturn(10000000000L)
+        assertEquals(10000000000L, dateUtil.now())
 
-    private fun prepareLogging() {
-        PowerMockito.mockStatic(L::class.java)
-        `when`(L.isEnabled(any())).thenReturn(true)
+        `when`(rh.gs(anyInt(), anyString())).thenReturn("")
     }
-    */
+
 }
diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormatTest.kt b/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormatTest.kt
deleted file mode 100644
index 8ad8516c7d6..00000000000
--- a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormatTest.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.plugins.general.maintenance.formats
-
-import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
-import org.junit.Assert
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.`when`
-import java.io.File
-
-class ClassicPrefsFormatTest : TestBase() {
-
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var userEntryPresentationHelper: UserEntryPresentationHelper
-    @Mock lateinit var file: MockedFile
-
-    @Test
-    fun preferenceLoadingTest() {
-        val test = "key1::val1\nkeyB::valB"
-
-        val classicFormat = ClassicPrefsFormat(resourceHelper, userEntryPresentationHelper, SingleStringStorage(test))
-        val prefs = classicFormat.loadPreferences(getMockedFile(), "")
-
-        Assert.assertEquals(prefs.values.size, 2)
-        Assert.assertEquals(prefs.values["key1"], "val1")
-        Assert.assertEquals(prefs.values["keyB"], "valB")
-        Assert.assertNull(prefs.values["key3"])
-    }
-
-    @Test
-    fun preferenceSavingTest() {
-        val storage = SingleStringStorage("")
-        val classicFormat = ClassicPrefsFormat(resourceHelper, userEntryPresentationHelper, storage)
-        val prefs = Prefs(
-            mapOf(
-                "key1" to "A",
-                "keyB" to "2"
-            ),
-            mapOf()
-        )
-
-        classicFormat.savePreferences(getMockedFile(), prefs)
-    }
-
-    class MockedFile(s: String) : File(s)
-
-    private fun getMockedFile(): File {
-        `when`(file.exists()).thenReturn(true)
-        `when`(file.canRead()).thenReturn(true)
-        `when`(file.canWrite()).thenReturn(true)
-        return file
-    }
-}
diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt b/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt
index 087cfcadc1e..3dfe9d6f40a 100644
--- a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt
@@ -17,7 +17,7 @@ import java.io.File
 @Suppress("SpellCheckingInspection")
 class EncryptedPrefsFormatTest : TestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var sp: SP
     @Mock lateinit var file: MockedFile
 
@@ -35,7 +35,7 @@ class EncryptedPrefsFormatTest : TestBase() {
 
     @Before
     fun mock() {
-        Mockito.`when`(resourceHelper.gs(ArgumentMatchers.anyInt())).thenReturn("mock translation")
+        Mockito.`when`(rh.gs(ArgumentMatchers.anyInt())).thenReturn("mock translation")
     }
 
     @Test
@@ -53,7 +53,7 @@ class EncryptedPrefsFormatTest : TestBase() {
             "}"
 
         val storage = SingleStringStorage(frozenPrefs)
-        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, cryptoUtil, storage)
+        val encryptedFormat = EncryptedPrefsFormat(rh, cryptoUtil, storage)
         val prefs = encryptedFormat.loadPreferences(getMockedFile(), "sikret")
 
         assumeAES256isSupported(cryptoUtil)
@@ -70,7 +70,7 @@ class EncryptedPrefsFormatTest : TestBase() {
     @Test
     fun preferenceSavingTest() {
         val storage = SingleStringStorage("")
-        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, cryptoUtil, storage)
+        val encryptedFormat = EncryptedPrefsFormat(rh, cryptoUtil, storage)
         val prefs = Prefs(
             mapOf(
                 "key1" to "A",
@@ -87,7 +87,7 @@ class EncryptedPrefsFormatTest : TestBase() {
     @Test
     fun importExportStabilityTest() {
         val storage = SingleStringStorage("")
-        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, cryptoUtil, storage)
+        val encryptedFormat = EncryptedPrefsFormat(rh, cryptoUtil, storage)
         val prefsIn = Prefs(
             mapOf(
                 "testpref1" to "--1--",
@@ -126,7 +126,7 @@ class EncryptedPrefsFormatTest : TestBase() {
             "}"
 
         val storage = SingleStringStorage(frozenPrefs)
-        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, cryptoUtil, storage)
+        val encryptedFormat = EncryptedPrefsFormat(rh, cryptoUtil, storage)
         val prefs = encryptedFormat.loadPreferences(getMockedFile(), "it-is-NOT-right-secret")
 
         Assert.assertEquals(prefs.values.size, 0)
@@ -153,7 +153,7 @@ class EncryptedPrefsFormatTest : TestBase() {
             "}"
 
         val storage = SingleStringStorage(frozenPrefs)
-        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, cryptoUtil, storage)
+        val encryptedFormat = EncryptedPrefsFormat(rh, cryptoUtil, storage)
         val prefs = encryptedFormat.loadPreferences(getMockedFile(), "sikret")
 
         assumeAES256isSupported(cryptoUtil)
@@ -180,7 +180,7 @@ class EncryptedPrefsFormatTest : TestBase() {
             "}"
 
         val storage = SingleStringStorage(frozenPrefs)
-        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, cryptoUtil, storage)
+        val encryptedFormat = EncryptedPrefsFormat(rh, cryptoUtil, storage)
         val prefs = encryptedFormat.loadPreferences(getMockedFile(), "sikret")
 
         Assert.assertEquals(prefs.values.size, 0)
@@ -195,7 +195,7 @@ class EncryptedPrefsFormatTest : TestBase() {
             "}"
 
         val storage = SingleStringStorage(frozenPrefs)
-        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, cryptoUtil, storage)
+        val encryptedFormat = EncryptedPrefsFormat(rh, cryptoUtil, storage)
         val prefs = encryptedFormat.loadPreferences(getMockedFile(), "sikret")
 
         Assert.assertEquals(prefs.values.size, 0)
@@ -207,7 +207,7 @@ class EncryptedPrefsFormatTest : TestBase() {
         val frozenPrefs = "whatever man, i duno care"
 
         val storage = SingleStringStorage(frozenPrefs)
-        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, cryptoUtil, storage)
+        val encryptedFormat = EncryptedPrefsFormat(rh, cryptoUtil, storage)
         encryptedFormat.loadPreferences(getMockedFile(), "sikret")
     }
 
@@ -226,7 +226,7 @@ class EncryptedPrefsFormatTest : TestBase() {
             "}"
 
         val storage = SingleStringStorage(frozenPrefs)
-        val encryptedFormat = EncryptedPrefsFormat(resourceHelper, cryptoUtil, storage)
+        val encryptedFormat = EncryptedPrefsFormat(rh, cryptoUtil, storage)
         encryptedFormat.loadPreferences(getMockedFile(), "sikret")
     }
 
diff --git a/core/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt b/core/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt
index 2df42bf26cb..bdd23eec47e 100644
--- a/core/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt
@@ -13,7 +13,7 @@ import java.util.*
 class DateUtilTest : TestBase() {
 
     @Mock lateinit var context: Context
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
 
     @Test
     fun fromISODateStringTest() {
@@ -65,7 +65,7 @@ class DateUtilTest : TestBase() {
     }
     */
     @Test fun timeFrameStringTest() {
-        `when`(resourceHelper.gs(R.string.shorthour)).thenReturn("h")
-        Assert.assertEquals("(1h 1')", DateUtil(context).timeFrameString(T.hours(1).msecs() + T.mins(1).msecs(), resourceHelper))
+        `when`(rh.gs(R.string.shorthour)).thenReturn("h")
+        Assert.assertEquals("(1h 1')", DateUtil(context).timeFrameString(T.hours(1).msecs() + T.mins(1).msecs(), rh))
     }
 }
\ No newline at end of file
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt
index d8b660e9d67..4e8f9411979 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt
@@ -21,12 +21,12 @@ import info.nightscout.androidaps.events.EventInitializationChanged
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.events.EventTempBasalChange
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Pump
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.queue.events.EventQueueChanged
 import info.nightscout.androidaps.utils.DateUtil
@@ -47,13 +47,13 @@ import javax.inject.Inject
 
 class DanaFragment : DaggerFragment() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var danaPump: DanaPump
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var sp: SP
     @Inject lateinit var warnColors: WarnColors
     @Inject lateinit var dateUtil: DateUtil
@@ -80,8 +80,10 @@ class DanaFragment : DaggerFragment() {
         }
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View {
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
         _binding = DanarFragmentBinding.inflate(inflater, container, false)
         return binding.root
     }
@@ -107,15 +109,17 @@ class DanaFragment : DaggerFragment() {
         }
         binding.stats.setOnClickListener { startActivity(Intent(context, TDDStatsActivity::class.java)) }
         binding.userOptions.setOnClickListener { startActivity(Intent(context, DanaUserOptionsActivity::class.java)) }
-        binding.btconnection.setOnClickListener {
+        binding.btConnectionLayout.setOnClickListener {
             aapsLogger.debug(LTag.PUMP, "Clicked connect to pump")
             danaPump.reset()
             commandQueue.readStatus("Clicked connect to pump", null)
         }
-        if (activePlugin.activePump.pumpDescription.pumpType == PumpType.DANA_RS)
-            binding.btconnection.setOnLongClickListener {
+        if (activePlugin.activePump.pumpDescription.pumpType == PumpType.DANA_RS ||
+            activePlugin.activePump.pumpDescription.pumpType == PumpType.DANA_I
+        )
+            binding.btConnectionLayout.setOnLongClickListener {
                 activity?.let {
-                    OKDialog.showConfirmation(it, resourceHelper.gs(R.string.resetpairing)) {
+                    OKDialog.showConfirmation(it, rh.gs(R.string.resetpairing)) {
                         uel.log(Action.CLEAR_PAIRING_KEYS, Sources.Dana)
                         (activePlugin.activePump as Dana).clearPairing()
                     }
@@ -152,22 +156,22 @@ class DanaFragment : DaggerFragment() {
             .toObservable(EventPumpStatusChanged::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({
-                pumpStatusIcon = when (it.status) {
-                    EventPumpStatusChanged.Status.CONNECTING   ->
-                        "{fa-bluetooth-b spin} ${it.secondsElapsed}s"
-                    EventPumpStatusChanged.Status.CONNECTED    ->
-                        "{fa-bluetooth}"
-                    EventPumpStatusChanged.Status.DISCONNECTED ->
-                        "{fa-bluetooth-b}"
-
-                    else                                       ->
-                        "{fa-bluetooth-b}"
-                }
-                binding.btconnection.text = pumpStatusIcon
-                pumpStatus = it.getStatus(resourceHelper)
-                binding.pumpStatus.text = pumpStatus
-                binding.pumpStatusLayout.visibility = (pumpStatus != "").toVisibility()
-            }, fabricPrivacy::logException)
+                           pumpStatusIcon = when (it.status) {
+                               EventPumpStatusChanged.Status.CONNECTING   ->
+                                   "{fa-bluetooth-b spin} ${it.secondsElapsed}s"
+                               EventPumpStatusChanged.Status.CONNECTED    ->
+                                   "{fa-bluetooth}"
+                               EventPumpStatusChanged.Status.DISCONNECTED ->
+                                   "{fa-bluetooth-b}"
+
+                               else                                       ->
+                                   "{fa-bluetooth-b}"
+                           }
+                           binding.btConnection.text = pumpStatusIcon
+                           pumpStatus = it.getStatus(rh)
+                           binding.pumpStatus.text = pumpStatus
+                           binding.pumpStatusLayout.visibility = (pumpStatus != "").toVisibility()
+                       }, fabricPrivacy::logException)
 
         pumpStatus = ""
         pumpStatusIcon = "{fa-bluetooth-b}"
@@ -193,7 +197,7 @@ class DanaFragment : DaggerFragment() {
     @Synchronized
     fun updateGUI() {
         if (_binding == null) return
-        binding.btconnection.text = pumpStatusIcon
+        binding.btConnection.text = pumpStatusIcon
         binding.pumpStatus.text = pumpStatus
         binding.pumpStatusLayout.visibility = (pumpStatus != "").toVisibility()
         binding.queue.text = commandQueue.spannedStatus()
@@ -203,7 +207,7 @@ class DanaFragment : DaggerFragment() {
         if (pump.lastConnection != 0L) {
             val agoMilliseconds = System.currentTimeMillis() - pump.lastConnection
             val agoMin = (agoMilliseconds.toDouble() / 60.0 / 1000.0).toInt()
-            binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + resourceHelper.gs(R.string.minago, agoMin) + ")"
+            binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(R.string.minago, agoMin) + ")"
             warnColors.setColor(binding.lastconnection, agoMin.toDouble(), 16.0, 31.0)
         }
         if (pump.lastBolusTime != 0L) {
@@ -211,22 +215,22 @@ class DanaFragment : DaggerFragment() {
             val agoHours = agoMilliseconds.toDouble() / 60.0 / 60.0 / 1000.0
             if (agoHours < 6)
             // max 6h back
-                binding.lastbolus.text = dateUtil.timeString(pump.lastBolusTime) + " " + dateUtil.sinceString(pump.lastBolusTime, resourceHelper) + " " + resourceHelper.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
+                binding.lastbolus.text = dateUtil.timeString(pump.lastBolusTime) + " " + dateUtil.sinceString(pump.lastBolusTime, rh) + " " + rh.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
             else
                 binding.lastbolus.text = ""
         }
 
-        binding.dailyunits.text = resourceHelper.gs(R.string.reservoirvalue, pump.dailyTotalUnits, pump.maxDailyTotalUnits)
+        binding.dailyunits.text = rh.gs(R.string.reservoirvalue, pump.dailyTotalUnits, pump.maxDailyTotalUnits)
         warnColors.setColor(binding.dailyunits, pump.dailyTotalUnits, pump.maxDailyTotalUnits * 0.75, pump.maxDailyTotalUnits * 0.9)
-        binding.basabasalrate.text = "( " + (pump.activeProfile + 1) + " )  " + resourceHelper.gs(R.string.pump_basebasalrate, plugin.baseBasalRate)
+        binding.basabasalrate.text = "( " + (pump.activeProfile + 1) + " )  " + rh.gs(R.string.pump_basebasalrate, plugin.baseBasalRate)
         // DanaRPlugin, DanaRKoreanPlugin
         binding.tempbasal.text = danaPump.temporaryBasalToString()
         binding.extendedbolus.text = danaPump.extendedBolusToString()
-        binding.reservoir.text = resourceHelper.gs(R.string.reservoirvalue, pump.reservoirRemainingUnits, 300)
+        binding.reservoir.text = rh.gs(R.string.reservoirvalue, pump.reservoirRemainingUnits, 300)
         warnColors.setColorInverse(binding.reservoir, pump.reservoirRemainingUnits, 50.0, 20.0)
         binding.battery.text = "{fa-battery-" + pump.batteryRemaining / 25 + "}"
         warnColors.setColorInverse(binding.battery, pump.batteryRemaining.toDouble(), 51.0, 26.0)
-        binding.firmware.text = resourceHelper.gs(R.string.dana_model, pump.modelFriendlyName(), pump.hwModel, pump.protocol, pump.productCode)
+        binding.firmware.text = rh.gs(R.string.dana_model, pump.modelFriendlyName(), pump.hwModel, pump.protocol, pump.productCode)
         binding.basalBolusStep.text = pump.basalStep.toString() + "/" + pump.bolusStep.toString()
         binding.serialNumber.text = pump.serialNumber
         val icon = if (danaPump.pumpType() == PumpType.DANA_I) R.drawable.ic_dana_i else R.drawable.ic_dana_rs
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
index 56cf61dcfcd..6f01ddff3d6 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
@@ -18,6 +18,7 @@ import org.joda.time.DateTimeZone
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
+import java.security.InvalidParameterException
 import java.text.DecimalFormat
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -25,6 +26,7 @@ import javax.inject.Singleton
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
+import kotlin.math.roundToLong
 
 @Singleton
 class DanaPump @Inject constructor(
@@ -34,11 +36,13 @@ class DanaPump @Inject constructor(
     private val injector: HasAndroidInjector
 ) {
 
+    @Suppress("unused")
     enum class ErrorState(val code: Int) {
+
         NONE(0x00),
         SUSPENDED(0x01),
-        DAILYMAX(0x02),
-        BOLUSBLOCK(0x04),
+        DAILY_MAX(0x02),
+        BOLUS_BLOCK(0x04),
         ORDERDELIVERING(0x08),
         NOPRIME(0x10);
 
@@ -104,8 +108,6 @@ class DanaPump @Inject constructor(
     var pumpSuspended = false
     var calculatorEnabled = false
     var dailyTotalUnits = 0.0
-    var dailyTotalBolusUnits = 0.0 // RS only
-    var dailyTotalBasalUnits = 0.0 // RS only
     var decRatio = 0 // RS v3: [%] for pump IOB calculation
     var maxDailyTotalUnits = 0
     var bolusStep = 0.1
@@ -147,7 +149,8 @@ class DanaPump @Inject constructor(
     fun temporaryBasalToString(): String {
         if (!isTempBasalInProgress) return ""
 
-        val passedMin = ((min(dateUtil.now(), tempBasalStart + tempBasalDuration) - tempBasalStart) / 60.0 / 1000).roundToInt()
+        val passedMin =
+            ((min(dateUtil.now(), tempBasalStart + tempBasalDuration) - tempBasalStart) / 60.0 / 1000).roundToInt()
         return tempBasalPercent.toString() + "% @" +
             dateUtil.timeString(tempBasalStart) +
             " " + passedMin + "/" + T.msecs(tempBasalDuration).mins() + "'"
@@ -183,7 +186,7 @@ class DanaPump @Inject constructor(
                 extendedBolusAmount = 0.0
             }
         }
-    val extendedBolusPassedMinutes: Int
+    private val extendedBolusPassedMinutes: Int
         get() = T.msecs(max(0, dateUtil.now() - extendedBolusStart)).mins().toInt()
     val extendedBolusRemainingMinutes: Int
         get() = max(T.msecs(extendedBolusStart + extendedBolusDuration - dateUtil.now()).mins().toInt(), 0)
@@ -237,8 +240,8 @@ class DanaPump @Inject constructor(
     var nightCF = 0.0
 
     // Profile I
-    var cf24 = Array<Double>(24) { 0.0 }
-    var cir24 = Array<Double>(24) { 0.0 }
+    var cf24 = Array(24) { 0.0 }
+    var cir24 = Array(24) { 0.0 }
 
     //var pumpProfiles = arrayOf<Array<Double>>()
     var pumpProfiles: Array<Array<Double>>? = null
@@ -263,7 +266,7 @@ class DanaPump @Inject constructor(
     var cannulaVolume = 0
     var refillAmount = 0
     var target = 0 // mgdl 40~400 mmol 2.2~22 => 220~2200
-    var userOptionsFrompump: ByteArray? = null
+    var userOptionsFromPump: ByteArray? = null
     var initialBolusAmount = 0.0
 
     // Bolus settings
@@ -273,7 +276,7 @@ class DanaPump @Inject constructor(
         return if (units == UNITS_MGDL) Constants.MGDL else Constants.MMOL
     }
 
-    var bolusStartErrorCode: Int = 0 // last start bolus erroCode
+    var bolusStartErrorCode: Int = 0 // last start bolus errorCode
     var bolusingTreatment: EventOverviewBolusProgress.Treatment? = null // actually delivered treatment
     var bolusAmountToBeDelivered = 0.0 // amount to be delivered
     var bolusProgressLastTimeStamp: Long = 0 // timestamp of last bolus progress message
@@ -282,7 +285,7 @@ class DanaPump @Inject constructor(
     var bolusDone = false // success end
     var lastEventTimeLoaded: Long = 0 // timestamp of last received event
 
-    // val lastKnownHistoryId: Int = 0 // hwver 7+, 1-2000
+    // val lastKnownHistoryId: Int = 0 // hw ver 7+, 1-2000
 
     fun createConvertedProfile(): ProfileStore? {
         pumpProfiles?.let {
@@ -297,19 +300,24 @@ class DanaPump @Inject constructor(
                 json.put("defaultProfile", PROFILE_PREFIX + (activeProfile + 1))
                 json.put("store", store)
                 profile.put("dia", Constants.defaultDIA)
-                val carbratios = JSONArray()
+                val carbRatios = JSONArray()
                 if (!profile24) {
-                    carbratios.put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCIR))
-                    carbratios.put(JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCIR))
-                    carbratios.put(JSONObject().put("time", "11:00").put("timeAsSeconds", 11 * 3600).put("value", afternoonCIR))
-                    carbratios.put(JSONObject().put("time", "14:00").put("timeAsSeconds", 17 * 3600).put("value", eveningCIR))
-                    carbratios.put(JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCIR))
+                    carbRatios.put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCIR))
+                    carbRatios.put(JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCIR))
+                    carbRatios.put(JSONObject().put("time", "11:00").put("timeAsSeconds", 11 * 3600).put("value", afternoonCIR))
+                    carbRatios.put(JSONObject().put("time", "14:00").put("timeAsSeconds", 17 * 3600).put("value", eveningCIR))
+                    carbRatios.put(JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCIR))
                 } else { // 24 values
                     for (i in 0..23) {
-                        carbratios.put(JSONObject().put("time", String.format("%02d", i) + ":00").put("timeAsSeconds", i * 3600).put("value", cir24[i]))
+                        carbRatios.put(
+                            JSONObject()
+                                .put("time", String.format("%02d", i) + ":00")
+                                .put("timeAsSeconds", i * 3600)
+                                .put("value", cir24[i])
+                        )
                     }
                 }
-                profile.put("carbratio", carbratios)
+                profile.put("carbratio", carbRatios)
                 val sens = JSONArray()
                 if (!profile24) {
                     sens.put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCF))
@@ -319,7 +327,12 @@ class DanaPump @Inject constructor(
                     sens.put(JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCF))
                 } else { // 24 values
                     for (i in 0..23) {
-                        sens.put(JSONObject().put("time", String.format("%02d", i) + ":00").put("timeAsSeconds", i * 3600).put("value", cf24[i]))
+                        sens.put(
+                            JSONObject()
+                                .put("time", String.format("%02d", i) + ":00")
+                                .put("timeAsSeconds", i * 3600)
+                                .put("value", cf24[i])
+                        )
                     }
                 }
                 profile.put("sens", sens)
@@ -334,11 +347,32 @@ class DanaPump @Inject constructor(
                     } else {
                         df.format(h.toLong()) + ":00"
                     }
-                    basals.put(JSONObject().put("time", time).put("timeAsSeconds", h * basalIncrement).put("value", it[activeProfile][h]))
+                    basals.put(
+                        JSONObject()
+                            .put("time", time)
+                            .put("timeAsSeconds", h * basalIncrement)
+                            .put("value", it[activeProfile][h])
+                    )
                 }
                 profile.put("basal", basals)
-                profile.put("target_low", JSONArray().put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", currentTarget)))
-                profile.put("target_high", JSONArray().put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", currentTarget)))
+                profile.put(
+                    "target_low",
+                    JSONArray().put(
+                        JSONObject()
+                            .put("time", "00:00")
+                            .put("timeAsSeconds", 0)
+                            .put("value", currentTarget)
+                    )
+                )
+                profile.put(
+                    "target_high",
+                    JSONArray().put(
+                        JSONObject()
+                            .put("time", "00:00")
+                            .put("timeAsSeconds", 0)
+                            .put("value", currentTarget)
+                    )
+                )
                 profile.put("units", if (units == UNITS_MGDL) Constants.MGDL else Constants.MMOL)
                 store.put(PROFILE_PREFIX + (activeProfile + 1), profile)
             } catch (e: JSONException) {
@@ -356,7 +390,7 @@ class DanaPump @Inject constructor(
         for (hour in 0..23) {
             //Some values get truncated to the next lower one.
             // -> round them to two decimals and make sure we are a small delta larger (that will get truncated)
-            val value = Math.round(100.0 * nsProfile.getBasalTimeFromMidnight((hour * 60 * 60))) / 100.0 + 0.00001
+            val value = (100.0 * nsProfile.getBasalTimeFromMidnight((hour * 60 * 60))).roundToLong() / 100.0 + 0.00001
             aapsLogger.debug(LTag.PUMP, "NS basal value for $hour:00 is $value")
             record[hour] = value
         }
@@ -367,7 +401,10 @@ class DanaPump @Inject constructor(
         get() = password == sp.getInt(R.string.key_danar_password, -2)
 
     val isRSPasswordOK: Boolean
-        get() = rsPassword.equals(sp.getString(R.string.key_danars_password, ""), ignoreCase = true) || ignoreUserPassword
+        get() = rsPassword.equals(
+            sp.getString(R.string.key_danars_password, ""),
+            ignoreCase = true
+        ) || ignoreUserPassword
 
     fun reset() {
         aapsLogger.debug(LTag.PUMP, "DanaRPump reset")
@@ -410,6 +447,34 @@ class DanaPump @Inject constructor(
             else -> PumpType.USER
         }
 
+    // v2, RS history entries
+    enum class HistoryEntry(val value: Int) {
+
+        TEMP_START(1),
+        TEMP_STOP(2),
+        EXTENDED_START(3),
+        EXTENDED_STOP(4),
+        BOLUS(5),
+        DUAL_BOLUS(6),
+        DUAL_EXTENDED_START(7),
+        DUAL_EXTENDED_STOP(8),
+        SUSPEND_ON(9),
+        SUSPEND_OFF(10),
+        REFILL(11),
+        PRIME(12),
+        PROFILE_CHANGE(13),
+        CARBS(14),
+        PRIME_CANNULA(15),
+        TIME_CHANGE(16)
+        ;
+
+        companion object {
+
+            fun fromInt(value: Int) = values().firstOrNull { it.value == value } ?: throw InvalidParameterException()
+        }
+
+    }
+
     companion object {
 
         const val UNITS_MGDL = 0
@@ -420,24 +485,6 @@ class DanaPump @Inject constructor(
         const val DELIVERY_EXT_BOLUS = 0x08
         const val PROFILE_PREFIX = "DanaR-"
 
-        // v2 history entries
-        const val TEMPSTART = 1
-        const val TEMPSTOP = 2
-        const val EXTENDEDSTART = 3
-        const val EXTENDEDSTOP = 4
-        const val BOLUS = 5
-        const val DUALBOLUS = 6
-        const val DUALEXTENDEDSTART = 7
-        const val DUALEXTENDEDSTOP = 8
-        const val SUSPENDON = 9
-        const val SUSPENDOFF = 10
-        const val REFILL = 11
-        const val PRIME = 12
-        const val PROFILECHANGE = 13
-        const val CARBS = 14
-        const val PRIMECANNULA = 15
-        const val TIMECHANGE = 16
-
         // Dana R btModel
         const val DOMESTIC_MODEL = 0x01
         const val EXPORT_MODEL = 0x03
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
index 0c6111e14ee..baf4ecba8d6 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
@@ -19,12 +19,12 @@ import info.nightscout.androidaps.dana.databinding.DanarHistoryItemBinding
 import info.nightscout.androidaps.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Profile
 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.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
@@ -39,12 +39,12 @@ import javax.inject.Inject
 
 class DanaHistoryActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var danaHistoryRecordDao: DanaHistoryRecordDao
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var aapsSchedulers: AapsSchedulers
@@ -65,7 +65,7 @@ class DanaHistoryActivity : NoSplashAppCompatActivity() {
         disposable += rxBus
             .toObservable(EventPumpStatusChanged::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({ binding.status.text = it.getStatus(resourceHelper) }, fabricPrivacy::logException)
+            .subscribe({ binding.status.text = it.getStatus(rh) }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventDanaRSyncStatus::class.java)
             .observeOn(aapsSchedulers.main)
@@ -96,19 +96,19 @@ class DanaHistoryActivity : NoSplashAppCompatActivity() {
 
         // Types
         val typeList = ArrayList<TypeList>()
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_ALARM, resourceHelper.gs(R.string.danar_history_alarm)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BASALHOUR, resourceHelper.gs(R.string.danar_history_basalhours)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BOLUS, resourceHelper.gs(R.string.danar_history_bolus)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_CARBO, resourceHelper.gs(R.string.danar_history_carbohydrates)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_DAILY, resourceHelper.gs(R.string.danar_history_dailyinsulin)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_GLUCOSE, resourceHelper.gs(R.string.danar_history_glucose)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_ALARM, rh.gs(R.string.danar_history_alarm)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BASALHOUR, rh.gs(R.string.danar_history_basalhours)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BOLUS, rh.gs(R.string.danar_history_bolus)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_CARBO, rh.gs(R.string.danar_history_carbohydrates)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_DAILY, rh.gs(R.string.danar_history_dailyinsulin)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_GLUCOSE, rh.gs(R.string.danar_history_glucose)))
         if (!isKorean && !isRS) {
-            typeList.add(TypeList(RecordTypes.RECORD_TYPE_ERROR, resourceHelper.gs(R.string.danar_history_errors)))
+            typeList.add(TypeList(RecordTypes.RECORD_TYPE_ERROR, rh.gs(R.string.danar_history_errors)))
         }
-        if (isRS) typeList.add(TypeList(RecordTypes.RECORD_TYPE_PRIME, resourceHelper.gs(R.string.danar_history_prime)))
+        if (isRS) typeList.add(TypeList(RecordTypes.RECORD_TYPE_PRIME, rh.gs(R.string.danar_history_prime)))
         if (!isKorean) {
-            typeList.add(TypeList(RecordTypes.RECORD_TYPE_REFILL, resourceHelper.gs(R.string.danar_history_refill)))
-            typeList.add(TypeList(RecordTypes.RECORD_TYPE_SUSPEND, resourceHelper.gs(R.string.danar_history_syspend)))
+            typeList.add(TypeList(RecordTypes.RECORD_TYPE_REFILL, rh.gs(R.string.danar_history_refill)))
+            typeList.add(TypeList(RecordTypes.RECORD_TYPE_SUSPEND, rh.gs(R.string.danar_history_syspend)))
         }
         binding.spinner.adapter = ArrayAdapter(this, R.layout.spinner_centered, typeList)
 
@@ -180,9 +180,9 @@ class DanaHistoryActivity : NoSplashAppCompatActivity() {
                 }
 
                 RecordTypes.RECORD_TYPE_DAILY                                                                                                                                                              -> {
-                    holder.binding.dailyBasal.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBasal)
-                    holder.binding.dailyBolus.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBolus)
-                    holder.binding.dailyTotal.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBolus + record.dailyBasal)
+                    holder.binding.dailyBasal.text = rh.gs(R.string.formatinsulinunits, record.dailyBasal)
+                    holder.binding.dailyBolus.text = rh.gs(R.string.formatinsulinunits, record.dailyBolus)
+                    holder.binding.dailyTotal.text = rh.gs(R.string.formatinsulinunits, record.dailyBolus + record.dailyBasal)
                     holder.binding.time.text = dateUtil.dateString(record.timestamp)
                     holder.binding.time.visibility = View.VISIBLE
                     holder.binding.value.visibility = View.GONE
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
index 3936d22eb8d..a2d30d15475 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
@@ -10,10 +10,10 @@ import info.nightscout.androidaps.dana.R
 import info.nightscout.androidaps.dana.databinding.DanarUserOptionsActivityBinding
 import info.nightscout.androidaps.events.EventInitializationChanged
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -28,12 +28,12 @@ import kotlin.math.min
 class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var context: Context
     @Inject lateinit var danaPump: DanaPump
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var aapsSchedulers: AapsSchedulers
 
     private val disposable = CompositeDisposable()
@@ -153,7 +153,7 @@ class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
         commandQueue.setUserOptions(object : Callback() {
             override fun run() {
                 if (!result.success) {
-                    ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.pumperror), R.raw.boluserror)
+                    ErrorHelperActivity.runAlarm(context, result.comment, rh.gs(R.string.pumperror), R.raw.boluserror)
                 }
             }
         })
diff --git a/dana/src/main/res/layout/danar_fragment.xml b/dana/src/main/res/layout/danar_fragment.xml
index eeb1a1f8537..4cd775c5835 100644
--- a/dana/src/main/res/layout/danar_fragment.xml
+++ b/dana/src/main/res/layout/danar_fragment.xml
@@ -67,6 +67,7 @@
                 android:background="@color/list_delimiter" />
 
             <LinearLayout
+                android:id="@+id/bt_connection_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
@@ -93,7 +94,7 @@
                     tools:ignore="HardcodedText" />
 
                 <com.joanzapata.iconify.widget.IconTextView
-                    android:id="@+id/btconnection"
+                    android:id="@+id/bt_connection"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
diff --git a/dana/src/main/res/values-bg-rBG/strings.xml b/dana/src/main/res/values-bg-rBG/strings.xml
index a596f0301f2..600425914c8 100644
--- a/dana/src/main/res/values-bg-rBG/strings.xml
+++ b/dana/src/main/res/values-bg-rBG/strings.xml
@@ -5,7 +5,9 @@
     <string name="danars_pairingok">Сдвояване - ОК</string>
     <string name="danars_pairingtimedout">Времето за сдвояване изтече</string>
     <string name="danars_waitingforpairing">Очаква сдвояване с помпа</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Интеграция за помпа DANA Diabecare RS и Dana-i</string>
     <string name="maxbolusviolation">Превишавате макс болус</string>
     <string name="commanderror">Грешка при команда</string>
     <string name="speederror">Скорост грешка</string>
@@ -92,8 +94,6 @@
     <string name="profile_set_failed">Неуспешно задаване на базален профил</string>
     <string name="danar_bluetooth_status">Bluetooh статус</string>
     <string name="danar_iob_label">IOB на помпата</string>
-    <string name="basal_step">Стъпка при базал</string>
-    <string name="bolus_step">Стъпка при болус</string>
     <string name="virtualpump_firmware_label">Фърмуер</string>
     <string name="danar_pump_settings">DanaR настройки</string>
     <string name="timeformat12h">12ч</string>
@@ -115,4 +115,5 @@
     <string name="press_ok_on_the_pump">Натиснете OK на помпата\nи въведете двата номера\nДръжте дисплея на помпата включен чрез натискане минус бутон, докато завършите въвеждане на код.</string>
     <string name="num1pin">1: (12 цифри)</string>
     <string name="num2pin">2: (8 цифри)</string>
+    <string name="basal_bolus_step">Базал/Болус стъпка</string>
 </resources>
diff --git a/dana/src/main/res/values-cs-rCZ/strings.xml b/dana/src/main/res/values-cs-rCZ/strings.xml
index db9f8376e1b..ae440efd4f2 100644
--- a/dana/src/main/res/values-cs-rCZ/strings.xml
+++ b/dana/src/main/res/values-cs-rCZ/strings.xml
@@ -94,8 +94,6 @@
     <string name="profile_set_failed">Nastavení bazálního profilu selhalo</string>
     <string name="danar_bluetooth_status">Stav Bluetooth</string>
     <string name="danar_iob_label">IOB z pumpy</string>
-    <string name="basal_step">Krok bazálu</string>
-    <string name="bolus_step">Krok bolusu</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Nastavení pumpy Dana</string>
     <string name="timeformat12h">12h</string>
@@ -117,4 +115,5 @@
     <string name="press_ok_on_the_pump">Stiskněte OK na pumpě\na zadejte 2 zobrazená čísla\nUdržujte display na pumpě zapnutý stisknutím tlačítka minus dokud nedokončíte zadání kódu.</string>
     <string name="num1pin">1: (12 číslic)</string>
     <string name="num2pin">2: (8 číslic)</string>
+    <string name="basal_bolus_step">Bazální/bolusový krok</string>
 </resources>
diff --git a/dana/src/main/res/values-de-rDE/strings.xml b/dana/src/main/res/values-de-rDE/strings.xml
index 07b1afd24a4..a275b6cffb0 100644
--- a/dana/src/main/res/values-de-rDE/strings.xml
+++ b/dana/src/main/res/values-de-rDE/strings.xml
@@ -94,8 +94,6 @@
     <string name="profile_set_failed">Setzen des Basal-Profils fehlgeschlagen</string>
     <string name="danar_bluetooth_status">Bluetooth-Status</string>
     <string name="danar_iob_label">Pumpen-IOB</string>
-    <string name="basal_step">Basal-Schritt</string>
-    <string name="bolus_step">Bolus-Schritt</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Dana Pumpen-Einstellungen</string>
     <string name="timeformat12h">12h</string>
@@ -117,4 +115,5 @@
     <string name="press_ok_on_the_pump">Drücke OK auf der Pumpe\nund gib die beiden angezeigten Ziffernfolgen ein.\nHalte das Pumpendisplay aktiv indem Du den Minus-Button gedrückt hälst, bis Du den Code eingegeben hast.</string>
     <string name="num1pin">1: (12 Zeichen)</string>
     <string name="num2pin">2: (8 Zeichen)</string>
+    <string name="basal_bolus_step">Basal/Bolus Schrittgröße</string>
 </resources>
diff --git a/dana/src/main/res/values-es-rES/strings.xml b/dana/src/main/res/values-es-rES/strings.xml
index 4fb7cb20b56..b48bb09e7f7 100644
--- a/dana/src/main/res/values-es-rES/strings.xml
+++ b/dana/src/main/res/values-es-rES/strings.xml
@@ -5,7 +5,9 @@
     <string name="danars_pairingok">Conexión OK</string>
     <string name="danars_pairingtimedout">Tiempo de Vinculación agotado</string>
     <string name="danars_waitingforpairing">Esperando para conectar con bomba</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Integración para bombas DANA Diabecare RS y Dana-i</string>
     <string name="maxbolusviolation">Violación de bolo Max</string>
     <string name="commanderror">Error de comando</string>
     <string name="speederror">Error de velocidad</string>
@@ -92,8 +94,6 @@
     <string name="profile_set_failed">Error al activar perfil basal</string>
     <string name="danar_bluetooth_status">Estado de bluetooth</string>
     <string name="danar_iob_label">Bomba IOB</string>
-    <string name="basal_step">Nivel base</string>
-    <string name="bolus_step">Nivel bolo</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Ajustes de la bomba Dana</string>
     <string name="timeformat12h">12 h</string>
@@ -115,4 +115,5 @@
     <string name="press_ok_on_the_pump">Pulse Aceptar en la bomba\ny entre 2 números visualizados\nMantener la pantalla en la bomba ON pulsando el botón menos hasta que termine de introducir el código.</string>
     <string name="num1pin">1: (12 dígitos)</string>
     <string name="num2pin">2: (8 dígitos)</string>
+    <string name="basal_bolus_step">Paso basal/bolo</string>
 </resources>
diff --git a/dana/src/main/res/values-fr-rFR/strings.xml b/dana/src/main/res/values-fr-rFR/strings.xml
index 32225ac81de..8f6eec6621e 100644
--- a/dana/src/main/res/values-fr-rFR/strings.xml
+++ b/dana/src/main/res/values-fr-rFR/strings.xml
@@ -94,8 +94,6 @@
     <string name="profile_set_failed">Echec Paramétrage Profil Basal</string>
     <string name="danar_bluetooth_status">État Bluetooth</string>
     <string name="danar_iob_label">IA pompe</string>
-    <string name="basal_step">Incrément Basal</string>
-    <string name="bolus_step">Incrément Bolus</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Paramètres pompe Dana</string>
     <string name="timeformat12h">12h</string>
@@ -117,4 +115,5 @@
     <string name="press_ok_on_the_pump">Appuyez sur OK sur la pompe\net entrez les 2 numéros affichés\nConserver l\'affichage ACTIF sur la pompe en appuyant sur le bouton &lt;b&gt;moins&lt;b&gt; jusqu\'à ce que le code soit entré.</string>
     <string name="num1pin">1: (12 chiffres)</string>
     <string name="num2pin">2: (8 chiffres)</string>
+    <string name="basal_bolus_step">Étape Basal/Bolus</string>
 </resources>
diff --git a/dana/src/main/res/values-ga-rIE/strings.xml b/dana/src/main/res/values-ga-rIE/strings.xml
index f0b71ab5917..a4dd30318fe 100644
--- a/dana/src/main/res/values-ga-rIE/strings.xml
+++ b/dana/src/main/res/values-ga-rIE/strings.xml
@@ -19,8 +19,6 @@
     <string name="danarpump">DanaR</string>
     <string name="danarv2pump">DanaRv2</string>
     <string name="danar_bluetooth_status">Bluetooth stádas</string>
-    <string name="basal_step">Bunaidh Céim</string>
-    <string name="bolus_step">Bólas Céim</string>
     <string name="timeformat12h">12u</string>
     <string name="timeformat24h">24u</string>
     <string name="danar_bt_name_title">DanaR Bluetooth gléas</string>
diff --git a/dana/src/main/res/values-hu-rHU/strings.xml b/dana/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/dana/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-it-rIT/strings.xml b/dana/src/main/res/values-it-rIT/strings.xml
index 391ef93c0b7..df7975240fb 100644
--- a/dana/src/main/res/values-it-rIT/strings.xml
+++ b/dana/src/main/res/values-it-rIT/strings.xml
@@ -94,8 +94,6 @@
     <string name="profile_set_failed">Impostazione profilo basale fallita</string>
     <string name="danar_bluetooth_status">Stato bluetooth</string>
     <string name="danar_iob_label">IOB micro</string>
-    <string name="basal_step">Incremento basale</string>
-    <string name="bolus_step">Incremento bolo</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Impostazioni micro Dana</string>
     <string name="timeformat12h">12h</string>
@@ -117,4 +115,5 @@
     <string name="press_ok_on_the_pump">Premi OK sul micro\ne inserisci i 2 numeri visualizzati\nMantieni acceso il display del micro premendo il tasto col simbolo del meno sino a che non hai finito di inserire il codice.</string>
     <string name="num1pin">1: (12 cifre)</string>
     <string name="num2pin">2: (8 cifre)</string>
+    <string name="basal_bolus_step">Incremento basale/bolo</string>
 </resources>
diff --git a/dana/src/main/res/values-iw-rIL/strings.xml b/dana/src/main/res/values-iw-rIL/strings.xml
index b88fd60ebdd..f73217831ef 100644
--- a/dana/src/main/res/values-iw-rIL/strings.xml
+++ b/dana/src/main/res/values-iw-rIL/strings.xml
@@ -51,7 +51,7 @@
     <string name="stoppingtempbasal">הפסקת בזאלי זמני</string>
     <string name="settingextendedbolus">מגדיר בולוס ממושך</string>
     <string name="stoppingextendedbolus">מפסיק בולוס ממושך</string>
-    <string name="updatingbasalrates">מעדכן את הקצב הבזאלי</string>
+    <string name="updatingbasalrates">מעדכן את המינון הבזאלי</string>
     <string name="settingtempbasal">הגדרת בזאלי זמני</string>
     <string name="waitingfortimesynchronization">ממתין לסינכרון השעון (%1$d שנ\')</string>
     <string name="wrongpumppassword">סיסמת משאבה שגויה!</string>
@@ -94,8 +94,6 @@
     <string name="profile_set_failed">הגדרת פרופיל הבזאלי נכשל</string>
     <string name="danar_bluetooth_status">מצב בלוטות\'</string>
     <string name="danar_iob_label">אינסולין פעיל מהמשאבה</string>
-    <string name="basal_step">צעד במינון בזאלי</string>
-    <string name="bolus_step">צעד במינון בולוס</string>
     <string name="virtualpump_firmware_label">קושחה</string>
     <string name="danar_pump_settings">הגדרות משאבת Dana</string>
     <string name="timeformat12h">12 שעות</string>
@@ -117,4 +115,5 @@
     <string name="press_ok_on_the_pump">לחצו OK במשאבה\nוהכניסו את שני המספרים המוצגים\nהשאירו את מסך המשאבה מופעל ע\"י לחיצה על לחצן מינוס עד סיום הכנסת הקוד.</string>
     <string name="num1pin">1: (12 ספרות)</string>
     <string name="num2pin">2: (8 ספרות)</string>
+    <string name="basal_bolus_step">צעד בזאלי\\בולוס</string>
 </resources>
diff --git a/dana/src/main/res/values-ko-rKR/strings.xml b/dana/src/main/res/values-ko-rKR/strings.xml
index fe2f46276b6..c08cf51b38e 100644
--- a/dana/src/main/res/values-ko-rKR/strings.xml
+++ b/dana/src/main/res/values-ko-rKR/strings.xml
@@ -92,8 +92,6 @@
     <string name="profile_set_failed">Basal 프로파일 설정이 실패하였습니다</string>
     <string name="danar_bluetooth_status">블루투스 상태</string>
     <string name="danar_iob_label">펌프 IOB</string>
-    <string name="basal_step">Basal 단위</string>
-    <string name="bolus_step">Bolus 단위</string>
     <string name="virtualpump_firmware_label">펌웨어</string>
     <string name="danar_pump_settings">다나 펌프 설정</string>
     <string name="timeformat12h">12h</string>
diff --git a/dana/src/main/res/values-lt-rLT/strings.xml b/dana/src/main/res/values-lt-rLT/strings.xml
index bba0bf0739b..e5922b8d070 100644
--- a/dana/src/main/res/values-lt-rLT/strings.xml
+++ b/dana/src/main/res/values-lt-rLT/strings.xml
@@ -5,7 +5,9 @@
     <string name="danars_pairingok">Sujungta</string>
     <string name="danars_pairingtimedout">Sujungimui skirtas laikas baigėsi</string>
     <string name="danars_waitingforpairing">Laukiama ryšio su pompa</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Integracija su DANA Diabecare RS ir Dana-i pompomis</string>
     <string name="maxbolusviolation">Pažeistas maks boluso limitas</string>
     <string name="commanderror">Komandos klaida</string>
     <string name="speederror">Greičio klaida</string>
@@ -92,8 +94,6 @@
     <string name="profile_set_failed">Nepavyko nustatyti bazės profilio</string>
     <string name="danar_bluetooth_status">Bluetooth statusas</string>
     <string name="danar_iob_label">Pompos AIO</string>
-    <string name="basal_step">Bazės žingsnis</string>
-    <string name="bolus_step">Boluso žingsnis</string>
     <string name="virtualpump_firmware_label">Programinė įranga</string>
     <string name="danar_pump_settings">Dana pompos nustatymai</string>
     <string name="timeformat12h">12h</string>
@@ -115,4 +115,5 @@
     <string name="press_ok_on_the_pump">Paspauskite pompos mygtuką OK\n ir įveskite 2 rodomus skaičius\nĮjunkite pompos ekraną spausdami minuso mygtuką, kol baigsite įvesti kodą.</string>
     <string name="num1pin">1: (12 skaitmenų)</string>
     <string name="num2pin">2: (8 skaitmenys)</string>
+    <string name="basal_bolus_step">Bazės / boluso žingsnis</string>
 </resources>
diff --git a/dana/src/main/res/values-nl-rNL/strings.xml b/dana/src/main/res/values-nl-rNL/strings.xml
index 569c798f328..ba29886a38f 100644
--- a/dana/src/main/res/values-nl-rNL/strings.xml
+++ b/dana/src/main/res/values-nl-rNL/strings.xml
@@ -5,7 +5,9 @@
     <string name="danars_pairingok">Koppeling geslaagd</string>
     <string name="danars_pairingtimedout">Koppeling verlopen</string>
     <string name="danars_waitingforpairing">Wachten op koppelen van de pomp</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Pomp integratie voor DANA RS en Dana-i pompen</string>
     <string name="maxbolusviolation">Max bolus overschrijding</string>
     <string name="commanderror">Opdracht fout</string>
     <string name="speederror">Snelheid fout</string>
@@ -92,8 +94,6 @@
     <string name="profile_set_failed">Instellen van basaal profiel mislukt</string>
     <string name="danar_bluetooth_status">Bluetooth status</string>
     <string name="danar_iob_label">Pomp IOB</string>
-    <string name="basal_step">Basaal Stap</string>
-    <string name="bolus_step">Bolus Stap</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Dana pomp instellingen</string>
     <string name="timeformat12h">12u</string>
@@ -115,4 +115,5 @@
     <string name="press_ok_on_the_pump">Druk op OK op de pomp\nen voer 2 weergegeven nummers in.\nHoud het scherm vd pomp actief door de min-knop op de pomp ingedrukt te houden totdat je klaar bent met het invoeren van de codes.</string>
     <string name="num1pin">1: (12 cijfers)</string>
     <string name="num2pin">2: (8 cijfers)</string>
+    <string name="basal_bolus_step">Basaal/bolus stap</string>
 </resources>
diff --git a/dana/src/main/res/values-no-rNO/strings.xml b/dana/src/main/res/values-no-rNO/strings.xml
index 890601835ff..7ff363d7ea5 100644
--- a/dana/src/main/res/values-no-rNO/strings.xml
+++ b/dana/src/main/res/values-no-rNO/strings.xml
@@ -94,8 +94,6 @@
     <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>
@@ -117,4 +115,5 @@
     <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>
+    <string name="basal_bolus_step">Basal/bolus trinn</string>
 </resources>
diff --git a/dana/src/main/res/values-pl-rPL/strings.xml b/dana/src/main/res/values-pl-rPL/strings.xml
index 5707c254bc7..d151b1fcf1f 100644
--- a/dana/src/main/res/values-pl-rPL/strings.xml
+++ b/dana/src/main/res/values-pl-rPL/strings.xml
@@ -5,7 +5,9 @@
     <string name="danars_pairingok">Parowanie OK</string>
     <string name="danars_pairingtimedout">Przekroczono limit czasu parowania</string>
     <string name="danars_waitingforpairing">Oczekiwanie na pompę na sparowanie</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Integracja z pompami DANA Diabecare RS i Dana-i</string>
     <string name="maxbolusviolation">Przekroczenie ograniczenia maks. bolusa</string>
     <string name="commanderror">Błąd polecenia</string>
     <string name="speederror">Błąd prędkości</string>
@@ -92,8 +94,6 @@
     <string name="profile_set_failed">Ustawienie profilu bazy nie powiodło się</string>
     <string name="danar_bluetooth_status">Status Bluetooth</string>
     <string name="danar_iob_label">IOB w pompie</string>
-    <string name="basal_step">Krok bazy</string>
-    <string name="bolus_step">Krok bolusa</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Ustawienia pompy Dana</string>
     <string name="timeformat12h">12h</string>
@@ -115,4 +115,5 @@
     <string name="press_ok_on_the_pump">Naciśnij OK na pompie\ni wpisz 2 wyświetlone numery\nUtrzymuj wyświetlacz pompy włączony poprzez naciskanie przycisku minus, aż do momentu zakończenia przepisywania kodu.</string>
     <string name="num1pin">1: (12 cyfr)</string>
     <string name="num2pin">2: (8 cyfr)</string>
+    <string name="basal_bolus_step">Rozmiar kroku Bazy/Bolusa</string>
 </resources>
diff --git a/dana/src/main/res/values-pt-rBR/strings.xml b/dana/src/main/res/values-pt-rBR/strings.xml
index c724f547649..66f5932818b 100644
--- a/dana/src/main/res/values-pt-rBR/strings.xml
+++ b/dana/src/main/res/values-pt-rBR/strings.xml
@@ -84,8 +84,6 @@
     <string name="profile_set_failed">Não foi possivel configurar o perfil de basal</string>
     <string name="danar_bluetooth_status">Estado Bluetooth</string>
     <string name="danar_iob_label">IOB Bomba</string>
-    <string name="basal_step">Valor da Basal</string>
-    <string name="bolus_step">Incremento de bolus</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Configurações da bomba Dana</string>
     <string name="option_on">Ligado</string>
diff --git a/dana/src/main/res/values-pt-rPT/strings.xml b/dana/src/main/res/values-pt-rPT/strings.xml
index d2d57ec978e..94bf982a3ad 100644
--- a/dana/src/main/res/values-pt-rPT/strings.xml
+++ b/dana/src/main/res/values-pt-rPT/strings.xml
@@ -92,8 +92,6 @@
     <string name="profile_set_failed">Não foi possível configurar o perfil de basal</string>
     <string name="danar_bluetooth_status">Estado do Bluetooth</string>
     <string name="danar_iob_label">IA Bomba</string>
-    <string name="basal_step">Incremento Basal</string>
-    <string name="bolus_step">Incremento Bólus</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Definições da bomba Dana</string>
     <string name="timeformat12h">12h</string>
diff --git a/dana/src/main/res/values-ro-rRO/strings.xml b/dana/src/main/res/values-ro-rRO/strings.xml
index b046a04a58a..2f51aea7816 100644
--- a/dana/src/main/res/values-ro-rRO/strings.xml
+++ b/dana/src/main/res/values-ro-rRO/strings.xml
@@ -5,7 +5,9 @@
     <string name="danars_pairingok">Conectare OK</string>
     <string name="danars_pairingtimedout">Conectare nereușită</string>
     <string name="danars_waitingforpairing">Se așteaptă conectarea la pompă</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Integrare pentru pompele DANA Diabecare RS și Dana-i pumps</string>
     <string name="maxbolusviolation">Încălcare a valorii maxime a bolusului</string>
     <string name="commanderror">Eroare de comandă</string>
     <string name="speederror">Eroare de viteză</string>
@@ -92,8 +94,6 @@
     <string name="profile_set_failed">Setarea profilului bazalei a eșuat</string>
     <string name="danar_bluetooth_status">Status Bluetooth</string>
     <string name="danar_iob_label">IOB din pompă</string>
-    <string name="basal_step">Pas bazală</string>
-    <string name="bolus_step">Pas bolus</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Setări pompă Dana</string>
     <string name="timeformat12h">12h</string>
@@ -115,4 +115,5 @@
     <string name="press_ok_on_the_pump">Apăsaţi OK pe pompă\nşi introduceţi cele 2 numere afişate\nPăstraţi ecranul pompei ACTIV apăsând butonul minus până când terminați introducerea codului.</string>
     <string name="num1pin">1: (12 cifre)</string>
     <string name="num2pin">2: (8 cifre)</string>
+    <string name="basal_bolus_step">Etapa bazală/bolus</string>
 </resources>
diff --git a/dana/src/main/res/values-ru-rRU/strings.xml b/dana/src/main/res/values-ru-rRU/strings.xml
index 4cc37c73182..35db38d6ccb 100644
--- a/dana/src/main/res/values-ru-rRU/strings.xml
+++ b/dana/src/main/res/values-ru-rRU/strings.xml
@@ -94,8 +94,6 @@
     <string name="profile_set_failed">настройка базального профиля не состоялась</string>
     <string name="danar_bluetooth_status">статус блутус</string>
     <string name="danar_iob_label">активный инсулин на помпе</string>
-    <string name="basal_step">шаг базала</string>
-    <string name="bolus_step">шаг болюса</string>
     <string name="virtualpump_firmware_label">прошивка</string>
     <string name="danar_pump_settings">Настройки помпы Dana</string>
     <string name="timeformat12h">12 ч</string>
@@ -117,4 +115,5 @@
     <string name="press_ok_on_the_pump">Нажмите OK на помпе\nи введите 2 отображаемых номера\nДержите экран помпы включенным нажимая кнопку минус, пока не закончите ввод кода.</string>
     <string name="num1pin">1: (12 цифр)</string>
     <string name="num2pin">2: (8 цифр)</string>
+    <string name="basal_bolus_step">Шаг Базала/болюса</string>
 </resources>
diff --git a/dana/src/main/res/values-sk-rSK/strings.xml b/dana/src/main/res/values-sk-rSK/strings.xml
index 953e931dccd..ecf5c2c2e4b 100644
--- a/dana/src/main/res/values-sk-rSK/strings.xml
+++ b/dana/src/main/res/values-sk-rSK/strings.xml
@@ -94,8 +94,6 @@
     <string name="profile_set_failed">Nastavenie bazálneho profilu zlyhalo</string>
     <string name="danar_bluetooth_status">Stav Bluetooth</string>
     <string name="danar_iob_label">IOB z pumpy</string>
-    <string name="basal_step">Krok bazálu</string>
-    <string name="bolus_step">Krok bolusu</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Nastavenie pumpy Dana</string>
     <string name="timeformat12h">12h</string>
@@ -117,4 +115,5 @@
     <string name="press_ok_on_the_pump">Stlačte OK na pumpe\na zadajte 2 zobrazené čísla\nUdržujte display na pumpe zapnutý stlačením tlačítka mínus, kým nedokončíte zadanie kódu.</string>
     <string name="num1pin">1: (12 číslic)</string>
     <string name="num2pin">2: (8 číslic)</string>
+    <string name="basal_bolus_step">Krok bazálu/bolusu</string>
 </resources>
diff --git a/dana/src/main/res/values-sv-rSE/strings.xml b/dana/src/main/res/values-sv-rSE/strings.xml
index 7780b8b1b3a..b35f0a179a0 100644
--- a/dana/src/main/res/values-sv-rSE/strings.xml
+++ b/dana/src/main/res/values-sv-rSE/strings.xml
@@ -94,8 +94,6 @@
     <string name="profile_set_failed">Lyckades inte sätta basalprofilen</string>
     <string name="danar_bluetooth_status">Bluetoothstatus</string>
     <string name="danar_iob_label">Pumpens IOB</string>
-    <string name="basal_step">Basalsteg</string>
-    <string name="bolus_step">Bolussteg</string>
     <string name="virtualpump_firmware_label">Firmwareversion</string>
     <string name="danar_pump_settings">Dana R pumpinställningar</string>
     <string name="timeformat12h">12 tim</string>
@@ -117,4 +115,5 @@
     <string name="press_ok_on_the_pump">Tryck på OK på pumpen och skriv in nycklarna som visas på skärmen. För att förhindra att pumpskärmen släcks, tryck på minus (-) ibland.</string>
     <string name="num1pin">1: (12 tecken)</string>
     <string name="num2pin">2: (8 tecken)</string>
+    <string name="basal_bolus_step">Basal/bolus steg</string>
 </resources>
diff --git a/dana/src/main/res/values-tr-rTR/strings.xml b/dana/src/main/res/values-tr-rTR/strings.xml
index 3ea04e700df..6c8592f865f 100644
--- a/dana/src/main/res/values-tr-rTR/strings.xml
+++ b/dana/src/main/res/values-tr-rTR/strings.xml
@@ -1,2 +1,119 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">Eşleştirme</string>
+    <string name="danars_nodeviceavailable">Şu ana kadar hiçbir cihaz bulunamadı</string>
+    <string name="danars_pairingok">Eşleştirme tamam</string>
+    <string name="danars_pairingtimedout">Eşleştirme zaman aşımı</string>
+    <string name="danars_waitingforpairing">Pompa ile eşleşme bekleniyor</string>
+    <string name="danarspump">Dana-i/RS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">DANA Diabecare RS ve Dana-i pompaları için pompa entegrasyonu</string>
+    <string name="maxbolusviolation">Maks bolus ihlali</string>
+    <string name="commanderror">Komut hatası</string>
+    <string name="speederror">Hız hatası</string>
+    <string name="insulinlimitviolation">İnsülin sınırı ihlali</string>
+    <string name="boluserrorcode">İstenen: %1$.2fÜ Teslim edilen: %2$.2fÜ Hata kodu: %3$s</string>
+    <string name="danar_valuenotsetproperly">Değer düzgün ayarlanmamış</string>
+    <string name="danar_setbasalstep001">Bazal adımı ayarla 0,01 Ü/s</string>
+    <string name="resetpairing">Eşleştirme bilgileri sıfırlansın mı?</string>
+    <string name="dana_model">%1$s\nModel: %2$02X\nProtokol: %3$02X\nKod: %4$02X</string>
+    <string name="processinghistory">Etkinlik işleniyor</string>
+    <string name="danar_enableextendedbolus">Pompada yayma bolusları etkinleştir</string>
+    <string name="overview_bolusprogress_delivered">İletildi</string>
+    <string name="overview_bolusprogress_stoped">Durdu</string>
+    <string name="unsupportedfirmware">Desteklenmeyen pompa yazılımı</string>
+    <string name="pumperror">Pompa hatası</string>
+    <string name="lowbattery">Düşük Pil</string>
+    <string name="basalcompare">Önceden ayarlanmış bazal orandan daha az teslimat</string>
+    <string name="pumpshutdown">Pompa Kapatma</string>
+    <string name="batterydischarged">Pompa pili bitmiş</string>
+    <string name="occlusion">Tıkanıklık</string>
+    <string name="emptyreservoir">Rezervuar boş</string>
+    <string name="checkshaft">Mili kontrol edin</string>
+    <string name="basalmax">Bazal maks</string>
+    <string name="dailymax">Günlük maks</string>
+    <string name="bloodsugarmeasurementalert">Kan şekeri ölçüm uyarısı</string>
+    <string name="remaininsulinalert">Kalan insülin düzeyi</string>
+    <string name="missedbolus">Kaçırılan bolus</string>
+    <string name="invalidpairing">Geçersiz eşleştirme bilgisi. Yeni eşleştirme isteği</string>
+    <string name="gettingpumpstatus">Pompa durumu alınıyor</string>
+    <string name="gettingextendedbolusstatus">Yayma bolus durumu alınıyor</string>
+    <string name="gettingbolusstatus">Bolus durumu alınıyor</string>
+    <string name="gettingtempbasalstatus">Geçici bazal durumu alınıyor</string>
+    <string name="gettingpumpsettings">Pompa ayarları alınıyor</string>
+    <string name="gettingpumptime">Pompa zamanı alınıyor</string>
+    <string name="largetimedifftitle">Büyük zaman farkı</string>
+    <string name="largetimediff">Büyük zaman farkı:\n1,5 saatten fazla olduğunda pompada zaman kapalıdır.\nLütfen pompanın üzerindeki zamanı manuel olarak ayarlayın ve geçmişin pompadan okunmasından dolayı beklenmedik davranışlara neden olmadığından emin olun.\nMümkünse, zamanı değiştirmeden önce geçmişini pompadan çıkarın veya son yanlış geçmiş girişinden sonra bir DIA için Kapalı Döngü\'yü iptal edin, ancak o andan itibaren en az bir DIA\'yı devre dışı bırakın.</string>
+    <string name="pairfirst">Lütfen pompanızı telefonunuzla bağlayın!</string>
+    <string name="approachingdailylimit">Günlük İnsülin limitine yaklaşıldı</string>
+    <string name="startingbolus">Bolus teslimatı başlatılıyor</string>
+    <string name="waitingforestimatedbolusend">Bolus bitimi için bekleniyor. Kalan %1$d san.</string>
+    <string name="stoppingtempbasal">Geçici bazal durduruluyor</string>
+    <string name="settingextendedbolus">Yayma bolus ayarlanıyor</string>
+    <string name="stoppingextendedbolus">Yayma bolus durduruluyor</string>
+    <string name="updatingbasalrates">Bazal oranların güncellenmesi</string>
+    <string name="settingtempbasal">Geçici bazal ayarı</string>
+    <string name="waitingfortimesynchronization">Zaman senkronizasyonu bekleniyor (%1$d sn)</string>
+    <string name="wrongpumppassword">Hatalı parola!</string>
+    <string name="danar_history_alarm">Alarmlar</string>
+    <string name="danar_history_basalhours">Bazal Saatleri</string>
+    <string name="danar_history_bolus">Boluslar</string>
+    <string name="danar_history_carbohydrates">Karbonhidratlar</string>
+    <string name="danar_history_dailyinsulin">Günlük İnsülin</string>
+    <string name="danar_history_errors">Hatalar</string>
+    <string name="danar_history_glucose">Glikoz</string>
+    <string name="danar_history_refill">Doldur</string>
+    <string name="danar_history_syspend">Askıya alınan</string>
+    <string name="danar_history_prime">Doldur</string>
+    <string name="danar_useroptions">Kullanıcı seçenekleri</string>
+    <string name="danar_timedisplay">Saat formatı</string>
+    <string name="danar_buttonscroll">Düğme kaydırma</string>
+    <string name="danar_beep">Tuşa basıldığında bip sesi çıkar</string>
+    <string name="danar_pumpalarm">Alarm</string>
+    <string name="danar_pumpalarm_sound">Ses</string>
+    <string name="danar_pumpalarm_vibrate">Titreşim</string>
+    <string name="danar_pumpalarm_both">İkisi de</string>
+    <string name="danar_screentimeout">LCD açık kalma süresi [seconds]</string>
+    <string name="danar_backlight">Arka ışık süresi [seconds]</string>
+    <string name="danar_glucoseunits">Glikoz birimleri</string>
+    <string name="danar_shutdown">Kapatma [hours]</string>
+    <string name="danar_lowreservoir">Düşük rezervuar [Units]</string>
+    <string name="danar_saveuseroptions">Seçenekleri pompaya kaydet</string>
+    <string name="description_pump_dana_r">DANA Diabecare R pompaları için pompa entegrasyonu</string>
+    <string name="description_pump_dana_r_korean">DANA Diabecare R yerli Kore pompaları için pompa entegrasyonu</string>
+    <string name="description_pump_dana_r_v2">Güncellenmiş ürün yazılımlı DANA Diabecare R pompaları için pompa entegrasyonu</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Bluetooth bağdaştırıcısı bulunamadı</string>
+    <string name="devicenotfound">Seçili aygıt bulunamadı</string>
+    <string name="danar_switchtouhmode">Pompayı Ü/d\'den Ü/s\'te değiştirin</string>
+    <string name="danarkoreanpump">DanaR Kore</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Pompa sürücüsü düzeltildi</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Pompada EasyUI modunu devre dışı bırak</string>
+    <string name="profile_set_failed">Bazal profil ayarı başarısız oldu</string>
+    <string name="danar_bluetooth_status">Bluetooth durumu</string>
+    <string name="danar_iob_label">IOB(Aktif insülin) pompa</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Dana pompa ayarları</string>
+    <string name="timeformat12h">12sa</string>
+    <string name="timeformat24h">24sa</string>
+    <string name="option_on">Aç</string>
+    <string name="option_off">Kapa</string>
+    <string name="danar_bt_name_title">DanaR Bluetooth aygıtı</string>
+    <string name="danars_password_title">Pompa şifresi (yalnızca v1)</string>
+    <string name="danar_password_title">Pompa Şifresi</string>
+    <string name="danar_useextended_title">Yayma bolusu &gt;200%% için kullan</string>
+    <string name="bolusspeed">Bolus hızı</string>
+    <string name="selectedpump">Seçilen Pompa</string>
+    <string name="rs_loginsulinchange_title">Rezervuar değişikliği günlüğü</string>
+    <string name="rs_loginsulinchange_summary">Geçmişte tespit edildiğinde careportal\'a \"İnsülin Değişimi\" olayı ekleyin</string>
+    <string name="rs_logcanulachange_title">Kanül değişikliği günlüğü</string>
+    <string name="rs_logcanulachange_summary">Geçmişte tespit edildiğinde careportal\'a \"Kanül Değişikliği\" olayı ekle</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Pompada OK\'e basın\nve görüntülenen 2 sayıyı girin\nKodu girmeyi bitirene kadar eksi düğmesine basarak pompa ekranını AÇIK tutun.</string>
+    <string name="num1pin">1: (12 basamak)</string>
+    <string name="num2pin">2: (8 basamak)</string>
+    <string name="basal_bolus_step">Bazal/bolus adımı</string>
+</resources>
diff --git a/dana/src/main/res/values/strings.xml b/dana/src/main/res/values/strings.xml
index da887616717..995ae018834 100644
--- a/dana/src/main/res/values/strings.xml
+++ b/dana/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <string name="key_danars_v3_randompairingkey" translatable="false">danars_v3_randompairing_key_</string>
     <string name="key_danars_v3_pairingkey" translatable="false">danars_v3_pairing_key_</string>
     <string name="key_danars_v3_randomsynckey" translatable="false">danars_v3_randomsync_key_</string>
+    <string name="key_dana_ble5_pairingkey" translatable="false">dana_ble5_pairingkey</string>
     <string name="key_rs_logcanulachange" translatable="false">rs_logcanulachange</string>
     <string name="key_rs_loginsulinchange" translatable="false">rs_loginsulinchange</string>
     <string name="key_rs_last_clear_key_request" translatable="false">rs_last_clear_key_request</string>
diff --git a/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index bd213d3c8e7..87720e49503 100644
--- a/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.ProfileStore
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -22,14 +22,14 @@ import org.mockito.Mock
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
     @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var config: Config
 
-    val rxBus = RxBusWrapper(aapsSchedulers)
+    val rxBus = RxBus(aapsSchedulers, aapsLogger)
 
     val profileInjector = HasAndroidInjector {
         AndroidInjector {
@@ -42,11 +42,17 @@ open class TestBaseWithProfile : TestBase() {
 
     @Before
     fun prepareMock() {
-        validProfileJSON = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+        validProfileJSON = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"3\"}," +
+            "{\"time\":\"2:00\",\"value\":\"3.4\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4.5\"}]," +
+            "\"target_high\":[{\"time\":\"00:00\",\"value\":\"7\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
         validProfile = ProfileSealed.Pure(pureProfileFromJson(JSONObject(validProfileJSON), dateUtil)!!)
     }
 
     fun getValidProfileStore(): ProfileStore {
+        validProfileJSON = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"3\"}," +
+            "{\"time\":\"2:00\",\"value\":\"3.4\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4.5\"}]," +
+            "\"target_high\":[{\"time\":\"00:00\",\"value\":\"7\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+
         val json = JSONObject()
         val store = JSONObject()
         store.put(TESTPROFILENAME, JSONObject(validProfileJSON))
@@ -54,4 +60,4 @@ open class TestBaseWithProfile : TestBase() {
         json.put("store", store)
         return ProfileStore(profileInjector, json, dateUtil)
     }
-}
\ No newline at end of file
+}
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
index 400512fc903..e064ec9ce7a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
@@ -18,7 +18,7 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.interfaces.PumpSync.TemporaryBasalType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
@@ -39,18 +39,18 @@ class DanaRKoreanPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     aapsSchedulers: AapsSchedulers,
-    rxBus: RxBusWrapper,
+    rxBus: RxBus,
     private val context: Context,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     constraintChecker: ConstraintChecker,
     activePlugin: ActivePlugin,
     sp: SP,
-    commandQueue: CommandQueueProvider,
+    commandQueue: CommandQueue,
     danaPump: DanaPump,
     dateUtil: DateUtil,
     private val fabricPrivacy: FabricPrivacy,
     pumpSync: PumpSync
-) : AbstractDanaRPlugin(injector, danaPump, resourceHelper, constraintChecker, aapsLogger, aapsSchedulers, commandQueue, rxBus, activePlugin, sp, dateUtil, pumpSync) {
+) : AbstractDanaRPlugin(injector, danaPump, rh, constraintChecker, aapsLogger, aapsSchedulers, commandQueue, rxBus, activePlugin, sp, dateUtil, pumpSync) {
 
     init {
         pluginDescription.description(R.string.description_pump_dana_r_korean)
@@ -100,7 +100,7 @@ class DanaRKoreanPlugin @Inject constructor(
 
     // Plugin base interface
     override val name: String
-        get() = resourceHelper.gs(R.string.danarkoreanpump)
+        get() = rh.gs(R.string.danarkoreanpump)
     override val preferencesId: Int
         get() = R.xml.pref_danarkorean
 
@@ -130,7 +130,7 @@ class DanaRKoreanPlugin @Inject constructor(
             val result = PumpEnactResult(injector)
             result.success(connectionOK && abs(detailedBolusInfo.insulin - t.insulin) < pumpDescription.bolusStep)
                 .bolusDelivered(t.insulin)
-            if (!result.success) result.comment(resourceHelper.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaPump.bolusStartErrorCode)) else result.comment(R.string.ok)
+            if (!result.success) result.comment(rh.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaPump.bolusStartErrorCode)) else result.comment(R.string.ok)
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered)
             detailedBolusInfo.insulin = t.insulin
             detailedBolusInfo.timestamp = dateUtil.now()
@@ -157,10 +157,22 @@ class DanaRKoreanPlugin @Inject constructor(
         //This should not be needed while using queue because connection should be done before calling this
         var result = PumpEnactResult(injector)
         val absoluteRateAfterConstraint = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
-        val doTempOff = baseBasalRate - absoluteRateAfterConstraint == 0.0 && absoluteRateAfterConstraint >= 0.10
+        var doTempOff = baseBasalRate - absoluteRateAfterConstraint == 0.0 && absoluteRateAfterConstraint >= 0.10
         val doLowTemp = absoluteRateAfterConstraint < baseBasalRate || absoluteRateAfterConstraint < 0.10
         val doHighTemp = absoluteRateAfterConstraint > baseBasalRate && !useExtendedBoluses
         val doExtendedTemp = absoluteRateAfterConstraint > baseBasalRate && useExtendedBoluses
+
+        var percentRate: Int = java.lang.Double.valueOf(absoluteRateAfterConstraint / baseBasalRate * 100).toInt()
+        // Any basal less than 0.10u/h will be dumped once per hour, not every 4 minutes. So if it's less than .10u/h, set a zero temp.
+        if (absoluteRateAfterConstraint < 0.10) percentRate = 0
+        percentRate = if (percentRate < 100) Round.ceilTo(percentRate.toDouble(), 10.0).toInt() else Round.floorTo(percentRate.toDouble(), 10.0).toInt()
+        if (percentRate > pumpDescription.maxTempPercent) {
+            percentRate = pumpDescription.maxTempPercent
+        }
+        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Calculated percent rate: $percentRate")
+
+        if (percentRate == 100) doTempOff = true
+
         if (doTempOff) {
             // If extended in progress
             if (danaPump.isExtendedInProgress && useExtendedBoluses) {
@@ -177,15 +189,6 @@ class DanaRKoreanPlugin @Inject constructor(
             return result
         }
         if (doLowTemp || doHighTemp) {
-            var percentRate: Int = java.lang.Double.valueOf(absoluteRateAfterConstraint / baseBasalRate * 100).toInt()
-            // Any basal less than 0.10u/h will be dumped once per hour, not every 4 minutes. So if it's less than .10u/h, set a zero temp.
-            if (absoluteRateAfterConstraint < 0.10) percentRate = 0
-            percentRate = if (percentRate < 100) Round.ceilTo(percentRate.toDouble(), 10.0).toInt() else Round.floorTo(percentRate.toDouble(), 10.0).toInt()
-            if (percentRate > pumpDescription.maxTempPercent) {
-                percentRate = pumpDescription.maxTempPercent
-            }
-            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Calculated percent rate: $percentRate")
-
             // If extended in progress
             if (danaPump.isExtendedInProgress && useExtendedBoluses) {
                 aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping extended bolus (doLowTemp || doHighTemp)")
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
index c8a6d7bd882..fab11da0ebd 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
@@ -32,13 +32,13 @@ class MsgInitConnStatusBasic_k(
         aapsLogger.debug(LTag.PUMPCOMM, "easyUIMode: $easyUIMode")
         aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaPump.password)
         if (danaPump.isEasyModeEnabled) {
-            val notification = Notification(Notification.EASY_MODE_ENABLED, resourceHelper.gs(R.string.danar_disableeasymode), Notification.URGENT)
+            val notification = Notification(Notification.EASY_MODE_ENABLED, rh.gs(R.string.danar_disableeasymode), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.EASY_MODE_ENABLED))
         }
         if (!danaPump.isPasswordOK) {
-            val notification = Notification(Notification.WRONG_PUMP_PASSWORD, resourceHelper.gs(R.string.wrongpumppassword), Notification.URGENT)
+            val notification = Notification(Notification.WRONG_PUMP_PASSWORD, rh.gs(R.string.wrongpumppassword), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.WRONG_PUMP_PASSWORD))
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
index 290121b7acf..acdda541013 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
@@ -32,7 +32,7 @@ class MsgInitConnStatusBolus_k(
         aapsLogger.debug(LTag.PUMPCOMM, "Bolus max: " + danaPump.maxBolus)
         aapsLogger.debug(LTag.PUMPCOMM, "Delivery status: $deliveryStatus")
         if (!danaPump.isExtendedBolusEnabled) {
-            val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, resourceHelper.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
+            val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, rh.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.EXTENDED_BOLUS_DISABLED))
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
index 26c602a2374..a15f694783e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
@@ -20,7 +20,7 @@ class MsgInitConnStatusTime_k(
 
     override fun handleMessage(bytes: ByteArray) {
         if (bytes.size - 10 < 10) {
-            val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
+            val notification = Notification(Notification.WRONG_DRIVER, rh.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
             danaRKoreanPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected. Switching to export DanaR")
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
index 2295373d356..9e22bbd4eb2 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -43,12 +43,12 @@
 import info.nightscout.androidaps.events.EventProfileSwitchChanged;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.CommandQueue;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -61,13 +61,13 @@
 
 public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     @Inject AAPSLogger aapsLogger;
-    @Inject RxBusWrapper rxBus;
-    @Inject ResourceHelper resourceHelper;
+    @Inject RxBus rxBus;
+    @Inject ResourceHelper rh;
     @Inject ConstraintChecker constraintChecker;
     @Inject DanaPump danaPump;
     @Inject DanaRPlugin danaRPlugin;
     @Inject DanaRKoreanPlugin danaRKoreanPlugin;
-    @Inject CommandQueueProvider commandQueue;
+    @Inject CommandQueue commandQueue;
     @Inject MessageHashTableRKorean messageHashTableRKorean;
     @Inject ActivePlugin activePlugin;
     @Inject ProfileFunction profileFunction;
@@ -126,7 +126,7 @@ public void connect() {
 
     public void getPumpStatus() {
         try {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumpstatus)));
             //MsgStatus_k statusMsg = new MsgStatus_k();
             MsgStatusBasic_k statusBasicMsg = new MsgStatusBasic_k(injector);
             MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(injector);
@@ -142,18 +142,18 @@ public void getPumpStatus() {
 
             //mSerialIOThread.sendMessage(statusMsg);
             mSerialIOThread.sendMessage(statusBasicMsg);
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingtempbasalstatus)));
             mSerialIOThread.sendMessage(tempStatusMsg);
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingextendedbolusstatus)));
             mSerialIOThread.sendMessage(exStatusMsg);
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingbolusstatus)));
 
             long now = System.currentTimeMillis();
             danaPump.setLastConnection(now);
 
             Profile profile = profileFunction.getProfile();
             if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= danaRKoreanPlugin.getPumpDescription().getBasalStep()) {
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 if (!danaRKoreanPlugin.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileSwitchChanged());
@@ -161,7 +161,7 @@ public void getPumpStatus() {
             }
 
             if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRKoreanPlugin.isInitialized()) {
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingShippingInfo(injector));
                 mSerialIOThread.sendMessage(new MsgSettingMeal(injector));
                 mSerialIOThread.sendMessage(new MsgSettingBasal_k(injector));
@@ -169,7 +169,7 @@ public void getPumpStatus() {
                 mSerialIOThread.sendMessage(new MsgSettingMaxValues(injector));
                 mSerialIOThread.sendMessage(new MsgSettingGlucose(injector));
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatios(injector));
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
+                rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumptime)));
                 mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                 if (danaPump.getPumpTime() == 0) {
                     // initial handshake was not successful
@@ -197,9 +197,9 @@ public void getPumpStatus() {
             if (danaPump.getDailyTotalUnits() > danaPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
                 aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
-                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
+                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, rh.gs(R.string.approachingdailylimit), Notification.URGENT);
                     rxBus.send(new EventNewNotification(reportFail));
-                    pumpSync.insertAnnouncement(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits() + "U", null, PumpType.DANA_R_KOREAN, danaRKoreanPlugin.serialNumber());
+                    pumpSync.insertAnnouncement(rh.gs(R.string.approachingdailylimit) + ": " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits() + "U", null, PumpType.DANA_R_KOREAN, danaRKoreanPlugin.serialNumber());
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
@@ -213,11 +213,11 @@ public void getPumpStatus() {
     public boolean tempBasal(int percent, int durationInHours) {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStart(injector, percent, durationInHours));
         mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
@@ -226,7 +226,7 @@ public boolean tempBasal(int percent, int durationInHours) {
 
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
         mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
@@ -235,7 +235,7 @@ public boolean tempBasalStop() {
 
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.settingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(injector, insulin, (byte) (durationInHalfHours & 0xFF)));
         mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
@@ -244,7 +244,7 @@ public boolean extendedBolus(double insulin, int durationInHalfHours) {
 
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.stoppingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(injector));
         mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
@@ -316,7 +316,7 @@ public boolean tempBasalShortDuration(int percent, int durationInMinutes) {
 
     public boolean updateBasalsInPump(final Profile profile) {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.updatingbasalrates)));
         Double[] basal = danaPump.buildDanaRProfileRecord(profile);
         MsgSetSingleBasalProfile msgSet = new MsgSetSingleBasalProfile(injector, basal);
         mSerialIOThread.sendMessage(msgSet);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
index 22f9c9a0693..1fe5f944a28 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
@@ -21,12 +21,12 @@
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.CommandQueue;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
@@ -47,7 +47,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
 
     private final AAPSLogger aapsLogger;
     private final Context context;
-    private final ResourceHelper resourceHelper;
+    private final ResourceHelper rh;
     private final ConstraintChecker constraintChecker;
     private final DetailedBolusInfoStorage detailedBolusInfoStorage;
     private final TemporaryBasalStorage temporaryBasalStorage;
@@ -60,13 +60,13 @@ public DanaRv2Plugin(
             HasAndroidInjector injector,
             AAPSLogger aapsLogger,
             AapsSchedulers aapsSchedulers,
-            RxBusWrapper rxBus,
+            RxBus rxBus,
             Context context,
-            ResourceHelper resourceHelper,
+            ResourceHelper rh,
             ConstraintChecker constraintChecker,
             ActivePlugin activePlugin,
             SP sp,
-            CommandQueueProvider commandQueue,
+            CommandQueue commandQueue,
             DanaPump danaPump,
             DetailedBolusInfoStorage detailedBolusInfoStorage,
             TemporaryBasalStorage temporaryBasalStorage,
@@ -74,10 +74,10 @@ public DanaRv2Plugin(
             FabricPrivacy fabricPrivacy,
             PumpSync pumpSync
     ) {
-        super(injector, danaPump, resourceHelper, constraintChecker, aapsLogger, aapsSchedulers, commandQueue, rxBus, activePlugin, sp, dateUtil, pumpSync);
+        super(injector, danaPump, rh, constraintChecker, aapsLogger, aapsSchedulers, commandQueue, rxBus, activePlugin, sp, dateUtil, pumpSync);
         this.aapsLogger = aapsLogger;
         this.context = context;
-        this.resourceHelper = resourceHelper;
+        this.rh = rh;
         this.constraintChecker = constraintChecker;
         this.detailedBolusInfoStorage = detailedBolusInfoStorage;
         this.temporaryBasalStorage = temporaryBasalStorage;
@@ -127,7 +127,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
     @NonNull
     @Override
     public String getName() {
-        return resourceHelper.gs(R.string.danarv2pump);
+        return rh.gs(R.string.danarv2pump);
     }
 
     @Override
@@ -194,7 +194,7 @@ public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
                     .bolusDelivered(t.insulin)
                     .carbsDelivered(detailedBolusInfo.carbs);
             if (!result.getSuccess())
-                result.comment(resourceHelper.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaPump.getBolusStartErrorCode()));
+                result.comment(rh.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaPump.getBolusStartErrorCode()));
             else
                 result.comment(R.string.ok);
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.getBolusDelivered());
@@ -225,10 +225,21 @@ public PumpEnactResult setTempBasalAbsolute(double absoluteRate, int durationInM
 
         absoluteRate = constraintChecker.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
 
-        final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d && absoluteRate >= 0.10d;
+        boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d && absoluteRate >= 0.10d;
         final boolean doLowTemp = absoluteRate < getBaseBasalRate() || absoluteRate < 0.10d;
         final boolean doHighTemp = absoluteRate > getBaseBasalRate();
 
+        int percentRate = Double.valueOf(absoluteRate / getBaseBasalRate() * 100).intValue();
+        // Any basal less than 0.10u/h will be dumped once per hour, not every 4 minutes. So if it's less than .10u/h, set a zero temp.
+        if (absoluteRate < 0.10d) percentRate = 0;
+        if (percentRate < 100) percentRate = Round.ceilTo((double) percentRate, 10d).intValue();
+        else percentRate = Round.floorTo((double) percentRate, 10d).intValue();
+        if (percentRate > 500) // Special high temp 500/15min
+            percentRate = 500;
+        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Calculated percent rate: " + percentRate);
+
+        if (percentRate == 100) doTempOff = true;
+
         if (doTempOff) {
             // If temp in progress
             if (danaPump.isTempBasalInProgress()) {
@@ -241,13 +252,6 @@ public PumpEnactResult setTempBasalAbsolute(double absoluteRate, int durationInM
         }
 
         if (doLowTemp || doHighTemp) {
-            int percentRate = Double.valueOf(absoluteRate / getBaseBasalRate() * 100).intValue();
-            // Any basal less than 0.10u/h will be dumped once per hour, not every 4 minutes. So if it's less than .10u/h, set a zero temp.
-            if (absoluteRate < 0.10d) percentRate = 0;
-            if (percentRate < 100) percentRate = Round.ceilTo((double) percentRate, 10d).intValue();
-            else percentRate = Round.floorTo((double) percentRate, 10d).intValue();
-            if (percentRate > 500) // Special high temp 500/15min
-                percentRate = 500;
             // Check if some temp is already in progress
             if (danaPump.isTempBasalInProgress()) {
                 // Correct basal already set ?
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
index 05ca40da1da..6f3ed03ff80 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
@@ -67,7 +67,7 @@ class MessageHashTableRv2 @Inject constructor(
         put(MsgCheckValue_v2(injector))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
         put(MsgStatusAPS_v2(injector))              // 0xE001 CMD_PUMPSTATUS_APS
         put(MsgSetAPSTempBasalStart_v2(injector, 0, false, false))   // 0xE002 CMD_PUMPSET_APSTEMP
-        put(MsgHistoryEvents_v2(injector))          // 0xE003 CMD_GET_HISTORY
+        put(MsgHistoryEventsV2(injector))          // 0xE003 CMD_GET_HISTORY
         put(MsgSetHistoryEntry_v2(injector, 0, 0, 0, 0))        // 0xE004 CMD_SET_HISTORY_ENTRY
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
index 500cbc8808c..08c73eb232e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
@@ -27,7 +27,7 @@ class MsgCheckValue_v2(
         danaPump.protocol = intFromBuff(bytes, 1, 1)
         danaPump.productCode = intFromBuff(bytes, 2, 1)
         if (danaPump.hwModel != DanaPump.EXPORT_MODEL) {
-            val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
+            val notification = Notification(Notification.WRONG_DRIVER, rh.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
             danaRPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected. Switching to Korean DanaR")
@@ -44,7 +44,7 @@ class MsgCheckValue_v2(
             return
         }
         if (danaPump.protocol != 2) {
-            val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
+            val notification = Notification(Notification.WRONG_DRIVER, rh.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
             danaRKoreanPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected. Switching to non APS DanaR")
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt
new file mode 100644
index 00000000000..6ce6dc13d59
--- /dev/null
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt
@@ -0,0 +1,276 @@
+package info.nightscout.androidaps.danaRv2.comm
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.danar.R
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.utils.T
+import java.util.*
+
+class MsgHistoryEventsV2 constructor(
+    injector: HasAndroidInjector,
+    var from: Long = 0
+) : MessageBase(injector) {
+
+    companion object {
+
+        var messageBuffer = arrayListOf<ByteArray>() // for reversing order of incoming messages
+    }
+
+    init {
+        SetCommand(0xE003)
+        if (from > dateUtil.now()) {
+            aapsLogger.error("Asked to load from the future")
+            from = 0
+        }
+        if (from == 0L) {
+            AddParamByte(0.toByte())
+            AddParamByte(1.toByte())
+            AddParamByte(1.toByte())
+            AddParamByte(0.toByte())
+            AddParamByte(0.toByte())
+        } else {
+            val gFrom = GregorianCalendar()
+            gFrom.timeInMillis = from
+            AddParamDate(gFrom)
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + dateUtil.dateAndTimeString(from))
+        danaPump.historyDoneReceived = false
+        messageBuffer = arrayListOf()
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val recordCode = intFromBuff(data, 0, 1).toByte()
+        // Last record
+        if (recordCode == 0xFF.toByte()) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Last record received")
+
+            val array: Array<ByteArray> = messageBuffer.toTypedArray()
+            val sorted = array.sortedArrayWith { s1: ByteArray, s2: ByteArray -> (dateTime(s1) - dateTime(s2)).toInt() }
+            for (message in sorted) processMessage(message)
+            danaPump.historyDoneReceived = true
+        } else messageBuffer.add(data)
+    }
+
+    fun dateTime(data: ByteArray): Long =
+        dateTimeSecFromBuff(data, 1) // 6 bytes
+
+    fun processMessage(bytes: ByteArray) {
+        val recordCode = intFromBuff(bytes, 0, 1).toByte()
+
+        // Last record
+        if (recordCode == 0xFF.toByte()) {
+            return
+        }
+        val datetime = dateTimeSecFromBuff(bytes, 1) // 6 bytes
+        val param1 = intFromBuff(bytes, 7, 2)
+        val param2 = intFromBuff(bytes, 9, 2)
+        val status: String
+        when (DanaPump.HistoryEntry.fromInt(recordCode.toInt())) {
+            DanaPump.HistoryEntry.TEMP_START          -> {
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    "EVENT TEMP_START ($recordCode) " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min"
+                )
+                val temporaryBasalInfo = temporaryBasalStorage.findTemporaryBasal(datetime, param1.toDouble())
+                pumpSync.syncTemporaryBasalWithPumpId(
+                    timestamp = datetime,
+                    rate = param1.toDouble(),
+                    duration = T.mins(param2.toLong()).msecs(),
+                    isAbsolute = false,
+                    type = temporaryBasalInfo?.type,
+                    pumpId = datetime,
+                    pumpType = PumpType.DANA_RV2,
+                    pumpSerial = danaPump.serialNumber
+                )
+                status = "TEMP_START " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.TEMP_STOP           -> {
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    "EVENT TEMP_STOP ($recordCode) " + dateUtil.dateAndTimeString(datetime)
+                )
+                pumpSync.syncStopTemporaryBasalWithPumpId(
+                    timestamp = datetime,
+                    endPumpId = datetime,
+                    pumpType = PumpType.DANA_RV2,
+                    pumpSerial = danaPump.serialNumber
+                )
+                status = "TEMP_STOP " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.EXTENDED_START      -> {
+                val newRecord = pumpSync.syncExtendedBolusWithPumpId(
+                    timestamp = datetime,
+                    amount = param1 / 100.0,
+                    duration = T.mins(param2.toLong()).msecs(),
+                    isEmulatingTB = false,
+                    pumpId = datetime,
+                    pumpType = PumpType.DANA_RV2,
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    (if (newRecord) "**NEW** " else "") + "EVENT EXTENDED_START (" + recordCode + ") "
+                        + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min"
+                )
+                status = "EXTENDED_START " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.EXTENDED_STOP       -> {
+                val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
+                    timestamp = datetime,
+                    endPumpId = datetime,
+                    pumpType = PumpType.DANA_RV2,
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    (if (newRecord) "**NEW** " else "") + "EVENT EXTENDED_STOP (" + recordCode + ") "
+                        + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min"
+                )
+                status = "EXTENDED_STOP " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.BOLUS               -> {
+                val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
+                val newRecord = pumpSync.syncBolusWithPumpId(
+                    timestamp = datetime,
+                    amount = param1 / 100.0,
+                    type = detailedBolusInfo?.bolusType,
+                    pumpId = datetime,
+                    pumpType = PumpType.DANA_RV2,
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") "
+                        + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min"
+                )
+                status = "BOLUS " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.DUAL_BOLUS          -> {
+                val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
+                val newRecord = pumpSync.syncBolusWithPumpId(
+                    timestamp = datetime,
+                    amount = param1 / 100.0,
+                    type = detailedBolusInfo?.bolusType,
+                    pumpId = datetime,
+                    pumpType = PumpType.DANA_RV2,
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    (if (newRecord) "**NEW** " else "") + "EVENT DUAL_BOLUS (" + recordCode + ") "
+                        + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min"
+                )
+                status = "DUAL_BOLUS " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.DUAL_EXTENDED_START -> {
+                val newRecord = pumpSync.syncExtendedBolusWithPumpId(
+                    timestamp = datetime,
+                    amount = param1 / 100.0,
+                    duration = T.mins(param2.toLong()).msecs(),
+                    isEmulatingTB = false,
+                    pumpId = datetime,
+                    pumpType = PumpType.DANA_RV2,
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    (if (newRecord) "**NEW** " else "") + "EVENT DUAL_EXTENDED_START (" + recordCode + ") "
+                        + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min"
+                )
+                status = "DUAL_EXTENDED_START " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.DUAL_EXTENDED_STOP  -> {
+                val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
+                    timestamp = datetime,
+                    endPumpId = datetime,
+                    pumpType = PumpType.DANA_RV2,
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    (if (newRecord) "**NEW** " else "") + "EVENT DUAL_EXTENDED_STOP (" + recordCode + ") "
+                        + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min"
+                )
+                status = "DUAL_EXTENDED_STOP " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.SUSPEND_ON          -> {
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    "EVENT SUSPEND_ON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")"
+                )
+                status = "SUSPEND_ON " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.SUSPEND_OFF         -> {
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    "EVENT SUSPEND_OFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")"
+                )
+                status = "SUSPEND_OFF " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.REFILL              -> {
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U"
+                )
+                status = "REFILL " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.PRIME               -> {
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U"
+                )
+                status = "PRIME " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.PROFILE_CHANGE      -> {
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    "EVENT PROFILE_CHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h"
+                )
+                status = "PROFILE_CHANGE " + dateUtil.timeString(datetime)
+            }
+
+            DanaPump.HistoryEntry.CARBS               -> {
+                val newRecord = pumpSync.syncCarbsWithTimestamp(
+                    timestamp = datetime,
+                    amount = param1.toDouble(),
+                    pumpId = datetime,
+                    pumpType = PumpType.DANA_RV2,
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + dateUtil.dateAndTimeString(
+                        datetime
+                    ) + " (" + datetime + ")" + " Carbs: " + param1 + "g"
+                )
+                status = "CARBS " + dateUtil.timeString(datetime)
+            }
+
+            else                                      -> {
+                aapsLogger.debug(
+                    LTag.PUMPBTCOMM,
+                    "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2
+                )
+                status = "UNKNOWN " + dateUtil.timeString(datetime)
+            }
+        }
+        if (datetime > danaPump.lastEventTimeLoaded) danaPump.lastEventTimeLoaded = datetime
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.processinghistory) + ": " + status))
+    }
+}
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
deleted file mode 100644
index cff117939c3..00000000000
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
+++ /dev/null
@@ -1,214 +0,0 @@
-package info.nightscout.androidaps.danaRv2.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.events.EventPumpStatusChanged
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
-import info.nightscout.androidaps.utils.T
-import java.util.*
-
-class MsgHistoryEvents_v2 constructor(
-    injector: HasAndroidInjector,
-    var from: Long = 0
-) : MessageBase(injector) {
-
-    companion object {
-
-        var messageBuffer = arrayListOf<ByteArray>() // for reversing order of incoming messages
-    }
-
-    init {
-        SetCommand(0xE003)
-        if (from > dateUtil.now()) {
-            aapsLogger.error("Asked to load from the future")
-            from = 0
-        }
-        if (from == 0L) {
-            AddParamByte(0.toByte())
-            AddParamByte(1.toByte())
-            AddParamByte(1.toByte())
-            AddParamByte(0.toByte())
-            AddParamByte(0.toByte())
-        } else {
-            val gfrom = GregorianCalendar()
-            gfrom.timeInMillis = from
-            AddParamDate(gfrom)
-        }
-        aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + dateUtil.dateAndTimeString(from))
-        danaPump.historyDoneReceived = false
-        messageBuffer = arrayListOf()
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        val recordCode = intFromBuff(data, 0, 1).toByte()
-        // Last record
-        if (recordCode == 0xFF.toByte()) {
-            aapsLogger.debug(LTag.PUMPCOMM, "Last record received")
-
-            val array: Array<ByteArray> = messageBuffer.toTypedArray()
-            val sorted = array.sortedArrayWith { s1: ByteArray, s2: ByteArray -> (dateTime(s1) - dateTime(s2)).toInt() }
-            for (message in sorted) processMessage(message)
-            danaPump.historyDoneReceived = true
-        } else messageBuffer.add(data)
-    }
-
-    fun dateTime(data: ByteArray): Long =
-        dateTimeSecFromBuff(data, 1) // 6 bytes
-
-    fun processMessage(bytes: ByteArray) {
-        val recordCode = intFromBuff(bytes, 0, 1).toByte()
-
-        // Last record
-        if (recordCode == 0xFF.toByte()) {
-            return
-        }
-        val datetime = dateTimeSecFromBuff(bytes, 1) // 6 bytes
-        val param1 = intFromBuff(bytes, 7, 2)
-        val param2 = intFromBuff(bytes, 9, 2)
-        val status: String
-        when (recordCode.toInt()) {
-            DanaPump.TEMPSTART         -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
-                val temporaryBasalInfo = temporaryBasalStorage.findTemporaryBasal(datetime, param1.toDouble())
-                pumpSync.syncTemporaryBasalWithPumpId(
-                    timestamp = datetime,
-                    rate = param1.toDouble(),
-                    duration = T.mins(param2.toLong()).msecs(),
-                    isAbsolute = false,
-                    type = temporaryBasalInfo?.type,
-                    pumpId = datetime,
-                    pumpType = PumpType.DANA_RV2,
-                    pumpSerial = danaPump.serialNumber)
-                status = "TEMPSTART " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.TEMPSTOP -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
-                pumpSync.syncStopTemporaryBasalWithPumpId(
-                    timestamp = datetime,
-                    endPumpId = datetime,
-                    pumpType = PumpType.DANA_RV2,
-                    pumpSerial = danaPump.serialNumber)
-                status = "TEMPSTOP " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.EXTENDEDSTART     -> {
-                val newRecord = pumpSync.syncExtendedBolusWithPumpId(
-                    timestamp = datetime,
-                    amount = param1 / 100.0,
-                    duration = T.mins(param2.toLong()).msecs(),
-                    isEmulatingTB = false,
-                    pumpId = datetime,
-                    pumpType = PumpType.DANA_RV2,
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
-                status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.EXTENDEDSTOP      -> {
-                val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
-                    timestamp = datetime,
-                    endPumpId = datetime,
-                    pumpType = PumpType.DANA_RV2,
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
-                status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.BOLUS             -> {
-                val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
-                val newRecord = pumpSync.syncBolusWithPumpId(
-                    timestamp = datetime,
-                    amount = param1 / 100.0,
-                    type = detailedBolusInfo?.bolusType,
-                    pumpId = datetime,
-                    pumpType = PumpType.DANA_RV2,
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
-                status = "BOLUS " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.DUALBOLUS         -> {
-                val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
-                val newRecord = pumpSync.syncBolusWithPumpId(
-                    timestamp = datetime,
-                    amount = param1 / 100.0,
-                    type = detailedBolusInfo?.bolusType,
-                    pumpId = datetime,
-                    pumpType = PumpType.DANA_RV2,
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
-                status = "DUALBOLUS " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.DUALEXTENDEDSTART -> {
-                val newRecord = pumpSync.syncExtendedBolusWithPumpId(
-                    timestamp = datetime,
-                    amount = param1 / 100.0,
-                    duration = T.mins(param2.toLong()).msecs(),
-                    isEmulatingTB = false,
-                    pumpId = datetime,
-                    pumpType = PumpType.DANA_RV2,
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
-                status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.DUALEXTENDEDSTOP  -> {
-                val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
-                    timestamp = datetime,
-                    endPumpId = datetime,
-                    pumpType = PumpType.DANA_RV2,
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
-                status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.SUSPENDON         -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
-                status = "SUSPENDON " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.SUSPENDOFF        -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
-                status = "SUSPENDOFF " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.REFILL            -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
-                status = "REFILL " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.PRIME             -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
-                status = "PRIME " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.PROFILECHANGE     -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
-                status = "PROFILECHANGE " + dateUtil.timeString(datetime)
-            }
-
-            DanaPump.CARBS             -> {
-                val newRecord = pumpSync.syncCarbsWithTimestamp(
-                    timestamp = datetime,
-                    amount = param1.toDouble(),
-                    pumpId = datetime,
-                    pumpType = PumpType.DANA_RV2,
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
-                status = "CARBS " + dateUtil.timeString(datetime)
-            }
-
-            else                                                       -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
-                status = "UNKNOWN " + dateUtil.timeString(datetime)
-            }
-        }
-        if (datetime > danaPump.lastEventTimeLoaded) danaPump.lastEventTimeLoaded = datetime
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.processinghistory) + ": " + status))
-    }
-}
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
index c393bdef2a7..392c5859a01 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
@@ -17,7 +17,7 @@
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.danaRv2.comm.MessageHashTableRv2;
 import info.nightscout.androidaps.danaRv2.comm.MsgCheckValue_v2;
-import info.nightscout.androidaps.danaRv2.comm.MsgHistoryEvents_v2;
+import info.nightscout.androidaps.danaRv2.comm.MsgHistoryEventsV2;
 import info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2;
 import info.nightscout.androidaps.danaRv2.comm.MsgSetHistoryEntry_v2;
 import info.nightscout.androidaps.danar.R;
@@ -56,13 +56,13 @@
 import info.nightscout.androidaps.events.EventProfileSwitchChanged;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.CommandQueue;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.Pump;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 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;
@@ -77,13 +77,13 @@
 public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     @Inject HasAndroidInjector injector;
     @Inject AAPSLogger aapsLogger;
-    @Inject RxBusWrapper rxBus;
-    @Inject ResourceHelper resourceHelper;
+    @Inject RxBus rxBus;
+    @Inject ResourceHelper rh;
     @Inject DanaPump danaPump;
     @Inject DanaRKoreanPlugin danaRKoreanPlugin;
     @Inject DanaRv2Plugin danaRv2Plugin;
     @Inject ActivePlugin activePlugin;
-    @Inject CommandQueueProvider commandQueue;
+    @Inject CommandQueue commandQueue;
     @Inject Context context;
     @Inject MessageHashTableRv2 messageHashTableRv2;
     @Inject ProfileFunction profileFunction;
@@ -143,7 +143,7 @@ public void connect() {
 
     public void getPumpStatus() {
         try {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumpstatus)));
             MsgStatus statusMsg = new MsgStatus(injector);
             MsgStatusBasic statusBasicMsg = new MsgStatusBasic(injector);
             MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(injector);
@@ -157,12 +157,12 @@ public void getPumpStatus() {
                 }
             }
 
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingbolusstatus)));
             mSerialIOThread.sendMessage(statusMsg);
             mSerialIOThread.sendMessage(statusBasicMsg);
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingtempbasalstatus)));
             mSerialIOThread.sendMessage(tempStatusMsg);
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingextendedbolusstatus)));
             mSerialIOThread.sendMessage(exStatusMsg);
 
             danaPump.setLastConnection(System.currentTimeMillis());
@@ -170,14 +170,14 @@ public void getPumpStatus() {
             Profile profile = profileFunction.getProfile();
             Pump pump = activePlugin.getActivePump();
             if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= pump.getPumpDescription().getBasalStep()) {
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileSwitchChanged());
                 }
             }
 
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumptime)));
             mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
             if (danaPump.getPumpTime() == 0) {
                 // initial handshake was not successful
@@ -193,7 +193,7 @@ public void getPumpStatus() {
                 if (Math.abs(timeDiff) > 60 * 60 * 1.5) {
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds - large difference");
                     //If time-diff is very large, warn user until we can synchronize history readings properly
-                    ErrorHelperActivity.Companion.runAlarm(context, resourceHelper.gs(R.string.largetimediff), resourceHelper.gs(R.string.largetimedifftitle), R.raw.error);
+                    ErrorHelperActivity.Companion.runAlarm(context, rh.gs(R.string.largetimediff), rh.gs(R.string.largetimedifftitle), R.raw.error);
 
                     //deinitialize pump
                     danaPump.reset();
@@ -212,7 +212,7 @@ public void getPumpStatus() {
 
             long now = System.currentTimeMillis();
             if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !pump.isInitialized()) {
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingShippingInfo(injector));
                 mSerialIOThread.sendMessage(new MsgSettingActiveProfile(injector));
                 mSerialIOThread.sendMessage(new MsgSettingMeal(injector));
@@ -234,9 +234,9 @@ public void getPumpStatus() {
             if (danaPump.getDailyTotalUnits() > danaPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
                 aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
-                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
+                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, rh.gs(R.string.approachingdailylimit), Notification.URGENT);
                     rxBus.send(new EventNewNotification(reportFail));
-                    pumpSync.insertAnnouncement(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits() + "U", null, PumpType.DANA_R_KOREAN, danaRKoreanPlugin.serialNumber());
+                    pumpSync.insertAnnouncement(rh.gs(R.string.approachingdailylimit) + ": " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits() + "U", null, PumpType.DANA_R_KOREAN, danaRKoreanPlugin.serialNumber());
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
@@ -248,11 +248,11 @@ public void getPumpStatus() {
     public boolean tempBasal(int percent, int durationInHours) {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStart(injector, percent, durationInHours));
         mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         loadEvents();
@@ -263,11 +263,11 @@ public boolean tempBasal(int percent, int durationInHours) {
     public boolean highTempBasal(int percent, int durationInMinutes) {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(injector, percent, durationInMinutes == 15, durationInMinutes == 30));
         mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         loadEvents();
@@ -283,11 +283,11 @@ public boolean tempBasalShortDuration(int percent, int durationInMinutes) {
 
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(injector, percent, durationInMinutes == 15, durationInMinutes == 30));
         mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         loadEvents();
@@ -297,7 +297,7 @@ public boolean tempBasalShortDuration(int percent, int durationInMinutes) {
 
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
         mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         loadEvents();
@@ -307,7 +307,7 @@ public boolean tempBasalStop() {
 
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.settingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(injector, insulin, (byte) (durationInHalfHours & 0xFF)));
         mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         loadEvents();
@@ -317,7 +317,7 @@ public boolean extendedBolus(double insulin, int durationInHalfHours) {
 
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.stoppingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(injector));
         mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         loadEvents();
@@ -329,7 +329,7 @@ public boolean bolus(final double amount, int carbs, long carbtime, final EventO
         if (!isConnected()) return false;
         if (BolusProgressDialog.Companion.getStopPressed()) return false;
 
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.startingbolus)));
         danaPump.setBolusingTreatment(t);
         danaPump.setBolusDone(false);
         final int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
@@ -344,7 +344,8 @@ public boolean bolus(final double amount, int carbs, long carbtime, final EventO
         if (carbs > 0) {
             MsgSetCarbsEntry msg = new MsgSetCarbsEntry(injector, carbtime, carbs);
             mSerialIOThread.sendMessage(msg);
-            MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, carbtime, carbs, 0);
+            MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector,
+                    DanaPump.HistoryEntry.CARBS.getValue(), carbtime, carbs, 0);
             mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
             danaPump.lastHistoryFetched = Math.min(danaPump.lastHistoryFetched, carbtime - T.Companion.mins(1).msecs());
         }
@@ -391,7 +392,7 @@ public boolean bolus(final double amount, int carbs, long carbtime, final EventO
         long expectedEnd = bolusStart + bolusDurationInMSec + 2000;
         while (System.currentTimeMillis() < expectedEnd) {
             long waitTime = expectedEnd - System.currentTimeMillis();
-            bolusingEvent.setStatus(String.format(resourceHelper.gs(R.string.waitingforestimatedbolusend), waitTime / 1000));
+            bolusingEvent.setStatus(String.format(rh.gs(R.string.waitingforestimatedbolusend), waitTime / 1000));
             rxBus.send(bolusingEvent);
             SystemClock.sleep(1000);
         }
@@ -400,10 +401,10 @@ public boolean bolus(final double amount, int carbs, long carbtime, final EventO
             @Override
             public void run() {
                 // load last bolus status
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
+                rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingbolusstatus)));
                 mSerialIOThread.sendMessage(new MsgStatus(injector));
                 bolusingEvent.setPercent(100);
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)));
+                rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.disconnecting)));
             }
         });
         return !start.failed;
@@ -413,7 +414,8 @@ public boolean carbsEntry(int amount, long time) {
         if (!isConnected()) return false;
         MsgSetCarbsEntry msg = new MsgSetCarbsEntry(injector, time, amount);
         mSerialIOThread.sendMessage(msg);
-        MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, time, amount, 0);
+        MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector,
+                DanaPump.HistoryEntry.CARBS.getValue(), time, amount, 0);
         mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
         danaPump.lastHistoryFetched = Math.min(danaPump.lastHistoryFetched, time - T.Companion.mins(1).msecs());
         return true;
@@ -430,7 +432,7 @@ public PumpEnactResult loadEvents() {
         if (!isConnected())
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(injector, danaPump.lastHistoryFetched);
+        MsgHistoryEventsV2 msg = new MsgHistoryEventsV2(injector, danaPump.lastHistoryFetched);
         aapsLogger.debug(LTag.PUMP, "Loading event history from: " + dateUtil.dateAndTimeString(danaPump.lastHistoryFetched));
 
         mSerialIOThread.sendMessage(msg);
@@ -448,7 +450,7 @@ public PumpEnactResult loadEvents() {
 
     public boolean updateBasalsInPump(final Profile profile) {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.updatingbasalrates)));
         Double[] basal = danaPump.buildDanaRProfileRecord(profile);
         MsgSetBasalProfile msgSet = new MsgSetBasalProfile(injector, (byte) 0, basal);
         mSerialIOThread.sendMessage(msgSet);
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 d7b97bf9a16..2ed03b933ce 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
@@ -16,7 +16,7 @@
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.extensions.PumpStateExtensionKt;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.CommandQueue;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.Constraints;
 import info.nightscout.androidaps.interfaces.Dana;
@@ -28,7 +28,7 @@
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
@@ -56,7 +56,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     protected PumpDescription pumpDescription = new PumpDescription();
     protected DanaPump danaPump;
     protected ConstraintChecker constraintChecker;
-    protected RxBusWrapper rxBus;
+    protected RxBus rxBus;
     protected ActivePlugin activePlugin;
     protected SP sp;
     protected DateUtil dateUtil;
@@ -66,12 +66,12 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     protected AbstractDanaRPlugin(
             HasAndroidInjector injector,
             DanaPump danaPump,
-            ResourceHelper resourceHelper,
+            ResourceHelper rh,
             ConstraintChecker constraintChecker,
             AAPSLogger aapsLogger,
             AapsSchedulers aapsSchedulers,
-            CommandQueueProvider commandQueue,
-            RxBusWrapper rxBus,
+            CommandQueue commandQueue,
+            RxBus rxBus,
             ActivePlugin activePlugin,
             SP sp,
             DateUtil dateUtil,
@@ -85,7 +85,7 @@ protected AbstractDanaRPlugin(
                         .shortName(R.string.danarpump_shortname)
                         .preferencesId(R.xml.pref_danar)
                         .description(R.string.description_pump_dana_r),
-                injector, aapsLogger, resourceHelper, commandQueue
+                injector, aapsLogger, rh, commandQueue
         );
         this.danaPump = danaPump;
         this.constraintChecker = constraintChecker;
@@ -108,7 +108,7 @@ protected AbstractDanaRPlugin(
                 .toObservable(EventPreferenceChange.class)
                 .observeOn(aapsSchedulers.getIo())
                 .subscribe(event -> {
-                    if (event.isChanged(getResourceHelper(), R.string.key_danar_bt_name)) {
+                    if (event.isChanged(getRh(), R.string.key_danar_bt_name)) {
                         danaPump.reset();
                         pumpSync.connectNewPump();
                         getCommandQueue().readStatus("DeviceChanged", null);
@@ -145,7 +145,7 @@ public PumpEnactResult setNewBasalProfile(@NonNull Profile profile) {
         }
         if (!isInitialized()) {
             getAapsLogger().error("setNewBasalProfile not initialized");
-            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, getResourceHelper().gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
+            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, getRh().gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
             rxBus.send(new EventNewNotification(notification));
             result.comment(R.string.pumpNotInitializedProfileNotSet);
             return result;
@@ -153,13 +153,13 @@ public PumpEnactResult setNewBasalProfile(@NonNull Profile profile) {
             rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
         }
         if (!sExecutionService.updateBasalsInPump(profile)) {
-            Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, getResourceHelper().gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, getRh().gs(R.string.failedupdatebasalprofile), Notification.URGENT);
             rxBus.send(new EventNewNotification(notification));
             result.comment(R.string.failedupdatebasalprofile);
         } else {
             rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
             rxBus.send(new EventDismissNotification(Notification.FAILED_UPDATE_PROFILE));
-            Notification notification = new Notification(Notification.PROFILE_SET_OK, getResourceHelper().gs(R.string.profile_set_ok), Notification.INFO, 60);
+            Notification notification = new Notification(Notification.PROFILE_SET_OK, getRh().gs(R.string.profile_set_ok), Notification.INFO, 60);
             rxBus.send(new EventNewNotification(notification));
             result.success(true).enacted(true).comment("OK");
         }
@@ -456,21 +456,21 @@ public PumpEnactResult loadHistory(byte type) {
 
     @NonNull @Override
     public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, @NonNull Profile profile) {
-        absoluteRate.setIfSmaller(getAapsLogger(), danaPump.getMaxBasal(), String.format(getResourceHelper().gs(R.string.limitingbasalratio), danaPump.getMaxBasal(), getResourceHelper().gs(R.string.pumplimit)), this);
+        absoluteRate.setIfSmaller(getAapsLogger(), danaPump.getMaxBasal(), String.format(getRh().gs(R.string.limitingbasalratio), danaPump.getMaxBasal(), getRh().gs(R.string.pumplimit)), this);
         return absoluteRate;
     }
 
     @NonNull @Override
     public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, @NonNull Profile profile) {
-        percentRate.setIfGreater(getAapsLogger(), 0, String.format(getResourceHelper().gs(R.string.limitingpercentrate), 0, getResourceHelper().gs(R.string.itmustbepositivevalue)), this);
-        percentRate.setIfSmaller(getAapsLogger(), getPumpDescription().getMaxTempPercent(), String.format(getResourceHelper().gs(R.string.limitingpercentrate), getPumpDescription().getMaxTempPercent(), getResourceHelper().gs(R.string.pumplimit)), this);
+        percentRate.setIfGreater(getAapsLogger(), 0, String.format(getRh().gs(R.string.limitingpercentrate), 0, getRh().gs(R.string.itmustbepositivevalue)), this);
+        percentRate.setIfSmaller(getAapsLogger(), getPumpDescription().getMaxTempPercent(), String.format(getRh().gs(R.string.limitingpercentrate), getPumpDescription().getMaxTempPercent(), getRh().gs(R.string.pumplimit)), this);
 
         return percentRate;
     }
 
     @NonNull @Override
     public Constraint<Double> applyBolusConstraints(Constraint<Double> insulin) {
-        insulin.setIfSmaller(getAapsLogger(), danaPump.getMaxBolus(), String.format(getResourceHelper().gs(R.string.limitingbolus), danaPump.getMaxBolus(), getResourceHelper().gs(R.string.pumplimit)), this);
+        insulin.setIfSmaller(getAapsLogger(), danaPump.getMaxBolus(), String.format(getRh().gs(R.string.limitingbolus), danaPump.getMaxBolus(), getRh().gs(R.string.pumplimit)), this);
         return insulin;
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
index 6a235aff4b6..9752ef36c71 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
@@ -19,14 +19,14 @@
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.CommandQueue;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
@@ -44,7 +44,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
 
     private final AAPSLogger aapsLogger;
     private final Context context;
-    private final ResourceHelper resourceHelper;
+    private final ResourceHelper rh;
     private final ConstraintChecker constraintChecker;
     private final FabricPrivacy fabricPrivacy;
 
@@ -53,22 +53,22 @@ public DanaRPlugin(
             HasAndroidInjector injector,
             AAPSLogger aapsLogger,
             AapsSchedulers aapsSchedulers,
-            RxBusWrapper rxBus,
+            RxBus rxBus,
             Context context,
-            ResourceHelper resourceHelper,
+            ResourceHelper rh,
             ConstraintChecker constraintChecker,
             ActivePlugin activePlugin,
             SP sp,
-            CommandQueueProvider commandQueue,
+            CommandQueue commandQueue,
             DanaPump danaPump,
             DateUtil dateUtil,
             FabricPrivacy fabricPrivacy,
             PumpSync pumpSync
     ) {
-        super(injector, danaPump, resourceHelper, constraintChecker, aapsLogger, aapsSchedulers, commandQueue, rxBus, activePlugin, sp, dateUtil, pumpSync);
+        super(injector, danaPump, rh, constraintChecker, aapsLogger, aapsSchedulers, commandQueue, rxBus, activePlugin, sp, dateUtil, pumpSync);
         this.aapsLogger = aapsLogger;
         this.context = context;
-        this.resourceHelper = resourceHelper;
+        this.rh = rh;
         this.constraintChecker = constraintChecker;
         this.fabricPrivacy = fabricPrivacy;
 
@@ -128,7 +128,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
     @NonNull
     @Override
     public String getName() {
-        return resourceHelper.gs(R.string.danarpump);
+        return rh.gs(R.string.danarpump);
     }
 
     @Override
@@ -170,7 +170,7 @@ public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
                     .bolusDelivered(t.insulin)
                     .carbsDelivered(detailedBolusInfo.carbs);
             if (!result.getSuccess())
-                result.comment(resourceHelper.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaPump.getBolusStartErrorCode()));
+                result.comment(rh.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaPump.getBolusStartErrorCode()));
             else
                 result.comment(R.string.ok);
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.getBolusDelivered());
@@ -209,11 +209,23 @@ public PumpEnactResult setTempBasalAbsolute(double absoluteRate, int durationInM
 
         absoluteRate = constraintChecker.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
 
-        final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d && absoluteRate >= 0.10d;
+        boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d && absoluteRate >= 0.10d;
         final boolean doLowTemp = absoluteRate < getBaseBasalRate() || absoluteRate < 0.10d;
         final boolean doHighTemp = absoluteRate > getBaseBasalRate() && !useExtendedBoluses;
         final boolean doExtendedTemp = absoluteRate > getBaseBasalRate() && useExtendedBoluses;
 
+        int percentRate = Double.valueOf(absoluteRate / getBaseBasalRate() * 100).intValue();
+        // Any basal less than 0.10u/h will be dumped once per hour, not every 4 minutes. So if it's less than .10u/h, set a zero temp.
+        if (absoluteRate < 0.10d) percentRate = 0;
+        if (percentRate < 100) percentRate = Round.ceilTo((double) percentRate, 10d).intValue();
+        else percentRate = Round.floorTo((double) percentRate, 10d).intValue();
+        if (percentRate > getPumpDescription().getMaxTempPercent()) {
+            percentRate = getPumpDescription().getMaxTempPercent();
+        }
+        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Calculated percent rate: " + percentRate);
+
+        if (percentRate == 100) doTempOff = true;
+
         if (doTempOff) {
             // If extended in progress
             if (danaPump.isExtendedInProgress() && useExtendedBoluses) {
@@ -231,16 +243,6 @@ public PumpEnactResult setTempBasalAbsolute(double absoluteRate, int durationInM
         }
 
         if (doLowTemp || doHighTemp) {
-            int percentRate = Double.valueOf(absoluteRate / getBaseBasalRate() * 100).intValue();
-            // Any basal less than 0.10u/h will be dumped once per hour, not every 4 minutes. So if it's less than .10u/h, set a zero temp.
-            if (absoluteRate < 0.10d) percentRate = 0;
-            if (percentRate < 100) percentRate = Round.ceilTo((double) percentRate, 10d).intValue();
-            else percentRate = Round.floorTo((double) percentRate, 10d).intValue();
-            if (percentRate > getPumpDescription().getMaxTempPercent()) {
-                percentRate = getPumpDescription().getMaxTempPercent();
-            }
-            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Calculated percent rate: " + percentRate);
-
             // If extended in progress
             if (danaPump.isExtendedInProgress() && useExtendedBoluses) {
                 aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping extended bolus (doLowTemp || doHighTemp)");
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
index f79d4d083e6..d75663f0882 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
@@ -19,12 +19,12 @@
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.danar.DanaRPlugin;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.CommandQueue;
 import info.nightscout.androidaps.interfaces.ConfigBuilder;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage;
@@ -45,11 +45,11 @@ public class MessageBase {
     @Inject public DanaRPlugin danaRPlugin;
     @Inject public DanaRKoreanPlugin danaRKoreanPlugin;
     @Inject public DanaRv2Plugin danaRv2Plugin;
-    @Inject public RxBusWrapper rxBus;
-    @Inject public ResourceHelper resourceHelper;
+    @Inject public RxBus rxBus;
+    @Inject public ResourceHelper rh;
     @Inject public ActivePlugin activePlugin;
     @Inject public ConfigBuilder configBuilder;
-    @Inject public CommandQueueProvider commandQueue;
+    @Inject public CommandQueue commandQueue;
     @Inject public DetailedBolusInfoStorage detailedBolusInfoStorage;
     @Inject public TemporaryBasalStorage temporaryBasalStorage;
     @Inject public ConstraintChecker constraintChecker;
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
index 2cceeb10f14..b59d96575fa 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
@@ -20,7 +20,7 @@ class MsgBolusProgress(
         danaPump.bolusProgressLastTimeStamp = System.currentTimeMillis()
         danaPump.bolusingTreatment?.insulin = deliveredInsulin
         val bolusingEvent = EventOverviewBolusProgress
-        bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, deliveredInsulin)
+        bolusingEvent.status = rh.gs(R.string.bolusdelivering, deliveredInsulin)
         bolusingEvent.t = danaPump.bolusingTreatment
         bolusingEvent.percent = min((deliveredInsulin / danaPump.bolusAmountToBeDelivered * 100).toInt(), 100)
         aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin so far: $deliveredInsulin")
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
index a531d1cc03a..15c0bbec89e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
@@ -20,10 +20,10 @@ class MsgBolusStop(
         danaPump.bolusStopped = true
         if (!danaPump.bolusStopForced) {
             danaPump.bolusingTreatment?.insulin = danaPump.bolusAmountToBeDelivered
-            bolusingEvent.status = resourceHelper.gs(R.string.overview_bolusprogress_delivered)
+            bolusingEvent.status = rh.gs(R.string.overview_bolusprogress_delivered)
             bolusingEvent.percent = 100
         } else {
-            bolusingEvent.status = resourceHelper.gs(R.string.overview_bolusprogress_stoped)
+            bolusingEvent.status = rh.gs(R.string.overview_bolusprogress_stoped)
         }
         rxBus.send(bolusingEvent)
     }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
index af635686a07..9429ff6dc93 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
@@ -18,11 +18,11 @@ class MsgError(
         val errorCode = intFromBuff(bytes, 0, 1)
         var errorString = ""
         when (errorCode) {
-            1, 2, 3 -> errorString = resourceHelper.gs(R.string.pumperror) + " " + errorCode
-            4       -> errorString = resourceHelper.gs(R.string.pumpshutdown)
-            5       -> errorString = resourceHelper.gs(R.string.occlusion)
-            7       -> errorString = resourceHelper.gs(R.string.lowbattery)
-            8       -> errorString = resourceHelper.gs(R.string.batterydischarged)
+            1, 2, 3 -> errorString = rh.gs(R.string.pumperror) + " " + errorCode
+            4       -> errorString = rh.gs(R.string.pumpshutdown)
+            5       -> errorString = rh.gs(R.string.occlusion)
+            7       -> errorString = rh.gs(R.string.lowbattery)
+            8       -> errorString = rh.gs(R.string.batterydischarged)
         }
         if (errorCode < 8) { // bolus delivering stopped
             val bolusingEvent = EventOverviewBolusProgress
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
index f866533d08e..30ede703142 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
@@ -31,7 +31,7 @@ class MsgInitConnStatusBolus(
         aapsLogger.debug(LTag.PUMPCOMM, "Bolus increment: " + danaPump.bolusStep)
         aapsLogger.debug(LTag.PUMPCOMM, "Bolus max: " + danaPump.maxBolus)
         if (!danaPump.isExtendedBolusEnabled) {
-            val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, resourceHelper.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
+            val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, rh.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.EXTENDED_BOLUS_DISABLED))
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
index 3fa4ef120c9..62cd8368af4 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
@@ -34,7 +34,7 @@ class MsgInitConnStatusOption(
             failed = true
         }
         if (!danaPump.isPasswordOK) {
-            val notification = Notification(Notification.WRONG_PUMP_PASSWORD, resourceHelper.gs(R.string.wrongpumppassword), Notification.URGENT)
+            val notification = Notification(Notification.WRONG_PUMP_PASSWORD, rh.gs(R.string.wrongpumppassword), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.WRONG_PUMP_PASSWORD))
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
index 8afdbfa611f..6d1f38ac8ff 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
@@ -19,7 +19,7 @@ class MsgInitConnStatusTime(
 
     override fun handleMessage(bytes: ByteArray) {
         if (bytes.size - 10 > 7) {
-            val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
+            val notification = Notification(Notification.WRONG_DRIVER, rh.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
             danaRPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected. Switching to Korean DanaR")
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
index b72acacffe6..ea0b72134f7 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
@@ -27,12 +27,12 @@ class MsgSetBasalProfile(
         if (result != 1) {
             failed = true
             aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile result: $result FAILED!!!")
-            val reportFail = Notification(Notification.PROFILE_SET_FAILED, resourceHelper.gs(R.string.profile_set_failed), Notification.URGENT)
+            val reportFail = Notification(Notification.PROFILE_SET_FAILED, rh.gs(R.string.profile_set_failed), Notification.URGENT)
             rxBus.send(EventNewNotification(reportFail))
         } else {
             failed = false
             aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile result: $result")
-            val reportOK = Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60)
+            val reportOK = Notification(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, 60)
             rxBus.send(EventNewNotification(reportOK))
         }
     }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
index fe183a648e4..16baca550cb 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
@@ -25,12 +25,12 @@ class MsgSetSingleBasalProfile(
         if (result != 1) {
             failed = true
             aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile result: $result FAILED!!!")
-            val reportFail = Notification(Notification.PROFILE_SET_FAILED, resourceHelper.gs(R.string.profile_set_failed), Notification.URGENT)
+            val reportFail = Notification(Notification.PROFILE_SET_FAILED, rh.gs(R.string.profile_set_failed), Notification.URGENT)
             rxBus.send(EventNewNotification(reportFail))
         } else {
             failed = false
             aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile result: $result")
-            val reportOK = Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60)
+            val reportOK = Notification(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, 60)
             rxBus.send(EventNewNotification(reportOK))
         }
     }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
index 142e3d85d08..2c0e8c2d51b 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
@@ -9,20 +9,20 @@ class MsgSetUserOptions(
 
     init {
         SetCommand(0x330B)
-        if (danaPump.userOptionsFrompump == null) {
+        if (danaPump.userOptionsFromPump == null) {
             // No options set -> Exiting
             aapsLogger.debug(LTag.PUMPCOMM, "NO USER OPTIONS LOADED EXITING!")
         } else {
-            danaPump.userOptionsFrompump!![0] = if( danaPump.timeDisplayType24) 0.toByte() else 1.toByte()
-            danaPump.userOptionsFrompump!![1] = if (danaPump.buttonScrollOnOff) 1.toByte() else 0.toByte()
-            danaPump.userOptionsFrompump!![2] = danaPump.beepAndAlarm.toByte()
-            danaPump.userOptionsFrompump!![3] = danaPump.lcdOnTimeSec.toByte()
-            danaPump.userOptionsFrompump!![4] = danaPump.backlightOnTimeSec.toByte()
-            danaPump.userOptionsFrompump!![5] = danaPump.selectedLanguage.toByte()
-            danaPump.userOptionsFrompump!![8] = danaPump.units.toByte()
-            danaPump.userOptionsFrompump!![9] = danaPump.shutdownHour.toByte()
-            danaPump.userOptionsFrompump!![27] = danaPump.lowReservoirRate.toByte()
-            for (element in danaPump.userOptionsFrompump!!) {
+            danaPump.userOptionsFromPump!![0] = if( danaPump.timeDisplayType24) 0.toByte() else 1.toByte()
+            danaPump.userOptionsFromPump!![1] = if (danaPump.buttonScrollOnOff) 1.toByte() else 0.toByte()
+            danaPump.userOptionsFromPump!![2] = danaPump.beepAndAlarm.toByte()
+            danaPump.userOptionsFromPump!![3] = danaPump.lcdOnTimeSec.toByte()
+            danaPump.userOptionsFromPump!![4] = danaPump.backlightOnTimeSec.toByte()
+            danaPump.userOptionsFromPump!![5] = danaPump.selectedLanguage.toByte()
+            danaPump.userOptionsFromPump!![8] = danaPump.units.toByte()
+            danaPump.userOptionsFromPump!![9] = danaPump.shutdownHour.toByte()
+            danaPump.userOptionsFromPump!![27] = danaPump.lowReservoirRate.toByte()
+            for (element in danaPump.userOptionsFromPump!!) {
                 AddParamByte(element)
             }
             aapsLogger.debug(LTag.PUMPCOMM, "New message")
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
index 4b9d3914532..10da26bab5c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
@@ -31,17 +31,17 @@ class MsgSettingMeal(
         aapsLogger.debug(LTag.PUMPCOMM, "Block time: $blockTime")
         aapsLogger.debug(LTag.PUMPCOMM, "Is Config U/d: " + danaPump.isConfigUD)
         // DanaRKorean is not possible to set to 0.01 but it works when controlled from AAPS
-        if (danaRKoreanPlugin.isEnabled(PluginType.PUMP)) {
+        if (danaRKoreanPlugin.isEnabled()) {
             danaPump.basalStep = 0.01
         }
         if (danaPump.basalStep != 0.01) {
-            val notification = Notification(Notification.WRONG_BASAL_STEP, resourceHelper.gs(R.string.danar_setbasalstep001), Notification.URGENT)
+            val notification = Notification(Notification.WRONG_BASAL_STEP, rh.gs(R.string.danar_setbasalstep001), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.WRONG_BASAL_STEP))
         }
         if (danaPump.isConfigUD) {
-            val notification = Notification(Notification.UD_MODE_ENABLED, resourceHelper.gs(R.string.danar_switchtouhmode), Notification.URGENT)
+            val notification = Notification(Notification.UD_MODE_ENABLED, rh.gs(R.string.danar_switchtouhmode), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.UD_MODE_ENABLED))
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
index 9f15346bb39..091cba7802a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
@@ -15,7 +15,7 @@ class MsgSettingUserOptions(
 
     override fun handleMessage(packet: ByteArray) {
         val bytes = getDataBytes(packet, packet.size - 10)
-        danaPump.userOptionsFrompump = bytes.copyOf(bytes.size) // saving pumpDataBytes to use it in MsgSetUserOptions
+        danaPump.userOptionsFromPump = bytes.copyOf(bytes.size) // saving pumpDataBytes to use it in MsgSetUserOptions
         for (pos in bytes.indices) {
             aapsLogger.debug(LTag.PUMPCOMM, "[" + pos + "]" + bytes[pos])
         }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt
index 6c157f6efb4..c7f99b705d8 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt
@@ -4,7 +4,7 @@ import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.danaRKorean.comm.*
 import info.nightscout.androidaps.danaRv2.comm.MsgCheckValue_v2
-import info.nightscout.androidaps.danaRv2.comm.MsgHistoryEvents_v2
+import info.nightscout.androidaps.danaRv2.comm.MsgHistoryEventsV2
 import info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2
 import info.nightscout.androidaps.danaRv2.comm.MsgSetHistoryEntry_v2
 import info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2
@@ -69,7 +69,7 @@ abstract class DanaRCommModule {
     @ContributesAndroidInjector abstract fun contributesMsgHistoryNew(): MsgHistoryNew
 
     @ContributesAndroidInjector abstract fun contributesMsgCheckValue_v2(): MsgCheckValue_v2
-    @ContributesAndroidInjector abstract fun contributesMsgHistoryEvents_v2(): MsgHistoryEvents_v2
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryEventsV2(): MsgHistoryEventsV2
     @ContributesAndroidInjector abstract fun contributesMsgSetAPSTempBasalStart_v2(): MsgSetAPSTempBasalStart_v2
     @ContributesAndroidInjector abstract fun contributesMsgSetHistoryEntry_v2(): MsgSetHistoryEntry_v2
     @ContributesAndroidInjector abstract fun contributesMsgStatusAPS_v2(): MsgStatusAPS_v2
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
index 4778cc0d010..49d5e030e4b 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
@@ -42,7 +42,7 @@
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 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;
@@ -61,10 +61,10 @@
 public abstract class AbstractDanaRExecutionService extends DaggerService {
     @Inject protected HasAndroidInjector injector;
     @Inject AAPSLogger aapsLogger;
-    @Inject RxBusWrapper rxBus;
+    @Inject RxBus rxBus;
     @Inject SP sp;
     @Inject Context context;
-    @Inject ResourceHelper resourceHelper;
+    @Inject ResourceHelper rh;
     @Inject DanaPump danaPump;
     @Inject FabricPrivacy fabricPrivacy;
     @Inject DateUtil dateUtil;
@@ -207,10 +207,10 @@ protected void getBTSocketForSelectedPump() {
                 }
             }
         } else {
-            ToastUtils.showToastInUiThread(context.getApplicationContext(), resourceHelper.gs(R.string.nobtadapter));
+            ToastUtils.showToastInUiThread(context.getApplicationContext(), rh.gs(R.string.nobtadapter));
         }
         if (mBTDevice == null) {
-            ToastUtils.showToastInUiThread(context.getApplicationContext(), resourceHelper.gs(R.string.devicenotfound));
+            ToastUtils.showToastInUiThread(context.getApplicationContext(), rh.gs(R.string.devicenotfound));
         }
     }
 
@@ -281,7 +281,7 @@ protected void waitForWholeMinute() {
             long timeToWholeMinute = (60000 - time % 60000);
             if (timeToWholeMinute > 59800 || timeToWholeMinute < 3000)
                 break;
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.waitingfortimesynchronization, (int) (timeToWholeMinute / 1000))));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.waitingfortimesynchronization, (int) (timeToWholeMinute / 1000))));
             SystemClock.sleep(Math.min(timeToWholeMinute, 100));
         }
     }
@@ -295,7 +295,7 @@ protected void doSanityCheck() {
                 if (pumpState.getTemporaryBasal().getRate() != danaPump.getTempBasalPercent()
                         || Math.abs(pumpState.getTemporaryBasal().getTimestamp() - danaPump.getTempBasalStart()) > 10000
                 ) { // Close current temp basal
-                    Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, resourceHelper.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
+                    Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, rh.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
                     rxBus.send(new EventNewNotification(notification));
                     aapsLogger.error(LTag.PUMP, "Different temporary basal found running AAPS: " + (pumpState.getTemporaryBasal() + " DanaPump " + danaPump.temporaryBasalToString()));
                     pumpSync.syncTemporaryBasalWithPumpId(
@@ -315,7 +315,7 @@ protected void doSanityCheck() {
                         activePlugin.getActivePump().model(),
                         activePlugin.getActivePump().serialNumber()
                 );
-                Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, resourceHelper.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
+                Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, rh.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
                 rxBus.send(new EventNewNotification(notification));
                 aapsLogger.error(LTag.PUMP, "Temporary basal should not be running. Sending stop to AAPS");
             }
@@ -330,7 +330,7 @@ protected void doSanityCheck() {
                         activePlugin.getActivePump().model(),
                         activePlugin.getActivePump().serialNumber()
                 );
-                Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, resourceHelper.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
+                Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, rh.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
                 rxBus.send(new EventNewNotification(notification));
                 aapsLogger.error(LTag.PUMP, "Temporary basal should be running: DanaPump " + danaPump.temporaryBasalToString());
             }
@@ -341,7 +341,7 @@ protected void doSanityCheck() {
                 if (pumpState.getExtendedBolus().getRate() != danaPump.getExtendedBolusAbsoluteRate()
                         || Math.abs(pumpState.getExtendedBolus().getTimestamp() - danaPump.getExtendedBolusStart()) > 10000
                 ) { // Close current extended
-                    Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, resourceHelper.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
+                    Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, rh.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
                     rxBus.send(new EventNewNotification(notification));
                     aapsLogger.error(LTag.PUMP, "Different extended bolus found running AAPS: " + (pumpState.getExtendedBolus() + " DanaPump " + danaPump.extendedBolusToString()));
                     pumpSync.syncExtendedBolusWithPumpId(
@@ -361,13 +361,13 @@ protected void doSanityCheck() {
                         activePlugin.getActivePump().model(),
                         activePlugin.getActivePump().serialNumber()
                 );
-                Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, resourceHelper.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
+                Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, rh.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
                 rxBus.send(new EventNewNotification(notification));
                 aapsLogger.error(LTag.PUMP, "Extended bolus should not be running. Sending stop to AAPS");
             }
         } else {
             if (danaPump.isExtendedInProgress()) { // Create new
-                Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, resourceHelper.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
+                Notification notification = new Notification(Notification.UNSUPPORTED_ACTION_IN_PUMP, rh.gs(R.string.unsupported_action_in_pump), Notification.URGENT);
                 rxBus.send(new EventNewNotification(notification));
                 aapsLogger.error(LTag.PUMP, "Extended bolus should not be running:  DanaPump " + danaPump.extendedBolusToString());
                 pumpSync.syncExtendedBolusWithPumpId(
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
index 0f4eb0f0e88..e88e137eeec 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
@@ -49,12 +49,12 @@
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventProfileSwitchChanged;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.CommandQueue;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 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;
@@ -66,12 +66,12 @@
 
 public class DanaRExecutionService extends AbstractDanaRExecutionService {
     @Inject AAPSLogger aapsLogger;
-    @Inject RxBusWrapper rxBus;
-    @Inject ResourceHelper resourceHelper;
+    @Inject RxBus rxBus;
+    @Inject ResourceHelper rh;
     @Inject DanaPump danaPump;
     @Inject DanaRPlugin danaRPlugin;
     @Inject DanaRKoreanPlugin danaRKoreanPlugin;
-    @Inject CommandQueueProvider commandQueue;
+    @Inject CommandQueue commandQueue;
     @Inject MessageHashTableR messageHashTableR;
     @Inject ProfileFunction profileFunction;
     @Inject PumpSync pumpSync;
@@ -130,7 +130,7 @@ public void connect() {
 
     public void getPumpStatus() {
         try {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumpstatus)));
             MsgStatus statusMsg = new MsgStatus(injector);
             MsgStatusBasic statusBasicMsg = new MsgStatusBasic(injector);
             MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(injector);
@@ -146,18 +146,18 @@ public void getPumpStatus() {
 
             mSerialIOThread.sendMessage(statusMsg);
             mSerialIOThread.sendMessage(statusBasicMsg);
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingtempbasalstatus)));
             mSerialIOThread.sendMessage(tempStatusMsg);
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingextendedbolusstatus)));
             mSerialIOThread.sendMessage(exStatusMsg);
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingbolusstatus)));
 
             long now = System.currentTimeMillis();
             danaPump.setLastConnection(now);
 
             Profile profile = profileFunction.getProfile();
             if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= danaRPlugin.getPumpDescription().getBasalStep()) {
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 if (!danaRPlugin.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileSwitchChanged());
@@ -165,7 +165,7 @@ public void getPumpStatus() {
             }
 
             if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRPlugin.isInitialized()) {
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
+                rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingShippingInfo(injector));
                 mSerialIOThread.sendMessage(new MsgSettingActiveProfile(injector));
                 mSerialIOThread.sendMessage(new MsgSettingMeal(injector));
@@ -177,7 +177,7 @@ public void getPumpStatus() {
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatios(injector));
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(injector));
                 mSerialIOThread.sendMessage(new MsgSettingUserOptions(injector));
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
+                rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.gettingpumptime)));
                 mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                 if (danaPump.getPumpTime() == 0) {
                     // initial handshake was not successful
@@ -203,9 +203,9 @@ public void getPumpStatus() {
             if (danaPump.getDailyTotalUnits() > danaPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
                 aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
-                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
+                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, rh.gs(R.string.approachingdailylimit), Notification.URGENT);
                     rxBus.send(new EventNewNotification(reportFail));
-                    pumpSync.insertAnnouncement(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits() + "U", null, PumpType.DANA_R_KOREAN, danaRKoreanPlugin.serialNumber());
+                    pumpSync.insertAnnouncement(rh.gs(R.string.approachingdailylimit) + ": " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits() + "U", null, PumpType.DANA_R_KOREAN, danaRKoreanPlugin.serialNumber());
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
@@ -219,11 +219,11 @@ public void getPumpStatus() {
     public boolean tempBasal(int percent, int durationInHours) {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+            rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStart(injector, percent, durationInHours));
         mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
@@ -232,7 +232,7 @@ public boolean tempBasal(int percent, int durationInHours) {
 
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
         mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
@@ -241,7 +241,7 @@ public boolean tempBasalStop() {
 
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.settingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(injector, insulin, (byte) (durationInHalfHours & 0xFF)));
         mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
@@ -250,7 +250,7 @@ public boolean extendedBolus(double insulin, int durationInHalfHours) {
 
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.stoppingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(injector));
         mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
@@ -328,7 +328,7 @@ public boolean bolus(double amount, int carbs, long carbTimeStamp, final EventOv
 
                 while (System.currentTimeMillis() < expectedEnd) {
                     long waitTime = expectedEnd - System.currentTimeMillis();
-                    bolusingEvent.setStatus(String.format(resourceHelper.gs(R.string.waitingforestimatedbolusend), waitTime / 1000));
+                    bolusingEvent.setStatus(String.format(rh.gs(R.string.waitingforestimatedbolusend), waitTime / 1000));
                     rxBus.send(bolusingEvent);
                     SystemClock.sleep(1000);
                 }
@@ -381,7 +381,7 @@ public boolean tempBasalShortDuration(int percent, int durationInMinutes) {
 
     public boolean updateBasalsInPump(final Profile profile) {
         if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
+        rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.updatingbasalrates)));
         Double[] basal = danaPump.buildDanaRProfileRecord(profile);
         MsgSetBasalProfile msgSet = new MsgSetBasalProfile(injector, (byte) 0, basal);
         mSerialIOThread.sendMessage(msgSet);
diff --git a/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index bd213d3c8e7..edc280d55eb 100644
--- a/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.ProfileStore
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -22,14 +22,14 @@ import org.mockito.Mock
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
     @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var config: Config
 
-    val rxBus = RxBusWrapper(aapsSchedulers)
+    val rxBus = RxBus(aapsSchedulers, aapsLogger)
 
     val profileInjector = HasAndroidInjector {
         AndroidInjector {
@@ -42,7 +42,9 @@ open class TestBaseWithProfile : TestBase() {
 
     @Before
     fun prepareMock() {
-        validProfileJSON = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+        validProfileJSON = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"3\"}," +
+            "{\"time\":\"2:00\",\"value\":\"3.4\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4.5\"}]," +
+            "\"target_high\":[{\"time\":\"00:00\",\"value\":\"7\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
         validProfile = ProfileSealed.Pure(pureProfileFromJson(JSONObject(validProfileJSON), dateUtil)!!)
     }
 
@@ -54,4 +56,4 @@ open class TestBaseWithProfile : TestBase() {
         json.put("store", store)
         return ProfileStore(profileInjector, json, dateUtil)
     }
-}
\ No newline at end of file
+}
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
index 395716449f3..99960a997ec 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.PumpSync
@@ -25,7 +25,7 @@ class DanaRPluginTest : TestBaseWithProfile() {
     @Mock lateinit var context: Context
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var sp: SP
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var pumpSync: PumpSync
 
     lateinit var danaPump: DanaPump
@@ -39,11 +39,11 @@ class DanaRPluginTest : TestBaseWithProfile() {
     @Before
     fun prepareMocks() {
         `when`(sp.getString(R.string.key_danars_address, "")).thenReturn("")
-        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
-        `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
-        `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
+        `when`(rh.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(rh.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
+        `when`(rh.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
         danaPump = DanaPump(aapsLogger, sp, dateUtil, injector)
-        danaRPlugin = DanaRPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, pumpSync)
+        danaRPlugin = DanaRPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, activePluginProvider, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, pumpSync)
     }
 
     @Test @Throws(Exception::class)
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
index e2847894bbc..90e9ca90405 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
@@ -11,11 +11,11 @@ import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.ConfigBuilder
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.utils.DateUtil
@@ -37,9 +37,9 @@ open class DanaRTestBase : TestBase() {
     @Mock lateinit var danaRPlugin: DanaRPlugin
     @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
     @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var configBuilder: ConfigBuilder
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var pumpSync: PumpSync
@@ -54,7 +54,7 @@ open class DanaRTestBase : TestBase() {
         `when`(activePlugin.activePump).thenReturn(testPumpPlugin)
         doNothing().`when`(danaRKoreanPlugin).setPluginEnabled(anyObject(), anyBoolean())
         doNothing().`when`(danaRPlugin).setPluginEnabled(anyObject(), anyBoolean())
-        `when`(resourceHelper.gs(ArgumentMatchers.anyInt())).thenReturn("")
+        `when`(rh.gs(ArgumentMatchers.anyInt())).thenReturn("")
     }
 
     val injector = HasAndroidInjector {
@@ -66,8 +66,8 @@ open class DanaRTestBase : TestBase() {
                 it.danaRPlugin = danaRPlugin
                 it.danaRKoreanPlugin = danaRKoreanPlugin
                 it.danaRv2Plugin = danaRv2Plugin
-                it.rxBus = RxBusWrapper(aapsSchedulers)
-                it.resourceHelper = resourceHelper
+                it.rxBus = RxBus(aapsSchedulers, aapsLogger)
+                it.rh = rh
                 it.activePlugin = activePlugin
                 it.configBuilder = configBuilder
                 it.detailedBolusInfoStorage = detailedBolusInfoStorage
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
index 02c197f6258..71d5020152e 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
@@ -11,7 +11,7 @@ import org.mockito.Mockito.`when`
 class MsgBolusProgressTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.bolusdelivering), ArgumentMatchers.anyDouble())).thenReturn("Delivering %1\$.2fU")
+        `when`(rh.gs(ArgumentMatchers.eq(R.string.bolusdelivering), ArgumentMatchers.anyDouble())).thenReturn("Delivering %1\$.2fU")
         danaPump.bolusingTreatment = EventOverviewBolusProgress.Treatment(0.0, 0, true)
         danaPump.bolusAmountToBeDelivered = 3.0
         val packet = MsgBolusProgress(injector)
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
index 76390f74048..fa8bdfeb8d3 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
@@ -10,7 +10,7 @@ import org.mockito.Mockito.`when`
 class MsgBolusStopTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        `when`(resourceHelper.gs(R.string.overview_bolusprogress_delivered)).thenReturn("Delivered")
+        `when`(rh.gs(R.string.overview_bolusprogress_delivered)).thenReturn("Delivered")
         danaPump.bolusingTreatment = EventOverviewBolusProgress.Treatment(0.0, 0, true)
         val packet = MsgBolusStop(injector)
 
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
index b1188543945..f0860cbf9b4 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.PumpSync
@@ -25,7 +25,7 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
     @Mock lateinit var context: Context
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var sp: SP
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var pumpSync: PumpSync
 
     lateinit var danaPump: DanaPump
@@ -39,11 +39,11 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
     @Before
     fun prepareMocks() {
         `when`(sp.getString(R.string.key_danars_address, "")).thenReturn("")
-        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
-        `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
-        `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
+        `when`(rh.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(rh.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
+        `when`(rh.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
         danaPump = DanaPump(aapsLogger, sp, dateUtil, injector)
-        danaRPlugin = DanaRKoreanPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, pumpSync)
+        danaRPlugin = DanaRKoreanPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, activePluginProvider, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, pumpSync)
     }
 
     @Test @Throws(Exception::class)
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
index 674b82943df..c97919e5ec4 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.PumpSync
@@ -26,7 +26,7 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
     @Mock lateinit var context: Context
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var sp: SP
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var temporaryBasalStorage: TemporaryBasalStorage
     @Mock lateinit var pumpSync: PumpSync
@@ -42,11 +42,11 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
     @Before
     fun prepareMocks() {
         `when`(sp.getString(R.string.key_danars_address, "")).thenReturn("")
-        `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
-        `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
-        `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
+        `when`(rh.gs(R.string.pumplimit)).thenReturn("pump limit")
+        `when`(rh.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
+        `when`(rh.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
         danaPump = DanaPump(aapsLogger, sp, dateUtil, injector)
-        danaRv2Plugin = DanaRv2Plugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, danaPump,detailedBolusInfoStorage, temporaryBasalStorage, dateUtil, fabricPrivacy, pumpSync)
+        danaRv2Plugin = DanaRv2Plugin(injector, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, activePluginProvider, sp, commandQueue, danaPump,detailedBolusInfoStorage, temporaryBasalStorage, dateUtil, fabricPrivacy, pumpSync)
     }
 
     @Test
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt
index 90f0def7dfd..82655d092b1 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
-import info.nightscout.androidaps.danaRv2.comm.MsgHistoryEvents_v2
+import info.nightscout.androidaps.danaRv2.comm.MsgHistoryEventsV2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
@@ -8,7 +8,7 @@ import org.junit.Test
 class MsgHistoryEventsRv2Test : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryEvents_v2(injector, 0)
+        val packet = MsgHistoryEventsV2(injector, 0)
 
         // test message decoding
         val array = createArray(100, 2)
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 896f456d68a..0cc5babb4b2 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.common.ManufacturerType
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
@@ -51,13 +51,13 @@ class DanaRSPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     private val aapsSchedulers: AapsSchedulers,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val context: Context,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val constraintChecker: ConstraintChecker,
     private val profileFunction: ProfileFunction,
     private val sp: SP,
-    commandQueue: CommandQueueProvider,
+    commandQueue: CommandQueue,
     private val danaPump: DanaPump,
     private val pumpSync: PumpSync,
     private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
@@ -74,22 +74,23 @@ class DanaRSPlugin @Inject constructor(
         .shortName(R.string.danarspump_shortname)
         .preferencesId(R.xml.pref_danars)
         .description(R.string.description_pump_dana_rs),
-    injector, aapsLogger, resourceHelper, commandQueue
+    injector, aapsLogger, rh, commandQueue
 ), Pump, Dana, Constraints {
 
     private val disposable = CompositeDisposable()
     private var danaRSService: DanaRSService? = null
     private var mDeviceAddress = ""
     var mDeviceName = ""
-    override val pumpDescription = PumpDescription(PumpType.DANA_RS)
+    override val pumpDescription
+        get() = PumpDescription(danaPump.pumpType())
 
     override fun updatePreferenceSummary(pref: Preference) {
         super.updatePreferenceSummary(pref)
 
-        if (pref.key == resourceHelper.gs(R.string.key_danars_name)) {
+        if (pref.key == rh.gs(R.string.key_danars_name)) {
             val value = sp.getStringOrNull(R.string.key_danars_name, null)
             pref.summary = value
-                ?: resourceHelper.gs(R.string.not_set_short)
+                ?: rh.gs(R.string.not_set_short)
         }
     }
 
@@ -145,7 +146,7 @@ class DanaRSPlugin @Inject constructor(
         aapsLogger.debug(LTag.PUMP, "RS connect from: $reason")
         if (danaRSService != null && mDeviceAddress != "" && mDeviceName != "") {
             val success = danaRSService?.connect(reason, mDeviceAddress) ?: false
-            if (!success) ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.ble_not_supported_or_not_paired))
+            if (!success) ToastUtils.showToastInUiThread(context, rh.gs(R.string.ble_not_supported_or_not_paired))
         }
     }
 
@@ -183,18 +184,18 @@ class DanaRSPlugin @Inject constructor(
 
     // Constraints interface
     override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
-        absoluteRate.setIfSmaller(aapsLogger, danaPump.maxBasal, resourceHelper.gs(R.string.limitingbasalratio, danaPump.maxBasal, resourceHelper.gs(R.string.pumplimit)), this)
+        absoluteRate.setIfSmaller(aapsLogger, danaPump.maxBasal, rh.gs(R.string.limitingbasalratio, danaPump.maxBasal, rh.gs(R.string.pumplimit)), this)
         return absoluteRate
     }
 
     override fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> {
-        percentRate.setIfGreater(aapsLogger, 0, resourceHelper.gs(R.string.limitingpercentrate, 0, resourceHelper.gs(R.string.itmustbepositivevalue)), this)
-        percentRate.setIfSmaller(aapsLogger, pumpDescription.maxTempPercent, resourceHelper.gs(R.string.limitingpercentrate, pumpDescription.maxTempPercent, resourceHelper.gs(R.string.pumplimit)), this)
+        percentRate.setIfGreater(aapsLogger, 0, rh.gs(R.string.limitingpercentrate, 0, rh.gs(R.string.itmustbepositivevalue)), this)
+        percentRate.setIfSmaller(aapsLogger, pumpDescription.maxTempPercent, rh.gs(R.string.limitingpercentrate, pumpDescription.maxTempPercent, rh.gs(R.string.pumplimit)), this)
         return percentRate
     }
 
     override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
-        insulin.setIfSmaller(aapsLogger, danaPump.maxBolus, resourceHelper.gs(R.string.limitingbolus, danaPump.maxBolus, resourceHelper.gs(R.string.pumplimit)), this)
+        insulin.setIfSmaller(aapsLogger, danaPump.maxBolus, rh.gs(R.string.limitingbolus, danaPump.maxBolus, rh.gs(R.string.pumplimit)), this)
         return insulin
     }
 
@@ -216,22 +217,22 @@ class DanaRSPlugin @Inject constructor(
         val result = PumpEnactResult(injector)
         if (!isInitialized()) {
             aapsLogger.error("setNewBasalProfile not initialized")
-            val notification = Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT)
+            val notification = Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, rh.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
-            result.comment = resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet)
+            result.comment = rh.gs(R.string.pumpNotInitializedProfileNotSet)
             return result
         } else {
             rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
         }
         return if (danaRSService?.updateBasalsInPump(profile) != true) {
-            val notification = Notification(Notification.FAILED_UPDATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT)
+            val notification = Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.failedupdatebasalprofile), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
-            result.comment = resourceHelper.gs(R.string.failedupdatebasalprofile)
+            result.comment = rh.gs(R.string.failedupdatebasalprofile)
             result
         } else {
             rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
             rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE))
-            val notification = Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60)
+            val notification = Notification(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, 60)
             rxBus.send(EventNewNotification(notification))
             result.success = true
             result.enacted = true
@@ -296,13 +297,13 @@ class DanaRSPlugin @Inject constructor(
             if (!result.success) {
                 var error = "" + danaPump.bolusStartErrorCode
                 when (danaPump.bolusStartErrorCode) {
-                    0x10 -> error = resourceHelper.gs(R.string.maxbolusviolation)
-                    0x20 -> error = resourceHelper.gs(R.string.commanderror)
-                    0x40 -> error = resourceHelper.gs(R.string.speederror)
-                    0x80 -> error = resourceHelper.gs(R.string.insulinlimitviolation)
+                    0x10 -> error = rh.gs(R.string.maxbolusviolation)
+                    0x20 -> error = rh.gs(R.string.commanderror)
+                    0x40 -> error = rh.gs(R.string.speederror)
+                    0x80 -> error = rh.gs(R.string.insulinlimitviolation)
                 }
-                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, error)
-            } else result.comment = resourceHelper.gs(R.string.ok)
+                result.comment = String.format(rh.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, error)
+            } else result.comment = rh.gs(R.string.ok)
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered)
             result
         } else {
@@ -310,7 +311,7 @@ class DanaRSPlugin @Inject constructor(
             result.success = false
             result.bolusDelivered = 0.0
             result.carbsDelivered = 0.0
-            result.comment = resourceHelper.gs(R.string.invalidinput)
+            result.comment = rh.gs(R.string.invalidinput)
             aapsLogger.error("deliverTreatment: Invalid input")
             result
         }
@@ -325,9 +326,23 @@ class DanaRSPlugin @Inject constructor(
     override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult {
         var result = PumpEnactResult(injector)
         val absoluteAfterConstrain = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
-        val doTempOff = baseBasalRate - absoluteAfterConstrain == 0.0
+        var doTempOff = baseBasalRate - absoluteAfterConstrain == 0.0
         val doLowTemp = absoluteAfterConstrain < baseBasalRate
         val doHighTemp = absoluteAfterConstrain > baseBasalRate
+
+        var percentRate = 0
+        // Any basal less than 0.10u/h will be dumped once per hour, not every 4 minutes. So if it's less than .10u/h, set a zero temp.
+        if (absoluteAfterConstrain >= 0.10) {
+            percentRate = java.lang.Double.valueOf(absoluteAfterConstrain / baseBasalRate * 100).toInt()
+        } else {
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Requested basal < 0.10u/h. Setting 0u/h (doLowTemp || doHighTemp)")
+        }
+        percentRate = if (percentRate < 100) Round.ceilTo(percentRate.toDouble(), 10.0).toInt() else Round.floorTo(percentRate.toDouble(), 10.0).toInt()
+        if (percentRate > 500) // Special high temp 500/15min
+            percentRate = 500
+
+        if (percentRate == 100) doTempOff = true
+
         if (doTempOff) {
             // If temp in progress
             if (danaPump.isTempBasalInProgress) {
@@ -343,16 +358,6 @@ class DanaRSPlugin @Inject constructor(
             return result
         }
         if (doLowTemp || doHighTemp) {
-            var percentRate = 0
-            // Any basal less than 0.10u/h will be dumped once per hour, not every 4 minutes. So if it's less than .10u/h, set a zero temp.
-            if (absoluteAfterConstrain >= 0.10) {
-                percentRate = java.lang.Double.valueOf(absoluteAfterConstrain / baseBasalRate * 100).toInt()
-            } else {
-                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Requested basal < 0.10u/h. Setting 0u/h (doLowTemp || doHighTemp)")
-            }
-            percentRate = if (percentRate < 100) Round.ceilTo(percentRate.toDouble(), 10.0).toInt() else Round.floorTo(percentRate.toDouble(), 10.0).toInt()
-            if (percentRate > 500) // Special high temp 500/15min
-                percentRate = 500
             // Check if some temp is already in progress
             if (danaPump.isTempBasalInProgress) {
                 aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: currently running")
@@ -401,7 +406,7 @@ class DanaRSPlugin @Inject constructor(
             result.isTempCancel = false
             result.enacted = false
             result.success = false
-            result.comment = resourceHelper.gs(R.string.invalidinput)
+            result.comment = rh.gs(R.string.invalidinput)
             aapsLogger.error("setTempBasalPercent: Invalid input")
             return result
         }
@@ -410,7 +415,7 @@ class DanaRSPlugin @Inject constructor(
             result.enacted = false
             result.success = true
             result.isTempCancel = false
-            result.comment = resourceHelper.gs(R.string.ok)
+            result.comment = rh.gs(R.string.ok)
             result.duration = danaPump.tempBasalRemainingMin
             result.percent = danaPump.tempBasalPercent
             result.isPercent = true
@@ -428,7 +433,7 @@ class DanaRSPlugin @Inject constructor(
         if (connectionOK && danaPump.isTempBasalInProgress && danaPump.tempBasalPercent == percentAfterConstraint) {
             result.enacted = true
             result.success = true
-            result.comment = resourceHelper.gs(R.string.ok)
+            result.comment = rh.gs(R.string.ok)
             result.isTempCancel = false
             result.duration = danaPump.tempBasalRemainingMin
             result.percent = danaPump.tempBasalPercent
@@ -438,7 +443,7 @@ class DanaRSPlugin @Inject constructor(
         }
         result.enacted = false
         result.success = false
-        result.comment = resourceHelper.gs(R.string.tempbasaldeliveryerror)
+        result.comment = rh.gs(R.string.tempbasaldeliveryerror)
         aapsLogger.error("setTempBasalPercent: Failed to set temp basal. connectionOK: $connectionOK isTempBasalInProgress: ${danaPump.isTempBasalInProgress} tempBasalPercent: ${danaPump.tempBasalPercent}")
         return result
     }
@@ -449,7 +454,7 @@ class DanaRSPlugin @Inject constructor(
         if (connectionOK && danaPump.isTempBasalInProgress && danaPump.tempBasalPercent == percent) {
             result.enacted = true
             result.success = true
-            result.comment = resourceHelper.gs(R.string.ok)
+            result.comment = rh.gs(R.string.ok)
             result.isTempCancel = false
             result.duration = danaPump.tempBasalRemainingMin
             result.percent = danaPump.tempBasalPercent
@@ -459,8 +464,8 @@ class DanaRSPlugin @Inject constructor(
         }
         result.enacted = false
         result.success = false
-        result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly)
-        aapsLogger.error("setHighTempBasalPercent: Failed to set temp basal")
+        result.comment = rh.gs(R.string.danar_valuenotsetproperly)
+        aapsLogger.error("setHighTempBasalPercent: Failed to set temp basal. connectionOK: $connectionOK isTempBasalInProgress: ${danaPump.isTempBasalInProgress} tempBasalPercent: ${danaPump.tempBasalPercent}")
         return result
     }
 
@@ -474,7 +479,7 @@ class DanaRSPlugin @Inject constructor(
         if (danaPump.isExtendedInProgress && abs(danaPump.extendedBolusAmount - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
             result.enacted = false
             result.success = true
-            result.comment = resourceHelper.gs(R.string.ok)
+            result.comment = rh.gs(R.string.ok)
             result.duration = danaPump.extendedBolusRemainingMinutes
             result.absolute = danaPump.extendedBolusAbsoluteRate
             result.isPercent = false
@@ -487,7 +492,7 @@ class DanaRSPlugin @Inject constructor(
         if (connectionOK && danaPump.isExtendedInProgress && abs(danaPump.extendedBolusAmount - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
             result.enacted = true
             result.success = true
-            result.comment = resourceHelper.gs(R.string.ok)
+            result.comment = rh.gs(R.string.ok)
             result.isTempCancel = false
             result.duration = danaPump.extendedBolusRemainingMinutes
             result.absolute = danaPump.extendedBolusAbsoluteRate
@@ -498,7 +503,7 @@ class DanaRSPlugin @Inject constructor(
         }
         result.enacted = false
         result.success = false
-        result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly)
+        result.comment = rh.gs(R.string.danar_valuenotsetproperly)
         aapsLogger.error("setExtendedBolus: Failed to extended bolus")
         return result
     }
@@ -515,7 +520,7 @@ class DanaRSPlugin @Inject constructor(
             result.success = true
             result.enacted = false
             result.isTempCancel = true
-            result.comment = resourceHelper.gs(R.string.ok)
+            result.comment = rh.gs(R.string.ok)
             aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK")
         }
         return result
@@ -530,7 +535,7 @@ class DanaRSPlugin @Inject constructor(
         } else {
             result.success = true
             result.enacted = false
-            result.comment = resourceHelper.gs(R.string.ok)
+            result.comment = rh.gs(R.string.ok)
             aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus: OK")
         }
         return result
@@ -616,9 +621,10 @@ class DanaRSPlugin @Inject constructor(
     override fun loadTDDs(): PumpEnactResult = loadHistory(RecordTypes.RECORD_TYPE_DAILY)
     override fun canHandleDST(): Boolean = false
     override fun clearPairing() {
-        sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + mDeviceName)
-        sp.remove(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + mDeviceName)
-        sp.remove(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + mDeviceName)
-        sp.remove(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + mDeviceName)
+        sp.remove(rh.gs(R.string.key_danars_pairingkey) + mDeviceName)
+        sp.remove(rh.gs(R.string.key_danars_v3_randompairingkey) + mDeviceName)
+        sp.remove(rh.gs(R.string.key_danars_v3_pairingkey) + mDeviceName)
+        sp.remove(rh.gs(R.string.key_danars_v3_randomsynckey) + mDeviceName)
+        sp.remove(rh.gs(R.string.key_dana_ble5_pairingkey) + mDeviceName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt b/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
index 283ae139e88..7bf9a818766 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
@@ -18,7 +18,7 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.danars.databinding.DanarsBlescannerActivityBinding
 import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
@@ -28,7 +28,7 @@ import javax.inject.Inject
 class BLEScanActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var sp: SP
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var blePreCheck: BlePreCheck
 
     private var listAdapter: ListAdapter? = null
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt b/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
index 71618506043..7c6b791a8d0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.danars.databinding.DanarsEnterPinActivityBinding
 import info.nightscout.androidaps.danars.services.BLEComm
 import info.nightscout.androidaps.events.EventPumpStatusChanged
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.extensions.hexStringToByteArray
@@ -22,7 +22,7 @@ import kotlin.experimental.xor
 
 class EnterPinActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var danaRSPlugin: DanaRSPlugin
     @Inject lateinit var sp: SP
@@ -39,12 +39,12 @@ class EnterPinActivity : NoSplashAppCompatActivity() {
         setContentView(binding.root)
 
         val p1 = DefaultEditTextValidator(binding.rsV3Pin1, this)
-            .setTestErrorString(resourceHelper.gs(R.string.error_mustbe12hexadidits), this)
-            .setCustomRegexp(resourceHelper.gs(R.string.twelvehexanumber), this)
+            .setTestErrorString(rh.gs(R.string.error_mustbe12hexadidits), this)
+            .setCustomRegexp(rh.gs(R.string.twelvehexanumber), this)
             .setTestType(EditTextValidator.TEST_REGEXP, this)
         val p2 = DefaultEditTextValidator(binding.rsV3Pin2, this)
-            .setTestErrorString(resourceHelper.gs(R.string.error_mustbe8hexadidits), this)
-            .setCustomRegexp(resourceHelper.gs(R.string.eighthexanumber), this)
+            .setTestErrorString(rh.gs(R.string.error_mustbe8hexadidits), this)
+            .setCustomRegexp(rh.gs(R.string.eighthexanumber), this)
             .setTestType(EditTextValidator.TEST_REGEXP, this)
 
         binding.okcancel.ok.setOnClickListener {
@@ -56,7 +56,7 @@ class EnterPinActivity : NoSplashAppCompatActivity() {
                 if (result) {
                     bleComm.finishV3Pairing()
                     finish()
-                } else OKDialog.show(this, resourceHelper.gs(R.string.error), resourceHelper.gs(R.string.invalidinput))
+                } else OKDialog.show(this, rh.gs(R.string.error), rh.gs(R.string.invalidinput))
             }
         }
         binding.okcancel.cancel.setOnClickListener { finish() }
@@ -86,12 +86,12 @@ class EnterPinActivity : NoSplashAppCompatActivity() {
         for (i in pairingKey.indices)
             pairingKeyCheckSum = pairingKeyCheckSum xor pairingKey[i]
 
-        sp.putString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, Base64.encodeToString(pairingKey, Base64.DEFAULT))
+        sp.putString(rh.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, Base64.encodeToString(pairingKey, Base64.DEFAULT))
 
         for (i in randomPairingKey.indices)
             pairingKeyCheckSum = pairingKeyCheckSum xor randomPairingKey[i]
 
-        sp.putString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, Base64.encodeToString(randomPairingKey, Base64.DEFAULT))
+        sp.putString(rh.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, Base64.encodeToString(randomPairingKey, Base64.DEFAULT))
 
         return checksum[0] == pairingKeyCheckSum
     }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt
index dbfbf8dc6fd..c048d10ebe0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt
@@ -8,10 +8,9 @@ import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -24,8 +23,8 @@ open class DanaRSPacketAPSHistoryEvents(
     private var from: Long
 ) : DanaRSPacket(injector) {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var danaPump: DanaPump
     @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Inject lateinit var temporaryBasalStorage: TemporaryBasalStorage
@@ -85,10 +84,16 @@ open class DanaRSPacketAPSHistoryEvents(
                 // sometimes TB is marked as canceled immediately
                 // but on pump is running
                 // at least on Model: 05 Protocol: 10 Code: 10
-                if (index > 0 && recordCode(message) == DanaPump.TEMPSTOP) {
+                if (index > 0 && recordCode(message) == DanaPump.HistoryEntry.TEMP_STOP.value) {
                     val previous = sorted[index - 1]
-                    if (recordCode(previous) == DanaPump.TEMPSTART && dateTime(message) == dateTime(previous)) {
-                        aapsLogger.debug(LTag.PUMPCOMM, "SKIPPING EVENT TEMPSTOP (" + recordCode(message) + ") " + dateUtil.dateAndTimeString(dateTime(message)) + " (" + dateTime(message) + ")")
+                    if (recordCode(previous) == DanaPump.HistoryEntry.TEMP_START.value && dateTime(message) == dateTime
+                            (previous)
+                    ) {
+                        aapsLogger.debug(
+                            LTag.PUMPCOMM,
+                            "SKIPPING EVENT TEMP_STOP (" + recordCode(message) + ") "
+                                + dateUtil.dateAndTimeString(dateTime(message)) + " (" + dateTime(message) + ")"
+                        )
                         continue
                     }
                 }
@@ -127,8 +132,8 @@ open class DanaRSPacketAPSHistoryEvents(
             pumpId = datetime * 2 + id
         }
         val status: String
-        when (recordCode) {
-            DanaPump.TEMPSTART         -> {
+        when (DanaPump.HistoryEntry.fromInt(recordCode)) {
+            DanaPump.HistoryEntry.TEMP_START          -> {
                 val temporaryBasalInfo = temporaryBasalStorage.findTemporaryBasal(datetime, param1.toDouble())
                 val newRecord = pumpSync.syncTemporaryBasalWithPumpId(
                     timestamp = datetime,
@@ -138,22 +143,30 @@ open class DanaRSPacketAPSHistoryEvents(
                     type = temporaryBasalInfo?.type,
                     pumpId = pumpId,
                     pumpType = danaPump.pumpType(),
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
-                status = "TEMPSTART " + dateUtil.timeString(datetime)
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] ${if (newRecord) "**NEW** " else ""}EVENT TEMP_START ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Ratio: $param1% Duration: ${param2}min"
+                )
+                status = "TEMP_START " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.TEMPSTOP          -> {
+            DanaPump.HistoryEntry.TEMP_STOP           -> {
                 val newRecord = pumpSync.syncStopTemporaryBasalWithPumpId(
                     timestamp = datetime,
                     endPumpId = pumpId,
                     pumpType = danaPump.pumpType(),
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
-                status = "TEMPSTOP " + dateUtil.timeString(datetime)
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] ${if (newRecord) "**NEW** " else ""}EVENT TEMP_STOP ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime)"
+                )
+                status = "TEMP_STOP " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.EXTENDEDSTART     -> {
+            DanaPump.HistoryEntry.EXTENDED_START      -> {
                 val newRecord = pumpSync.syncExtendedBolusWithPumpId(
                     timestamp = datetime,
                     amount = param1 / 100.0,
@@ -161,22 +174,30 @@ open class DanaRSPacketAPSHistoryEvents(
                     isEmulatingTB = false,
                     pumpId = pumpId,
                     pumpType = danaPump.pumpType(),
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
-                status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] ${if (newRecord) "**NEW** " else ""}EVENT EXTENDED_START ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Amount: ${param1 / 100.0}U Duration: ${param2}min"
+                )
+                status = "EXTENDED_START " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.EXTENDEDSTOP      -> {
+            DanaPump.HistoryEntry.EXTENDED_STOP       -> {
                 val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
                     timestamp = datetime,
                     endPumpId = pumpId,
                     pumpType = danaPump.pumpType(),
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
-                status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] ${if (newRecord) "**NEW** " else ""}EVENT EXTENDED_STOP ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Delivered: ${param1 / 100.0}U RealDuration: ${param2}min"
+                )
+                status = "EXTENDED_STOP " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.BOLUS             -> {
+            DanaPump.HistoryEntry.BOLUS               -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                 val newRecord = pumpSync.syncBolusWithPumpId(
                     timestamp = datetime,
@@ -184,12 +205,16 @@ open class DanaRSPacketAPSHistoryEvents(
                     type = detailedBolusInfo?.bolusType,
                     pumpId = pumpId,
                     pumpType = danaPump.pumpType(),
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U ")
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] ${if (newRecord) "**NEW** " else ""}EVENT BOLUS ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Bolus: ${param1 / 100.0}U "
+                )
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.DUALBOLUS         -> {
+            DanaPump.HistoryEntry.DUAL_BOLUS          -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                 val newRecord = pumpSync.syncBolusWithPumpId(
                     timestamp = datetime,
@@ -197,12 +222,16 @@ open class DanaRSPacketAPSHistoryEvents(
                     type = detailedBolusInfo?.bolusType,
                     pumpId = pumpId,
                     pumpType = danaPump.pumpType(),
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
-                status = "DUALBOLUS " + dateUtil.timeString(datetime)
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] ${if (newRecord) "**NEW** " else ""}EVENT DUAL_BOLUS ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Bolus: ${param1 / 100.0}U Duration: ${param2}min"
+                )
+                status = "DUAL_BOLUS " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.DUALEXTENDEDSTART -> {
+            DanaPump.HistoryEntry.DUAL_EXTENDED_START -> {
                 val newRecord = pumpSync.syncExtendedBolusWithPumpId(
                     timestamp = datetime,
                     amount = param1 / 100.0,
@@ -210,32 +239,46 @@ open class DanaRSPacketAPSHistoryEvents(
                     isEmulatingTB = false,
                     pumpId = pumpId,
                     pumpType = danaPump.pumpType(),
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
-                status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] ${if (newRecord) "**NEW** " else ""}EVENT DUAL_EXTENDED_START ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Amount: ${param1 / 100.0}U Duration: ${param2}min"
+                )
+                status = "DUAL_EXTENDED_START " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.DUALEXTENDEDSTOP  -> {
+            DanaPump.HistoryEntry.DUAL_EXTENDED_STOP  -> {
                 val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
                     timestamp = datetime,
                     endPumpId = pumpId,
                     pumpType = danaPump.pumpType(),
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
-                status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] ${if (newRecord) "**NEW** " else ""}EVENT DUAL_EXTENDED_STOP ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Delivered: ${param1 / 100.0}U RealDuration: ${param2}min"
+                )
+                status = "DUAL_EXTENDED_STOP " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.SUSPENDON         -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
-                status = "SUSPENDON " + dateUtil.timeString(datetime)
+            DanaPump.HistoryEntry.SUSPEND_ON          -> {
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] EVENT SUSPEND_ON ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime)"
+                )
+                status = "SUSPEND_ON " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.SUSPENDOFF        -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
-                status = "SUSPENDOFF " + dateUtil.timeString(datetime)
+            DanaPump.HistoryEntry.SUSPEND_OFF         -> {
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] EVENT SUSPEND_OFF ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime)"
+                )
+                status = "SUSPEND_OFF " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.REFILL            -> {
+            DanaPump.HistoryEntry.REFILL              -> {
                 if (sp.getBoolean(R.string.key_rs_loginsulinchange, true)) {
                     val newRecord = pumpSync.insertTherapyEventIfNewWithTimestamp(
                         timestamp = datetime,
@@ -244,33 +287,46 @@ open class DanaRSPacketAPSHistoryEvents(
                         pumpType = danaPump.pumpType(),
                         pumpSerial = danaPump.serialNumber
                     )
-                    aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                    aapsLogger.debug(
+                        LTag.PUMPCOMM,
+                        "[$pumpId] ${if (newRecord) "**NEW** " else ""}EVENT REFILL ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Amount: ${param1 / 100.0}U"
+                    )
                 }
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.PRIME             -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+            DanaPump.HistoryEntry.PRIME               -> {
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] EVENT PRIME ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Amount: ${param1 / 100.0}U"
+                )
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.PROFILECHANGE     -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
-                status = "PROFILECHANGE " + dateUtil.timeString(datetime)
+            DanaPump.HistoryEntry.PROFILE_CHANGE      -> {
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] EVENT PROFILE_CHANGE ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) No: $param1 CurrentRate: ${param2 / 100.0}U/h"
+                )
+                status = "PROFILE_CHANGE " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.CARBS             -> {
+            DanaPump.HistoryEntry.CARBS               -> {
                 val newRecord = pumpSync.syncCarbsWithTimestamp(
                     timestamp = datetime,
                     amount = param1.toDouble(),
                     pumpId = pumpId,
                     pumpType = danaPump.pumpType(),
-                    pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
+                    pumpSerial = danaPump.serialNumber
+                )
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] ${if (newRecord) "**NEW** " else ""}EVENT CARBS ($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Carbs: ${param1}g"
+                )
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.PRIMECANNULA      -> {
+            DanaPump.HistoryEntry.PRIME_CANNULA       -> {
                 if (sp.getBoolean(R.string.key_rs_logcanulachange, true)) {
                     val newRecord = pumpSync.insertTherapyEventIfNewWithTimestamp(
                         timestamp = datetime,
@@ -279,24 +335,33 @@ open class DanaRSPacketAPSHistoryEvents(
                         pumpType = danaPump.pumpType(),
                         pumpSerial = danaPump.serialNumber
                     )
-                    aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT PRIMECANNULA(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                    aapsLogger.debug(
+                        LTag.PUMPCOMM,
+                        "[$pumpId] ${if (newRecord) "**NEW** " else ""}EVENT PRIME_CANNULA($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Amount: ${param1 / 100.0}U"
+                    )
                 }
-                status = "PRIMECANNULA " + dateUtil.timeString(datetime)
+                status = "PRIME_CANNULA " + dateUtil.timeString(datetime)
             }
 
-            DanaPump.TIMECHANGE        -> {
+            DanaPump.HistoryEntry.TIME_CHANGE         -> {
                 val oldDateTime = intFromBuffMsbLsb(data, 7, 4) * 1000L
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "EVENT TIMECHANGE(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Previous: " + dateUtil.dateAndTimeString(oldDateTime))
-                status = "TIMECHANGE " + dateUtil.timeString(datetime)
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] EVENT TIME_CHANGE($recordCode) ${dateUtil.dateAndTimeString(datetime)} ($datetime) Previous: ${dateUtil.dateAndTimeString(oldDateTime)}"
+                )
+                status = "TIME_CHANGE " + dateUtil.timeString(datetime)
             }
 
-            else                       -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
+            else                                      -> {
+                aapsLogger.debug(
+                    LTag.PUMPCOMM,
+                    "[$pumpId] Event: $recordCode ${dateUtil.dateAndTimeString(datetime)} ($datetime) Param1: $param1 Param2: $param2"
+                )
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
         }
         if (datetime > danaPump.lastEventTimeLoaded) danaPump.lastEventTimeLoaded = datetime
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.processinghistory) + ": " + status))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.processinghistory) + ": " + status))
     }
 
     override val friendlyName: String = "APS_HISTORY_EVENTS"
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt
index cfa51a9d5e7..7aa0481e646 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt
@@ -20,7 +20,7 @@ class DanaRSPacketAPSSetEventHistory(
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY
-        if ((packetType == DanaPump.CARBS || packetType == DanaPump.BOLUS) && param1 <= 0) this.param1 = 0
+        if ((packetType == DanaPump.HistoryEntry.CARBS.value || packetType == DanaPump.HistoryEntry.BOLUS.value) && param1 <= 0) param1 = 0
         aapsLogger.debug(LTag.PUMPCOMM, "Set history entry: " + dateUtil.dateAndTimeString(time) + " type: " + packetType + " param1: " + param1 + " param2: " + param2)
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt
index ae9b5a95c94..588f021cc6c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.danars.comm
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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
@@ -17,8 +17,8 @@ class DanaRSPacketBasalGetBasalRate(
     injector: HasAndroidInjector
 ) : DanaRSPacket(injector) {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var danaPump: DanaPump
 
     init {
@@ -48,7 +48,7 @@ class DanaRSPacketBasalGetBasalRate(
             aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaPump.pumpProfiles!![danaPump.activeProfile][index])
         if (danaPump.basalStep != 0.01) {
             failed = true
-            val notification = Notification(Notification.WRONG_BASAL_STEP, resourceHelper.gs(R.string.danar_setbasalstep001), Notification.URGENT)
+            val notification = Notification(Notification.WRONG_BASAL_STEP, rh.gs(R.string.danar_setbasalstep001), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.WRONG_BASAL_STEP))
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt
index 9b87c11a192..5fe74210495 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.danars.comm
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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
@@ -16,8 +16,8 @@ class DanaRSPacketBolusGetBolusOption(
     injector: HasAndroidInjector
 ) : DanaRSPacket(injector) {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var danaPump: DanaPump
 
     init {
@@ -84,7 +84,7 @@ class DanaRSPacketBolusGetBolusOption(
         dataSize = 1
         val missedBolus04EndMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         if (!danaPump.isExtendedBolusEnabled) {
-            val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, resourceHelper.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
+            val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, rh.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
             failed = true
         } else {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt
index 2262a2acdee..8cd865d0130 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.danars.comm
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
@@ -14,8 +14,8 @@ open class DanaRSPacketBolusSetStepBolusStop(
     injector: HasAndroidInjector
 ) : DanaRSPacket(injector) {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var danaPump: DanaPump
 
     init {
@@ -37,10 +37,10 @@ open class DanaRSPacketBolusSetStepBolusStop(
         if (!danaPump.bolusStopForced) {
             // delivery ended without user intervention
             danaPump.bolusingTreatment?.insulin = danaPump.bolusAmountToBeDelivered
-            bolusingEvent.status = resourceHelper.gs(R.string.overview_bolusprogress_delivered)
+            bolusingEvent.status = rh.gs(R.string.overview_bolusprogress_delivered)
             bolusingEvent.percent = 100
         } else {
-            bolusingEvent.status = resourceHelper.gs(R.string.overview_bolusprogress_stoped)
+            bolusingEvent.status = rh.gs(R.string.overview_bolusprogress_stoped)
         }
         rxBus.send(bolusingEvent)
     }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt
index 8085f4163a4..7761d2bddbd 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.danars.comm
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.dana.DanaPump
@@ -15,8 +15,8 @@ class DanaRSPacketGeneralGetPumpCheck(
     injector: HasAndroidInjector
 ) : DanaRSPacket(injector) {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var danaPump: DanaPump
 
     init {
@@ -43,7 +43,7 @@ class DanaRSPacketGeneralGetPumpCheck(
         aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaPump.protocol))
         aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaPump.productCode))
         if (danaPump.productCode < 2) {
-            rxBus.send(EventNewNotification(Notification(Notification.UNSUPPORTED_FIRMWARE, resourceHelper.gs(R.string.unsupportedfirmware), Notification.URGENT)))
+            rxBus.send(EventNewNotification(Notification(Notification.UNSUPPORTED_FIRMWARE, rh.gs(R.string.unsupportedfirmware), Notification.URGENT)))
         }
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt
index 5cbb2ecff0b..40e630c5452 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt
@@ -8,8 +8,7 @@ import info.nightscout.androidaps.dana.database.DanaHistoryRecordDao
 import info.nightscout.androidaps.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.T
 import org.joda.time.DateTime
 import java.util.*
@@ -20,7 +19,7 @@ abstract class DanaRSPacketHistory(
     protected val from: Long
 ) : DanaRSPacket(injector) {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var danaHistoryRecordDao: DanaHistoryRecordDao
     @Inject lateinit var pumpSync: PumpSync
     @Inject lateinit var danaPump: DanaPump
@@ -77,7 +76,7 @@ abstract class DanaRSPacketHistory(
             dataIndex += dataSize
             dataSize = 2
             totalCount = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-            aapsLogger.debug(LTag.PUMPCOMM, "History end. Code: " + error + " Success: " + (error == 0x00) + " Toatal count: " + totalCount)
+            aapsLogger.debug(LTag.PUMPCOMM, "History end. Code: " + error + " Success: " + (error == 0x00) + " Total count: " + totalCount)
         } else {
             val recordCode = byteArrayToInt(getBytes(data, DATA_START, 1))
             val historyYear = byteArrayToInt(getBytes(data, DATA_START + 1, 1))
@@ -233,7 +232,7 @@ abstract class DanaRSPacketHistory(
                     basalAmount = danaRHistoryRecord.dailyBasal,
                     totalAmount = 0.0,
                     pumpId = null,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     danaPump.serialNumber
                 )
             }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt
index f46b5581f46..d3b643bb991 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -16,8 +16,8 @@ class DanaRSPacketNotifyAlarm(
     injector: HasAndroidInjector
 ) : DanaRSPacket(injector) {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var pumpSync: PumpSync
     @Inject lateinit var danaPump: DanaPump
 
@@ -32,31 +32,31 @@ class DanaRSPacketNotifyAlarm(
         var errorString = ""
         when (alarmCode) {
             0x01       ->  // Battery 0% Alarm
-                errorString = resourceHelper.gs(R.string.batterydischarged)
+                errorString = rh.gs(R.string.batterydischarged)
             0x02       ->  // Pump Error
-                errorString = resourceHelper.gs(R.string.pumperror) + " " + alarmCode
+                errorString = rh.gs(R.string.pumperror) + " " + alarmCode
             0x03       ->  // Occlusion
-                errorString = resourceHelper.gs(R.string.occlusion)
+                errorString = rh.gs(R.string.occlusion)
             0x04       ->  // LOW BATTERY
-                errorString = resourceHelper.gs(R.string.pumpshutdown)
+                errorString = rh.gs(R.string.pumpshutdown)
             0x05       ->  // Shutdown
-                errorString = resourceHelper.gs(R.string.lowbattery)
+                errorString = rh.gs(R.string.lowbattery)
             0x06       ->  // Basal Compare
-                errorString = resourceHelper.gs(R.string.basalcompare)
+                errorString = rh.gs(R.string.basalcompare)
             0x07, 0xFF ->  // Blood sugar measurement alert
-                errorString = resourceHelper.gs(R.string.bloodsugarmeasurementalert)
+                errorString = rh.gs(R.string.bloodsugarmeasurementalert)
             0x08, 0xFE ->  // Remaining insulin level
-                errorString = resourceHelper.gs(R.string.remaininsulinalert)
+                errorString = rh.gs(R.string.remaininsulinalert)
             0x09       ->  // Empty Reservoir
-                errorString = resourceHelper.gs(R.string.emptyreservoir)
+                errorString = rh.gs(R.string.emptyreservoir)
             0x0A       ->  // Check shaft
-                errorString = resourceHelper.gs(R.string.checkshaft)
+                errorString = rh.gs(R.string.checkshaft)
             0x0B       ->  // Basal MAX
-                errorString = resourceHelper.gs(R.string.basalmax)
+                errorString = rh.gs(R.string.basalmax)
             0x0C       ->  // Daily MAX
-                errorString = resourceHelper.gs(R.string.dailymax)
+                errorString = rh.gs(R.string.dailymax)
             0xFD       ->  // Blood sugar check miss alarm
-                errorString = resourceHelper.gs(R.string.missedbolus)
+                errorString = rh.gs(R.string.missedbolus)
         }
         // No error no need to upload anything
         if (errorString == "") {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt
index c6b55b2e960..1a69a999a44 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.danars.comm
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
@@ -15,8 +15,8 @@ class DanaRSPacketNotifyDeliveryComplete(
     injector: HasAndroidInjector
 ) : DanaRSPacket(injector) {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var danaPump: DanaPump
 
     init {
@@ -29,7 +29,7 @@ class DanaRSPacketNotifyDeliveryComplete(
         val deliveredInsulin = byteArrayToInt(getBytes(data, DATA_START, 2)) / 100.0
         danaPump.bolusingTreatment?.insulin = deliveredInsulin
         val bolusingEvent = EventOverviewBolusProgress
-        bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, deliveredInsulin)
+        bolusingEvent.status = rh.gs(R.string.bolusdelivering, deliveredInsulin)
         bolusingEvent.t = danaPump.bolusingTreatment
         bolusingEvent.percent = min((deliveredInsulin / danaPump.bolusAmountToBeDelivered * 100).toInt(), 100)
         danaPump.bolusDone = true
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt
index e1a18ddd408..63adc7d654b 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.danars.comm
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
@@ -15,8 +15,8 @@ class DanaRSPacketNotifyDeliveryRateDisplay(
     injector: HasAndroidInjector
 ) : DanaRSPacket(injector) {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var danaPump: DanaPump
 
     init {
@@ -29,7 +29,7 @@ class DanaRSPacketNotifyDeliveryRateDisplay(
         danaPump.bolusProgressLastTimeStamp = System.currentTimeMillis()
         danaPump.bolusingTreatment?.insulin = deliveredInsulin
         val bolusingEvent = EventOverviewBolusProgress
-        bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, deliveredInsulin)
+        bolusingEvent.status = rh.gs(R.string.bolusdelivering, deliveredInsulin)
         bolusingEvent.t = danaPump.bolusingTreatment
         bolusingEvent.percent = min((deliveredInsulin / danaPump.bolusAmountToBeDelivered * 100).toInt(), 100)
         failed = bolusingEvent.percent < 100
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java b/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java
index a3e6e2362db..0a87dfa8ea1 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java
@@ -19,7 +19,7 @@
 import info.nightscout.androidaps.danars.activities.PairingHelperActivity;
 import info.nightscout.androidaps.danars.databinding.DanarsPairingProgressDialogBinding;
 import info.nightscout.androidaps.danars.events.EventDanaRSPairingSuccess;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.rx.AapsSchedulers;
@@ -29,8 +29,8 @@
 public class PairingProgressDialog extends DaggerDialogFragment {
 
     @Inject AapsSchedulers aapsSchedulers;
-    @Inject ResourceHelper resourceHelper;
-    @Inject RxBusWrapper rxBus;
+    @Inject ResourceHelper rh;
+    @Inject RxBus rxBus;
     @Inject FabricPrivacy fabricPrivacy;
 
     private final CompositeDisposable disposable = new CompositeDisposable();
@@ -146,7 +146,7 @@ private void setViews() {
         if (binding != null) {
             binding.danarsPairingprogressProgressbar.setMax(100);
             binding.danarsPairingprogressProgressbar.setProgress(0);
-            binding.danarsPairingprogressStatus.setText(resourceHelper.gs(R.string.danars_waitingforpairing));
+            binding.danarsPairingprogressStatus.setText(rh.gs(R.string.danars_waitingforpairing));
             binding.ok.setVisibility(View.GONE);
             binding.ok.setOnClickListener(v -> dismiss());
         }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
index 9ae06c3fe30..26b1627fd18 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
@@ -23,7 +23,7 @@ import info.nightscout.androidaps.extensions.waitMillis
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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
@@ -41,9 +41,9 @@ import javax.inject.Singleton
 class BLEComm @Inject internal constructor(
     private val injector: HasAndroidInjector,
     private val aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val context: Context,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val sp: SP,
     private val danaRSMessageHashTable: DanaRSMessageHashTable,
     private val danaPump: DanaPump,
@@ -149,15 +149,7 @@ class BLEComm @Inject internal constructor(
             if (lastClearRequest != 0L && dateUtil.isOlderThan(lastClearRequest, 5)) {
                 ToastUtils.showToastInUiThread(context, R.string.invalidpairing)
                 danaRSPlugin.changePump()
-                sp.getStringOrNull(R.string.key_danars_address, null)?.let { address ->
-                    bluetoothAdapter?.getRemoteDevice(address)?.let { device ->
-                        try {
-                            device::class.java.getMethod("removeBond").invoke(device)
-                        } catch (e: Exception) {
-                            aapsLogger.error("Removing bond has been failed. ${e.message}")
-                        }
-                    }
-                }
+                removeBond()
             } else if (lastClearRequest == 0L) {
                 aapsLogger.error("Clearing pairing keys postponed")
                 sp.putLong(R.string.key_rs_last_clear_key_request, dateUtil.now())
@@ -169,9 +161,9 @@ class BLEComm @Inject internal constructor(
             val lastClearRequest = sp.getLong(R.string.key_rs_last_clear_key_request, 0)
             if (lastClearRequest != 0L && dateUtil.isOlderThan(lastClearRequest, 5)) {
                 aapsLogger.error("Clearing pairing keys !!!")
-                sp.remove(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName)
-                sp.remove(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName)
-                sp.remove(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName)
+                sp.remove(rh.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName)
+                sp.remove(rh.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName)
+                sp.remove(rh.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName)
                 ToastUtils.showToastInUiThread(context, R.string.invalidpairing)
                 danaRSPlugin.changePump()
             } else if (lastClearRequest == 0L) {
@@ -196,6 +188,18 @@ class BLEComm @Inject internal constructor(
         SystemClock.sleep(2000)
     }
 
+    private fun removeBond() {
+        sp.getStringOrNull(R.string.key_danars_address, null)?.let { address ->
+            bluetoothAdapter?.getRemoteDevice(address)?.let { device ->
+                try {
+                    device::class.java.getMethod("removeBond").invoke(device)
+                } catch (e: Exception) {
+                    aapsLogger.error("Removing bond has been failed. ${e.message}")
+                }
+            }
+        }
+    }
+
     @Synchronized fun close() {
         /*
         if (!encryptedDataRead && !encryptedCommandSent) {
@@ -506,7 +510,7 @@ class BLEComm @Inject internal constructor(
     private fun sendConnect() {
         val deviceName = connectDeviceName
         if (deviceName == null || deviceName == "") {
-            val n = Notification(Notification.DEVICE_NOT_PAIRED, resourceHelper.gs(R.string.pairfirst), Notification.URGENT)
+            val n = Notification(Notification.DEVICE_NOT_PAIRED, rh.gs(R.string.pairfirst), Notification.URGENT)
             rxBus.send(EventNewNotification(n))
             return
         }
@@ -523,7 +527,7 @@ class BLEComm @Inject internal constructor(
             encryption = EncryptionType.ENCRYPTION_DEFAULT
             danaPump.ignoreUserPassword = false
             // Grab pairing key from preferences if exists
-            val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, "")
+            val pairingKey = sp.getString(rh.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, "")
             aapsLogger.debug(LTag.PUMPBTCOMM, "Using stored pairing key: $pairingKey")
             if (pairingKey.isNotEmpty()) {
                 sendPasskeyCheck(pairingKey)
@@ -539,7 +543,7 @@ class BLEComm @Inject internal constructor(
             danaPump.hwModel = decryptedBuffer[5].toInt()
             danaPump.protocol = decryptedBuffer[7].toInt()
             // grab randomSyncKey
-            sp.putString(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName, String.format("%02x", decryptedBuffer[decryptedBuffer.size - 1]))
+            sp.putString(rh.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName, String.format("%02x", decryptedBuffer[decryptedBuffer.size - 1]))
 
             if (danaPump.hwModel == 0x05) {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 (OK)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
@@ -558,9 +562,17 @@ class BLEComm @Inject internal constructor(
             danaPump.hwModel = decryptedBuffer[5].toInt()
             danaPump.protocol = decryptedBuffer[7].toInt()
             val pairingKey = DanaRSPacket.asciiStringFromBuff(decryptedBuffer, 8, 6) // used while bonding
+            if (decryptedBuffer[8] != 0.toByte())
+                sp.putString(rh.gs(R.string.key_dana_ble5_pairingkey) + danaRSPlugin.mDeviceName, pairingKey)
+
+            val storedPairingKey = sp.getString(rh.gs(R.string.key_dana_ble5_pairingkey) + danaRSPlugin.mDeviceName, "")
+            if (storedPairingKey.isNullOrBlank()) {
+                removeBond()
+                disconnect("Non existing pairing key")
+            }
 
             if (danaPump.hwModel == 0x09) {
-                bleEncryption.setBle5Key(pairingKey.encodeToByteArray())
+                bleEncryption.setBle5Key(storedPairingKey.encodeToByteArray())
                 aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK BLE5 (OK)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
                 // Dana-i BLE5 Pump
                 sendBLE5PairingInformation()
@@ -569,22 +581,22 @@ class BLEComm @Inject internal constructor(
         } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'P'.code.toByte() && decryptedBuffer[3] == 'U'.code.toByte() && decryptedBuffer[4] == 'M'.code.toByte() && decryptedBuffer[5] == 'P'.code.toByte()) {
             aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
             mSendQueue.clear()
-            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumperror)))
-            pumpSync.insertAnnouncement(resourceHelper.gs(R.string.pumperror), null, danaPump.pumpType(), danaPump.serialNumber)
-            val n = Notification(Notification.PUMP_ERROR, resourceHelper.gs(R.string.pumperror), Notification.URGENT)
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(R.string.pumperror)))
+            pumpSync.insertAnnouncement(rh.gs(R.string.pumperror), null, danaPump.pumpType(), danaPump.serialNumber)
+            val n = Notification(Notification.PUMP_ERROR, rh.gs(R.string.pumperror), Notification.URGENT)
             rxBus.send(EventNewNotification(n))
             // response BUSY: error status
         } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'B'.code.toByte() && decryptedBuffer[3] == 'U'.code.toByte() && decryptedBuffer[4] == 'S'.code.toByte() && decryptedBuffer[5] == 'Y'.code.toByte()) {
             aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
             mSendQueue.clear()
-            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumpbusy)))
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(R.string.pumpbusy)))
         } else {
             // ERROR in response, wrong serial number
             aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
             mSendQueue.clear()
-            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.connectionerror)))
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(R.string.connectionerror)))
             danaRSPlugin.clearPairing()
-            val n = Notification(Notification.WRONG_SERIAL_NUMBER, resourceHelper.gs(R.string.password_cleared), Notification.URGENT)
+            val n = Notification(Notification.WRONG_SERIAL_NUMBER, rh.gs(R.string.password_cleared), Notification.URGENT)
             rxBus.send(EventNewNotification(n))
         }
     }
@@ -609,13 +621,13 @@ class BLEComm @Inject internal constructor(
     // 2nd packet v3
     // 0x00 Start encryption, 0x01 Request pairing
     private fun sendV3PairingInformation() {
-        val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
-        val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
+        val randomPairingKey = sp.getString(rh.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
+        val pairingKey = sp.getString(rh.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
         if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
             val tPairingKey = Base64.decode(pairingKey, Base64.DEFAULT)
             val tRandomPairingKey = Base64.decode(randomPairingKey, Base64.DEFAULT)
             var tRandomSyncKey: Byte = 0
-            val randomSyncKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName, "")
+            val randomSyncKey = sp.getString(rh.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName, "")
             if (randomSyncKey.isNotEmpty()) {
                 tRandomSyncKey = randomSyncKey.toInt(16).toByte()
             }
@@ -651,8 +663,8 @@ class BLEComm @Inject internal constructor(
         } else if (encryption == EncryptionType.ENCRYPTION_RSv3) {
             // decryptedBuffer[2] : 0x00 OK  0x01 Error, No pairing
             if (decryptedBuffer[2] == 0x00.toByte()) {
-                val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
-                val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
+                val randomPairingKey = sp.getString(rh.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
+                val pairingKey = sp.getString(rh.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
                 if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
                     // expecting successful connect
                     isConnected = true
@@ -675,7 +687,7 @@ class BLEComm @Inject internal constructor(
             aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + danaPump.rsPassword)
             if (!danaPump.isRSPasswordOK) {
                 aapsLogger.error(LTag.PUMPBTCOMM, "Wrong pump password")
-                rxBus.send(EventNewNotification(Notification(Notification.WRONG_PUMP_PASSWORD, resourceHelper.gs(R.string.wrongpumppassword), Notification.URGENT)))
+                rxBus.send(EventNewNotification(Notification(Notification.WRONG_PUMP_PASSWORD, rh.gs(R.string.wrongpumppassword), Notification.URGENT)))
                 disconnect("WrongPassword")
                 SystemClock.sleep(T.mins(1).msecs())
             } else {
@@ -707,8 +719,8 @@ class BLEComm @Inject internal constructor(
 
     // 3rd packet v3 : only after entering PIN codes
     fun finishV3Pairing() {
-        val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
-        val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
+        val randomPairingKey = sp.getString(rh.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
+        val pairingKey = sp.getString(rh.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
         if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
             val tPairingKey = Base64.decode(pairingKey, Base64.DEFAULT)
             val tRandomPairingKey = Base64.decode(randomPairingKey, Base64.DEFAULT)
@@ -734,7 +746,7 @@ class BLEComm @Inject internal constructor(
         sendTimeInfo()
         val pairingKey = byteArrayOf(decryptedBuffer[2], decryptedBuffer[3])
         // store pairing key to preferences
-        sp.putString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, DanaRSPacket.bytesToHex(pairingKey))
+        sp.putString(rh.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, DanaRSPacket.bytesToHex(pairingKey))
         aapsLogger.debug(LTag.PUMPBTCOMM, "Got pairing key: " + DanaRSPacket.bytesToHex(pairingKey))
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
index 854d8e0b2ba..08f8c0d54c0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
@@ -16,7 +16,6 @@ import info.nightscout.androidaps.dana.events.EventDanaRNewStatus
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.danars.comm.*
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.dialogs.BolusProgressDialog
 import info.nightscout.androidaps.events.EventAppExit
@@ -24,12 +23,13 @@ import info.nightscout.androidaps.events.EventInitializationChanged
 import info.nightscout.androidaps.events.EventProfileSwitchChanged
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
@@ -44,6 +44,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
 import java.util.concurrent.TimeUnit
@@ -56,11 +57,11 @@ class DanaRSService : DaggerService() {
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var context: Context
     @Inject lateinit var danaRSPlugin: DanaRSPlugin
     @Inject lateinit var danaPump: DanaPump
@@ -79,11 +80,10 @@ class DanaRSService : DaggerService() {
 
     override fun onCreate() {
         super.onCreate()
-        disposable.add(rxBus
+        disposable += rxBus
             .toObservable(EventAppExit::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ stopSelf() }, fabricPrivacy::logException)
-        )
     }
 
     override fun onDestroy() {
@@ -116,8 +116,9 @@ class DanaRSService : DaggerService() {
     fun readPumpStatus() {
         try {
             val pump = activePlugin.activePump
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingpumpsettings)))
             sendMessage(DanaRSPacketEtcKeepConnection(injector)) // test encryption for v3 & BLE
+            if (!bleComm.isConnected) return
             sendMessage(DanaRSPacketGeneralGetShippingInformation(injector)) // serial no
             sendMessage(DanaRSPacketGeneralGetPumpCheck(injector)) // firmware
             sendMessage(DanaRSPacketBasalGetProfileNumber(injector))
@@ -127,19 +128,19 @@ class DanaRSService : DaggerService() {
             if (danaPump.profile24) sendMessage(DanaRSPacketBolusGet24CIRCFArray(injector))
             else sendMessage(DanaRSPacketBolusGetCIRCFArray(injector))
             sendMessage(DanaRSPacketOptionGetUserOption(injector)) // Getting user options
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingpumpstatus)))
             sendMessage(DanaRSPacketGeneralInitialScreenInformation(injector))
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingbolusstatus)))
             sendMessage(DanaRSPacketBolusGetStepBolusInformation(injector)) // last bolus, bolusStep, maxBolus
             danaPump.lastConnection = System.currentTimeMillis()
             val profile = profileFunction.getProfile()
             if (profile != null && abs(danaPump.currentBasal - profile.getBasal()) >= pump.pumpDescription.basalStep) {
-                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+                rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingpumpsettings)))
                 if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(EventProfileSwitchChanged())
                 }
             }
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingpumptime)))
             if (danaPump.usingUTC) sendMessage(DanaRSPacketOptionGetPumpUTCAndTimeZone(injector))
             else sendMessage(DanaRSPacketOptionGetPumpTime(injector))
             var timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L
@@ -161,7 +162,7 @@ class DanaRSService : DaggerService() {
                 if (abs(timeDiff) > 60 * 60 * 1.5) {
                     aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds - large difference")
                     //If time-diff is very large, warn user until we can synchronize history readings properly
-                    ErrorHelperActivity.runAlarm(context, resourceHelper.gs(R.string.largetimediff), resourceHelper.gs(R.string.largetimedifftitle), R.raw.error)
+                    ErrorHelperActivity.runAlarm(context, rh.gs(R.string.largetimediff), rh.gs(R.string.largetimedifftitle), R.raw.error)
 
                     //de-initialize pump
                     danaPump.reset()
@@ -190,7 +191,7 @@ class DanaRSService : DaggerService() {
                     aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
                 }
             }
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.reading_pump_history)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.reading_pump_history)))
             loadEvents()
             // RS doesn't provide exact timestamp = rely on history
             val eb = pumpSync.expectedPumpState().extendedBolus
@@ -202,9 +203,14 @@ class DanaRSService : DaggerService() {
             if (danaPump.dailyTotalUnits > danaPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
                 aapsLogger.debug(LTag.PUMPCOMM, "Approaching daily limit: " + danaPump.dailyTotalUnits + "/" + danaPump.maxDailyTotalUnits)
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
-                    val reportFail = Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT)
+                    val reportFail = Notification(Notification.APPROACHING_DAILY_LIMIT, rh.gs(R.string.approachingdailylimit), Notification.URGENT)
                     rxBus.send(EventNewNotification(reportFail))
-                    pumpSync.insertAnnouncement(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaPump.dailyTotalUnits + "/" + danaPump.maxDailyTotalUnits + "U", null, danaPump.pumpType(), danaPump.serialNumber)
+                    pumpSync.insertAnnouncement(
+                        rh.gs(R.string.approachingdailylimit) + ": " + danaPump.dailyTotalUnits + "/" + danaPump.maxDailyTotalUnits + "U",
+                        null,
+                        danaPump.pumpType(),
+                        danaPump.serialNumber
+                    )
                     lastApproachingDailyLimit = System.currentTimeMillis()
                 }
             }
@@ -235,6 +241,8 @@ class DanaRSService : DaggerService() {
         }
         danaPump.lastHistoryFetched = if (danaPump.lastEventTimeLoaded != 0L) danaPump.lastEventTimeLoaded - T.mins(1).msecs() else 0
         aapsLogger.debug(LTag.PUMPCOMM, "Events loaded")
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingpumpstatus)))
+        sendMessage(DanaRSPacketGeneralInitialScreenInformation(injector))
         danaPump.lastConnection = System.currentTimeMillis()
         return PumpEnactResult(injector).success(msg.success())
     }
@@ -248,7 +256,7 @@ class DanaRSService : DaggerService() {
     fun bolus(insulin: Double, carbs: Int, carbTime: Long, t: EventOverviewBolusProgress.Treatment): Boolean {
         if (!isConnected) return false
         if (BolusProgressDialog.stopPressed) return false
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.startingbolus)))
         val preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0)
         danaPump.bolusDone = false
         danaPump.bolusingTreatment = t
@@ -260,7 +268,7 @@ class DanaRSService : DaggerService() {
         if (carbs > 0) {
 //            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(carbTime, carbs); ####
 //            sendMessage(msg);
-            val msgSetHistoryEntryV2 = DanaRSPacketAPSSetEventHistory(injector, DanaPump.CARBS, carbTime, carbs, 0)
+            val msgSetHistoryEntryV2 = DanaRSPacketAPSSetEventHistory(injector, DanaPump.HistoryEntry.CARBS.value, carbTime, carbs, 0)
             sendMessage(msgSetHistoryEntryV2)
             danaPump.lastHistoryFetched = min(danaPump.lastHistoryFetched, carbTime - T.mins(1).msecs())
         }
@@ -296,7 +304,7 @@ class DanaRSService : DaggerService() {
         val expectedEnd = bolusStart + bolusDurationInMSec + 2000
         while (System.currentTimeMillis() < expectedEnd) {
             val waitTime = expectedEnd - System.currentTimeMillis()
-            bolusingEvent.status = String.format(resourceHelper.gs(R.string.waitingforestimatedbolusend), waitTime / 1000)
+            bolusingEvent.status = String.format(rh.gs(R.string.waitingforestimatedbolusend), waitTime / 1000)
             rxBus.send(bolusingEvent)
             SystemClock.sleep(1000)
         }
@@ -304,10 +312,10 @@ class DanaRSService : DaggerService() {
         commandQueue.loadEvents(object : Callback() {
             override fun run() {
                 // reread bolus status
-                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)))
+                rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingbolusstatus)))
                 sendMessage(DanaRSPacketBolusGetStepBolusInformation(injector)) // last bolus
                 bolusingEvent.percent = 100
-                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)))
+                rxBus.send(EventPumpStatusChanged(rh.gs(R.string.disconnecting)))
             }
         })
         return !start.failed
@@ -331,11 +339,11 @@ class DanaRSService : DaggerService() {
     fun tempBasal(percent: Int, durationInHours: Int): Boolean {
         if (!isConnected) return false
         if (danaPump.isTempBasalInProgress) {
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)))
             sendMessage(DanaRSPacketBasalSetCancelTemporaryBasal(injector))
             SystemClock.sleep(500)
         }
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.settingtempbasal)))
         val msgTBR = DanaRSPacketBasalSetTemporaryBasal(injector, percent, durationInHours)
         sendMessage(msgTBR)
         SystemClock.sleep(200)
@@ -348,11 +356,11 @@ class DanaRSService : DaggerService() {
 
     fun highTempBasal(percent: Int): Boolean {
         if (danaPump.isTempBasalInProgress) {
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)))
             sendMessage(DanaRSPacketBasalSetCancelTemporaryBasal(injector))
             SystemClock.sleep(500)
         }
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.settingtempbasal)))
         val msgTBR = DanaRSPacketAPSBasalSetTemporaryBasal(injector, percent)
         sendMessage(msgTBR)
         loadEvents()
@@ -368,11 +376,11 @@ class DanaRSService : DaggerService() {
             return false
         }
         if (danaPump.isTempBasalInProgress) {
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)))
             sendMessage(DanaRSPacketBasalSetCancelTemporaryBasal(injector))
             SystemClock.sleep(500)
         }
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.settingtempbasal)))
         val msgTBR = DanaRSPacketAPSBasalSetTemporaryBasal(injector, percent)
         sendMessage(msgTBR)
         loadEvents()
@@ -385,7 +393,7 @@ class DanaRSService : DaggerService() {
 
     fun tempBasalStop(): Boolean {
         if (!isConnected) return false
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)))
         val msgCancel = DanaRSPacketBasalSetCancelTemporaryBasal(injector)
         sendMessage(msgCancel)
         loadEvents()
@@ -397,7 +405,7 @@ class DanaRSService : DaggerService() {
 
     fun extendedBolus(insulin: Double, durationInHalfHours: Int): Boolean {
         if (!isConnected) return false
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.settingextendedbolus)))
         val msgExtended = DanaRSPacketBolusSetExtendedBolus(injector, insulin, durationInHalfHours)
         sendMessage(msgExtended)
         SystemClock.sleep(200)
@@ -410,7 +418,7 @@ class DanaRSService : DaggerService() {
 
     fun extendedBolusStop(): Boolean {
         if (!isConnected) return false
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.stoppingextendedbolus)))
         val msgStop = DanaRSPacketBolusSetExtendedBolusCancel(injector)
         sendMessage(msgStop)
         loadEvents()
@@ -422,7 +430,7 @@ class DanaRSService : DaggerService() {
 
     fun updateBasalsInPump(profile: Profile): Boolean {
         if (!isConnected) return false
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.updatingbasalrates)))
         val basal = danaPump.buildDanaRProfileRecord(profile)
         val msgSet = DanaRSPacketBasalSetProfileBasalRate(injector, 0, basal)
         sendMessage(msgSet)
@@ -485,7 +493,7 @@ class DanaRSService : DaggerService() {
             val time = dateUtil.now()
             val timeToWholeMinute = 60000 - time % 60000
             if (timeToWholeMinute > 59800 || timeToWholeMinute < 300) break
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.waitingfortimesynchronization, (timeToWholeMinute / 1000).toInt())))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.waitingfortimesynchronization, (timeToWholeMinute / 1000).toInt())))
             SystemClock.sleep(min(timeToWholeMinute, 100))
         }
     }
diff --git a/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index bd213d3c8e7..edc280d55eb 100644
--- a/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.ProfileStore
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -22,14 +22,14 @@ import org.mockito.Mock
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
     @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var config: Config
 
-    val rxBus = RxBusWrapper(aapsSchedulers)
+    val rxBus = RxBus(aapsSchedulers, aapsLogger)
 
     val profileInjector = HasAndroidInjector {
         AndroidInjector {
@@ -42,7 +42,9 @@ open class TestBaseWithProfile : TestBase() {
 
     @Before
     fun prepareMock() {
-        validProfileJSON = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+        validProfileJSON = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"3\"}," +
+            "{\"time\":\"2:00\",\"value\":\"3.4\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4.5\"}]," +
+            "\"target_high\":[{\"time\":\"00:00\",\"value\":\"7\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
         validProfile = ProfileSealed.Pure(pureProfileFromJson(JSONObject(validProfileJSON), dateUtil)!!)
     }
 
@@ -54,4 +56,4 @@ open class TestBaseWithProfile : TestBase() {
         json.put("store", store)
         return ProfileStore(profileInjector, json, dateUtil)
     }
-}
\ No newline at end of file
+}
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt
index 45fcde6f935..550484e1e75 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.danars
 import android.content.Context
 import dagger.android.AndroidInjector
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.PumpSync
@@ -22,7 +22,7 @@ class DanaRSPluginTest : DanaRSTestBase() {
 
     @Mock lateinit var context: Context
     @Mock lateinit var constraintChecker: ConstraintChecker
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var temporaryBasalStorage: TemporaryBasalStorage
     @Mock lateinit var pumpSync: PumpSync
@@ -56,9 +56,9 @@ class DanaRSPluginTest : DanaRSTestBase() {
     @Before
     fun prepareMocks() {
         Mockito.`when`(sp.getString(R.string.key_danars_address, "")).thenReturn("")
-        Mockito.`when`(resourceHelper.gs(eq(R.string.limitingbasalratio), anyObject(), anyObject())).thenReturn("limitingbasalratio")
-        Mockito.`when`(resourceHelper.gs(eq(R.string.limitingpercentrate), anyObject(), anyObject())).thenReturn("limitingpercentrate")
+        Mockito.`when`(rh.gs(eq(R.string.limitingbasalratio), anyObject(), anyObject())).thenReturn("limitingbasalratio")
+        Mockito.`when`(rh.gs(eq(R.string.limitingpercentrate), anyObject(), anyObject())).thenReturn("limitingpercentrate")
 
-        danaRSPlugin = DanaRSPlugin({ AndroidInjector { } }, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, profileFunction, sp, commandQueue, danaPump, pumpSync, detailedBolusInfoStorage, temporaryBasalStorage, fabricPrivacy, dateUtil)
+        danaRSPlugin = DanaRSPlugin({ AndroidInjector { } }, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, profileFunction, sp, commandQueue, danaPump, pumpSync, detailedBolusInfoStorage, temporaryBasalStorage, fabricPrivacy, dateUtil)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt b/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt
index b7a6c6a25d6..9091aaacd64 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt
@@ -21,7 +21,7 @@ open class DanaRSTestBase : TestBaseWithProfile() {
 
     @Before
     fun prepare() {
-        Mockito.`when`(resourceHelper.gs(ArgumentMatchers.anyInt())).thenReturn("AnyString")
+        Mockito.`when`(rh.gs(ArgumentMatchers.anyInt())).thenReturn("AnyString")
     }
 
     fun createArray(length: Int, fillWith: Byte): ByteArray {
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt
index 034df8113e9..1728dd08eff 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt
@@ -21,14 +21,14 @@ class DanaRSPacketNotifyDeliveryCompleteTest : DanaRSTestBase() {
             if (it is DanaRSPacketNotifyDeliveryComplete) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.danaPump = danaPump
             }
         }
     }
 
     @Test fun runTest() {
-        `when`(resourceHelper.gs(anyInt(), anyDouble())).thenReturn("SomeString")
+        `when`(rh.gs(anyInt(), anyDouble())).thenReturn("SomeString")
 
         danaPump.bolusingTreatment = EventOverviewBolusProgress.Treatment(0.0, 0, true)
         val packet = DanaRSPacketNotifyDeliveryComplete(packetInjector)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
index 62244b0ba29..4fc446bd31c 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
@@ -8,7 +8,6 @@ import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import org.junit.Assert
 import org.junit.Test
 import org.mockito.Mock
@@ -42,7 +41,7 @@ class DanaRsMessageHashTableTest : DanaRSTestBase() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
 
         val danaRSMessageHashTable = DanaRSMessageHashTable(packetInjector)
-        val forTesting: DanaRSPacket = DanaRSPacketAPSSetEventHistory(packetInjector, DanaPump.CARBS, 0, 0, 0)
+        val forTesting: DanaRSPacket = DanaRSPacketAPSSetEventHistory(packetInjector, DanaPump.HistoryEntry.CARBS.value, 0, 0, 0)
         val testPacket: DanaRSPacket = danaRSMessageHashTable.findMessage(forTesting.command)
         Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.opCode.toLong())
     }
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt
index de5f2d75888..4c0b6c4dd07 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt
@@ -29,7 +29,7 @@ class DanaRsPacketApsHistoryEventsTest : DanaRSTestBase() {
             }
             if (it is DanaRSPacketAPSHistoryEvents) {
                 it.rxBus = rxBus
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.pumpSync = pumpSync
                 it.danaPump = danaPump
                 it.detailedBolusInfoStorage = detailedBolusInfoStorage
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt
index 584e6da3bb1..b8f152d522c 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
@@ -22,23 +23,23 @@ class DanaRsPacketApsSetEventHistoryTest : DanaRSTestBase() {
 
     @Test fun runTest() { // test for negative carbs
         val now = dateUtil.now()
-        var historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, -1, 0)
+        var historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, DanaPump.HistoryEntry.CARBS.value, now, -1, 0)
         var testParams = historyTest.getRequestParams()
         Assert.assertEquals(0.toByte(), testParams[8])
         // 5g carbs
-        historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 5, 0)
+        historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, DanaPump.HistoryEntry.CARBS.value, now, 5, 0)
         testParams = historyTest.getRequestParams()
         Assert.assertEquals(5.toByte(), testParams[8])
         // 150g carbs
-        historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 150, 0)
+        historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, DanaPump.HistoryEntry.CARBS.value, now, 150, 0)
         testParams = historyTest.getRequestParams()
         Assert.assertEquals(150.toByte(), testParams[8])
         // test message generation
-        historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 5, 0)
+        historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, DanaPump.HistoryEntry.CARBS.value, now, 5, 0)
         testParams = historyTest.getRequestParams()
         Assert.assertEquals(5.toByte(), testParams[8])
         Assert.assertEquals(11, testParams.size)
-        Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.CARBS.toByte(), testParams[0])
+        Assert.assertEquals(DanaPump.HistoryEntry.CARBS.value.toByte(), testParams[0])
         // test message decoding
         historyTest.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, historyTest.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt
index f7865fce364..5d59c274bc4 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt
@@ -13,7 +13,7 @@ class DanaRsPacketBasalGetBasalRateTest : DanaRSTestBase() {
             if (it is DanaRSPacketBasalGetBasalRate) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.danaPump = danaPump
             }
         }
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt
index 76dec68c505..04a8a69a10b 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt
@@ -13,7 +13,7 @@ class DanaRsPacketBolusGetBolusOptionTest : DanaRSTestBase() {
             if (it is DanaRSPacketBolusGetBolusOption) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.danaPump = danaPump
             }
         }
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
index c1a9ea46b5e..ab385d84f35 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
@@ -5,7 +5,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.danars.DanaRSTestBase
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
@@ -20,7 +20,7 @@ import org.mockito.Mockito
 class DanaRsPacketBolusSetStepBolusStartTest : DanaRSTestBase() {
 
     @Mock lateinit var constraintChecker: ConstraintChecker
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var context: Context
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var temporaryBasalStorage: TemporaryBasalStorage
@@ -54,7 +54,7 @@ class DanaRsPacketBolusSetStepBolusStartTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin({ AndroidInjector { } }, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, profileFunction, sp, commandQueue, danaPump, pumpSync, detailedBolusInfoStorage, temporaryBasalStorage, fabricPrivacy, dateUtil)
+        danaRSPlugin = DanaRSPlugin({ AndroidInjector { } }, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, profileFunction, sp, commandQueue, danaPump, pumpSync, detailedBolusInfoStorage, temporaryBasalStorage, fabricPrivacy, dateUtil)
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt
index 9ef433e5559..8a980fb52e6 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt
@@ -20,14 +20,14 @@ class DanaRsPacketBolusSetStepBolusStopTest : DanaRSTestBase() {
             if (it is DanaRSPacketBolusSetStepBolusStop) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.danaPump = danaPump
             }
         }
     }
 
     @Test fun runTest() {
-        `when`(resourceHelper.gs(Mockito.anyInt())).thenReturn("SomeString")
+        `when`(rh.gs(Mockito.anyInt())).thenReturn("SomeString")
 
         danaPump.bolusingTreatment = EventOverviewBolusProgress.Treatment(0.0, 0, true)
         val testPacket = DanaRSPacketBolusSetStepBolusStop(packetInjector)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt
index a3ba829cb95..df3b05c394f 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt
@@ -13,7 +13,7 @@ class DanaRsPacketGeneralGetPumpCheckTest : DanaRSTestBase() {
             if (it is DanaRSPacketGeneralGetPumpCheck) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.danaPump = danaPump
             }
         }
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt
index 371cbb68110..fabe9474648 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt
@@ -17,7 +17,7 @@ class DanaRsPacketNotifyAlarmTest : DanaRSTestBase() {
             if (it is DanaRSPacketNotifyAlarm) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.pumpSync = pumpSync
                 it.danaPump = danaPump
             }
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt
index 2bb10b963c5..de504cf6130 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt
@@ -6,7 +6,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
@@ -23,7 +23,7 @@ class DanaRsPacketNotifyDeliveryRateDisplayTest : DanaRSTestBase() {
 
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var constraintChecker: ConstraintChecker
-    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var context: Context
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var temporaryBasalStorage: TemporaryBasalStorage
@@ -36,14 +36,14 @@ class DanaRsPacketNotifyDeliveryRateDisplayTest : DanaRSTestBase() {
             if (it is DanaRSPacketNotifyDeliveryRateDisplay) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
-                it.resourceHelper = resourceHelper
+                it.rh = rh
                 it.danaPump = danaPump
             }
         }
     }
 
     @Test fun runTest() {
-        `when`(resourceHelper.gs(ArgumentMatchers.anyInt(), anyObject())).thenReturn("SomeString")
+        `when`(rh.gs(ArgumentMatchers.anyInt(), anyObject())).thenReturn("SomeString")
         // val packet = DanaRS_Packet_Notify_Delivery_Rate_Display(1.0, Treatment(treatmentInjector))
         val packet = DanaRSPacketNotifyDeliveryRateDisplay(packetInjector)
         // test params
@@ -60,7 +60,7 @@ class DanaRsPacketNotifyDeliveryRateDisplayTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin(packetInjector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, profileFunction, sp, commandQueue, danaPump, pumpSync, detailedBolusInfoStorage, temporaryBasalStorage, fabricPrivacy, dateUtil)
+        danaRSPlugin = DanaRSPlugin(packetInjector, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, profileFunction, sp, commandQueue, danaPump, pumpSync, detailedBolusInfoStorage, temporaryBasalStorage, fabricPrivacy, dateUtil)
         danaPump.bolusingTreatment = EventOverviewBolusProgress.Treatment(0.0, 0, true)
     }
 }
\ No newline at end of file
diff --git a/database/build.gradle b/database/build.gradle
index af81fc73ac6..6f6eddd1b21 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
     implementation("io.reactivex.rxjava2:rxkotlin:$rxkotlin_version")
 
-    implementation "com.google.code.gson:gson:2.8.8"
+    implementation "com.google.code.gson:gson:2.8.9"
 
     api "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
diff --git a/database/src/main/java/info/nightscout/androidaps/database/AppRepository.kt b/database/src/main/java/info/nightscout/androidaps/database/AppRepository.kt
index 6654bd13772..caff9784bbb 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/AppRepository.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/AppRepository.kt
@@ -95,15 +95,15 @@ import kotlin.math.roundToInt
        *
        * It is a Maybe as there might be no next element.
        * */
-    fun getNextSyncElementGlucoseValue(id: Long): Maybe<Pair<GlucoseValue, Long>> =
+    fun getNextSyncElementGlucoseValue(id: Long): Maybe<Pair<GlucoseValue, GlucoseValue>> =
         database.glucoseValueDao.getNextModifiedOrNewAfter(id)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.glucoseValueDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
@@ -123,15 +123,15 @@ import kotlin.math.roundToInt
        *
        * It is a Maybe as there might be no next element.
        * */
-    fun getNextSyncElementTemporaryTarget(id: Long): Maybe<Pair<TemporaryTarget, Long>> =
+    fun getNextSyncElementTemporaryTarget(id: Long): Maybe<Pair<TemporaryTarget, TemporaryTarget>> =
         database.temporaryTargetDao.getNextModifiedOrNewAfter(id)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.temporaryTargetDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
@@ -185,15 +185,15 @@ import kotlin.math.roundToInt
 
     // PROFILE SWITCH
 
-    fun getNextSyncElementProfileSwitch(id: Long): Maybe<Pair<ProfileSwitch, Long>> =
+    fun getNextSyncElementProfileSwitch(id: Long): Maybe<Pair<ProfileSwitch, ProfileSwitch>> =
         database.profileSwitchDao.getNextModifiedOrNewAfter(id)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.profileSwitchDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
@@ -250,15 +250,15 @@ import kotlin.math.roundToInt
        *
        * It is a Maybe as there might be no next element.
        * */
-    fun getNextSyncElementEffectiveProfileSwitch(id: Long): Maybe<Pair<EffectiveProfileSwitch, Long>> =
+    fun getNextSyncElementEffectiveProfileSwitch(id: Long): Maybe<Pair<EffectiveProfileSwitch, EffectiveProfileSwitch>> =
         database.effectiveProfileSwitchDao.getNextModifiedOrNewAfter(id)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.effectiveProfileSwitchDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
@@ -309,15 +309,15 @@ import kotlin.math.roundToInt
        *
        * It is a Maybe as there might be no next element.
        * */
-    fun getNextSyncElementTherapyEvent(id: Long): Maybe<Pair<TherapyEvent, Long>> =
+    fun getNextSyncElementTherapyEvent(id: Long): Maybe<Pair<TherapyEvent, TherapyEvent>> =
         database.therapyEventDao.getNextModifiedOrNewAfter(id)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.therapyEventDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
@@ -376,15 +376,15 @@ import kotlin.math.roundToInt
        *
        * It is a Maybe as there might be no next element.
        * */
-    fun getNextSyncElementFood(id: Long): Maybe<Pair<Food, Long>> =
+    fun getNextSyncElementFood(id: Long): Maybe<Pair<Food, Food>> =
         database.foodDao.getNextModifiedOrNewAfter(id)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.foodDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
@@ -412,15 +412,15 @@ import kotlin.math.roundToInt
       *
       * It is a Maybe as there might be no next element.
       * */
-    fun getNextSyncElementBolus(id: Long): Maybe<Pair<Bolus, Long>> =
+    fun getNextSyncElementBolus(id: Long): Maybe<Pair<Bolus, Bolus>> =
         database.bolusDao.getNextModifiedOrNewAfterExclude(id, Bolus.Type.PRIMING)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.bolusDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
@@ -436,8 +436,10 @@ import kotlin.math.roundToInt
             .subscribeOn(Schedulers.io())
             .toWrappedSingle()
 
-    fun getLastBolusRecordOfType(type: Bolus.Type): Bolus? =
+    fun getLastBolusRecordOfTypeWrapped(type: Bolus.Type): Single<ValueWrapper<Bolus>> =
         database.bolusDao.getLastBolusRecordOfType(type)
+            .subscribeOn(Schedulers.io())
+            .toWrappedSingle()
 
     fun getOldestBolusRecord(): Bolus? =
         database.bolusDao.getOldestBolusRecord()
@@ -499,15 +501,15 @@ import kotlin.math.roundToInt
       *
       * It is a Maybe as there might be no next element.
       * */
-    fun getNextSyncElementCarbs(id: Long): Maybe<Pair<Carbs, Long>> =
+    fun getNextSyncElementCarbs(id: Long): Maybe<Pair<Carbs, Carbs>> =
         database.carbsDao.getNextModifiedOrNewAfter(id)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.carbsDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
@@ -590,15 +592,15 @@ import kotlin.math.roundToInt
       *
       * It is a Maybe as there might be no next element.
       * */
-    fun getNextSyncElementBolusCalculatorResult(id: Long): Maybe<Pair<BolusCalculatorResult, Long>> =
+    fun getNextSyncElementBolusCalculatorResult(id: Long): Maybe<Pair<BolusCalculatorResult, BolusCalculatorResult>> =
         database.bolusCalculatorResultDao.getNextModifiedOrNewAfter(id)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.bolusCalculatorResultDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
@@ -658,15 +660,15 @@ import kotlin.math.roundToInt
        * It is a Maybe as there might be no next element.
        * */
 
-    fun getNextSyncElementTemporaryBasal(id: Long): Maybe<Pair<TemporaryBasal, Long>> =
+    fun getNextSyncElementTemporaryBasal(id: Long): Maybe<Pair<TemporaryBasal, TemporaryBasal>> =
         database.temporaryBasalDao.getNextModifiedOrNewAfter(id)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.temporaryBasalDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
@@ -683,6 +685,10 @@ import kotlin.math.roundToInt
             .subscribeOn(Schedulers.io())
             .toWrappedSingle()
 
+    fun getTemporaryBasalsDataActiveBetweenTimeAndTime(from: Long, to: Long): Single<List<TemporaryBasal>> =
+        database.temporaryBasalDao.getTemporaryBasalActiveBetweenTimeAndTime(from, to)
+            .subscribeOn(Schedulers.io())
+
     fun getTemporaryBasalsDataFromTime(timestamp: Long, ascending: Boolean): Single<List<TemporaryBasal>> =
         database.temporaryBasalDao.getTemporaryBasalDataFromTime(timestamp)
             .map { if (!ascending) it.reversed() else it }
@@ -720,15 +726,15 @@ import kotlin.math.roundToInt
       * It is a Maybe as there might be no next element.
       * */
 
-    fun getNextSyncElementExtendedBolus(id: Long): Maybe<Pair<ExtendedBolus, Long>> =
+    fun getNextSyncElementExtendedBolus(id: Long): Maybe<Pair<ExtendedBolus, ExtendedBolus>> =
         database.extendedBolusDao.getNextModifiedOrNewAfter(id)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.extendedBolusDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
@@ -788,15 +794,15 @@ import kotlin.math.roundToInt
        *
        * It is a Maybe as there might be no next element.
        * */
-    fun getNextSyncElementOfflineEvent(id: Long): Maybe<Pair<OfflineEvent, Long>> =
+    fun getNextSyncElementOfflineEvent(id: Long): Maybe<Pair<OfflineEvent, OfflineEvent>> =
         database.offlineEventDao.getNextModifiedOrNewAfter(id)
             .flatMap { nextIdElement ->
                 val nextIdElemReferenceId = nextIdElement.referenceId
                 if (nextIdElemReferenceId == null) {
-                    Maybe.just(nextIdElement to nextIdElement.id)
+                    Maybe.just(nextIdElement to nextIdElement)
                 } else {
                     database.offlineEventDao.getCurrentFromHistoric(nextIdElemReferenceId)
-                        .map { it to nextIdElement.id }
+                        .map { it to nextIdElement }
                 }
             }
 
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/BolusCalculatorResultDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/BolusCalculatorResultDao.kt
index 0b192849e12..0b7e4dff8e3 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/BolusCalculatorResultDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/BolusCalculatorResultDao.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.database.daos
 
 import androidx.room.Dao
 import androidx.room.Query
-import info.nightscout.androidaps.database.TABLE_APS_RESULTS
 import info.nightscout.androidaps.database.TABLE_BOLUS_CALCULATOR_RESULTS
 import info.nightscout.androidaps.database.entities.BolusCalculatorResult
 import io.reactivex.Maybe
@@ -22,6 +21,12 @@ internal interface BolusCalculatorResultDao : TraceableDao<BolusCalculatorResult
     @Query("SELECT id FROM $TABLE_BOLUS_CALCULATOR_RESULTS ORDER BY id DESC limit 1")
     fun getLastId(): Maybe<Long>
 
+    @Query("SELECT * FROM $TABLE_BOLUS_CALCULATOR_RESULTS WHERE timestamp = :timestamp AND referenceId IS NULL")
+    fun findByTimestamp(timestamp: Long): BolusCalculatorResult?
+
+    @Query("SELECT * FROM $TABLE_BOLUS_CALCULATOR_RESULTS WHERE nightscoutId = :nsId AND referenceId IS NULL")
+    fun findByNSId(nsId: String): BolusCalculatorResult?
+
     @Query("SELECT * FROM $TABLE_BOLUS_CALCULATOR_RESULTS WHERE isValid = 1 AND timestamp >= :timestamp AND referenceId IS NULL ORDER BY id DESC")
     fun getBolusCalculatorResultsFromTime(timestamp: Long): Single<List<BolusCalculatorResult>>
 
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/BolusDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/BolusDao.kt
index 7bfa7fd72a7..f69fd5257da 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/BolusDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/BolusDao.kt
@@ -3,10 +3,8 @@ package info.nightscout.androidaps.database.daos
 import androidx.room.Dao
 import androidx.room.Query
 import info.nightscout.androidaps.database.TABLE_BOLUSES
-import info.nightscout.androidaps.database.TABLE_BOLUS_CALCULATOR_RESULTS
 import info.nightscout.androidaps.database.embedments.InterfaceIDs
 import info.nightscout.androidaps.database.entities.Bolus
-import info.nightscout.androidaps.database.entities.BolusCalculatorResult
 import io.reactivex.Maybe
 import io.reactivex.Single
 
@@ -42,7 +40,7 @@ internal interface BolusDao : TraceableDao<Bolus> {
     fun getLastBolusRecordMaybe(exclude: Bolus.Type = Bolus.Type.PRIMING): Maybe<Bolus>
 
     @Query("SELECT * FROM $TABLE_BOLUSES WHERE isValid = 1 AND type == :only AND referenceId IS NULL ORDER BY timestamp DESC LIMIT 1")
-    fun getLastBolusRecordOfType(only: Bolus.Type): Bolus?
+    fun getLastBolusRecordOfType(only: Bolus.Type): Maybe<Bolus>
 
     @Query("SELECT * FROM $TABLE_BOLUSES WHERE isValid = 1 AND type <> :exclude AND referenceId IS NULL ORDER BY timestamp ASC LIMIT 1")
     fun getOldestBolusRecord(exclude: Bolus.Type = Bolus.Type.PRIMING): Bolus?
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/CarbsDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/CarbsDao.kt
index 4e76fd1ef21..55779c2470f 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/CarbsDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/CarbsDao.kt
@@ -45,7 +45,7 @@ internal interface CarbsDao : TraceableDao<Carbs> {
     @Query("SELECT * FROM $TABLE_CARBS WHERE isValid = 1 AND timestamp >= :from AND timestamp <= :to AND referenceId IS NULL ORDER BY id DESC")
     fun getCarbsFromTimeToTime(from: Long, to: Long): Single<List<Carbs>>
 
-    @Query("SELECT * FROM $TABLE_CARBS WHERE isValid = 1 AND timestamp + duration >= :from AND timestamp <= :to AND referenceId IS NULL ORDER BY id DESC")
+    @Query("SELECT * FROM $TABLE_CARBS WHERE isValid = 1 AND timestamp + duration > :from AND timestamp <= :to AND referenceId IS NULL ORDER BY id DESC")
     fun getCarbsFromTimeToTimeExpandable(from: Long, to: Long): Single<List<Carbs>>
 
     @Query("SELECT * FROM $TABLE_CARBS WHERE timestamp >= :timestamp AND referenceId IS NULL ORDER BY id DESC")
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryBasalDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryBasalDao.kt
index 94f717a420d..b4aac3ba54a 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryBasalDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryBasalDao.kt
@@ -47,6 +47,9 @@ internal interface TemporaryBasalDao : TraceableDao<TemporaryBasal> {
     @Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE timestamp <= :timestamp AND (timestamp + duration) > :timestamp AND referenceId IS NULL AND isValid = 1 ORDER BY timestamp DESC LIMIT 1")
     fun getTemporaryBasalActiveAt(timestamp: Long): Maybe<TemporaryBasal>
 
+    @Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE timestamp <= :to AND (timestamp + duration) > :from AND referenceId IS NULL AND isValid = 1 ORDER BY timestamp DESC")
+    fun getTemporaryBasalActiveBetweenTimeAndTime(from: Long, to: Long): Single<List<TemporaryBasal>>
+
     @Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE timestamp >= :timestamp AND isValid = 1 AND referenceId IS NULL ORDER BY timestamp ASC")
     fun getTemporaryBasalDataFromTime(timestamp: Long): Single<List<TemporaryBasal>>
 
diff --git a/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt b/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt
index b06098f4ee2..0477dc1c8df 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt
@@ -1,7 +1,5 @@
 package info.nightscout.androidaps.database.embedments
 
-import info.nightscout.androidaps.database.entities.TherapyEvent
-
 data class InterfaceIDs(
     var nightscoutSystemId: String? = null,
     var nightscoutId: String? = null,
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/Bolus.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/Bolus.kt
index d174f9b25d1..5e7538bbb2b 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/Bolus.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/Bolus.kt
@@ -12,12 +12,14 @@ import info.nightscout.androidaps.database.interfaces.DBEntryWithTime
 import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
 import java.util.*
 
-@Entity(tableName = TABLE_BOLUSES,
+@Entity(
+    tableName = TABLE_BOLUSES,
     foreignKeys = [
         ForeignKey(
             entity = Bolus::class,
             parentColumns = ["id"],
-            childColumns = ["referenceId"])],
+            childColumns = ["referenceId"]
+        )],
     indices = [
         Index("id"),
         Index("isValid"),
@@ -27,7 +29,8 @@ import java.util.*
         Index("pumpType"),
         Index("referenceId"),
         Index("timestamp")
-    ])
+    ]
+)
 data class Bolus(
     @PrimaryKey(autoGenerate = true)
     override var id: Long = 0,
@@ -46,6 +49,20 @@ data class Bolus(
     var insulinConfiguration: InsulinConfiguration? = null
 ) : TraceableDBEntry, DBEntryWithTime {
 
+    private fun contentEqualsTo(other: Bolus): Boolean =
+        isValid == other.isValid &&
+            timestamp == other.timestamp &&
+            utcOffset == other.utcOffset &&
+            amount == other.amount &&
+            type == other.type &&
+            isBasalInsulin == other.isBasalInsulin
+
+    fun onlyNsIdAdded(previous: Bolus): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
+
     enum class Type {
         NORMAL,
         SMB,
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/BolusCalculatorResult.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/BolusCalculatorResult.kt
index 8e1f0b05320..681addd996a 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/BolusCalculatorResult.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/BolusCalculatorResult.kt
@@ -1,23 +1,30 @@
 package info.nightscout.androidaps.database.entities
 
-import androidx.room.*
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
 import info.nightscout.androidaps.database.TABLE_BOLUS_CALCULATOR_RESULTS
 import info.nightscout.androidaps.database.embedments.InterfaceIDs
 import info.nightscout.androidaps.database.interfaces.DBEntryWithTime
 import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
-import java.util.TimeZone
+import java.util.*
 
-@Entity(tableName = TABLE_BOLUS_CALCULATOR_RESULTS,
+@Entity(
+    tableName = TABLE_BOLUS_CALCULATOR_RESULTS,
     foreignKeys = [ForeignKey(
         entity = BolusCalculatorResult::class,
         parentColumns = ["id"],
-        childColumns = ["referenceId"])],
+        childColumns = ["referenceId"]
+    )],
     indices = [
         Index("referenceId"),
         Index("timestamp"),
         Index("id"),
         Index("isValid")
-    ])
+    ]
+)
 data class BolusCalculatorResult(
     @PrimaryKey(autoGenerate = true)
     override var id: Long = 0,
@@ -58,4 +65,45 @@ data class BolusCalculatorResult(
     var percentageCorrection: Int,
     var profileName: String,
     var note: String
-) : TraceableDBEntry, DBEntryWithTime
\ No newline at end of file
+) : TraceableDBEntry, DBEntryWithTime {
+
+    private fun contentEqualsTo(other: BolusCalculatorResult): Boolean =
+        isValid == other.isValid &&
+            timestamp == other.timestamp &&
+            utcOffset == other.utcOffset &&
+            targetBGLow == other.targetBGLow &&
+            targetBGHigh == other.targetBGHigh &&
+            isf == other.isf &&
+            ic == other.ic &&
+            bolusIOB == other.bolusIOB &&
+            wasBolusIOBUsed == other.wasBolusIOBUsed &&
+            basalIOB == other.basalIOB &&
+            wasBasalIOBUsed == other.wasBasalIOBUsed &&
+            glucoseValue == other.glucoseValue &&
+            wasGlucoseUsed == other.wasGlucoseUsed &&
+            glucoseDifference == other.glucoseDifference &&
+            glucoseInsulin == other.glucoseInsulin &&
+            glucoseTrend == other.glucoseTrend &&
+            wasTrendUsed == other.wasTrendUsed &&
+            trendInsulin == other.trendInsulin &&
+            cob == other.cob &&
+            wasCOBUsed == other.wasCOBUsed &&
+            cobInsulin == other.cobInsulin &&
+            carbs == other.carbs &&
+            wereCarbsUsed == other.wereCarbsUsed &&
+            carbsInsulin == other.carbsInsulin &&
+            otherCorrection == other.otherCorrection &&
+            wasSuperbolusUsed == other.wasSuperbolusUsed &&
+            superbolusInsulin == other.superbolusInsulin &&
+            wasTempTargetUsed == other.wasTempTargetUsed &&
+            totalInsulin == other.totalInsulin &&
+            percentageCorrection == other.percentageCorrection &&
+            profileName == other.profileName &&
+            note == other.note
+
+    fun onlyNsIdAdded(previous: BolusCalculatorResult): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/Carbs.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/Carbs.kt
index c068da1bfe9..9e9d703dfa0 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/Carbs.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/Carbs.kt
@@ -36,4 +36,18 @@ data class Carbs(
     override var utcOffset: Long = TimeZone.getDefault().getOffset(timestamp).toLong(),
     override var duration: Long, // in milliseconds
     var amount: Double
-) : TraceableDBEntry, DBEntryWithTimeAndDuration
\ No newline at end of file
+) : TraceableDBEntry, DBEntryWithTimeAndDuration {
+
+    private fun contentEqualsTo(other: Carbs): Boolean =
+        isValid == other.isValid &&
+            timestamp == other.timestamp &&
+            utcOffset == other.utcOffset &&
+            amount == other.amount &&
+            duration == other.duration
+
+    fun onlyNsIdAdded(previous: Carbs): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/EffectiveProfileSwitch.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/EffectiveProfileSwitch.kt
index a7ff14eb64a..969a67c4f03 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/EffectiveProfileSwitch.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/EffectiveProfileSwitch.kt
@@ -14,17 +14,20 @@ import info.nightscout.androidaps.database.interfaces.DBEntryWithTime
 import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
 import java.util.*
 
-@Entity(tableName = TABLE_EFFECTIVE_PROFILE_SWITCHES,
+@Entity(
+    tableName = TABLE_EFFECTIVE_PROFILE_SWITCHES,
     foreignKeys = [ForeignKey(
         entity = EffectiveProfileSwitch::class,
         parentColumns = ["id"],
-        childColumns = ["referenceId"])],
+        childColumns = ["referenceId"]
+    )],
     indices = [
         Index("id"),
         Index("referenceId"),
         Index("timestamp"),
         Index("isValid")
-    ])
+    ]
+)
 data class EffectiveProfileSwitch(
     @PrimaryKey(autoGenerate = true)
     override var id: Long = 0,
@@ -52,6 +55,28 @@ data class EffectiveProfileSwitch(
     var insulinConfiguration: InsulinConfiguration
 ) : TraceableDBEntry, DBEntryWithTime {
 
+    private fun contentEqualsTo(other: EffectiveProfileSwitch): Boolean =
+        isValid == other.isValid &&
+            timestamp == other.timestamp &&
+            utcOffset == other.utcOffset &&
+            basalBlocks == other.basalBlocks &&
+            isfBlocks == other.isfBlocks &&
+            icBlocks == other.icBlocks &&
+            targetBlocks == other.targetBlocks &&
+            glucoseUnit == other.glucoseUnit &&
+            originalProfileName == other.originalProfileName &&
+            originalCustomizedName == other.originalCustomizedName &&
+            originalTimeshift == other.originalTimeshift &&
+            originalPercentage == other.originalPercentage &&
+            originalDuration == other.originalDuration &&
+            originalEnd == other.originalEnd
+
+    fun onlyNsIdAdded(previous: EffectiveProfileSwitch): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
+
     enum class GlucoseUnit {
         MGDL,
         MMOL;
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/ExtendedBolus.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/ExtendedBolus.kt
index c59afdd34c3..f8ec3f52b4d 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/ExtendedBolus.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/ExtendedBolus.kt
@@ -11,11 +11,13 @@ import info.nightscout.androidaps.database.interfaces.DBEntryWithTimeAndDuration
 import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
 import java.util.*
 
-@Entity(tableName = TABLE_EXTENDED_BOLUSES,
+@Entity(
+    tableName = TABLE_EXTENDED_BOLUSES,
     foreignKeys = [ForeignKey(
         entity = ExtendedBolus::class,
         parentColumns = ["id"],
-        childColumns = ["referenceId"])],
+        childColumns = ["referenceId"]
+    )],
     indices = [
         Index("id"),
         Index("isValid"),
@@ -25,7 +27,8 @@ import java.util.*
         Index("pumpType"),
         Index("referenceId"),
         Index("timestamp")
-    ])
+    ]
+)
 data class ExtendedBolus(
     @PrimaryKey(autoGenerate = true)
     override var id: Long = 0,
@@ -46,6 +49,20 @@ data class ExtendedBolus(
         require(duration > 0)
     }
 
+    private fun contentEqualsTo(other: ExtendedBolus): Boolean =
+        isValid == other.isValid &&
+            timestamp == other.timestamp &&
+            utcOffset == other.utcOffset &&
+            isEmulatingTempBasal == other.isEmulatingTempBasal &&
+            duration == other.duration &&
+            rate == other.rate
+
+    fun onlyNsIdAdded(previous: ExtendedBolus): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
+
     val rate: Double // in U/h
         get() = amount * (60 * 60 * 1000.0) / duration
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/Food.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/Food.kt
index 762edf38c77..50a9601899a 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/Food.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/Food.kt
@@ -9,17 +9,20 @@ import info.nightscout.androidaps.database.TABLE_FOODS
 import info.nightscout.androidaps.database.embedments.InterfaceIDs
 import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
 
-@Entity(tableName = TABLE_FOODS,
+@Entity(
+    tableName = TABLE_FOODS,
     foreignKeys = [ForeignKey(
         entity = Food::class,
         parentColumns = ["id"],
-        childColumns = ["referenceId"])],
+        childColumns = ["referenceId"]
+    )],
     indices = [
         Index("id"),
         Index("nightscoutId"),
         Index("referenceId"),
         Index("isValid")
-    ])
+    ]
+)
 data class Food(
     @PrimaryKey(autoGenerate = true)
     override var id: Long = 0,
@@ -46,7 +49,7 @@ data class Food(
 
 ) : TraceableDBEntry {
 
-    fun isEqual(other: Food): Boolean {
+    fun contentEqualsTo(other: Food): Boolean {
         if (isValid != other.isValid) return false
         if (portion != other.portion) return false
         if (carbs != other.carbs) return false
@@ -60,6 +63,12 @@ data class Food(
         return unit == other.unit
     }
 
+    fun onlyNsIdAdded(previous: Food): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
+
     fun copyFrom(other: Food) {
         isValid = other.isValid
         name = other.name
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/GlucoseValue.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/GlucoseValue.kt
index d101681a7b3..241485a254a 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/GlucoseValue.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/GlucoseValue.kt
@@ -45,14 +45,20 @@ data class GlucoseValue(
 ) : TraceableDBEntry, DBEntryWithTime {
 
     fun contentEqualsTo(other: GlucoseValue): Boolean =
-        timestamp == other.timestamp &&
+        isValid == other.isValid &&
+            timestamp == other.timestamp &&
             utcOffset == other.utcOffset &&
             raw == other.raw &&
             value == other.value &&
             trendArrow == other.trendArrow &&
             noise == other.noise &&
-            sourceSensor == other.sourceSensor &&
-            isValid == other.isValid
+            sourceSensor == other.sourceSensor
+
+    fun onlyNsIdAdded(previous: GlucoseValue): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
 
     fun isRecordDeleted(other: GlucoseValue): Boolean =
         isValid && !other.isValid
@@ -102,6 +108,7 @@ data class GlucoseValue(
         GLIMP("Glimp"),
         LIBRE_2_NATIVE("Libre2"),
         POCTECH_NATIVE("Poctech"),
+        GLUNOVO_NATIVE("Glunovo"),
         MM_600_SERIES("MM600Series"),
         EVERSENSE("Eversense"),
         RANDOM("Random"),
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/OfflineEvent.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/OfflineEvent.kt
index c2af9d5edb7..d4f83b4737e 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/OfflineEvent.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/OfflineEvent.kt
@@ -11,18 +11,21 @@ import info.nightscout.androidaps.database.interfaces.DBEntryWithTimeAndDuration
 import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
 import java.util.*
 
-@Entity(tableName = TABLE_OFFLINE_EVENTS,
+@Entity(
+    tableName = TABLE_OFFLINE_EVENTS,
     foreignKeys = [ForeignKey(
         entity = OfflineEvent::class,
         parentColumns = ["id"],
-        childColumns = ["referenceId"])],
+        childColumns = ["referenceId"]
+    )],
     indices = [
         Index("id"),
         Index("isValid"),
         Index("nightscoutId"),
         Index("referenceId"),
         Index("timestamp")
-    ])
+    ]
+)
 data class OfflineEvent(
     @PrimaryKey(autoGenerate = true)
     override var id: Long = 0,
@@ -45,6 +48,12 @@ data class OfflineEvent(
             duration == other.duration &&
             isValid == other.isValid
 
+    fun onlyNsIdAdded(previous: OfflineEvent): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
+
     fun isRecordDeleted(other: OfflineEvent): Boolean =
         isValid && !other.isValid
 
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/ProfileSwitch.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/ProfileSwitch.kt
index 569a8953016..dfda513382b 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/ProfileSwitch.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/ProfileSwitch.kt
@@ -14,18 +14,21 @@ import info.nightscout.androidaps.database.interfaces.DBEntryWithTimeAndDuration
 import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
 import java.util.*
 
-@Entity(tableName = TABLE_PROFILE_SWITCHES,
+@Entity(
+    tableName = TABLE_PROFILE_SWITCHES,
     foreignKeys = [ForeignKey(
         entity = ProfileSwitch::class,
         parentColumns = ["id"],
-        childColumns = ["referenceId"])],
+        childColumns = ["referenceId"]
+    )],
     indices = [
         Index("referenceId"),
         Index("timestamp"),
         Index("isValid"),
         Index("id"),
         Index("nightscoutId")
-    ])
+    ]
+)
 data class ProfileSwitch(
     @PrimaryKey(autoGenerate = true)
     override var id: Long = 0,
@@ -50,6 +53,26 @@ data class ProfileSwitch(
     var insulinConfiguration: InsulinConfiguration
 ) : TraceableDBEntry, DBEntryWithTimeAndDuration {
 
+    private fun contentEqualsTo(other: ProfileSwitch): Boolean =
+        isValid == other.isValid &&
+            timestamp == other.timestamp &&
+            utcOffset == other.utcOffset &&
+            basalBlocks == other.basalBlocks &&
+            isfBlocks == other.isfBlocks &&
+            icBlocks == other.icBlocks &&
+            targetBlocks == other.targetBlocks &&
+            glucoseUnit == other.glucoseUnit &&
+            profileName == other.profileName &&
+            timeshift == other.timeshift &&
+            percentage == other.percentage &&
+            duration == other.duration
+
+    fun onlyNsIdAdded(previous: ProfileSwitch): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
+
     enum class GlucoseUnit {
         MGDL,
         MMOL;
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryBasal.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryBasal.kt
index 14d1b876e62..8133f336355 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryBasal.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryBasal.kt
@@ -48,6 +48,21 @@ data class TemporaryBasal(
         require(duration > 0)
     }
 
+    private fun contentEqualsTo(other: TemporaryBasal): Boolean =
+        isValid == other.isValid &&
+            timestamp == other.timestamp &&
+            utcOffset == other.utcOffset &&
+            isAbsolute == other.isAbsolute &&
+            type == other.type &&
+            duration == other.duration &&
+            rate == other.rate
+
+    fun onlyNsIdAdded(previous: TemporaryBasal): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
+
     enum class Type {
         NORMAL,
         EMULATED_PUMP_SUSPEND,
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryTarget.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryTarget.kt
index 7e6c2774fc9..a818a78904a 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryTarget.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryTarget.kt
@@ -12,18 +12,21 @@ import info.nightscout.androidaps.database.interfaces.DBEntryWithTimeAndDuration
 import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
 import java.util.*
 
-@Entity(tableName = TABLE_TEMPORARY_TARGETS,
+@Entity(
+    tableName = TABLE_TEMPORARY_TARGETS,
     foreignKeys = [ForeignKey(
         entity = TemporaryTarget::class,
         parentColumns = ["id"],
-        childColumns = ["referenceId"])],
+        childColumns = ["referenceId"]
+    )],
     indices = [
         Index("id"),
         Index("isValid"),
         Index("nightscoutId"),
         Index("referenceId"),
         Index("timestamp")
-    ])
+    ]
+)
 data class TemporaryTarget(
     @PrimaryKey(autoGenerate = true)
     override var id: Long = 0,
@@ -53,6 +56,12 @@ data class TemporaryTarget(
     fun isRecordDeleted(other: TemporaryTarget): Boolean =
         isValid && !other.isValid
 
+    fun onlyNsIdAdded(previous: TemporaryTarget): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
+
     enum class Reason(val text: String) {
         @SerializedName("Custom")
         CUSTOM("Custom"),
@@ -69,6 +78,7 @@ data class TemporaryTarget(
         ;
 
         companion object {
+
             fun fromString(reason: String?) = values().firstOrNull { it.text == reason }
                 ?: CUSTOM
         }
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt
index f930be4645a..f2421908add 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt
@@ -12,11 +12,13 @@ import info.nightscout.androidaps.database.interfaces.DBEntryWithTimeAndDuration
 import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
 import java.util.*
 
-@Entity(tableName = TABLE_THERAPY_EVENTS,
+@Entity(
+    tableName = TABLE_THERAPY_EVENTS,
     foreignKeys = [ForeignKey(
         entity = TherapyEvent::class,
         parentColumns = ["id"],
-        childColumns = ["referenceId"])],
+        childColumns = ["referenceId"]
+    )],
     indices = [
         Index("id"),
         Index("type"),
@@ -24,7 +26,8 @@ import java.util.*
         Index("isValid"),
         Index("referenceId"),
         Index("timestamp")
-    ])
+    ]
+)
 data class TherapyEvent(
     @PrimaryKey(autoGenerate = true)
     override var id: Long = 0,
@@ -45,9 +48,28 @@ data class TherapyEvent(
     var glucoseUnit: GlucoseUnit,
 ) : TraceableDBEntry, DBEntryWithTimeAndDuration {
 
+    private fun contentEqualsTo(other: TherapyEvent): Boolean =
+        isValid == other.isValid &&
+            timestamp == other.timestamp &&
+            utcOffset == other.utcOffset &&
+            duration == other.duration &&
+            type == other.type &&
+            note == other.note &&
+            enteredBy == other.enteredBy &&
+            glucose == other.glucose &&
+            glucoseType == other.glucoseType &&
+            glucoseUnit == other.glucoseUnit
+
+    fun onlyNsIdAdded(previous: TherapyEvent): Boolean =
+        previous.id != id &&
+            contentEqualsTo(previous) &&
+            previous.interfaceIDs.nightscoutId == null &&
+            interfaceIDs.nightscoutId != null
+
     enum class GlucoseUnit {
         MGDL,
         MMOL;
+
         companion object
     }
 
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
index e7a753713a8..0b0db5bf82b 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
@@ -25,6 +25,8 @@ data class UserEntry(
 ) : DBEntry, DBEntryWithTime {
     enum class Action (val colorGroup: ColorGroup) {
         BOLUS (ColorGroup.InsulinTreatment),
+        BOLUS_CALCULATOR_RESULT (ColorGroup.InsulinTreatment),
+        BOLUS_CALCULATOR_RESULT_REMOVED (ColorGroup.Aaps),
         SMB (ColorGroup.InsulinTreatment),
         BOLUS_ADVISOR (ColorGroup.InsulinTreatment),
         EXTENDED_BOLUS (ColorGroup.InsulinTreatment),
@@ -62,23 +64,23 @@ data class UserEntry(
         CALIBRATION (ColorGroup.Careportal),
         PRIME_BOLUS (ColorGroup.Pump),
         TREATMENT (ColorGroup.InsulinTreatment),
-        CAREPORTAL_NS_REFRESH (ColorGroup.Aaps),
-        PROFILE_SWITCH_NS_REFRESH (ColorGroup.Aaps),
-        TREATMENTS_NS_REFRESH (ColorGroup.Aaps),
-        TT_NS_REFRESH (ColorGroup.Aaps),
+        CAREPORTAL_NS_REFRESH (ColorGroup.Careportal),
+        PROFILE_SWITCH_NS_REFRESH (ColorGroup.Profile),
+        TREATMENTS_NS_REFRESH (ColorGroup.InsulinTreatment),
+        TT_NS_REFRESH (ColorGroup.TT),
         AUTOMATION_REMOVED (ColorGroup.Aaps),
         BG_REMOVED (ColorGroup.Aaps),
-        CAREPORTAL_REMOVED (ColorGroup.Aaps),
-        EXTENDED_BOLUS_REMOVED (ColorGroup.Aaps),
+        CAREPORTAL_REMOVED (ColorGroup.Careportal),
+        EXTENDED_BOLUS_REMOVED (ColorGroup.InsulinTreatment),
         FOOD_REMOVED (ColorGroup.CarbTreatment),
         PROFILE_REMOVED (ColorGroup.Profile),
-        PROFILE_SWITCH_REMOVED (ColorGroup.Aaps),
+        PROFILE_SWITCH_REMOVED (ColorGroup.Profile),
         RESTART_EVENTS_REMOVED (ColorGroup.Aaps),
-        TREATMENT_REMOVED (ColorGroup.Aaps),
-        BOLUS_REMOVED (ColorGroup.Aaps),
-        CARBS_REMOVED (ColorGroup.Aaps),
-        TEMP_BASAL_REMOVED (ColorGroup.Aaps),
-        TT_REMOVED (ColorGroup.Aaps),
+        TREATMENT_REMOVED (ColorGroup.InsulinTreatment),
+        BOLUS_REMOVED (ColorGroup.InsulinTreatment),
+        CARBS_REMOVED (ColorGroup.CarbTreatment),
+        TEMP_BASAL_REMOVED (ColorGroup.BasalTreatment),
+        TT_REMOVED (ColorGroup.TT),
         NS_PAUSED (ColorGroup.Aaps),
         NS_RESUME (ColorGroup.Aaps),
         NS_QUEUE_CLEARED (ColorGroup.Aaps),
@@ -144,6 +146,7 @@ data class UserEntry(
         NSClientSource,
         PocTech,
         Tomato,
+        Glunovo,
         Xdrip,
         LocalProfile,       //From LocalProfile plugin
         Loop,               //From Loop plugin
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/CgmSourceTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/CgmSourceTransaction.kt
index 0aebab6c6a2..382aed5cdeb 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/CgmSourceTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/CgmSourceTransaction.kt
@@ -27,11 +27,14 @@ class CgmSourceTransaction(
                 noise = it.noise,
                 trendArrow = it.trendArrow,
                 sourceSensor = it.sourceSensor
-            )
-            glucoseValue.interfaceIDs.nightscoutId = it.nightscoutId
+            ).also { gv ->
+                gv.interfaceIDs.nightscoutId = it.nightscoutId
+            }
             // if nsId is not provided in new record, copy from current if exists
             if (glucoseValue.interfaceIDs.nightscoutId == null)
                 current?.let { existing -> glucoseValue.interfaceIDs.nightscoutId = existing.interfaceIDs.nightscoutId }
+            // preserve invalidated status (user may delete record in UI)
+            current?.let { existing -> glucoseValue.isValid = existing.isValid }
             when {
                 // new record, create new
                 current == null                                                                -> {
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsBolusCalculatorResultTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsBolusCalculatorResultTransaction.kt
new file mode 100644
index 00000000000..7ac50e32d2e
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsBolusCalculatorResultTransaction.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.database.transactions
+
+import info.nightscout.androidaps.database.entities.BolusCalculatorResult
+
+/**
+ * Sync the BolusCalculatorResult from NS
+ */
+class SyncNsBolusCalculatorResultTransaction(private val bolusCalculatorResult: BolusCalculatorResult) :
+    Transaction<SyncNsBolusCalculatorResultTransaction.TransactionResult>() {
+
+    override fun run(): TransactionResult {
+        val result = TransactionResult()
+
+        val current: BolusCalculatorResult? =
+            bolusCalculatorResult.interfaceIDs.nightscoutId?.let {
+                database.bolusCalculatorResultDao.findByNSId(it)
+            }
+
+        if (current != null) {
+            // nsId exists, allow only invalidation
+            if (current.isValid && !bolusCalculatorResult.isValid) {
+                current.isValid = false
+                database.bolusCalculatorResultDao.updateExistingEntry(current)
+                result.invalidated.add(current)
+            }
+            return result
+        }
+
+        // not known nsId
+        val existing = database.bolusCalculatorResultDao.findByTimestamp(bolusCalculatorResult.timestamp)
+        if (existing != null && existing.interfaceIDs.nightscoutId == null) {
+            // the same record, update nsId only
+            existing.interfaceIDs.nightscoutId = bolusCalculatorResult.interfaceIDs.nightscoutId
+            existing.isValid = bolusCalculatorResult.isValid
+            database.bolusCalculatorResultDao.updateExistingEntry(existing)
+            result.updatedNsId.add(existing)
+        } else {
+            database.bolusCalculatorResultDao.insertNewEntry(bolusCalculatorResult)
+            result.inserted.add(bolusCalculatorResult)
+        }
+        return result
+
+    }
+
+    class TransactionResult {
+
+        val updatedNsId = mutableListOf<BolusCalculatorResult>()
+        val inserted = mutableListOf<BolusCalculatorResult>()
+        val invalidated = mutableListOf<BolusCalculatorResult>()
+    }
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsBolusTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsBolusTransaction.kt
index 6fbaa57ca27..5c453a3673f 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsBolusTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsBolusTransaction.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.database.entities.Bolus
 /**
  * Sync the Bolus from NS
  */
-class SyncNsBolusTransaction(private val bolus: Bolus, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsBolusTransaction.TransactionResult>() {
+class SyncNsBolusTransaction(private val bolus: Bolus) : Transaction<SyncNsBolusTransaction.TransactionResult>() {
 
     override fun run(): TransactionResult {
         val result = TransactionResult()
@@ -25,8 +25,6 @@ class SyncNsBolusTransaction(private val bolus: Bolus, private val invalidateByN
             return result
         }
 
-        if (invalidateByNsOnly) return result
-
         // not known nsId
         val existing = database.bolusDao.findByTimestamp(bolus.timestamp)
         if (existing != null && existing.interfaceIDs.nightscoutId == null) {
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsCarbsTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsCarbsTransaction.kt
index 40443b06e90..9d4378c01ba 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsCarbsTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsCarbsTransaction.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.database.entities.Carbs
 /**
  * Sync the carbs from NS
  */
-class SyncNsCarbsTransaction(private val carbs: Carbs, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsCarbsTransaction.TransactionResult>() {
+class SyncNsCarbsTransaction(private val carbs: Carbs) : Transaction<SyncNsCarbsTransaction.TransactionResult>() {
 
     override fun run(): TransactionResult {
         val result = TransactionResult()
@@ -25,8 +25,6 @@ class SyncNsCarbsTransaction(private val carbs: Carbs, private val invalidateByN
             return result
         }
 
-        if (invalidateByNsOnly) return result
-
         // not known nsId
         val existing = database.carbsDao.findByTimestamp(carbs.timestamp)
         if (existing != null && existing.interfaceIDs.nightscoutId == null) {
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsEffectiveProfileSwitchTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsEffectiveProfileSwitchTransaction.kt
index fd7eced13c6..93579275e42 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsEffectiveProfileSwitchTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsEffectiveProfileSwitchTransaction.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch
 /**
  * Sync the EffectiveProfileSwitch from NS
  */
-class SyncNsEffectiveProfileSwitchTransaction(private val effectiveProfileSwitch: EffectiveProfileSwitch, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsEffectiveProfileSwitchTransaction.TransactionResult>() {
+class SyncNsEffectiveProfileSwitchTransaction(private val effectiveProfileSwitch: EffectiveProfileSwitch) : Transaction<SyncNsEffectiveProfileSwitchTransaction.TransactionResult>() {
 
     override fun run(): TransactionResult {
         val result = TransactionResult()
@@ -25,8 +25,6 @@ class SyncNsEffectiveProfileSwitchTransaction(private val effectiveProfileSwitch
             return result
         }
 
-        if (invalidateByNsOnly) return result
-
         // not known nsId
         val existing = database.effectiveProfileSwitchDao.findByTimestamp(effectiveProfileSwitch.timestamp)
         if (existing != null && existing.interfaceIDs.nightscoutId == null) {
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsExtendedBolusTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsExtendedBolusTransaction.kt
index 49845038908..22522eb0127 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsExtendedBolusTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsExtendedBolusTransaction.kt
@@ -7,7 +7,8 @@ import kotlin.math.abs
 /**
  * Sync the Extended bolus from NS
  */
-class SyncNsExtendedBolusTransaction(private val extendedBolus: ExtendedBolus, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsExtendedBolusTransaction.TransactionResult>() {
+class SyncNsExtendedBolusTransaction(private val extendedBolus: ExtendedBolus) :
+    Transaction<SyncNsExtendedBolusTransaction.TransactionResult>() {
 
     override fun run(): TransactionResult {
         val result = TransactionResult()
@@ -26,11 +27,14 @@ class SyncNsExtendedBolusTransaction(private val extendedBolus: ExtendedBolus, p
                     database.extendedBolusDao.updateExistingEntry(current)
                     result.invalidated.add(current)
                 }
+                if (current.duration != extendedBolus.duration) {
+                    current.duration = extendedBolus.duration
+                    database.extendedBolusDao.updateExistingEntry(current)
+                    result.updatedDuration.add(current)
+                }
                 return result
             }
 
-            if (invalidateByNsOnly) return result
-
             // not known nsId
             val running = database.extendedBolusDao.getExtendedBolusActiveAt(extendedBolus.timestamp).blockingGet()
             if (running != null && abs(running.timestamp - extendedBolus.timestamp) < 1000 && running.interfaceIDs.nightscoutId == null) { // allow missing milliseconds
@@ -40,6 +44,8 @@ class SyncNsExtendedBolusTransaction(private val extendedBolus: ExtendedBolus, p
                 result.updatedNsId.add(running)
             } else if (running != null) {
                 // another running record. end current and insert new
+                val pctRun = (extendedBolus.timestamp - running.timestamp) / running.duration.toDouble()
+                running.amount *= pctRun
                 running.end = extendedBolus.timestamp
                 database.extendedBolusDao.updateExistingEntry(running)
                 database.extendedBolusDao.insertNewEntry(extendedBolus)
@@ -55,6 +61,8 @@ class SyncNsExtendedBolusTransaction(private val extendedBolus: ExtendedBolus, p
             // ending event
             val running = database.extendedBolusDao.getExtendedBolusActiveAt(extendedBolus.timestamp).blockingGet()
             if (running != null) {
+                val pctRun = (extendedBolus.timestamp - running.timestamp) / running.duration.toDouble()
+                running.amount *= pctRun
                 running.end = extendedBolus.timestamp
                 database.extendedBolusDao.updateExistingEntry(running)
                 result.ended.add(running)
@@ -66,6 +74,7 @@ class SyncNsExtendedBolusTransaction(private val extendedBolus: ExtendedBolus, p
     class TransactionResult {
 
         val updatedNsId = mutableListOf<ExtendedBolus>()
+        val updatedDuration = mutableListOf<ExtendedBolus>()
         val inserted = mutableListOf<ExtendedBolus>()
         val invalidated = mutableListOf<ExtendedBolus>()
         val ended = mutableListOf<ExtendedBolus>()
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsFoodTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsFoodTransaction.kt
index f651b0e7eee..0ed3d70d93c 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsFoodTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsFoodTransaction.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.database.entities.Food
 /**
  * Sync the TherapyEvents from NS
  */
-class SyncNsFoodTransaction(private val food: Food, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsFoodTransaction.TransactionResult>() {
+class SyncNsFoodTransaction(private val food: Food) : Transaction<SyncNsFoodTransaction.TransactionResult>() {
 
     override fun run(): TransactionResult {
         val result = TransactionResult()
@@ -17,7 +17,7 @@ class SyncNsFoodTransaction(private val food: Food, private val invalidateByNsOn
 
         if (current != null) {
             // nsId exists, update if different
-            if (!current.isEqual(food)) {
+            if (!current.contentEqualsTo(food)) {
                 current.copyFrom(food)
                 database.foodDao.updateExistingEntry(current)
                 if (food.isValid && current.isValid) result.updated.add(current)
@@ -26,8 +26,6 @@ class SyncNsFoodTransaction(private val food: Food, private val invalidateByNsOn
             return result
         }
 
-        if (invalidateByNsOnly) return result
-
         // not known nsId, add
         database.foodDao.insertNewEntry(food)
         result.inserted.add(food)
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsOfflineEventTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsOfflineEventTransaction.kt
index d7a741436c5..d5fa3560398 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsOfflineEventTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsOfflineEventTransaction.kt
@@ -7,7 +7,8 @@ import kotlin.math.abs
 /**
  * Sync the OfflineEvent from NS
  */
-class SyncNsOfflineEventTransaction(private val offlineEvent: OfflineEvent, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsOfflineEventTransaction.TransactionResult>() {
+class SyncNsOfflineEventTransaction(private val offlineEvent: OfflineEvent) :
+    Transaction<SyncNsOfflineEventTransaction.TransactionResult>() {
 
     override fun run(): TransactionResult {
         val result = TransactionResult()
@@ -26,11 +27,14 @@ class SyncNsOfflineEventTransaction(private val offlineEvent: OfflineEvent, priv
                     database.offlineEventDao.updateExistingEntry(current)
                     result.invalidated.add(current)
                 }
+                if (current.duration != offlineEvent.duration) {
+                    current.duration = offlineEvent.duration
+                    database.offlineEventDao.updateExistingEntry(current)
+                    result.updatedDuration.add(current)
+                }
                 return result
             }
 
-            if (invalidateByNsOnly) return result
-
             // not known nsId
             val running = database.offlineEventDao.getOfflineEventActiveAt(offlineEvent.timestamp).blockingGet()
             if (running != null && abs(running.timestamp - offlineEvent.timestamp) < 1000 && running.interfaceIDs.nightscoutId == null) { // allow missing milliseconds
@@ -66,6 +70,7 @@ class SyncNsOfflineEventTransaction(private val offlineEvent: OfflineEvent, priv
     class TransactionResult {
 
         val updatedNsId = mutableListOf<OfflineEvent>()
+        val updatedDuration = mutableListOf<OfflineEvent>()
         val inserted = mutableListOf<OfflineEvent>()
         val invalidated = mutableListOf<OfflineEvent>()
         val ended = mutableListOf<OfflineEvent>()
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsProfileSwitchTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsProfileSwitchTransaction.kt
index 40e1ff0aa0b..e99d79a334d 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsProfileSwitchTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsProfileSwitchTransaction.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.database.entities.ProfileSwitch
 /**
  * Sync the ProfileSwitch from NS
  */
-class SyncNsProfileSwitchTransaction(private val profileSwitch: ProfileSwitch, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsProfileSwitchTransaction.TransactionResult>() {
+class SyncNsProfileSwitchTransaction(private val profileSwitch: ProfileSwitch) : Transaction<SyncNsProfileSwitchTransaction.TransactionResult>() {
 
     override fun run(): TransactionResult {
         val result = TransactionResult()
@@ -25,8 +25,6 @@ class SyncNsProfileSwitchTransaction(private val profileSwitch: ProfileSwitch, p
             return result
         }
 
-        if (invalidateByNsOnly) return result
-
         // not known nsId
         val existing = database.profileSwitchDao.findByTimestamp(profileSwitch.timestamp)
         if (existing != null && existing.interfaceIDs.nightscoutId == null) {
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTemporaryBasalTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTemporaryBasalTransaction.kt
index 3c69328e3e1..8a4931617a8 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTemporaryBasalTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTemporaryBasalTransaction.kt
@@ -7,7 +7,9 @@ import kotlin.math.abs
 /**
  * Sync the Temporary Basal from NS
  */
-class SyncNsTemporaryBasalTransaction(private val temporaryBasal: TemporaryBasal, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsTemporaryBasalTransaction.TransactionResult>() {
+class SyncNsTemporaryBasalTransaction(
+    private val temporaryBasal: TemporaryBasal
+) : Transaction<SyncNsTemporaryBasalTransaction.TransactionResult>() {
 
     override fun run(): TransactionResult {
         val result = TransactionResult()
@@ -26,11 +28,14 @@ class SyncNsTemporaryBasalTransaction(private val temporaryBasal: TemporaryBasal
                     database.temporaryBasalDao.updateExistingEntry(current)
                     result.invalidated.add(current)
                 }
+                if (current.duration != temporaryBasal.duration) {
+                    current.duration = temporaryBasal.duration
+                    database.temporaryBasalDao.updateExistingEntry(current)
+                    result.updatedDuration.add(current)
+                }
                 return result
             }
 
-            if (invalidateByNsOnly) return result
-
             // not known nsId
             val running = database.temporaryBasalDao.getTemporaryBasalActiveAt(temporaryBasal.timestamp).blockingGet()
             if (running != null && abs(running.timestamp - temporaryBasal.timestamp) < 1000 && running.interfaceIDs.nightscoutId == null) { // allow missing milliseconds
@@ -57,6 +62,7 @@ class SyncNsTemporaryBasalTransaction(private val temporaryBasal: TemporaryBasal
     class TransactionResult {
 
         val updatedNsId = mutableListOf<TemporaryBasal>()
+        val updatedDuration = mutableListOf<TemporaryBasal>()
         val inserted = mutableListOf<TemporaryBasal>()
         val invalidated = mutableListOf<TemporaryBasal>()
         val ended = mutableListOf<TemporaryBasal>()
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTemporaryTargetTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTemporaryTargetTransaction.kt
index b5f0d694e29..a3eff6d1e6d 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTemporaryTargetTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTemporaryTargetTransaction.kt
@@ -7,7 +7,8 @@ import kotlin.math.abs
 /**
  * Sync the TemporaryTarget from NS
  */
-class SyncNsTemporaryTargetTransaction(private val temporaryTarget: TemporaryTarget, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsTemporaryTargetTransaction.TransactionResult>() {
+class SyncNsTemporaryTargetTransaction(private val temporaryTarget: TemporaryTarget) :
+    Transaction<SyncNsTemporaryTargetTransaction.TransactionResult>() {
 
     override fun run(): TransactionResult {
         val result = TransactionResult()
@@ -26,11 +27,14 @@ class SyncNsTemporaryTargetTransaction(private val temporaryTarget: TemporaryTar
                     database.temporaryTargetDao.updateExistingEntry(current)
                     result.invalidated.add(current)
                 }
+                if (current.duration != temporaryTarget.duration) {
+                    current.duration = temporaryTarget.duration
+                    database.temporaryTargetDao.updateExistingEntry(current)
+                    result.updatedDuration.add(current)
+                }
                 return result
             }
 
-            if (invalidateByNsOnly) return result
-
             // not known nsId
             val running = database.temporaryTargetDao.getTemporaryTargetActiveAt(temporaryTarget.timestamp).blockingGet()
             if (running != null && abs(running.timestamp - temporaryTarget.timestamp) < 1000 && running.interfaceIDs.nightscoutId == null) { // allow missing milliseconds
@@ -66,6 +70,7 @@ class SyncNsTemporaryTargetTransaction(private val temporaryTarget: TemporaryTar
     class TransactionResult {
 
         val updatedNsId = mutableListOf<TemporaryTarget>()
+        val updatedDuration = mutableListOf<TemporaryTarget>()
         val inserted = mutableListOf<TemporaryTarget>()
         val invalidated = mutableListOf<TemporaryTarget>()
         val ended = mutableListOf<TemporaryTarget>()
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTherapyEventTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTherapyEventTransaction.kt
index 64773a3739e..5ed73cf9d86 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTherapyEventTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsTherapyEventTransaction.kt
@@ -5,7 +5,8 @@ import info.nightscout.androidaps.database.entities.TherapyEvent
 /**
  * Sync the TherapyEvents from NS
  */
-class SyncNsTherapyEventTransaction(private val therapyEvent: TherapyEvent, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsTherapyEventTransaction.TransactionResult>() {
+class SyncNsTherapyEventTransaction(private val therapyEvent: TherapyEvent) :
+    Transaction<SyncNsTherapyEventTransaction.TransactionResult>() {
 
     override fun run(): TransactionResult {
         val result = TransactionResult()
@@ -22,11 +23,14 @@ class SyncNsTherapyEventTransaction(private val therapyEvent: TherapyEvent, priv
                 database.therapyEventDao.updateExistingEntry(current)
                 result.invalidated.add(current)
             }
+            if (current.duration != therapyEvent.duration) {
+                current.duration = therapyEvent.duration
+                database.therapyEventDao.updateExistingEntry(current)
+                result.updatedDuration.add(current)
+            }
             return result
         }
 
-        if (invalidateByNsOnly) return result
-
         // not known nsId
         val existing = database.therapyEventDao.findByTimestamp(therapyEvent.type, therapyEvent.timestamp)
         if (existing != null && existing.interfaceIDs.nightscoutId == null) {
@@ -46,6 +50,7 @@ class SyncNsTherapyEventTransaction(private val therapyEvent: TherapyEvent, priv
     class TransactionResult {
 
         val updatedNsId = mutableListOf<TherapyEvent>()
+        val updatedDuration = mutableListOf<TherapyEvent>()
         val inserted = mutableListOf<TherapyEvent>()
         val invalidated = mutableListOf<TherapyEvent>()
     }
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpExtendedBolusTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpExtendedBolusTransaction.kt
index f3cd17eaa6f..2cf424fe807 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpExtendedBolusTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpExtendedBolusTransaction.kt
@@ -30,8 +30,9 @@ class SyncPumpExtendedBolusTransaction(private val extendedBolus: ExtendedBolus)
             val running = database.extendedBolusDao.getExtendedBolusActiveAt(extendedBolus.timestamp, extendedBolus.interfaceIDs.pumpType!!, extendedBolus.interfaceIDs.pumpSerial!!).blockingGet()
             if (running != null) {
                 val pctRun = (extendedBolus.timestamp - running.timestamp) / running.duration.toDouble()
-                running.amount /= pctRun
+                running.amount *= pctRun
                 running.end = extendedBolus.timestamp
+                running.interfaceIDs.endId = extendedBolus.interfaceIDs.pumpId
                 database.extendedBolusDao.updateExistingEntry(running)
                 result.updated.add(running)
             }
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpTemporaryBasalTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpTemporaryBasalTransaction.kt
index bd4c64cf2d0..e3303c5c90b 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpTemporaryBasalTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpTemporaryBasalTransaction.kt
@@ -35,6 +35,7 @@ class SyncPumpTemporaryBasalTransaction(
             val running = database.temporaryBasalDao.getTemporaryBasalActiveAt(temporaryBasal.timestamp, temporaryBasal.interfaceIDs.pumpType!!, temporaryBasal.interfaceIDs.pumpSerial!!).blockingGet()
             if (running != null) {
                 running.end = temporaryBasal.timestamp
+                running.interfaceIDs.endId = temporaryBasal.interfaceIDs.pumpId
                 database.temporaryBasalDao.updateExistingEntry(running)
                 result.updated.add(running)
             }
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt
index 31ff3fd40b0..84ba98e25b8 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt
@@ -19,11 +19,11 @@ import info.nightscout.androidaps.events.EventInitializationChanged
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.events.EventTempBasalChange
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Pump
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.queue.events.EventQueueChanged
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -38,13 +38,13 @@ import javax.inject.Inject
 
 class DiaconnG8Fragment : DaggerFragment() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var sp: SP
     @Inject lateinit var warnColors: WarnColors
     @Inject lateinit var dateUtil: DateUtil
@@ -126,8 +126,8 @@ class DiaconnG8Fragment : DaggerFragment() {
                         binding.btconnection.text = "{fa-bluetooth-b}"
                     else                                       -> {}
                 }
-                if (it.getStatus(resourceHelper) != "") {
-                    binding.diaconnG8Pumpstatus.text = it.getStatus(resourceHelper)
+                if (it.getStatus(rh) != "") {
+                    binding.diaconnG8Pumpstatus.text = it.getStatus(rh)
                     binding.diaconnG8Pumpstatuslayout.visibility = View.VISIBLE
                 } else {
                     binding.diaconnG8Pumpstatuslayout.visibility = View.GONE
@@ -158,7 +158,7 @@ class DiaconnG8Fragment : DaggerFragment() {
         if (pump.lastConnection != 0L) {
             val agoMsec = System.currentTimeMillis() - pump.lastConnection
             val agoMin = (agoMsec.toDouble() / 60.0 / 1000.0).toInt()
-            binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + resourceHelper.gs(R.string.minago, agoMin) + ")"
+            binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(R.string.minago, agoMin) + ")"
             warnColors.setColor(binding.lastconnection, agoMin.toDouble(), 16.0, 31.0)
         }
         if (pump.lastBolusTime != 0L) {
@@ -166,24 +166,24 @@ class DiaconnG8Fragment : DaggerFragment() {
             val agoHours = agoMsec.toDouble() / 60.0 / 60.0 / 1000.0
             if (agoHours < 6)
             // max 6h back
-                binding.lastbolus.text = dateUtil.timeString(pump.lastBolusTime) + " " + dateUtil.sinceString(pump.lastBolusTime, resourceHelper) + " " + resourceHelper.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
+                binding.lastbolus.text = dateUtil.timeString(pump.lastBolusTime) + " " + dateUtil.sinceString(pump.lastBolusTime, rh) + " " + rh.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
             else
                 binding.lastbolus.text = ""
         }
 
         val todayInsulinAmount = (pump.todayBaseAmount + pump.todaySnackAmount + pump.todayMealAmount)
         val todayInsulinLimitAmount = (pump.maxBasal.toInt() * 24) + pump.maxBolusePerDay.toInt()
-        binding.dailyunits.text = resourceHelper.gs(R.string.reservoirvalue, todayInsulinAmount, todayInsulinLimitAmount)
+        binding.dailyunits.text = rh.gs(R.string.reservoirvalue, todayInsulinAmount, todayInsulinLimitAmount)
         warnColors.setColor(binding.dailyunits, todayInsulinAmount, todayInsulinLimitAmount * 0.75, todayInsulinLimitAmount * 0.9)
-        binding.basabasalrate.text = pump.baseInjAmount.toString() +" / "+ resourceHelper.gs(R.string.pump_basebasalrate, plugin.baseBasalRate)
+        binding.basabasalrate.text = pump.baseInjAmount.toString() +" / "+ rh.gs(R.string.pump_basebasalrate, plugin.baseBasalRate)
 
         binding.tempbasal.text = diaconnG8Pump.temporaryBasalToString()
         binding.extendedbolus.text = diaconnG8Pump.extendedBolusToString()
-        binding.reservoir.text = resourceHelper.gs(R.string.reservoirvalue, pump.systemRemainInsulin, 307)
+        binding.reservoir.text = rh.gs(R.string.reservoirvalue, pump.systemRemainInsulin, 307)
         warnColors.setColorInverse(binding.reservoir, pump.systemRemainInsulin , 50.0, 20.0)
         binding.battery.text = "{fa-battery-" + pump.systemRemainBattery / 25  + "}" + " ("+ pump.systemRemainBattery + " %)"
         warnColors.setColorInverse(binding.battery, pump.systemRemainBattery.toDouble(), 51.0, 26.0)
-        binding.firmware.text = resourceHelper.gs(R.string.diaconn_g8_pump) + "\nVersion: " + pump.majorVersion.toString() + "." +  pump.minorVersion.toString() + "\nCountry: "+pump.country.toString() + "\nProductType: "+ pump.productType.toString() + "\nManufacture: " + pump.makeYear + "." + pump.makeMonth + "." + pump.makeDay
+        binding.firmware.text = rh.gs(R.string.diaconn_g8_pump) + "\nVersion: " + pump.majorVersion.toString() + "." +  pump.minorVersion.toString() + "\nCountry: "+pump.country.toString() + "\nProductType: "+ pump.productType.toString() + "\nManufacture: " + pump.makeYear + "." + pump.makeMonth + "." + pump.makeDay
         binding.basalstep.text = pump.basalStep.toString()
         binding.bolusstep.text = pump.bolusStep.toString()
         binding.serialNumber.text = pump.serialNo.toString()
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt
index 168c0f3fa58..277f723dac9 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt
@@ -20,7 +20,7 @@ import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.common.ManufacturerType
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
@@ -48,13 +48,13 @@ import kotlin.math.max
 class DiaconnG8Plugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val context: Context,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     private val constraintChecker: ConstraintChecker,
     private val profileFunction: ProfileFunction,
     private val sp: SP,
-    commandQueue: CommandQueueProvider,
+    commandQueue: CommandQueue,
     private val diaconnG8Pump: DiaconnG8Pump,
     private val pumpSync: PumpSync,
     private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
@@ -69,7 +69,7 @@ class DiaconnG8Plugin @Inject constructor(
     .shortName(R.string.diaconn_g8_pump_shortname)
     .preferencesId(R.xml.pref_diaconn)
     .description(R.string.description_pump_diaconn_g8),
-    injector, aapsLogger, resourceHelper, commandQueue
+    injector, aapsLogger, rh, commandQueue
 ), Pump, Diaconn, Constraints {
 
     private val disposable = CompositeDisposable()
@@ -130,7 +130,7 @@ class DiaconnG8Plugin @Inject constructor(
         aapsLogger.debug(LTag.PUMP, "Diaconn G8 connect from: $reason")
         if(diaconnG8Service != null && mDeviceAddress != "" && mDeviceName != "") {
             val success = diaconnG8Service?.connect(reason, mDeviceAddress) ?: false
-            if(!success) ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.ble_not_supported))
+            if(!success) ToastUtils.showToastInUiThread(context, rh.gs(R.string.ble_not_supported))
         }
     }
 
@@ -166,18 +166,18 @@ class DiaconnG8Plugin @Inject constructor(
 
     // Constraints interface
     override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
-        absoluteRate.setIfSmaller(aapsLogger, diaconnG8Pump.maxBasal, resourceHelper.gs(R.string.limitingbasalratio, diaconnG8Pump.maxBasal, resourceHelper.gs(R.string.pumplimit)), this)
+        absoluteRate.setIfSmaller(aapsLogger, diaconnG8Pump.maxBasal, rh.gs(R.string.limitingbasalratio, diaconnG8Pump.maxBasal, rh.gs(R.string.pumplimit)), this)
         return absoluteRate
     }
 
     override fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> {
-        percentRate.setIfGreater(aapsLogger, 0, resourceHelper.gs(R.string.limitingpercentrate, 0, resourceHelper.gs(R.string.itmustbepositivevalue)), this)
-        percentRate.setIfSmaller(aapsLogger, pumpDescription.maxTempPercent, resourceHelper.gs(R.string.limitingpercentrate, pumpDescription.maxTempPercent, resourceHelper.gs(R.string.pumplimit)), this)
+        percentRate.setIfGreater(aapsLogger, 0, rh.gs(R.string.limitingpercentrate, 0, rh.gs(R.string.itmustbepositivevalue)), this)
+        percentRate.setIfSmaller(aapsLogger, pumpDescription.maxTempPercent, rh.gs(R.string.limitingpercentrate, pumpDescription.maxTempPercent, rh.gs(R.string.pumplimit)), this)
         return percentRate
     }
 
     override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
-        insulin.setIfSmaller(aapsLogger, diaconnG8Pump.maxBolus, resourceHelper.gs(R.string.limitingbolus, diaconnG8Pump.maxBolus, resourceHelper.gs(R.string.pumplimit)), this)
+        insulin.setIfSmaller(aapsLogger, diaconnG8Pump.maxBolus, rh.gs(R.string.limitingbolus, diaconnG8Pump.maxBolus, rh.gs(R.string.pumplimit)), this)
         return insulin
     }
 
@@ -198,22 +198,22 @@ class DiaconnG8Plugin @Inject constructor(
     override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
         val result = PumpEnactResult(injector)
         if (!isInitialized()) {
-            val notification = Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT)
+            val notification = Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, rh.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
-            result.comment = resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet)
+            result.comment = rh.gs(R.string.pumpNotInitializedProfileNotSet)
             return result
         } else {
             rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
         }
         return if (diaconnG8Service?.updateBasalsInPump(profile) != true) {
-            val notification = Notification(Notification.FAILED_UPDATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT)
+            val notification = Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.failedupdatebasalprofile), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
-            result.comment = resourceHelper.gs(R.string.failedupdatebasalprofile)
+            result.comment = rh.gs(R.string.failedupdatebasalprofile)
             result
         } else {
             rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
             rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE))
-            val notification = Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60)
+            val notification = Notification(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, 60)
             rxBus.send(EventNewNotification(notification))
             result.success = true
             result.enacted = true
@@ -269,7 +269,7 @@ class DiaconnG8Plugin @Inject constructor(
             if(result.success) result.enacted = true
             if (!result.success) {
                 setErrorMsg(diaconnG8Pump.resultErrorCode, result)
-            } else result.comment = resourceHelper.gs(R.string.ok)
+            } else result.comment = rh.gs(R.string.ok)
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered)
             result
         } else {
@@ -277,7 +277,7 @@ class DiaconnG8Plugin @Inject constructor(
             result.success = false
             result.bolusDelivered = 0.0
             result.carbsDelivered = 0.0
-            result.comment = resourceHelper.gs(R.string.invalidinput)
+            result.comment = rh.gs(R.string.invalidinput)
             aapsLogger.error("deliverTreatment: Invalid input")
             result
         }
@@ -291,7 +291,7 @@ class DiaconnG8Plugin @Inject constructor(
     @Synchronized
     override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult {
         val result = PumpEnactResult(injector)
-        var absoluteAfterConstrain = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
+        val absoluteAfterConstrain = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
         val doTempOff = baseBasalRate - absoluteAfterConstrain == 0.0
         val doLowTemp = absoluteAfterConstrain < baseBasalRate
         val doHighTemp = absoluteAfterConstrain > baseBasalRate
@@ -312,7 +312,7 @@ class DiaconnG8Plugin @Inject constructor(
 
         if (doLowTemp || doHighTemp) {
             // Check if some temp is already in progress
-            if(absoluteAfterConstrain > 6.0) absoluteAfterConstrain = 6.0  // pumpLimit
+            //if(absoluteAfterConstrain > 6.0) absoluteAfterConstrain = 6.0  // pumpLimit
             //val activeTemp = activePluginProvider.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())
             if (diaconnG8Pump.isTempBasalInProgress) {
                 aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: currently running")
@@ -343,7 +343,7 @@ class DiaconnG8Plugin @Inject constructor(
             if (connectionOK && diaconnG8Pump.isTempBasalInProgress && diaconnG8Pump.tempBasalAbsoluteRate == absoluteAfterConstrain) {
                 result.enacted = true
                 result.success = true
-                result.comment = resourceHelper.gs(R.string.ok)
+                result.comment = rh.gs(R.string.ok)
                 result.isTempCancel = false
                 result.duration = diaconnG8Pump.tempBasalRemainingMin
                 result.absolute = diaconnG8Pump.tempBasalAbsoluteRate
@@ -355,7 +355,7 @@ class DiaconnG8Plugin @Inject constructor(
 
         result.enacted = false
         result.success = false
-        result.comment = resourceHelper.gs(R.string.tempbasaldeliveryerror)
+        result.comment = rh.gs(R.string.tempbasaldeliveryerror)
         aapsLogger.error("setTempBasalAbsolute: Failed to set temp basal")
         return result
     }
@@ -383,7 +383,7 @@ class DiaconnG8Plugin @Inject constructor(
         if (diaconnG8Pump.isExtendedInProgress && abs(diaconnG8Pump.extendedBolusAmount - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
             result.enacted = false
             result.success = true
-            result.comment = resourceHelper.gs(R.string.ok)
+            result.comment = rh.gs(R.string.ok)
             result.duration = diaconnG8Pump.extendedBolusRemainingMinutes
             result.absolute = diaconnG8Pump.extendedBolusAbsoluteRate
             result.isPercent = false
@@ -397,7 +397,7 @@ class DiaconnG8Plugin @Inject constructor(
         if (connectionOK) {
             result.enacted = true
             result.success = true
-            result.comment = resourceHelper.gs(R.string.ok)
+            result.comment = rh.gs(R.string.ok)
             result.isTempCancel = false
             result.duration = diaconnG8Pump.extendedBolusRemainingMinutes
             result.absolute = diaconnG8Pump.extendedBolusAbsoluteRate
@@ -427,7 +427,7 @@ class DiaconnG8Plugin @Inject constructor(
             result.success = true
             result.enacted = false
             result.isTempCancel = true
-            result.comment = resourceHelper.gs(R.string.ok)
+            result.comment = rh.gs(R.string.ok)
             aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK")
         }
         return result
@@ -447,7 +447,7 @@ class DiaconnG8Plugin @Inject constructor(
        } else {
             result.success = true
             result.enacted = false
-            result.comment = resourceHelper.gs(R.string.ok)
+            result.comment = rh.gs(R.string.ok)
             aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus: OK")
         }
         return result
@@ -552,32 +552,32 @@ class DiaconnG8Plugin @Inject constructor(
     @Synchronized
     fun setErrorMsg(errorCode: Int, result: PumpEnactResult) {
         when (errorCode) {
-            1 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_1)
-            2 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_2)
-            3 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_3)
-            4 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_4)
-            6 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_6)
-            7 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_7)
-            8 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_8)
-            9 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_9)
-            10 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_10)
-            11 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_11)
-            12 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_12)
-            13 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_13)
-            14 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_14)
-            15 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_15)
-            32 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_32)
-            33 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_33)
-            34 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_34)
-            35 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_35)
-            36 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_36)
+            1 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_1)
+            2 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_2)
+            3 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_3)
+            4 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_4)
+            6 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_6)
+            7 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_7)
+            8 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_8)
+            9 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_9)
+            10 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_10)
+            11 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_11)
+            12 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_12)
+            13 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_13)
+            14 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_14)
+            15 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_15)
+            32 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_32)
+            33 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_33)
+            34 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_34)
+            35 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_35)
+            36 -> result.comment = rh.gs(R.string.diaconn_g8_errorcode_36)
             else -> result.comment = "not defined Error code: $errorCode"
         }
     }
 
     override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
 
-        val bolusSpeedPreference: Preference? = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_diaconn_g8_bolusspeed))
+        val bolusSpeedPreference: Preference? = preferenceFragment.findPreference(rh.gs(R.string.key_diaconn_g8_bolusspeed))
         bolusSpeedPreference?.setOnPreferenceChangeListener { _, newValue ->
             val intBolusSpeed = newValue.toString().toInt()
 
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt
index 77739cf9e9e..fab0ccc26a9 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt
@@ -21,7 +21,6 @@ class DiaconnG8Pump @Inject constructor(
     private val dateUtil: DateUtil
 ) {
 
-
     var maxBolusePerDay: Double = 0.0
     var pumpIncarnationNum: Int = 65536
     var isPumpVersionGe2_63: Boolean = false // is pumpVersion higher then 2.63
@@ -37,6 +36,7 @@ class DiaconnG8Pump @Inject constructor(
     var injectionBlockGrade: Int = 0
     var lastConnection: Long = 0
     var lastSettingsRead: Long = 0
+    var mealLimitTime: Int = 0
 
     // time
     private var pumpTime: Long = 0
@@ -259,9 +259,9 @@ class DiaconnG8Pump @Inject constructor(
     // 7. Tempbasal status
     var tbStatus = 0 // 임시기저 상태 (1 : running, 2:not  running )
     var tbTime = 0 // 임시기저 시간
-    var tbInjectRateRatio = 0 // 임시기저 주입량/률  1000(0.00U)~1600(6.00U), 50000(0%)~50200(200%), 50000이상이면 주입률로 판정
+    var tbInjectRateRatio = 0 // 임시기저 주입량/률  1000(0.00U)~1600(6.00U), 50000(0%)~50250(250%), 50000이상이면 주입률로 판정
     var tbElapsedTime = 0 // 임시기저 경과 시간(0~1425분)
-    var tbInjectAbsoluteValue = 0.0 // 임시기저 주입량/률  1000(0.00U)~1600(6.00U)
+    var tbInjectAbsoluteValue = 0.0 // 임시기저 주입량/률  1000(0.00U)~2500(15.00U)
 
     // 8. Basal status
     var baseStatus = 0 // 주입상태
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt
index 0581f0a42b1..baf3825e1aa 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt
@@ -21,7 +21,7 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.diaconn.events.EventDiaconnG8DeviceChange
 import info.nightscout.androidaps.diaconn.R
 import info.nightscout.androidaps.diaconn.databinding.DiaconnG8BlescannerActivityBinding
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
@@ -30,7 +30,7 @@ import javax.inject.Inject
 class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var sp: SP
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var blePreCheck: BlePreCheck
 
     private var listAdapter: ListAdapter? = null
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt
index 06ec319cb4d..6be6b270318 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt
@@ -17,10 +17,10 @@ import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
 import info.nightscout.androidaps.diaconn.databinding.DiaconnG8HistoryActivityBinding
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
@@ -36,12 +36,12 @@ import javax.inject.Inject
 
 class DiaconnG8HistoryActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var diaconnHistoryRecordDao: DiaconnHistoryRecordDao
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var aapsSchedulers: AapsSchedulers
@@ -63,7 +63,7 @@ class DiaconnG8HistoryActivity : NoSplashAppCompatActivity() {
         disposable += rxBus
             .toObservable(EventPumpStatusChanged::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({ binding.status.text = it.getStatus(resourceHelper) }) { fabricPrivacy.logException(it) }
+            .subscribe({ binding.status.text = it.getStatus(rh) }) { fabricPrivacy.logException(it) }
         swapAdapter(showingType)
     }
 
@@ -84,13 +84,13 @@ class DiaconnG8HistoryActivity : NoSplashAppCompatActivity() {
 
         // Types
         val typeList = ArrayList<TypeList>()
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_ALARM, resourceHelper.gs(R.string.diaconn_g8_history_alarm)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BASALHOUR, resourceHelper.gs(R.string.diaconn_g8_history_basalhours)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BOLUS, resourceHelper.gs(R.string.diaconn_g8_history_bolus)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_TB, resourceHelper.gs(R.string.diaconn_g8_history_tempbasal)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_DAILY, resourceHelper.gs(R.string.diaconn_g8_history_dailyinsulin)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_REFILL, resourceHelper.gs(R.string.diaconn_g8_history_refill)))
-        typeList.add(TypeList(RecordTypes.RECORD_TYPE_SUSPEND, resourceHelper.gs(R.string.diaconn_g8_history_suspend)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_ALARM, rh.gs(R.string.diaconn_g8_history_alarm)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BASALHOUR, rh.gs(R.string.diaconn_g8_history_basalhours)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BOLUS, rh.gs(R.string.diaconn_g8_history_bolus)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_TB, rh.gs(R.string.diaconn_g8_history_tempbasal)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_DAILY, rh.gs(R.string.diaconn_g8_history_dailyinsulin)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_REFILL, rh.gs(R.string.diaconn_g8_history_refill)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_SUSPEND, rh.gs(R.string.diaconn_g8_history_suspend)))
         binding.spinner.adapter = ArrayAdapter(this, R.layout.spinner_centered, typeList)
 
         binding.reload.setOnClickListener {
@@ -163,9 +163,9 @@ class DiaconnG8HistoryActivity : NoSplashAppCompatActivity() {
                 }
 
                 RecordTypes.RECORD_TYPE_DAILY -> {
-                    holder.dailyBasal.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBasal)
-                    holder.dailyBolus.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBolus)
-                    holder.dailyTotal.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBolus + record.dailyBasal)
+                    holder.dailyBasal.text = rh.gs(R.string.formatinsulinunits, record.dailyBasal)
+                    holder.dailyBolus.text = rh.gs(R.string.formatinsulinunits, record.dailyBolus)
+                    holder.dailyTotal.text = rh.gs(R.string.formatinsulinunits, record.dailyBolus + record.dailyBasal)
                     holder.time.text = dateUtil.dateString(record.timestamp)
                     holder.time.visibility = View.VISIBLE
                     holder.value.visibility = View.GONE
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt
index 4ec3c4b3a28..1676859acdd 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt
@@ -15,10 +15,10 @@ import info.nightscout.androidaps.diaconn.R
 import info.nightscout.androidaps.diaconn.databinding.DiaconnG8UserOptionsActivityBinding
 
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.ToastUtils
@@ -30,12 +30,12 @@ import javax.inject.Inject
 class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var context: Context
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var sp: SP
 
     private val disposable = CompositeDisposable()
@@ -158,7 +158,7 @@ class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
                     val i = Intent(context, ErrorHelperActivity::class.java)
                     i.putExtra("soundid", R.raw.boluserror)
                     i.putExtra("status", result.comment)
-                    i.putExtra("title", resourceHelper.gs(R.string.pumperror))
+                    i.putExtra("title", rh.gs(R.string.pumperror))
                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                     context.startActivity(i)
                 }
@@ -169,9 +169,9 @@ class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
 
     private fun fillSoundCategory() {
         val categories = ArrayList<String>()
-        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_sound))
-        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_vibrate))
-        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_silent))
+        categories.add(rh.gs(R.string.diaconn_g8_pumpalarm_sound))
+        categories.add(rh.gs(R.string.diaconn_g8_pumpalarm_vibrate))
+        categories.add(rh.gs(R.string.diaconn_g8_pumpalarm_silent))
         context.let { context ->
             val adapterCategories = ArrayAdapter(context, R.layout.spinner_centered, categories)
             binding.beepAndAlarm.adapter = adapterCategories
@@ -180,9 +180,9 @@ class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
 
     private fun fillSoundSubCategory() {
         val categories = ArrayList<String>()
-        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_intensity_low))
-        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_intensity_middle))
-        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_intensity_high))
+        categories.add(rh.gs(R.string.diaconn_g8_pumpalarm_intensity_low))
+        categories.add(rh.gs(R.string.diaconn_g8_pumpalarm_intensity_middle))
+        categories.add(rh.gs(R.string.diaconn_g8_pumpalarm_intensity_high))
         context.let { context ->
             val adapterCategories = ArrayAdapter(context, R.layout.spinner_centered, categories)
             binding.alarmIntesity.adapter = adapterCategories
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt
index 26bb9a78ab7..aeb445cc1c0 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt
@@ -2,7 +2,12 @@ package info.nightscout.androidaps.diaconn.packet
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.StringUtils
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
 
 /**
@@ -11,6 +16,8 @@ import javax.inject.Inject
 class BasalLimitInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
 
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+    @Inject lateinit var rh: ResourceHelper
 
     init {
         msgType = 0x92.toByte()
@@ -32,7 +39,12 @@ class BasalLimitInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8P
             return
         }
         diaconnG8Pump.maxBasalPerHours = getShortToInt(bufferData).toDouble() / 100.0  // not include tempbasal limit
-        diaconnG8Pump.maxBasal =  diaconnG8Pump.maxBasalPerHours * 2 // include tempbasal
+        val pumpFirmwareVersion = sp.getString(rh.gs(R.string.pumpversion), "")
+        if(!StringUtils.emptyString(pumpFirmwareVersion) && PumplogUtil.isPumpVersionGe(pumpFirmwareVersion, 3, 0)) {
+            diaconnG8Pump.maxBasal =  diaconnG8Pump.maxBasalPerHours * 2.5 // include tempbasal
+        } else {
+            diaconnG8Pump.maxBasal =  diaconnG8Pump.maxBasalPerHours * 2.0 // include tempbasal
+        }
 
         aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
         aapsLogger.debug(LTag.PUMPCOMM, "maxBasal --> ${diaconnG8Pump.maxBasal}")
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt
index 5b56b512df5..3bb56b63374 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt
@@ -4,9 +4,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.diaconn.DiaconnG8Pump
 import info.nightscout.androidaps.diaconn.R
 import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
-import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.joda.time.DateTime
@@ -22,8 +20,7 @@ class BigAPSMainInfoInquireResponsePacket(
 
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
     @Inject lateinit var sp: SP
-    @Inject lateinit var resourceHelper: ResourceHelper
-    private var pumpDesc = PumpDescription(PumpType.DIACONN_G8)
+    @Inject lateinit var rh: ResourceHelper
 
     init {
         msgType = 0x94.toByte()
@@ -77,7 +74,7 @@ class BigAPSMainInfoInquireResponsePacket(
         diaconnG8Pump.minorVersion = getByteToInt(bufferData)
 
         // save current pump firmware version
-        sp.putString(resourceHelper.gs(R.string.pumpversion), diaconnG8Pump.majorVersion.toString() + "." + diaconnG8Pump.minorVersion.toString())
+        sp.putString(rh.gs(R.string.pumpversion), diaconnG8Pump.majorVersion.toString() + "." + diaconnG8Pump.minorVersion.toString())
 
         // 5. pump log status
         diaconnG8Pump.pumpLastLogNum = getShortToInt(bufferData) // last saved log no
@@ -167,9 +164,10 @@ class BigAPSMainInfoInquireResponsePacket(
 
         // 16. 1hour basal limit
         diaconnG8Pump.maxBasalPerHours = getShortToInt(bufferData).toDouble() / 100.0  // not include tempbasal limit
-        diaconnG8Pump.maxBasal =  diaconnG8Pump.maxBasalPerHours * 2 // include tempbasal
+        diaconnG8Pump.maxBasal =  diaconnG8Pump.maxBasalPerHours * 2.5 // include tempbasal
 
         // 17. snack limit
+        diaconnG8Pump.mealLimitTime = getByteToInt(bufferData) // mealLimittime
         diaconnG8Pump.maxBolus =  getShortToInt(bufferData).toDouble() / 100
         diaconnG8Pump.maxBolusePerDay =  getShortToInt(bufferData).toDouble() / 100
 
@@ -216,7 +214,7 @@ class BigAPSMainInfoInquireResponsePacket(
         diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][23] = diaconnG8Pump.baseAmount24
 
         //incarnation no 처리
-        diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(resourceHelper.gs(R.string.pumpversion), ""),2, 63)
+        diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(rh.gs(R.string.pumpversion), ""),2, 63)
 
         aapsLogger.debug(LTag.PUMPCOMM, "result > " + diaconnG8Pump.result)
         aapsLogger.debug(LTag.PUMPCOMM, "systemRemainInsulin > " + diaconnG8Pump.systemRemainInsulin)
@@ -323,6 +321,7 @@ class BigAPSMainInfoInquireResponsePacket(
         aapsLogger.debug(LTag.PUMPCOMM, "maxBasal > " + diaconnG8Pump.maxBasal)
         aapsLogger.debug(LTag.PUMPCOMM, "maxBolus > " + diaconnG8Pump.maxBolus)
         aapsLogger.debug(LTag.PUMPCOMM, "maxBolusePerDay > " + diaconnG8Pump.maxBolusePerDay)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealLimitTime > " + diaconnG8Pump.mealLimitTime)
         aapsLogger.debug(LTag.PUMPCOMM, "beepAndAlarm > " + diaconnG8Pump.beepAndAlarm)
         aapsLogger.debug(LTag.PUMPCOMM, "alarmIntesity > " + diaconnG8Pump.alarmIntesity)
         aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec > " + diaconnG8Pump.lcdOnTimeSec)
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt
index e75008d66c8..12bb0ddc232 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
@@ -31,8 +31,8 @@ class BigLogInquireResponsePacket(
     injector: HasAndroidInjector
 ) : DiaconnG8Packet(injector) {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
     @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
@@ -89,8 +89,8 @@ class BigLogInquireResponsePacket(
 
             diaconnG8Pump.apsWrappingCount = wrapingCount
             diaconnG8Pump.apslastLogNum  = logNum
-            sp.putInt(resourceHelper.gs(R.string.apslastLogNum), logNum)
-            sp.putInt(resourceHelper.gs(R.string.apsWrappingCount), wrapingCount)
+            sp.putInt(rh.gs(R.string.apslastLogNum), logNum)
+            sp.putInt(rh.gs(R.string.apsWrappingCount), wrapingCount)
 
             // process Log to DB
             val logDataToHexString = toNarrowHex(logdata)
@@ -118,7 +118,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.value = logItem.injectAmount / 100.0
                     diaconnG8HistoryRecord.duration =  logItem.getInjectTime()
                     diaconnG8HistoryRecord.bolusType = "M" // meal bolus
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logmealsuccess)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logmealsuccess)
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "MEALBOLUSSUCCESS" + dateUtil.timeString(logDateTime)
                 }
@@ -142,7 +142,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.value = if ((logItem.injectAmount / 100.0) < 0) 0.0 else (logItem.injectAmount / 100.0)
                     diaconnG8HistoryRecord.duration = logItem.getInjectTime()
                     diaconnG8HistoryRecord.bolusType = "M" // Meal bolus
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logmealfail)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logmealfail)
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "MEALBOLUSFAIL " + dateUtil.timeString(logDateTime)
                 }
@@ -167,7 +167,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.value = logItem.injectAmount / 100.0
                     diaconnG8HistoryRecord.duration = logItem.getInjectTime()
                     diaconnG8HistoryRecord.bolusType = "B" // bolus
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logsuccess)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logsuccess)
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "BOLUSSUCCESS" + dateUtil.timeString(logDateTime)
                 }
@@ -217,7 +217,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.timestamp = logDateTime
                     diaconnG8HistoryRecord.value = logItem.setAmount / 100.0
                     diaconnG8HistoryRecord.duration = logItem.getInjectTime()
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logsquarestart)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logsquarestart)
                     diaconnG8HistoryRecord.bolusType = "E" // Extended
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "EXTENDEDBOLUSSTART " + dateUtil.timeString(logDateTime)
@@ -231,7 +231,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
                     diaconnG8HistoryRecord.timestamp = logDateTime
                     diaconnG8HistoryRecord.duration = logItem.getInjectTime()
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logsquaresuccess)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logsquaresuccess)
                     diaconnG8HistoryRecord.bolusType = "E" // Extended
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "EXTENDEDBOLUSEND " + dateUtil.timeString(logDateTime)
@@ -278,7 +278,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.timestamp = logDateTime
                     diaconnG8HistoryRecord.value = logItem.setSquareAmount / 100.0
                     diaconnG8HistoryRecord.duration = logItem.getInjectTime() * 10 // (1~30) 1:10min 30:300min
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logdualsquarestart)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logdualsquarestart)
                     diaconnG8HistoryRecord.bolusType = "D" // Extended
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
 
@@ -309,7 +309,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.value = logItem.injectAmount / 100.0
                     diaconnG8HistoryRecord.duration = logItem.getInjectTime()
                     diaconnG8HistoryRecord.bolusType = "D" // bolus
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logdualnormalsuccess)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logdualnormalsuccess)
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "DUALBOLUS" + dateUtil.timeString(logDateTime)
                 }
@@ -325,7 +325,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.value = logItem.injectSquareAmount / 100.0
                     diaconnG8HistoryRecord.duration = logItem.getInjectTime()
                     diaconnG8HistoryRecord.bolusType = "D"
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logdualsquaresuccess)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logdualsquaresuccess)
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "DUALBOLUS SQUARESUCCESS " + dateUtil.timeString(logDateTime)
                 }
@@ -372,7 +372,7 @@ class BigLogInquireResponsePacket(
                     val logDateTime = logStartDate.time
                     diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_SUSPEND
                     diaconnG8HistoryRecord.timestamp = logDateTime
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_lgosuspend, logItem.getBasalPattern())
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_lgosuspend, logItem.getBasalPattern())
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "SUSPEND " + dateUtil.timeString(logDateTime)
                 }
@@ -384,7 +384,7 @@ class BigLogInquireResponsePacket(
                     val logDateTime = logStartDate.time
                     diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_SUSPEND
                     diaconnG8HistoryRecord.timestamp = logDateTime
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_lgorelease, logItem.getBasalPattern())
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_lgorelease, logItem.getBasalPattern())
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "SUSPENDRELEASE " + dateUtil.timeString(logDateTime)
                 }
@@ -407,7 +407,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_REFILL
                     diaconnG8HistoryRecord.timestamp = logDateTime
                     diaconnG8HistoryRecord.value = logItem.remainAmount / 100.0
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_loginjectorprime, logItem.primeAmount / 100.0)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_loginjectorprime, logItem.primeAmount / 100.0)
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "INSULINCHANGE " + dateUtil.timeString(logDateTime)
                 }
@@ -421,7 +421,7 @@ class BigLogInquireResponsePacket(
                         val newRecord = pumpSync.insertTherapyEventIfNewWithTimestamp(
                             timestamp = logDateTime,
                             type = DetailedBolusInfo.EventType.NOTE,
-                            note = resourceHelper.gs(R.string.diaconn_g8_logtubeprime, logItem.primeAmount / 100.0),
+                            note = rh.gs(R.string.diaconn_g8_logtubeprime, logItem.primeAmount / 100.0),
                             pumpId = logDateTime,
                             pumpType = PumpType.DIACONN_G8,
                             pumpSerial = diaconnG8Pump.serialNo.toString()
@@ -433,7 +433,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_REFILL
                     diaconnG8HistoryRecord.timestamp = logDateTime
                     diaconnG8HistoryRecord.value = logItem.remainAmount / 100.0
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logtubeprime, logItem.primeAmount / 100.0)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logtubeprime, logItem.primeAmount / 100.0)
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "TUBECHANGE " + dateUtil.timeString(logDateTime)
                 }
@@ -552,7 +552,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_REFILL
                     diaconnG8HistoryRecord.timestamp = logDateTime
                     diaconnG8HistoryRecord.value = logItem.remainAmount / 100.0
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logneedleprime, logItem.primeAmount / 100.0)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logneedleprime, logItem.primeAmount / 100.0)
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "NEEDLECHANGE " + dateUtil.timeString(logDateTime)
                 }
@@ -569,7 +569,7 @@ class BigLogInquireResponsePacket(
                         absoluteRate = pumpDesc.pumpType.determineCorrectBasalSize(diaconnG8Pump.baseAmount * (tempBasalPercent / 100.0))
                     }
 
-                    if (logItem.getTbInjectRateRatio() in 1000..1600) {
+                    if (logItem.getTbInjectRateRatio() in 1000..2500) {
                         absoluteRate = (logItem.getTbInjectRateRatio() - 1000) / 100.0
                     }
 
@@ -589,7 +589,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.timestamp = logDateTime
                     diaconnG8HistoryRecord.duration = logItem.tbTime * 15
                     diaconnG8HistoryRecord.value = absoluteRate
-                    diaconnG8HistoryRecord.stringValue =  resourceHelper.gs(R.string.diaconn_g8_logtempstart)
+                    diaconnG8HistoryRecord.stringValue =  rh.gs(R.string.diaconn_g8_logtempstart)
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "TEMPSTART " + dateUtil.timeString(logDateTime)
                 }
@@ -604,7 +604,7 @@ class BigLogInquireResponsePacket(
                         val tempBasalPercent = logItem.getTbInjectRateRatio() - 50000
                         absoluteRate = diaconnG8Pump.baseAmount * (tempBasalPercent / 100.0)
                     }
-                    if (logItem.getTbInjectRateRatio() in 1000..1600) {
+                    if (logItem.getTbInjectRateRatio() in 1000..2500) {
                         absoluteRate = (logItem.getTbInjectRateRatio() - 1000) / 100.0
                     }
 
@@ -632,7 +632,7 @@ class BigLogInquireResponsePacket(
 
                     diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_ALARM
                     diaconnG8HistoryRecord.timestamp = logDateTime
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logbatteryshorage)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logbatteryshorage)
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "BATTERYALARM " + dateUtil.timeString(logDateTime)
                 }
@@ -647,7 +647,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_ALARM
                     diaconnG8HistoryRecord.timestamp = logDateTime
                     diaconnG8HistoryRecord.value = logItem.amount / 100.0
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logalarmblock, getReasonName(pumplogKind, logItem.reason))
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_logalarmblock, getReasonName(pumplogKind, logItem.reason))
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "BLOCKALARM " + dateUtil.timeString(logDateTime)
                 }
@@ -662,7 +662,7 @@ class BigLogInquireResponsePacket(
                     diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_ALARM
                     diaconnG8HistoryRecord.timestamp = logDateTime
                     diaconnG8HistoryRecord.value = logItem.remain.toDouble()
-                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_loginsulinshorage)
+                    diaconnG8HistoryRecord.stringValue = rh.gs(R.string.diaconn_g8_loginsulinshorage)
                     diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
                     status = "SHORTAGEALARM " + dateUtil.timeString(logDateTime)
                 }
@@ -694,12 +694,12 @@ class BigLogInquireResponsePacket(
                 }
 
                 else       -> {
-                    status = resourceHelper.gs(R.string.diaconn_g8_logsyncinprogress)
+                    status = rh.gs(R.string.diaconn_g8_logsyncinprogress)
                     rxBus.send(EventPumpStatusChanged(status))
                     continue
                 }
             }
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.processinghistory) + ": " + status))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.processinghistory) + ": " + status))
         }
     }
 
@@ -726,40 +726,40 @@ class BigLogInquireResponsePacket(
     private fun failLog(reason: Byte): String {
         return when (reason) {
             //1=Injection blockage, 2=Battery shortage, 3=Drug shortage, 4=User shutdown, 5=System reset, 6=Other, 7=Emergency shutdown
-            0.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasoncomplete)
-            1.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasoninjectonblock)
-            2.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonbatteryshortage)
-            3.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasoninsulinshortage)
-            4.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonuserstop)
-            5.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonsystemreset)
-            6.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonother)
-            7.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonemergencystop)
+            0.toByte() -> rh.gs(R.string.diaconn_g8_reasoncomplete)
+            1.toByte() -> rh.gs(R.string.diaconn_g8_reasoninjectonblock)
+            2.toByte() -> rh.gs(R.string.diaconn_g8_reasonbatteryshortage)
+            3.toByte() -> rh.gs(R.string.diaconn_g8_reasoninsulinshortage)
+            4.toByte() -> rh.gs(R.string.diaconn_g8_reasonuserstop)
+            5.toByte() -> rh.gs(R.string.diaconn_g8_reasonsystemreset)
+            6.toByte() -> rh.gs(R.string.diaconn_g8_reasonother)
+            7.toByte() -> rh.gs(R.string.diaconn_g8_reasonemergencystop)
             else       -> "No Reason"
         }
     }
 
     private fun resetLog(reason: Byte): String {
         return when (reason.toInt()) {
-            1 -> resourceHelper.gs(R.string.diaconn_g8_resetfactoryreset)
-            2 -> resourceHelper.gs(R.string.diaconn_g8_resetemergencyoff)
-            3 -> resourceHelper.gs(R.string.diaconn_g8_resetbatteryreplacement)
-            4 -> resourceHelper.gs(R.string.diaconn_g8_resetaftercalibration)
-            5 -> resourceHelper.gs(R.string.diaconn_g8_resetpreshipment)
-            9 -> resourceHelper.gs(R.string.diaconn_g8_resetunexpected)
+            1 -> rh.gs(R.string.diaconn_g8_resetfactoryreset)
+            2 -> rh.gs(R.string.diaconn_g8_resetemergencyoff)
+            3 -> rh.gs(R.string.diaconn_g8_resetbatteryreplacement)
+            4 -> rh.gs(R.string.diaconn_g8_resetaftercalibration)
+            5 -> rh.gs(R.string.diaconn_g8_resetpreshipment)
+            9 -> rh.gs(R.string.diaconn_g8_resetunexpected)
             else -> ""
         }
     }
 
     private fun blockLog(reason: Byte): String {
         return when (reason.toInt()) {
-            1 -> resourceHelper.gs(R.string.diacon_g8_blockbasal)
-            2 -> resourceHelper.gs(R.string.diacon_g8_blockmealbolus)
-            3 -> resourceHelper.gs(R.string.diacon_g8_blocknormalbolus)
-            4 -> resourceHelper.gs(R.string.diacon_g8_blocksquarebolus)
-            5 -> resourceHelper.gs(R.string.diacon_g8_blockdualbolus)
-            6 -> resourceHelper.gs(R.string.diacon_g8_blockreplacetube)
-            7 -> resourceHelper.gs(R.string.diacon_g8_blockreplaceneedle)
-            8 -> resourceHelper.gs(R.string.diacon_g8_blockreplacesyringe)
+            1 -> rh.gs(R.string.diacon_g8_blockbasal)
+            2 -> rh.gs(R.string.diacon_g8_blockmealbolus)
+            3 -> rh.gs(R.string.diacon_g8_blocknormalbolus)
+            4 -> rh.gs(R.string.diacon_g8_blocksquarebolus)
+            5 -> rh.gs(R.string.diacon_g8_blockdualbolus)
+            6 -> rh.gs(R.string.diacon_g8_blockreplacetube)
+            7 -> rh.gs(R.string.diacon_g8_blockreplaceneedle)
+            8 -> rh.gs(R.string.diacon_g8_blockreplacesyringe)
             else -> ""
         }
     }
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt
index 42aca3f51e0..662d8b846fb 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt
@@ -22,7 +22,7 @@ class BigMainInfoInquireResponsePacket(
 
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
     @Inject lateinit var sp: SP
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     private var pumpDesc = PumpDescription(PumpType.DIACONN_G8)
 
     init {
@@ -76,7 +76,7 @@ class BigMainInfoInquireResponsePacket(
         diaconnG8Pump.majorVersion = getByteToInt(bufferData)
         diaconnG8Pump.minorVersion = getByteToInt(bufferData)
 
-        sp.putString(resourceHelper.gs(R.string.pumpversion), diaconnG8Pump.majorVersion.toString() + "." + diaconnG8Pump.minorVersion.toString())
+        sp.putString(rh.gs(R.string.pumpversion), diaconnG8Pump.majorVersion.toString() + "." + diaconnG8Pump.minorVersion.toString())
 
         // 5. pump log status
         diaconnG8Pump.pumpLastLogNum = getShortToInt(bufferData) // last saved log no
@@ -213,7 +213,7 @@ class BigMainInfoInquireResponsePacket(
         diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][23] = diaconnG8Pump.baseAmount24
 
         //incarnation no 처리
-        diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(resourceHelper.gs(R.string.pumpversion), ""),2, 63)
+        diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(rh.gs(R.string.pumpversion), ""),2, 63)
 
         aapsLogger.debug(LTag.PUMPCOMM, "result > " + diaconnG8Pump.result)
         aapsLogger.debug(LTag.PUMPCOMM, "systemRemainInsulin > " + diaconnG8Pump.systemRemainInsulin)
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt
index 55aedbcf057..6e7863e8f47 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt
@@ -16,7 +16,7 @@ open class IncarnationInquireResponsePacket(
 
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
     @Inject lateinit var sp: SP
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
 
     var result = 0
     init {
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt
index 53f2f6e96e1..17b768090b2 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.diaconn.packet
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.diaconn.DiaconnG8Pump
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
@@ -13,8 +13,8 @@ import javax.inject.Inject
 class InjectionExtendedBolusResultReportPacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
 
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
 
     init {
         msgType = 0xe5.toByte()
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt
index a85c35002b8..13de89d399e 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt
@@ -3,8 +3,7 @@ package info.nightscout.androidaps.diaconn.packet
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.diaconn.DiaconnG8Pump
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
@@ -14,8 +13,8 @@ import javax.inject.Inject
 class InjectionSnackResultReportPacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
 
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
 
     init {
         msgType = 0xe4.toByte()
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt
index 83b8475b9eb..6209a89fb3c 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt
@@ -14,7 +14,7 @@ import info.nightscout.androidaps.extensions.notify
 import info.nightscout.androidaps.extensions.waitMillis
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import java.util.concurrent.ScheduledFuture
@@ -25,9 +25,9 @@ import javax.inject.Singleton
 class BLECommonService @Inject internal constructor(
     private val injector: HasAndroidInjector,
     private val aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
     private val context: Context,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val diaconnG8ResponseMessageHashTable: DiaconnG8ResponseMessageHashTable,
     private val diaconnG8SettingResponseMessageHashTable: DiaconnG8SettingResponseMessageHashTable,
     private val diaconnG8Pump: DiaconnG8Pump,
@@ -167,16 +167,18 @@ class BLECommonService @Inject internal constructor(
     @Synchronized
     private fun writeCharacteristicNoResponse(characteristic: BluetoothGattCharacteristic, data: ByteArray) {
         Thread(Runnable {
-            SystemClock.sleep(WRITE_DELAY_MILLIS)
-            if (bluetoothAdapter == null || bluetoothGatt == null) {
-                aapsLogger.error("BluetoothAdapter not initialized_ERROR")
-                isConnecting = false
-                isConnected = false
-                return@Runnable
+            synchronized(this) {
+                SystemClock.sleep(WRITE_DELAY_MILLIS)
+                if (bluetoothAdapter == null || bluetoothGatt == null) {
+                    aapsLogger.error("BluetoothAdapter not initialized_ERROR")
+                    isConnecting = false
+                    isConnected = false
+                    return@Runnable
+                }
+                characteristic.value = data
+                characteristic.writeType = BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
+                bluetoothGatt?.writeCharacteristic(characteristic)
             }
-            characteristic.value = data
-            characteristic.writeType = BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
-            bluetoothGatt?.writeCharacteristic(characteristic)
         }).start()
         SystemClock.sleep(50)
     }
@@ -200,6 +202,7 @@ class BLECommonService @Inject internal constructor(
         return bluetoothGatt?.services
     }
 
+    @Synchronized
     private fun findCharacteristic() {
         val gattServices = getSupportedGattServices() ?: return
         var uuid: String
@@ -214,7 +217,7 @@ class BLECommonService @Inject internal constructor(
                     // nRF Connect 참고하여 추가함
                     val descriptor: BluetoothGattDescriptor = uartIndicate!!.getDescriptor(UUID.fromString(CHARACTERISTIC_CONFIG_UUID))
                     descriptor.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
-                    bluetoothGatt!!.writeDescriptor(descriptor)
+                    bluetoothGatt?.writeDescriptor(descriptor)
                 }
                 if (WRITE_UUID == uuid) {
                     uartWrite = gattCharacteristic
@@ -297,8 +300,8 @@ class BLECommonService @Inject internal constructor(
                 diaconnG8Pump.bolusBlocked = true
                 val i = Intent(context, ErrorHelperActivity::class.java)
                 i.putExtra("soundid", R.raw.boluserror)
-                i.putExtra("status", resourceHelper.gs(R.string.injectionblocked))
-                i.putExtra("title", resourceHelper.gs(R.string.injectionblocked))
+                i.putExtra("status", rh.gs(R.string.injectionblocked))
+                i.putExtra("title", rh.gs(R.string.injectionblocked))
                 i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 context.startActivity(i)
                 return
@@ -308,8 +311,8 @@ class BLECommonService @Inject internal constructor(
                 message.handleMessage(data)
                 val i = Intent(context, ErrorHelperActivity::class.java)
                 i.putExtra("soundid", R.raw.boluserror)
-                i.putExtra("status", resourceHelper.gs(R.string.needbatteryreplace))
-                i.putExtra("title", resourceHelper.gs(R.string.batterywarning))
+                i.putExtra("status", rh.gs(R.string.needbatteryreplace))
+                i.putExtra("title", rh.gs(R.string.batterywarning))
                 i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 context.startActivity(i)
                 return
@@ -320,8 +323,8 @@ class BLECommonService @Inject internal constructor(
                 message.handleMessage(data)
                 val i = Intent(context, ErrorHelperActivity::class.java)
                 i.putExtra("soundid", R.raw.boluserror)
-                i.putExtra("status", resourceHelper.gs(R.string.needinsullinreplace))
-                i.putExtra("title", resourceHelper.gs(R.string.insulinlackwarning))
+                i.putExtra("status", rh.gs(R.string.needinsullinreplace))
+                i.putExtra("title", rh.gs(R.string.insulinlackwarning))
                 i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 context.startActivity(i)
                 return
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt
index cc9822872d4..978bb9eff23 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt
@@ -23,13 +23,13 @@ import info.nightscout.androidaps.events.EventInitializationChanged
 import info.nightscout.androidaps.events.EventProfileSwitchChanged
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
@@ -56,11 +56,11 @@ import kotlin.math.min
 class DiaconnG8Service : DaggerService() {
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var context: Context
     @Inject lateinit var diaconnG8Plugin : DiaconnG8Plugin
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
@@ -133,9 +133,9 @@ class DiaconnG8Service : DaggerService() {
     fun readPumpStatus() {
         try {
             val pump = activePlugin.activePump
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingpumpsettings)))
 
-            val pumpFirmwareVersion = sp.getString(resourceHelper.gs(R.string.pumpversion),"")
+            val pumpFirmwareVersion = sp.getString(rh.gs(R.string.pumpversion),"")
 
             if(!StringUtils.emptyString(pumpFirmwareVersion) && PumplogUtil.isPumpVersionGe(pumpFirmwareVersion, 3, 0)) {
                 sendMessage(BigAPSMainInfoInquirePacket(injector)) // APS Pump Main Info
@@ -152,7 +152,7 @@ class DiaconnG8Service : DaggerService() {
 
             val profile = profileFunction.getProfile()
             if (profile != null && abs(diaconnG8Pump.baseAmount - profile.getBasal()) >= pump.pumpDescription.basalStep) {
-                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+                rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingpumpsettings)))
 
                 if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(EventProfileSwitchChanged())
@@ -160,7 +160,7 @@ class DiaconnG8Service : DaggerService() {
             }
 
             // 시간 설정
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingpumptime)))
             var timeDiff = (diaconnG8Pump.getPumpTime() - System.currentTimeMillis()) / 1000L
             if (diaconnG8Pump.getPumpTime() == 0L) {
                  // initial handshake was not successful
@@ -180,7 +180,7 @@ class DiaconnG8Service : DaggerService() {
                 if (abs(timeDiff) > 60 * 60 * 1.5) {
                     aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds - large difference")
                     //If time-diff is very large, warn user until we can synchronize history readings properly
-                    ErrorHelperActivity.runAlarm(context, resourceHelper.gs(R.string.largetimediff), resourceHelper.gs(R.string.largetimedifftitle), R.raw.error)
+                    ErrorHelperActivity.runAlarm(context, rh.gs(R.string.largetimediff), rh.gs(R.string.largetimedifftitle), R.raw.error)
 
 
                     //de-initialize pump
@@ -213,9 +213,9 @@ class DiaconnG8Service : DaggerService() {
             if (diaconnG8Pump.dailyTotalUnits > diaconnG8Pump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
                 aapsLogger.debug(LTag.PUMPCOMM, "Approaching daily limit: " + diaconnG8Pump.dailyTotalUnits + "/" + diaconnG8Pump.maxDailyTotalUnits)
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
-                    val reportFail = Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT)
+                    val reportFail = Notification(Notification.APPROACHING_DAILY_LIMIT, rh.gs(R.string.approachingdailylimit), Notification.URGENT)
                     rxBus.send(EventNewNotification(reportFail))
-                    pumpSync.insertAnnouncement(resourceHelper.gs(R.string.approachingdailylimit) + ": " + diaconnG8Pump.dailyTotalUnits + "/" + diaconnG8Pump.maxDailyTotalUnits + "U", null, PumpType.DIACONN_G8, diaconnG8Pump.serialNo.toString())
+                    pumpSync.insertAnnouncement(rh.gs(R.string.approachingdailylimit) + ": " + diaconnG8Pump.dailyTotalUnits + "/" + diaconnG8Pump.maxDailyTotalUnits + "U", null, PumpType.DIACONN_G8, diaconnG8Pump.serialNo.toString())
                     lastApproachingDailyLimit = System.currentTimeMillis()
                 }
             }
@@ -243,11 +243,11 @@ class DiaconnG8Service : DaggerService() {
         // pump log status
         val pumpLastNum = diaconnG8Pump.pumpLastLogNum
         val pumpWrappingCount = diaconnG8Pump.pumpWrappingCount
-        val apsIncarnationNum = sp.getInt(resourceHelper.gs(R.string.apsIncarnationNo), 65536)
+        val apsIncarnationNum = sp.getInt(rh.gs(R.string.apsIncarnationNo), 65536)
         // aps last log num
-        val pumpSerialNo      = sp.getInt(resourceHelper.gs(R.string.pumpserialno), 0)
-        val apsWrappingCount  = sp.getInt(resourceHelper.gs(R.string.apsWrappingCount), 0)
-        val apsLastLogNum     = sp.getInt(resourceHelper.gs(R.string.apslastLogNum), 0)
+        val pumpSerialNo      = sp.getInt(rh.gs(R.string.pumpserialno), 0)
+        var apsWrappingCount  = sp.getInt(rh.gs(R.string.apsWrappingCount), 0)
+        var apsLastLogNum     = sp.getInt(rh.gs(R.string.apslastLogNum), 0)
 
         // if first install app
         if(apsWrappingCount == 0 && apsLastLogNum == 0 ) {
@@ -257,15 +257,18 @@ class DiaconnG8Service : DaggerService() {
         // if pump reset
         if(apsIncarnationNum != diaconnG8Pump.pumpIncarnationNum) {
             pumpLogDefaultSetting()
-            sp.putInt(resourceHelper.gs(R.string.apsIncarnationNo), diaconnG8Pump.pumpIncarnationNum)
+            sp.putInt(rh.gs(R.string.apsIncarnationNo), diaconnG8Pump.pumpIncarnationNum)
         }
 
         // if another pump
         if(pumpSerialNo != diaconnG8Pump.serialNo) {
             pumpLogDefaultSetting()
-            sp.putInt(resourceHelper.gs(R.string.pumpserialno), diaconnG8Pump.serialNo)
+            sp.putInt(rh.gs(R.string.pumpserialno), diaconnG8Pump.serialNo)
         }
 
+        apsWrappingCount  = sp.getInt(rh.gs(R.string.apsWrappingCount), 0)
+        apsLastLogNum     = sp.getInt(rh.gs(R.string.apslastLogNum), 0)
+
         val apsLastNum = apsWrappingCount * 10000 + apsLastLogNum
         if((pumpWrappingCount * 10000 + pumpLastNum) < apsLastLogNum ) {
             pumpLogDefaultSetting()
@@ -339,7 +342,7 @@ class DiaconnG8Service : DaggerService() {
     fun bolus(insulin: Double, carbs: Int, carbTime: Long, t: EventOverviewBolusProgress.Treatment): Boolean {
         if (!isConnected) return false
         if (BolusProgressDialog.stopPressed) return false
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.startingbolus)))
 
         // bolus speed setting
         val apsPrefBolusSpeed = sp.getInt("g8_bolusspeed", 5)
@@ -397,7 +400,7 @@ class DiaconnG8Service : DaggerService() {
         val totalwaitTime = (expectedEnd - System.currentTimeMillis()) /1000
         while (!diaconnG8Pump.bolusDone) {
             val waitTime = (expectedEnd - System.currentTimeMillis()) / 1000
-            bolusingEvent.status = String.format(resourceHelper.gs(R.string.waitingforestimatedbolusend), if(waitTime < 0) 0 else waitTime)
+            bolusingEvent.status = String.format(rh.gs(R.string.waitingforestimatedbolusend), if(waitTime < 0) 0 else waitTime)
             var progressPecent = 0
             if(totalwaitTime > waitTime) {
                 progressPecent = ((totalwaitTime - waitTime) * 100 / totalwaitTime).toInt()
@@ -411,11 +414,11 @@ class DiaconnG8Service : DaggerService() {
         commandQueue.loadEvents(object : Callback() {
             override fun run() {
                 // reread bolus status
-                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)))
+                rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingbolusstatus)))
                 sendMessage(InjectionSnackInquirePacket(injector), 1000) // last bolus
                 // 볼러스 결과 보고패킷에서 처리함.
                 bolusingEvent.percent = 100
-                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)))
+                rxBus.send(EventPumpStatusChanged(rh.gs(R.string.disconnecting)))
             }
         })
        return !start.failed
@@ -443,7 +446,7 @@ class DiaconnG8Service : DaggerService() {
         sendMessage(TempBasalInquirePacket(injector))
 
         if (diaconnG8Pump.tbStatus ==1 ) {
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)))
             val msgPacket = TempBasalSettingPacket(injector, 2, diaconnG8Pump.tbTime, diaconnG8Pump.tbInjectRateRatio)
             // tempbasal stop
             sendMessage(msgPacket)
@@ -451,7 +454,7 @@ class DiaconnG8Service : DaggerService() {
             if(!processConfirm(msgPacket.msgType)) return false
             diaconnG8Pump.tempBasalStart= dateUtil.now()
         }
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.settingtempbasal)))
         val tbInjectRate = ((absoluteRate*100) + 1000).toInt()
         val msgTBR = TempBasalSettingPacket(injector, 1, ((durationInHours * 60) / 15).toInt(), tbInjectRate)
         sendMessage(msgTBR)
@@ -475,7 +478,7 @@ class DiaconnG8Service : DaggerService() {
         // temp state check
         sendMessage(TempBasalInquirePacket(injector))
         if (diaconnG8Pump.tbStatus ==1 ) {
-            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            rxBus.send(EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)))
             val msgPacket = TempBasalSettingPacket(injector, 2, diaconnG8Pump.tbTime, diaconnG8Pump.tbInjectRateRatio)
             // tempbasal stop
             sendMessage(msgPacket)
@@ -483,7 +486,7 @@ class DiaconnG8Service : DaggerService() {
             if(!processConfirm(msgPacket.msgType)) return false
             SystemClock.sleep(500)
         }
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.settingtempbasal)))
         val tbInjectRate = absoluteRate * 100 + 1000
         val msgTBR = TempBasalSettingPacket(injector, 1, 2, tbInjectRate.toInt())
         sendMessage(msgTBR)
@@ -499,7 +502,7 @@ class DiaconnG8Service : DaggerService() {
 
     fun tempBasalStop(): Boolean {
         if (!isConnected) return false
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)))
         // temp state check
         sendMessage(TempBasalInquirePacket(injector))
         if(diaconnG8Pump.tbStatus == 1) {
@@ -525,7 +528,7 @@ class DiaconnG8Service : DaggerService() {
 
     fun extendedBolus(insulin: Double, durationInMinutes: Int): Boolean {
         if (!isConnected) return false
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.settingextendedbolus)))
         aapsLogger.error(LTag.PUMPCOMM, "insulin: $insulin durationInMinutes: $durationInMinutes")
 
         val msgExtended = InjectionExtendedBolusSettingPacket(injector, (insulin * 100).toInt(), durationInMinutes, dateUtil.now())
@@ -542,7 +545,7 @@ class DiaconnG8Service : DaggerService() {
 
     fun extendedBolusStop(): Boolean {
         if (!isConnected) return false
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.stoppingextendedbolus)))
         val msgType  = if(diaconnG8Pump.dualStatus == 1) 0x09.toByte() else 0x08.toByte()
         val msgStop = InjectionCancelSettingPacket(injector, msgType)
         sendMessage(msgStop)
@@ -557,7 +560,7 @@ class DiaconnG8Service : DaggerService() {
 
     fun updateBasalsInPump(profile: Profile): Boolean {
         if (!isConnected) return false
-        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)))
+        rxBus.send(EventPumpStatusChanged(rh.gs(R.string.updatingbasalrates)))
         val basalList = diaconnG8Pump.buildDiaconnG8ProfileRecord(profile)
 
         val requestReqPacket1 = BasalSettingPacket(
@@ -596,8 +599,8 @@ class DiaconnG8Service : DaggerService() {
     private fun pumpLogDefaultSetting() {
         val apsWrappingCount = diaconnG8Pump.pumpWrappingCount
         val apsLastLogNum = if(diaconnG8Pump.pumpLastLogNum - 1 < 0 ) 0 else  diaconnG8Pump.pumpLastLogNum - 1
-        sp.putInt(resourceHelper.gs(R.string.apslastLogNum), apsLastLogNum)
-        sp.putInt(resourceHelper.gs(R.string.apsWrappingCount), apsWrappingCount)
+        sp.putInt(rh.gs(R.string.apslastLogNum), apsLastLogNum)
+        sp.putInt(rh.gs(R.string.apsWrappingCount), apsWrappingCount)
     }
 
     private fun processConfirm(msgType:Byte) : Boolean {
@@ -609,8 +612,8 @@ class DiaconnG8Service : DaggerService() {
             // Thread {
             //     val i = Intent(context, ErrorHelperActivity::class.java)
             //     i.putExtra("soundid", R.raw.boluserror)
-            //     i.putExtra("status", resourceHelper.gs(R.string.diaconn_g8_errotpreceivedyet))
-            //     i.putExtra("title", resourceHelper.gs(R.string.pumperror))
+            //     i.putExtra("status", rh.gs(R.string.diaconn_g8_errotpreceivedyet))
+            //     i.putExtra("title", rh.gs(R.string.pumperror))
             //     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             //     context.startActivity(i)
             // }.start()
diff --git a/diaconn/src/main/res/values-cs-rCZ/strings.xml b/diaconn/src/main/res/values-cs-rCZ/strings.xml
index 62fe26605e1..f4dac8ace78 100644
--- a/diaconn/src/main/res/values-cs-rCZ/strings.xml
+++ b/diaconn/src/main/res/values-cs-rCZ/strings.xml
@@ -94,10 +94,13 @@
     <string name="diaconn_g8_loginsulinshorage">Nedostatek inzulínu</string>
     <string name="diaconn_g8_logbatteryshorage">Slabá baterie</string>
     <string name="diaconn_g8_logneedleprime">Plnění jehly :%1$.2fU</string>
+    <string name="diaconn_g8_loginjectorprime">Plnění zásobníku: %1$.2fU</string>
+    <string name="diaconn_g8_logtubeprime">Plnění kanyly: %1$.2fU</string>
     <string name="diaconn_g8_resetfactoryreset">Resetovat po obnovení továrního nastavení</string>
     <string name="diaconn_g8_resetemergencyoff">Resetovat po nouzovém vypnutí</string>
     <string name="diaconn_g8_resetbatteryreplacement">Resetovat po výměně baterie</string>
     <string name="diaconn_g8_resetaftercalibration">Po kalibraci resetovat</string>
+    <string name="diaconn_g8_resetpreshipment">Reset po úvodním nastavení</string>
     <string name="diaconn_g8_resetunexpected">Neočekávaný reset systému</string>
     <string name="diaconn_g8_reasoncomplete">Dokončeno</string>
     <string name="diaconn_g8_reasoninjectonblock">Zablokované vydávání</string>
@@ -110,11 +113,43 @@
     <string name="diacon_g8_blockbasal">BAZÁL</string>
     <string name="diacon_g8_blockmealbolus">BOLUS NA JÍDLO</string>
     <string name="diacon_g8_blocknormalbolus">NORMÁLNÍ BOLUS</string>
+    <string name="diacon_g8_blocksquarebolus">KOMBINOVANÝ BOLUS</string>
+    <string name="diacon_g8_blockdualbolus">DUÁLNÍ BOLUS</string>
+    <string name="diacon_g8_blockreplacetube">VYMĚNIT HADIČKU</string>
+    <string name="diacon_g8_blockreplaceneedle">VYMĚNIT JEHLU</string>
+    <string name="diacon_g8_blockreplacesyringe">VYMĚNIT ZÁSOBNÍK</string>
+    <string name="diaconn_g8_logalarmblock">Zablokované vydávání (%s)</string>
+    <string name="diaconn_g8_lgorelease">vydání bazálu (%s)</string>
+    <string name="diaconn_g8_lgosuspend">pozastavení bazálu (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Dual Nomal úspěch</string>
+    <string name="diaconn_g8_logdualsquarestart">Kombinovaný bolus start</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Kombinovaný bolus úspěch</string>
+    <string name="diaconn_g8_logsquarestart">Kombinovaný bolus start</string>
+    <string name="diaconn_g8_logsquaresuccess">Kombinovaný bolus úspěch</string>
+    <string name="diaconn_g8_logmealfail">Bolus selhal</string>
     <string name="diaconn_g8_logsuccess">Úspěch</string>
+    <string name="diaconn_g8_logmealsuccess">Bolus úspěšný</string>
     <string name="diaconn_g8_errorcode_1">Nemohu vyhledat kvůli chybě CRC paketu.</string>
+    <string name="diaconn_g8_errorcode_2">Chyba parametru.</string>
+    <string name="diaconn_g8_errorcode_3">Chyba protokolu.</string>
+    <string name="diaconn_g8_errorcode_4">Časový limit vypršel.</string>
     <string name="diaconn_g8_errorcode_6">Zrušeno pumpou</string>
     <string name="diaconn_g8_errorcode_7">Přijímání dalších akcí, omezení nastavení aplikace.</string>
     <string name="diaconn_g8_errorcode_8">V průběhu podávání Bolusu je další Bolus omezen.</string>
     <string name="diaconn_g8_errorcode_9">Vyžaduje obnovení bazálu</string>
     <string name="diaconn_g8_errorcode_10">Zrušeno, protože pumpa neodpovídá.</string>
+    <string name="diaconn_g8_errorcode_11">Nízký stav baterie.</string>
+    <string name="diaconn_g8_errorcode_12">Nedostatek inzulínu.</string>
+    <string name="diaconn_g8_errorcode_13">Překročen limit.</string>
+    <string name="diaconn_g8_errorcode_14">Překročen denní limit inzulínu.</string>
+    <string name="diaconn_g8_errorcode_15">Po dokončení nastavení může být bazál spuštěn.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Příkaz nebyl proveden. Zkuste to prosím znovu.</string>
+    <string name="diaconn_g8_logtubechange_title">Zaznamenat výměnu hadičky</string>
+    <string name="diaconn_g8_logtubechange_summary">Přidat událost \"Výměna setu\" do portálu pěče, pokud je zjištěna v historii</string>
+    <string name="diaconn_g8_logtempstart">Dočasný bazál začátek</string>
+    <string name="diaconn_g8_errorcode_32">Během LGS je podávání izulínu omezeno</string>
+    <string name="diaconn_g8_errorcode_33">LGS status je zapnutý, ON příkaz je odmítnut.</string>
+    <string name="diaconn_g8_errorcode_34">LGS status je vypnutý, OFF příkaz je odmítnut.</string>
+    <string name="diaconn_g8_errorcode_35">Spuštění dočasného bazálu je odmítnuto, pokud je již spuštěn jiný</string>
+    <string name="diaconn_g8_errorcode_36">Zastavení dočasného bazálu je odmítnuto, pokud žádný není spuštěn</string>
 </resources>
diff --git a/diaconn/src/main/res/values-de-rDE/strings.xml b/diaconn/src/main/res/values-de-rDE/strings.xml
index 716f9e053b0..696d5e84f49 100644
--- a/diaconn/src/main/res/values-de-rDE/strings.xml
+++ b/diaconn/src/main/res/values-de-rDE/strings.xml
@@ -129,7 +129,6 @@
     <string name="diaconn_g8_logmealfail">Mahlzeit fehlgeschlagen</string>
     <string name="diaconn_g8_logsuccess">Erfolgreich</string>
     <string name="diaconn_g8_logmealsuccess">Mahlzeit erfolgreich</string>
-    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
     <string name="diaconn_g8_errorcode_1">CRC Fehler - Lookup nicht möglich.</string>
     <string name="diaconn_g8_errorcode_2">Kann nicht auf fehlerhaften Eingabeparameter gesetzt werden.</string>
     <string name="diaconn_g8_errorcode_3">Kann nicht auf fehlerhafte Protokollspezifikation gesetzt werden.</string>
diff --git a/diaconn/src/main/res/values-es-rES/strings.xml b/diaconn/src/main/res/values-es-rES/strings.xml
index 3ea04e700df..5477f33b817 100644
--- a/diaconn/src/main/res/values-es-rES/strings.xml
+++ b/diaconn/src/main/res/values-es-rES/strings.xml
@@ -1,2 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="diaconn_nodeviceavailable">Ningún dispositivo disponible</string>
+    <string name="diaconn_pairing">Emparejamiento de Bomba Diaconn</string>
+    <string name="pumperror">Error de bomba</string>
+    <string name="diaconn_g8_history_basalhours">Horas Basales</string>
+    <string name="diaconn_g8_history_bolus">Bolos</string>
+    <string name="diaconn_g8_history_dailyinsulin">Insulina diaria</string>
+    <string name="diaconn_g8_history_prime">Cebar</string>
+    <string name="diaconn_g8_history_refill">Llenar</string>
+    <string name="diaconn_g8_history_suspend">Suspender</string>
+    <string name="diaconn_g8_waitingforpairing">Esperando Emparejamiento</string>
+    <string name="invalidpairing">Información de emparejamiento inválida. Solicitando un nuevo emparejamiento</string>
+    <string name="gettingpumpsettings">Recibiendo configuración de la bomba</string>
+    <string name="gettingpumptime">Recibiendo hora de la bomba</string>
+    <string name="approachingdailylimit">Alcanzando el limite de insulina diario</string>
+    <string name="startingbolus">Iniciando entrega del bolo</string>
+    <string name="description_pump_diaconn_g8">Integración de bombas de Insulina Diaconn G8</string>
+</resources>
diff --git a/diaconn/src/main/res/values-fr-rFR/strings.xml b/diaconn/src/main/res/values-fr-rFR/strings.xml
index d289a19934d..6786619d6b7 100644
--- a/diaconn/src/main/res/values-fr-rFR/strings.xml
+++ b/diaconn/src/main/res/values-fr-rFR/strings.xml
@@ -129,7 +129,6 @@
     <string name="diaconn_g8_logmealfail">Repas échoué</string>
     <string name="diaconn_g8_logsuccess">Effectué</string>
     <string name="diaconn_g8_logmealsuccess">Repas réussi</string>
-    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
     <string name="diaconn_g8_errorcode_1">Recherche impossible en raison d\'une erreur CRC de paquets.</string>
     <string name="diaconn_g8_errorcode_2">Impossible de définir à cause d\'une erreur de paramètre d\'entrée.</string>
     <string name="diaconn_g8_errorcode_3">Impossible de définir à cause d\'une erreur de spécification de protocole.</string>
diff --git a/diaconn/src/main/res/values-hu-rHU/strings.xml b/diaconn/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/diaconn/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-it-rIT/strings.xml b/diaconn/src/main/res/values-it-rIT/strings.xml
index 2f4e8704837..c4c7b80b161 100644
--- a/diaconn/src/main/res/values-it-rIT/strings.xml
+++ b/diaconn/src/main/res/values-it-rIT/strings.xml
@@ -129,7 +129,6 @@
     <string name="diaconn_g8_logmealfail">Pasto: fallito</string>
     <string name="diaconn_g8_logsuccess">OK</string>
     <string name="diaconn_g8_logmealsuccess">Pasto: OK</string>
-    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
     <string name="diaconn_g8_errorcode_1">Ricerca non possibile a causa di un errore CRC del pacchetto.</string>
     <string name="diaconn_g8_errorcode_2">Impostazione non possibile - errore di un parametro di input.</string>
     <string name="diaconn_g8_errorcode_3">Impostazione non possibile - errore di specifica del protocollo.</string>
diff --git a/diaconn/src/main/res/values-iw-rIL/strings.xml b/diaconn/src/main/res/values-iw-rIL/strings.xml
index 4b5a63bed62..793e713ae86 100644
--- a/diaconn/src/main/res/values-iw-rIL/strings.xml
+++ b/diaconn/src/main/res/values-iw-rIL/strings.xml
@@ -119,7 +119,6 @@
     <string name="diaconn_g8_logmealfail">רישום המזון נכשל</string>
     <string name="diaconn_g8_logsuccess">הצלחה</string>
     <string name="diaconn_g8_logmealsuccess">רישום המזון הצליח</string>
-    <string name="key_diaconn_g8_logtubechange">רישום החלפת צינורית</string>
     <string name="diaconn_g8_errorcode_3">לא ניתן להגדיר שגיאת פרוטוקול ספציפי.</string>
     <string name="diaconn_g8_errorcode_4">הארוחה נרשמה, לא ניתן להזריק.</string>
     <string name="diaconn_g8_errorcode_6">בוטל על ידי המשאבה</string>
diff --git a/diaconn/src/main/res/values-ko-rKR/strings.xml b/diaconn/src/main/res/values-ko-rKR/strings.xml
index 2000c331b4c..29cb87c6945 100644
--- a/diaconn/src/main/res/values-ko-rKR/strings.xml
+++ b/diaconn/src/main/res/values-ko-rKR/strings.xml
@@ -129,7 +129,6 @@
     <string name="diaconn_g8_logmealfail">식사 실패</string>
     <string name="diaconn_g8_logsuccess">성공</string>
     <string name="diaconn_g8_logmealsuccess">식사 성공</string>
-    <string name="key_diaconn_g8_logtubechange">디아콘_g8_로그튜브변경</string>
     <string name="diaconn_g8_errorcode_1">패킷 CRC 오류로 조회 불가합니다.</string>
     <string name="diaconn_g8_errorcode_2">입력 파라미터 오류로 설정 불가합니다.</string>
     <string name="diaconn_g8_errorcode_3">프로토콜 규격 오류로 설정 불가합니다.</string>
diff --git a/diaconn/src/main/res/values-lt-rLT/strings.xml b/diaconn/src/main/res/values-lt-rLT/strings.xml
index 3ea04e700df..568a6d74b8b 100644
--- a/diaconn/src/main/res/values-lt-rLT/strings.xml
+++ b/diaconn/src/main/res/values-lt-rLT/strings.xml
@@ -1,2 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="resetpairing">Panaikinti sąsają</string>
+    <string name="diaconn_nodeviceavailable">Nėra prieinamų įrenginių</string>
+    <string name="diaconn_pairing">Diaconn pompos sąsaja</string>
+    <string name="pumperror">Pompos klaida</string>
+    <string name="diaconn_g8_history_alarm">Aliarmai</string>
+    <string name="diaconn_g8_history_basalhours">Valandinė bazė</string>
+    <string name="diaconn_g8_history_bolus">Bolusai</string>
+    <string name="diaconn_g8_history_dailyinsulin">Paros insulinas</string>
+    <string name="diaconn_g8_history_errors">Klaidos</string>
+    <string name="diaconn_g8_history_prime">Užpildyti sistemą</string>
+    <string name="diaconn_g8_history_refill">Užpildymas</string>
+    <string name="diaconn_g8_history_suspend">Sustabdyta</string>
+    <string name="diaconn_g8_pairingok">Sujungta</string>
+    <string name="diaconn_g8_waitingforpairing">Laukiama sujungimo</string>
+    <string name="diaconn_firmware_version">Versija</string>
+    <string name="invalidpairing">Netinkama susiejimo informacija. Bandoma susieti iš naujo</string>
+    <string name="gettingpumpsettings">Gaunami pompos nustatymai</string>
+    <string name="gettingpumptime">Gaunamas pompos laikas</string>
+    <string name="largetimediff">Didelis laiko skirtumas:\nLaikas pompoje skiriasi daugiau nei 1,5 val.\nNustatykite laiką pompoje rankiniu būdu ir įsitikinkite, kad įrašai iš pompos istorijos nesukels netikėtų sistemos veiksmų.\nJei įmanoma, ištrinkite istoriją pompoje prieš keisdami laiką arba atjunkite uždarąjį ciklą vienai IVT po paskutinio neteisingo istorijos įrašo ar mažiausiai vienai IVT nuo dabar.</string>
+    <string name="largetimedifftitle">Didelis laiko neatitikimas</string>
+    <string name="approachingdailylimit">Artėja paros insulino limitas</string>
+    <string name="startingbolus">Pradedamas boluso leidimas</string>
+    <string name="waitingforestimatedbolusend">Laukiama boluso suleidimo pabaigos</string>
+    <string name="gettingbolusstatus">Gaunama boluso būklė</string>
+    <string name="stoppingtempbasal">Stabdoma laikina bazė</string>
+    <string name="settingtempbasal">Laikinos bazės nustatymas</string>
+    <string name="settingextendedbolus">Ištęsto boluso nustatymas</string>
+    <string name="stoppingextendedbolus">Stabdomas ištęstas bolusas</string>
+    <string name="updatingbasalrates">Bazė naujinama</string>
+    <string name="description_pump_diaconn_g8">Pompos integracija su Diaconn G8 Pompomis</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation">Pažeistas maks boluso limitas</string>
+    <string name="commanderror">Komandos klaida</string>
+    <string name="speederror">Greičio klaida</string>
+    <string name="insulinlimitviolation">Pažeistas insulino dozės limitas</string>
+    <string name="boluserrorcode">Įvesta: %1$.2fvv Suleista: %2$.2fvv Klaidos kodas: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Reikšmė nėra tinkamai nustatyta</string>
+    <string name="diaconn_g8_bt_name_title">Diaconn G8 Bluetooth įrenginys</string>
+    <string name="diaconn_g8_password_title">Pompos slaptažodis</string>
+    <string name="bolusspeed">Boluso greitis</string>
+    <string name="selectedpump">Pasirinkta pompa</string>
+    <string name="diaconn_g8_useextended_title">Naudoti ištęstinį bolusą &gt;200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Rodyti ištęstinį boliusą kaip %%</string>
+    <string name="diaconn_g8_bluetooth_status">Bluetooth būklė</string>
+    <string name="diagonn_g8_tdd_label">BPD</string>
+    <string name="bolus_step">Boluso žingsnis</string>
+    <string name="basal_step">Bazės žingsnis</string>
+    <string name="pump_firmware_label">Programinė įranga</string>
+    <string name="diagonn_g8_useroptions">VARTOTOJO PARINKTYS</string>
+    <string name="pairfirst">Atnaujinkite pompos ir telefono ryšį!</string>
+    <string name="processinghistory">"Apdorojama "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Laikina bazė</string>
+    <string name="diaconng8_pump_settings">Diaconn pompos nustatymai</string>
+    <string name="diaconn_g8_pumpalarm">Garsas</string>
+    <string name="diaconn_g8_pumpalarm_sound">garsas</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">vibravimas</string>
+    <string name="diaconn_g8_pumpalarm_silent">begarsis</string>
+    <string name="diaconn_g8_pumpalarmlevel">Įspėjimo intensyvumas</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">žemas</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">vidutinis</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">aukštas</string>
+    <string name="diaconn_g8_screentimeout">Ekrano aktyvumo laikas [second]</string>
+    <string name="diaconn_g8_saveuseroptions">IŠSAUGOTI POMPOJE</string>
+    <string name="diaconn_g8_language">Kalba</string>
+    <string name="diaconn_g8_bolus_speed">Boluso greitis</string>
+    <string name="diaconn_g8_pumplang_chiness">Kinų</string>
+    <string name="diaconn_g8_pumplang_korean">Korėjiečių</string>
+    <string name="diaconn_g8_pumplang_english">Anglų</string>
+    <string name="diaconn_g8_screentimeout_10">"10 "</string>
+    <string name="diaconn_g8_pumpscreentimeout_10">10</string>
+    <string name="diaconn_g8_pumpscreentimeout_20">20</string>
+    <string name="diaconn_g8_pumpscreentimeout_30">30</string>
+    <string name="diaconn_g8_pumpalarm_low">žemas</string>
+    <string name="injectionblocked">Užblokuotas leidimas</string>
+    <string name="batterywarning">Senkančios baterijos įspėjimas</string>
+    <string name="insulinlackwarning">Įspėjimas apie insulino trūkumą</string>
+    <string name="needbatteryreplace">Būtina pakeisti bateriją</string>
+    <string name="needinsullinreplace">Būtina pakeisti insuliną</string>
+    <string name="pumpversion">pump_version</string>
+    <string name="apsIncarnationNo">aps_incarnation_no</string>
+    <string name="pumpserialno">pump_serial_no</string>
+    <string name="diaconn_g8_loginsulinchange_title">Įrašyti rezervuaro keitimą</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Įtraukti į terapijos skiltį įvykį „Insulino pakeitimas“, jei jis aptinkamas istorijoje</string>
+    <string name="diaconn_g8_logcanulachange_title">Įrašyti kaniulės pakeitimą</string>
+    <string name="diaconn_g8_logcanulachange_summary">Įtraukti į terapijos skiltį įvykį „Kaniulės pakeitimas“, jei jis aptinkamas istorijoje</string>
+    <string name="diaconn_g8_logbatterychange_summary">Įtraukti į terapijos skiltį įvykį „Baterijos pakeitimas“, jei jis aptinkamas istorijoje</string>
+    <string name="diaconn_g8_logbatterychange_title">Įrašyti baterijos pakeitimą</string>
+    <string name="diaconn_g8_logsyncinprogress">Įrašyti sinchronizacijos įvykius</string>
+    <string name="diaconn_g8_loginsulinshorage">Insulino trūkumas</string>
+    <string name="diaconn_g8_logbatteryshorage">Nepakankama baterijos įkrova</string>
+    <string name="diaconn_g8_logneedleprime">Užpildyti kaniulę: %1$.2fvv</string>
+    <string name="diaconn_g8_loginjectorprime">Užpildyti injektorių: %1$.2fvv</string>
+    <string name="diaconn_g8_logtubeprime">Vamzdelio užpildymas: %1$.2fvv</string>
+    <string name="diaconn_g8_resetfactoryreset">Iš naujo nustatyti po gamyklinių nustatymų atkūrimo</string>
+    <string name="diaconn_g8_resetemergencyoff">Iš naujo nustatyti po avarinio išjungimo</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Iš naujo nustatyti po baterijos pakeitimo</string>
+    <string name="diaconn_g8_resetaftercalibration">Iš naujo nustatyti po kalibracijos</string>
+    <string name="diaconn_g8_resetpreshipment">Iš naujo nustatyti po pradinio nustatymo</string>
+    <string name="diaconn_g8_resetunexpected">Netikėtas sistemos atstatymas</string>
+    <string name="diaconn_g8_reasoncomplete">Atlikta</string>
+    <string name="diaconn_g8_reasoninjectonblock">Užblokuotas leidimas</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Nepakankama baterijos įkrova</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Insulino trūkumas</string>
+    <string name="diaconn_g8_reasonuserstop">Sustabdyta vartotojo</string>
+    <string name="diaconn_g8_reasonsystemreset">Sistemos atstatymas</string>
+    <string name="diaconn_g8_reasonother">Kita</string>
+    <string name="diaconn_g8_reasonemergencystop">Avarinis sustabdymas</string>
+    <string name="diacon_g8_blockbasal">BAZĖ</string>
+    <string name="diacon_g8_blockmealbolus">MAISTO BOLUSAS</string>
+    <string name="diacon_g8_blocknormalbolus">NORMALUS BOLUSAS</string>
+    <string name="diacon_g8_blocksquarebolus">DAUGIABANGIS BOLUSAS</string>
+    <string name="diacon_g8_blockdualbolus">DVIGUBAS BOLUSAS</string>
+    <string name="diacon_g8_blockreplacetube">VAMZDELIO KEITIMAS</string>
+    <string name="diacon_g8_blockreplaceneedle">KANIULĖS KEITIMAS</string>
+    <string name="diacon_g8_blockreplacesyringe">ŠVIRKŠTO KEITIMAS</string>
+    <string name="diaconn_g8_logalarmblock">Užblokuotas leidimas(%s)</string>
+    <string name="diaconn_g8_lgorelease">bazės leidimas (%s)</string>
+    <string name="diaconn_g8_lgosuspend">bazė sustabdyta (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Dvigubas normalus suleistas sėkmingai</string>
+    <string name="diaconn_g8_logdualsquarestart">Dvigubas normalus pradėtas</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Dvigubas daugiabangis suleistas sėkmingai</string>
+    <string name="diaconn_g8_logsquarestart">Daugiabangis pradėtas</string>
+    <string name="diaconn_g8_logsquaresuccess">Daugiabangis suleistas sėkmingai</string>
+    <string name="diaconn_g8_logmealfail">Maistas neįrašytas</string>
+    <string name="diaconn_g8_logsuccess">Atlikta</string>
+    <string name="diaconn_g8_logmealsuccess">Maistas įrašytas</string>
+    <string name="diaconn_g8_errorcode_1">Negalima ieškoti dėl CRC paketo klaidos.</string>
+    <string name="diaconn_g8_errorcode_2">Neįmanoma nustatyti dėl įvesties parametro klaidos.</string>
+    <string name="diaconn_g8_errorcode_3">Neįmanoma nustatyti dėl protokolo specifikacijos klaidos.</string>
+    <string name="diaconn_g8_errorcode_4">Nustatytas valgymo laikas. Insulino leisti negalima.</string>
+    <string name="diaconn_g8_errorcode_6">Atšaukta pompos</string>
+    <string name="diaconn_g8_errorcode_7">Atliekami kiti veiksmai, apribojami programos nustatymai.</string>
+    <string name="diaconn_g8_errorcode_8">Boluso leidimo metu naujas suleidimas negalimas.</string>
+    <string name="diaconn_g8_errorcode_9">Reikalingas bazės leidimo atstatymas</string>
+    <string name="diaconn_g8_errorcode_10">Atšaukta, nes pompa nereaguoja.</string>
+    <string name="diaconn_g8_errorcode_11">Suleidimas neįmanomas dėl per žemos baterijos įkrovos.</string>
+    <string name="diaconn_g8_errorcode_12">Negalima suleisti, nes nepakanka insulino.</string>
+    <string name="diaconn_g8_errorcode_13">Suleidimas negalimas, nes viršijamas limitas.</string>
+    <string name="diaconn_g8_errorcode_14">Suleidimas negalimas, nes viršijama dienos riba.</string>
+    <string name="diaconn_g8_errorcode_15">Po bazės nustatymo galima pradėti leisti bazę.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Komanda nenusiųsta. Pabandykite dar kartą.</string>
+    <string name="diaconn_g8_logtubechange_title">Įrašyti infuzijos vamzdelio pakeitimą</string>
+    <string name="diaconn_g8_logtubechange_summary">Įtraukti į Pastabas įvykį „Infuzijos vamzdelio pakeitimas“, jei jis aptinkamas istorijoje</string>
+    <string name="diaconn_g8_logtempstart">Pradėta laikina bazė</string>
+    <string name="diaconn_g8_errorcode_32">Negalima leisti insulino kol veikia sustabdymo prie žemos glikemijos režimas</string>
+    <string name="diaconn_g8_errorcode_33">Sustabdymo prie žemos glikemijos režimas aktyvus, komanda ĮJUNGTI atmesta.</string>
+    <string name="diaconn_g8_errorcode_34">Sustabdymo prie žemos glikemijos režimas išjungtas, komanda IŠJUNGTI atmesta.</string>
+    <string name="diaconn_g8_errorcode_35">Laikinos bazės paleidimas atmestas, nes jau veikia nustatyta laikina bazė</string>
+    <string name="diaconn_g8_errorcode_36">Laikinos bazės stabdymas atmestas, nes nėra nustatyta laikina bazė</string>
+</resources>
diff --git a/diaconn/src/main/res/values-nl-rNL/strings.xml b/diaconn/src/main/res/values-nl-rNL/strings.xml
index f6d192e7050..acee82d0a6b 100644
--- a/diaconn/src/main/res/values-nl-rNL/strings.xml
+++ b/diaconn/src/main/res/values-nl-rNL/strings.xml
@@ -5,10 +5,12 @@
     <string name="diaconn_pairing">Diaconn Pomp Koppeling</string>
     <string name="pumperror">Pomp storing</string>
     <string name="diaconn_g8_history_alarm">Alarmen</string>
+    <string name="diaconn_g8_history_basalhours">Basaal uren</string>
     <string name="diaconn_g8_history_bolus">Bolussen</string>
     <string name="diaconn_g8_history_dailyinsulin">Dagtotaal insuline</string>
     <string name="diaconn_g8_history_errors">Foutmeldingen</string>
     <string name="diaconn_g8_history_prime">Vullen</string>
+    <string name="diaconn_g8_history_refill">Hervullen</string>
     <string name="diaconn_g8_history_suspend">Onderbreken</string>
     <string name="diaconn_g8_pairingok">Koppeling geslaagd</string>
     <string name="diaconn_g8_waitingforpairing">Wachten op koppeling</string>
@@ -16,8 +18,11 @@
     <string name="invalidpairing">Ongeldige koppelingsinformatie. Nieuwe koppelingspoging wordt uitgevoerd</string>
     <string name="gettingpumpsettings">Pomp instellingen aan het ophalen</string>
     <string name="gettingpumptime">Pomp tijd aan het ophalen</string>
+    <string name="largetimediff">Groot tijdsverschil:\nTijd in de pomp staat meer dan 1,5 uur uit.\nPas de tijd handmatig aan op de pomp en zorg ervoor dat het lezen van geschiedenis uit de pomp geen onverwacht gedrag veroorzaakt.\nindien mogelijk verwijder de geschiedenis van de pomp voordat je de tijd wijzigt of schakel de closed loop uit voor een DIA na het laatste verkeerde geschiedenis-invoer, maar vanaf nu minimaal één DIA.</string>
+    <string name="largetimedifftitle">Kenmerk groot tijdverschil</string>
     <string name="approachingdailylimit">Insuline daglimiet aan het benaderen</string>
     <string name="startingbolus">Bolus toediening gestart</string>
+    <string name="waitingforestimatedbolusend">Wachten op het geschatte bolus einde</string>
     <string name="gettingbolusstatus">Bolus status aan het ophalen</string>
     <string name="stoppingtempbasal">Stoppen van tijdelijk basaal</string>
     <string name="settingtempbasal">Instellen tijdelijk basaal</string>
@@ -25,4 +30,126 @@
     <string name="stoppingextendedbolus">Stoppen van vertraagde bolus</string>
     <string name="updatingbasalrates">Bijwerken basaal profiel</string>
     <string name="description_pump_diaconn_g8">Pomp integratie voor Diaconn G8 Pompen</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation">Maximale bolus overschrijding</string>
+    <string name="commanderror">Opdracht fout</string>
+    <string name="speederror">Snelheid fout</string>
+    <string name="insulinlimitviolation">Insuline limiet overschrijding</string>
+    <string name="boluserrorcode">Gevraagd: %1$.2fE Toegediend: %2$.2fE Error code: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Waarde niet correct ingesteld</string>
+    <string name="diaconn_g8_bt_name_title">Diaconn G8 Bluetooth-apparaat</string>
+    <string name="diaconn_g8_password_title">Pomp wachtwoord</string>
+    <string name="bolusspeed">Bolus snelheid</string>
+    <string name="selectedpump">Geselecteerde pomp</string>
+    <string name="diaconn_g8_useextended_title">Gebruik vertraagde bolussen voor &gt;200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Geef vertraagde bolus weer in %%</string>
+    <string name="diaconn_g8_bluetooth_status">Bluetooth Status</string>
+    <string name="diagonn_g8_tdd_label">TDD</string>
+    <string name="bolus_step">Bolus Stap</string>
+    <string name="basal_step">Basaal Stap</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <string name="diagonn_g8_useroptions">GEBRUIKER OPTIES</string>
+    <string name="pairfirst">A.u.b. de pomp koppelen met je telefoon!</string>
+    <string name="processinghistory">"Gebeurtenis wordt uitgevoerd "</string>
+    <string name="apslastLogNum">aps_laatste_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Tijdelijk basaal</string>
+    <string name="diaconng8_pump_settings">Diaconn pomp instellingen</string>
+    <string name="diaconn_g8_pumpalarm">Geluid</string>
+    <string name="diaconn_g8_pumpalarm_sound">geluid</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">trillen</string>
+    <string name="diaconn_g8_pumpalarm_silent">stil</string>
+    <string name="diaconn_g8_pumpalarmlevel">Alarm intensiteit</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">laag</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">middel</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">hoog</string>
+    <string name="diaconn_g8_screentimeout">LCD-aan tijd [seconden]</string>
+    <string name="diaconn_g8_saveuseroptions">OPTIE OPSLAAN IN POMP</string>
+    <string name="diaconn_g8_language">Taal</string>
+    <string name="diaconn_g8_bolus_speed">Bolus snelheid</string>
+    <string name="diaconn_g8_pumplang_chiness">Chinees</string>
+    <string name="diaconn_g8_pumplang_korean">Koreaans</string>
+    <string name="diaconn_g8_pumplang_english">Engels</string>
+    <string name="diaconn_g8_screentimeout_10">"10 "</string>
+    <string name="diaconn_g8_pumpscreentimeout_10">10</string>
+    <string name="diaconn_g8_pumpscreentimeout_20">20</string>
+    <string name="diaconn_g8_pumpscreentimeout_30">30</string>
+    <string name="diaconn_g8_pumpalarm_low">laag</string>
+    <string name="injectionblocked">Injectie Geblokkeerd</string>
+    <string name="batterywarning">Batterij waarschuwing</string>
+    <string name="insulinlackwarning">Insuline gebrek Waarschuwing</string>
+    <string name="needbatteryreplace">Vervanging van de batterij is vereist</string>
+    <string name="needinsullinreplace">Insuline vervanging is vereist</string>
+    <string name="pumpversion">pump_version</string>
+    <string name="apsIncarnationNo">aps_incarnation_no</string>
+    <string name="pumpserialno">pump_serial_no</string>
+    <string name="diaconn_g8_loginsulinchange_title">Reservoir wissel vastleggen</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Zet \"Reservoir wissel\" melding in Nightscout als deze in pomp geschiedenis wordt uitgelezen</string>
+    <string name="diaconn_g8_logcanulachange_title">Infuus wissel noteren</string>
+    <string name="diaconn_g8_logcanulachange_summary">Zet \"Infuuswissel\" melding in Nightscout als deze in pompgeschiedenis wordt uitgelezen</string>
+    <string name="diaconn_g8_logbatterychange_summary">Zet \"Batterij wissel\" melding in Nightscout als deze in pomp geschiedenis wordt uitgelezen</string>
+    <string name="diaconn_g8_logbatterychange_title">Batterijwissel noteren</string>
+    <string name="diaconn_g8_logsyncinprogress">Log synchronisatie in uitvoering</string>
+    <string name="diaconn_g8_loginsulinshorage">Insuline tekort</string>
+    <string name="diaconn_g8_logbatteryshorage">Batterij bijna leeg</string>
+    <string name="diaconn_g8_logneedleprime">Naald voorvullen :%1$.2fE</string>
+    <string name="diaconn_g8_loginjectorprime">Injector voorvullen :%1$.2fE</string>
+    <string name="diaconn_g8_logtubeprime">Infuus wissel voorvullen :%1$.2fE</string>
+    <string name="diaconn_g8_resetfactoryreset">Herstellen na terugzetten naar fabrieksinstellingen</string>
+    <string name="diaconn_g8_resetemergencyoff">Herstellen na nood uitschakeling</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Herstellen na batterij vervanging door de gebruiker</string>
+    <string name="diaconn_g8_resetaftercalibration">Herstellen na kalibratie</string>
+    <string name="diaconn_g8_resetpreshipment">Herstellen na pre-verzending setup</string>
+    <string name="diaconn_g8_resetunexpected">Onverwachte systeemreset</string>
+    <string name="diaconn_g8_reasoncomplete">Voltooid</string>
+    <string name="diaconn_g8_reasoninjectonblock">Injectie Geblokkeerd</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Batterij bijna leeg</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Insuline tekort</string>
+    <string name="diaconn_g8_reasonuserstop">Gebruikers stop</string>
+    <string name="diaconn_g8_reasonsystemreset">Systeem opnieuw instellen</string>
+    <string name="diaconn_g8_reasonother">Overige</string>
+    <string name="diaconn_g8_reasonemergencystop">Noodstop</string>
+    <string name="diacon_g8_blockbasal">Basaal</string>
+    <string name="diacon_g8_blockmealbolus">MAALTIJD BOLUS</string>
+    <string name="diacon_g8_blocknormalbolus">NORMALE BOLUS</string>
+    <string name="diacon_g8_blocksquarebolus">SQUARE BOLUS</string>
+    <string name="diacon_g8_blockdualbolus">DUAL BOLUS</string>
+    <string name="diacon_g8_blockreplacetube">VERVANG INFUUS</string>
+    <string name="diacon_g8_blockreplaceneedle">VERVANG NAALD</string>
+    <string name="diacon_g8_blockreplacesyringe">VERVANG RESERVOIR</string>
+    <string name="diaconn_g8_logalarmblock">Injectie geblokkeerd (%s)</string>
+    <string name="diaconn_g8_lgorelease">basaal afgifte (%s)</string>
+    <string name="diaconn_g8_lgosuspend">basaal opgeschort (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Dual Nomarl geslaagd</string>
+    <string name="diaconn_g8_logdualsquarestart">Dual Square Start</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Dual Square Succes</string>
+    <string name="diaconn_g8_logsquarestart">Square Start</string>
+    <string name="diaconn_g8_logsquaresuccess">Square Succes</string>
+    <string name="diaconn_g8_logmealfail">Maaltijd Mislukt</string>
+    <string name="diaconn_g8_logsuccess">Succes</string>
+    <string name="diaconn_g8_logmealsuccess">Maaltijd succesvol</string>
+    <string name="diaconn_g8_errorcode_1">Kan niet zoeken vanwege pakket CRC fout.</string>
+    <string name="diaconn_g8_errorcode_2">Kan niet worden ingesteld op een invoer parameterfout.</string>
+    <string name="diaconn_g8_errorcode_3">Kan niet worden ingesteld op een protocol specificatie fout.</string>
+    <string name="diaconn_g8_errorcode_4">Eten ingesteld kan niet worden geïnjecteerd.</string>
+    <string name="diaconn_g8_errorcode_6">Door pomp geannuleerd</string>
+    <string name="diaconn_g8_errorcode_7">Andere maatregelen nemen, app instellingen beperkt.</string>
+    <string name="diaconn_g8_errorcode_8">Tijdens weer een Bolus-injectie, wordt injectie beperkt.</string>
+    <string name="diaconn_g8_errorcode_9">Herstarten basale injectie is vereist</string>
+    <string name="diaconn_g8_errorcode_10">Geannuleerd omdat de pomp niet reageert.</string>
+    <string name="diaconn_g8_errorcode_11">Injectie is niet mogelijk als gevolg van een te lege batterij.</string>
+    <string name="diaconn_g8_errorcode_12">Insuline tekort kan niet worden geïnjecteerd.</string>
+    <string name="diaconn_g8_errorcode_13">U kunt het niet injecteren omdat het de limiet eenmaal overschrijdt.</string>
+    <string name="diaconn_g8_errorcode_14">Injectie kan niet toegediend worden omdat de dagelijkse maximale injectie hoeveelheid overschreden is.</string>
+    <string name="diaconn_g8_errorcode_15">Nadat je basaal instellingen zijn voltooid, kan basaal afgifte worden uitgevoerd.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Het commando is niet aangekomen. Probeer het nogmaals.</string>
+    <string name="diaconn_g8_logtubechange_title">Infuuswissel noteren</string>
+    <string name="diaconn_g8_logtubechange_summary">Zet \"Infuuswissel\" melding in Nightscout als deze in pompgeschiedenis wordt uitgelezen</string>
+    <string name="diaconn_g8_logtempstart">Tijdelijk Basaal Start</string>
+    <string name="diaconn_g8_errorcode_32">Als LGS loopt is de injectie begrensd</string>
+    <string name="diaconn_g8_errorcode_33">LGS status AAN, Aan Commando is geweigerd.</string>
+    <string name="diaconn_g8_errorcode_34">LGS status UIT, UIT Commando is geweigerd.</string>
+    <string name="diaconn_g8_errorcode_35">Tijdelijk basaal start geweigerd als tijdelijk basaal wordt uitgevoerd</string>
+    <string name="diaconn_g8_errorcode_36">Tijdelijk basaal stop geweigerd als tijdelijk basaal niet wordt uitgevoerd</string>
 </resources>
diff --git a/diaconn/src/main/res/values-no-rNO/strings.xml b/diaconn/src/main/res/values-no-rNO/strings.xml
index cef3434ebaf..2c33d1b032b 100644
--- a/diaconn/src/main/res/values-no-rNO/strings.xml
+++ b/diaconn/src/main/res/values-no-rNO/strings.xml
@@ -129,7 +129,6 @@
     <string name="diaconn_g8_logmealfail">Måltidsbolus feilet</string>
     <string name="diaconn_g8_logsuccess">Suksess</string>
     <string name="diaconn_g8_logmealsuccess">Måltidsbolus vellykket</string>
-    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
     <string name="diaconn_g8_errorcode_1">Kan ikke lese på grunn av feil med kommunikasjonen</string>
     <string name="diaconn_g8_errorcode_2">Kan ikke settes på grunn av feil i parameterverdi.</string>
     <string name="diaconn_g8_errorcode_3">Kan ikke settes på grunn av feil i kommunikasjonsprotokollen.</string>
diff --git a/diaconn/src/main/res/values-ro-rRO/strings.xml b/diaconn/src/main/res/values-ro-rRO/strings.xml
index 3ea04e700df..e4c1e07b421 100644
--- a/diaconn/src/main/res/values-ro-rRO/strings.xml
+++ b/diaconn/src/main/res/values-ro-rRO/strings.xml
@@ -1,2 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="resetpairing">Resetează împerecherea</string>
+    <string name="diaconn_nodeviceavailable">Niciun dispozitiv disponibil</string>
+    <string name="diaconn_pairing">Asocierea pompei Diaconn</string>
+    <string name="pumperror">Eroare pompă</string>
+    <string name="diaconn_g8_history_alarm">Alarme</string>
+    <string name="diaconn_g8_history_basalhours">Ore rate bazale</string>
+    <string name="diaconn_g8_history_bolus">Bolusuri</string>
+    <string name="diaconn_g8_history_dailyinsulin">Insulină zilnică</string>
+    <string name="diaconn_g8_history_errors">Erori</string>
+    <string name="diaconn_g8_history_prime">Amorsare</string>
+    <string name="diaconn_g8_history_refill">Reumplere</string>
+    <string name="diaconn_g8_history_suspend">Suspendare</string>
+    <string name="diaconn_g8_pairingok">Împerechere Ok</string>
+    <string name="diaconn_g8_waitingforpairing">Se așteaptă împerecherea</string>
+    <string name="diaconn_firmware_version">Versiune</string>
+    <string name="invalidpairing">Informații de împerechere invalide. Se cere o noua împerechere</string>
+    <string name="gettingpumpsettings">Se obțin setările pompei</string>
+    <string name="gettingpumptime">Se citește ora pompei</string>
+    <string name="largetimediff">Diferență majoră de timp:\nOra din pompă este diferită cu mai multe de 1.5 ore.\nCorectati manual ora din pompă și asigurați-vă că sincronizarea cu datele din pompă nu va produce un comportament neașteptat.\nDacă este posibil, ștergeți istoricul pompei înaintea modificării orei și inactivați bucla închisă pentru un interval DIA după ultima intrare istorică cu timp greșit, dar minim o DIA de acum încolo.</string>
+    <string name="largetimedifftitle">Diferență majoră de timp Titlu</string>
+    <string name="approachingdailylimit">Se apropie de limita zilnică de insulină</string>
+    <string name="startingbolus">Pornire livrare bolus</string>
+    <string name="waitingforestimatedbolusend">Se așteaptă sfârșitul bolusului estimat</string>
+    <string name="gettingbolusstatus">Se citește starea bolusului</string>
+    <string name="stoppingtempbasal">Se oprește bazala temporară</string>
+    <string name="settingtempbasal">Se setează bazala temporară</string>
+    <string name="settingextendedbolus">Se setează bolusul extins</string>
+    <string name="stoppingextendedbolus">Se oprește bolusul extins</string>
+    <string name="updatingbasalrates">Se actualizează ratele bazale</string>
+    <string name="description_pump_diaconn_g8">Integrare cu pompa Diaconn G8</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation">Încălcare a valorii maxime a bolusului</string>
+    <string name="commanderror">Eroare de comandă</string>
+    <string name="speederror">Eroare de viteză</string>
+    <string name="insulinlimitviolation">Încălcare a limitei de insulina</string>
+    <string name="boluserrorcode">Solicitat: %1$.2fU Livrat: %2$.2fU Cod eroare: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Valoare setată incorect</string>
+    <string name="diaconn_g8_bt_name_title">Dispozitiv Bluetooth Diaconn G8</string>
+    <string name="diaconn_g8_password_title">Parola pompei</string>
+    <string name="bolusspeed">Viteză bolusare</string>
+    <string name="selectedpump">Pompa selectată</string>
+    <string name="diaconn_g8_useextended_title">Folosiți bolusuri extinse pentru &gt;200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Afișati bolusul extins ca %%</string>
+    <string name="diaconn_g8_bluetooth_status">Stare Bluetooth</string>
+    <string name="diagonn_g8_tdd_label">TDD</string>
+    <string name="bolus_step">Pas bolus</string>
+    <string name="basal_step">Pas bazală</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <string name="diagonn_g8_useroptions">OPȚIUNI UTILIZATOR</string>
+    <string name="pairfirst">Vă rog să împerecheați pompa cu telefonul!</string>
+    <string name="processinghistory">"Se procesează evenimentul "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Bazală temporară</string>
+    <string name="diaconng8_pump_settings">Setări pompă Diaconn</string>
+    <string name="diaconn_g8_pumpalarm">Sunet</string>
+    <string name="diaconn_g8_pumpalarm_sound">sunet</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">vibrație</string>
+    <string name="diaconn_g8_pumpalarm_silent">silențios</string>
+    <string name="diaconn_g8_pumpalarmlevel">Intensitate alarmă</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">scăzut</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">mijloc</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">mare</string>
+    <string name="diaconn_g8_screentimeout">LCD în timp [second]</string>
+    <string name="diaconn_g8_saveuseroptions">SALVEAZĂ OPȚIUNEA IN POMPA</string>
+    <string name="diaconn_g8_language">Limba</string>
+    <string name="diaconn_g8_bolus_speed">Viteză bolus</string>
+    <string name="diaconn_g8_pumplang_chiness">Chineză</string>
+    <string name="diaconn_g8_pumplang_korean">Coreeană</string>
+    <string name="diaconn_g8_pumplang_english">Engleză</string>
+    <string name="diaconn_g8_screentimeout_10">"10 "</string>
+    <string name="diaconn_g8_pumpscreentimeout_10">10</string>
+    <string name="diaconn_g8_pumpscreentimeout_20">20</string>
+    <string name="diaconn_g8_pumpscreentimeout_30">30</string>
+    <string name="diaconn_g8_pumpalarm_low">scăzut</string>
+    <string name="injectionblocked">Blocare injectare</string>
+    <string name="batterywarning">Avertizare baterie</string>
+    <string name="insulinlackwarning">Avertisment lipsa insulina</string>
+    <string name="needbatteryreplace">Înlocuirea bateriei este necesară</string>
+    <string name="needinsullinreplace">Schimbarea insulinei este necesară</string>
+    <string name="pumpversion">pump_version</string>
+    <string name="apsIncarnationNo">aps_incarnation_no</string>
+    <string name="pumpserialno">pump_serial_no</string>
+    <string name="diaconn_g8_loginsulinchange_title">Înregistrează schimbarea rezervorului</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Adăugare eveniment \"Schimbare insulină\" în Ns/Careportal când este detectat în istoric</string>
+    <string name="diaconn_g8_logcanulachange_title">Înregistrează schimbarea canulei</string>
+    <string name="diaconn_g8_logcanulachange_summary">Adăugare eveniment \"Schimbare canula\" în Careportal când este detectat în istoric</string>
+    <string name="diaconn_g8_logbatterychange_summary">Adaugă evenimentul \"Schimbare baterie\" in Careportal când este detectat in istoric</string>
+    <string name="diaconn_g8_logbatterychange_title">Înregistrează schimbările bateriei</string>
+    <string name="diaconn_g8_logsyncinprogress">Înregistrează Sincronizare în curs</string>
+    <string name="diaconn_g8_loginsulinshorage">Insulina pe terminate</string>
+    <string name="diaconn_g8_logbatteryshorage">Baterie pe terminate</string>
+    <string name="diaconn_g8_logneedleprime">Amorsare ac :%1$.2fU</string>
+    <string name="diaconn_g8_loginjectorprime">Amorsare injector :%1$.2fU</string>
+    <string name="diaconn_g8_logtubeprime">Amorsare schimbare furtun :%1$.2fU</string>
+    <string name="diaconn_g8_resetfactoryreset">Resetează după resetarea de fabrica</string>
+    <string name="diaconn_g8_resetemergencyoff">Resetare după oprire de urgenţă</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Resetați după înlocuirea bateriei</string>
+    <string name="diaconn_g8_resetaftercalibration">Resetare după calibrare</string>
+    <string name="diaconn_g8_resetpreshipment">Resetare după configurarea pre-livrare</string>
+    <string name="diaconn_g8_resetunexpected">Resetare neașteptată a sistemului</string>
+    <string name="diaconn_g8_reasoncomplete">Complet</string>
+    <string name="diaconn_g8_reasoninjectonblock">Blocare injectare</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Baterie pe terminate</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Insulina pe terminate</string>
+    <string name="diaconn_g8_reasonuserstop">Oprire utilizator</string>
+    <string name="diaconn_g8_reasonsystemreset">Resetare sistem</string>
+    <string name="diaconn_g8_reasonother">Altele</string>
+    <string name="diaconn_g8_reasonemergencystop">Stop de urgenţă</string>
+    <string name="diacon_g8_blockbasal">BAZALA</string>
+    <string name="diacon_g8_blockmealbolus">BOLUS DE MASA</string>
+    <string name="diacon_g8_blocknormalbolus">BOLUS NORMAL</string>
+    <string name="diacon_g8_blocksquarebolus">BOLUS EXTINS</string>
+    <string name="diacon_g8_blockdualbolus">BOLUS DUAL</string>
+    <string name="diacon_g8_blockreplacetube">ÎNLOCUIEȘTE FURTUNUL</string>
+    <string name="diacon_g8_blockreplaceneedle">ÎNLOCUIEȘTE CANULA</string>
+    <string name="diacon_g8_blockreplacesyringe">ÎNLOCUIEȘTE REZERVORUL</string>
+    <string name="diaconn_g8_logalarmblock">Blocare injectare (%s)</string>
+    <string name="diaconn_g8_lgorelease">livrare bazala (%s)</string>
+    <string name="diaconn_g8_lgosuspend">bazala suspendata (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Succes Dual Normal</string>
+    <string name="diaconn_g8_logdualsquarestart">Start Dual Extins</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Succes Dual Extins</string>
+    <string name="diaconn_g8_logsquarestart">Start Extins</string>
+    <string name="diaconn_g8_logsquaresuccess">Succes Extins</string>
+    <string name="diaconn_g8_logmealfail">Masa a eșuat</string>
+    <string name="diaconn_g8_logsuccess">Succes</string>
+    <string name="diaconn_g8_logmealsuccess">Masa cu succes</string>
+    <string name="diaconn_g8_errorcode_1">Nu se poate căuta din cauza erorii pachetului CRC.</string>
+    <string name="diaconn_g8_errorcode_2">Nu poate fi setat la o eroare de introducere a parametrului.</string>
+    <string name="diaconn_g8_errorcode_3">Nu poate fi setat la o eroare de specificare a protocolului.</string>
+    <string name="diaconn_g8_errorcode_4">Masa a fost inregistrata, nu poate fi injectat.</string>
+    <string name="diaconn_g8_errorcode_6">Anulat de pompa</string>
+    <string name="diaconn_g8_errorcode_7">Se iau alte acțiuni, se limiteaza setările aplicației.</string>
+    <string name="diaconn_g8_errorcode_8">În timpul livrării unui bolus, injectarea este restricționată.</string>
+    <string name="diaconn_g8_errorcode_9">Necesită reluarea livrarii de bazala</string>
+    <string name="diaconn_g8_errorcode_10">Anulat din cauza faptului că pompa nu răspunde.</string>
+    <string name="diaconn_g8_errorcode_11">Injectarea nu este posibilă din cauza bateriei descărcate.</string>
+    <string name="diaconn_g8_errorcode_12">Insuficienta insulina. Nu poate fi injectată.</string>
+    <string name="diaconn_g8_errorcode_13">Nu se poata injecta deoarece depăşeşte limita.</string>
+    <string name="diaconn_g8_errorcode_14">Injecţia nu poate fi injectată deoarece depăşeşte volumul injectării în prezent.</string>
+    <string name="diaconn_g8_errorcode_15">După finalizarea configurării ratei bazale, se poate injecta bazala.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Comanda nu a fost realizata. Vă rugăm să încercați din nou.</string>
+    <string name="diaconn_g8_logtubechange_title">Înregistrează schimbarea furtunului</string>
+    <string name="diaconn_g8_logtubechange_summary">Adăugare eveniment \"Schimbare furtun\" în Nota atunci când este detectat în istoric</string>
+    <string name="diaconn_g8_logtempstart">Start bazală temporară</string>
+    <string name="diaconn_g8_errorcode_32">În timpul rulării LGS, injectarea este restricţionată.</string>
+    <string name="diaconn_g8_errorcode_33">Starea LGS este activ, comanda de activare este refuzată.</string>
+    <string name="diaconn_g8_errorcode_34">Starea LGS este inactiv, comanda de inactivare este refuzată.</string>
+    <string name="diaconn_g8_errorcode_35">Pornirea bazalei temporare este respinsă atunci când se execută bazala temporară</string>
+    <string name="diaconn_g8_errorcode_36">Oprirea bazalei temporare este respinsă atunci când bazala temporară nu rulează</string>
+</resources>
diff --git a/diaconn/src/main/res/values-ru-rRU/strings.xml b/diaconn/src/main/res/values-ru-rRU/strings.xml
index 5b4dfdf4d4a..f3fd8c04f36 100644
--- a/diaconn/src/main/res/values-ru-rRU/strings.xml
+++ b/diaconn/src/main/res/values-ru-rRU/strings.xml
@@ -129,7 +129,6 @@
     <string name="diaconn_g8_logmealfail">Прием пищи не записан</string>
     <string name="diaconn_g8_logsuccess">Успешно</string>
     <string name="diaconn_g8_logmealsuccess">Прием пиши записан</string>
-    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
     <string name="diaconn_g8_errorcode_1">Не удается найти из-за ошибки пакета CRC.</string>
     <string name="diaconn_g8_errorcode_2">Не удается установить ошибку входного параметра.</string>
     <string name="diaconn_g8_errorcode_3">Не удается установить ошибку спецификации протокола.</string>
diff --git a/diaconn/src/main/res/values-sk-rSK/strings.xml b/diaconn/src/main/res/values-sk-rSK/strings.xml
index b0da6f5f9a8..0e02dcb5e12 100644
--- a/diaconn/src/main/res/values-sk-rSK/strings.xml
+++ b/diaconn/src/main/res/values-sk-rSK/strings.xml
@@ -85,15 +85,16 @@
     <string name="apsIncarnationNo">aps_incarnation_no</string>
     <string name="pumpserialno">pump_serial_no</string>
     <string name="diaconn_g8_loginsulinchange_title">Zaznamenať výmenu zásobníka</string>
-    <string name="diaconn_g8_loginsulinchange_summary">Pridať udalosť \"Výmena inzulínu\" do portálu starostlivosti, pokiaľ je zistená v histórii</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Pridať udalosť \"Výmena inzulínu\" do portálu starostlivosti, pokiaľ bola zistená v histórii</string>
     <string name="diaconn_g8_logcanulachange_title">Zaznamenať výmenu kanyly</string>
-    <string name="diaconn_g8_logcanulachange_summary">Pridať udalosť \"Výmena setu\" do portálu starostlivosti, pokiaľ je zistená v histórii</string>
-    <string name="diaconn_g8_logbatterychange_summary">Pridať udalosť \"Výmena batérie\" do portálu starostlivosti, pokiaľ je zistená v histórii</string>
+    <string name="diaconn_g8_logcanulachange_summary">Pridať udalosť \"Výmena setu\" do portálu starostlivosti, pokiaľ bola zistená v histórii</string>
+    <string name="diaconn_g8_logbatterychange_summary">Pridať udalosť \"Výmena batérie\" do portálu starostlivosti, pokiaľ bola zistená v histórii</string>
     <string name="diaconn_g8_logbatterychange_title">Zaznamenať výmenu batérie</string>
     <string name="diaconn_g8_logsyncinprogress">Prebieha synchronizácia logov</string>
     <string name="diaconn_g8_loginsulinshorage">Nedostatok inzulínu</string>
     <string name="diaconn_g8_logbatteryshorage">Slabá batéria</string>
     <string name="diaconn_g8_logneedleprime">Plnenie ihly :%1$.2fJI</string>
+    <string name="diaconn_g8_loginjectorprime">Plnenie kanyly:%1$.2fJI</string>
     <string name="diaconn_g8_logtubeprime">Plnenie hadičky :%1$.2fJI</string>
     <string name="diaconn_g8_resetfactoryreset">Resetovať po obnovení na továrenské nastavenia</string>
     <string name="diaconn_g8_resetemergencyoff">Resetovať po núdzovom vypnutí</string>
@@ -121,10 +122,13 @@
     <string name="diaconn_g8_lgorelease">výdaj bazálu (%s)</string>
     <string name="diaconn_g8_lgosuspend">bazál pozastavený (%s)</string>
     <string name="diaconn_g8_logdualnormalsuccess">Kombinovaný bolus vydaný</string>
+    <string name="diaconn_g8_logdualsquarestart">Začiatok kombinovaného bolusu</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Kombinovaný bolus úspešne vydaný</string>
+    <string name="diaconn_g8_logsquarestart">Začiatok oneskoreného bolusu</string>
+    <string name="diaconn_g8_logsquaresuccess">Oneskorený bolus podaný</string>
     <string name="diaconn_g8_logmealfail">Jedlo zlyhalo</string>
     <string name="diaconn_g8_logsuccess">Hotovo</string>
     <string name="diaconn_g8_logmealsuccess">Jedlo úspešné</string>
-    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
     <string name="diaconn_g8_errorcode_1">Nie je možné vyhľadať kvôli chybe CRC.</string>
     <string name="diaconn_g8_errorcode_2">Nemôže byť nastavené na základe chybných vstupných parametrov.</string>
     <string name="diaconn_g8_errorcode_3">Nemôže byť nastavené na základe chyby špecifikácie protokolu.</string>
@@ -135,4 +139,17 @@
     <string name="diaconn_g8_errorcode_9">Vyžaduje sa obnovenie bazálu</string>
     <string name="diaconn_g8_errorcode_10">Zrušené, pretože pumpa neodpovedá.</string>
     <string name="diaconn_g8_errorcode_11">Podávanie nie je možné z dôvodu slabej batérie.</string>
+    <string name="diaconn_g8_errorcode_12">Podanie nie je možné, z dôvodu nedostatku inzulínu.</string>
+    <string name="diaconn_g8_errorcode_13">Nemôžete podať, pretože bol prekročený limit jednorázovej dávky.</string>
+    <string name="diaconn_g8_errorcode_14">Dávka nemôže byť podaná, pretože bol prekročený denný limit.</string>
+    <string name="diaconn_g8_errorcode_15">Potom, čo je nastavenie bazálov hotové, môže byť podávanie bazálu úspešné.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Príkaz nebol vykonaný. Prosím skúste to znovu.</string>
+    <string name="diaconn_g8_logtubechange_title">Zaznamenať výmenu hadičky</string>
+    <string name="diaconn_g8_logtubechange_summary">Pridať udalosť \"Výmena hadičky\" do portálu starostlivosti, pokiaľ bola zistená v histórii</string>
+    <string name="diaconn_g8_logtempstart">Začiatok dočasného bazálu</string>
+    <string name="diaconn_g8_errorcode_32">Počas bežiaceho LGS, je podávanie obmedzené</string>
+    <string name="diaconn_g8_errorcode_33">Stav LGS je ZAP, príkaz ZAP je zamietnutý.</string>
+    <string name="diaconn_g8_errorcode_34">Stav LGS je VYP, príkaz VYP je zamietnutý.</string>
+    <string name="diaconn_g8_errorcode_35">Začiatok dočasného bazálu nie je možný, ak už beží dočasný bazál</string>
+    <string name="diaconn_g8_errorcode_36">Koniec dočasného bazálu nie je možný, ak nebeží dočasný bazál</string>
 </resources>
diff --git a/diaconn/src/main/res/values-sv-rSE/strings.xml b/diaconn/src/main/res/values-sv-rSE/strings.xml
index 3ea04e700df..ffe441b74fd 100644
--- a/diaconn/src/main/res/values-sv-rSE/strings.xml
+++ b/diaconn/src/main/res/values-sv-rSE/strings.xml
@@ -1,2 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="resetpairing">Återställ parkoppling</string>
+    <string name="diaconn_nodeviceavailable">Ingen enhet tillgänglig</string>
+    <string name="diaconn_pairing">Diaconn parkoppling</string>
+    <string name="pumperror">Pumpfel</string>
+    <string name="diaconn_g8_history_alarm">Larm</string>
+    <string name="diaconn_g8_history_basalhours">Basaltimmar</string>
+    <string name="diaconn_g8_history_bolus">Bolus</string>
+    <string name="diaconn_g8_history_dailyinsulin">Daglig insulinmängd</string>
+    <string name="diaconn_g8_history_errors">Fel</string>
+    <string name="diaconn_g8_history_prime">Förfyllning</string>
+    <string name="diaconn_g8_history_refill">Påfyllning</string>
+    <string name="diaconn_g8_history_suspend">Pausa</string>
+    <string name="diaconn_g8_pairingok">Parkoppling OK</string>
+    <string name="diaconn_g8_waitingforpairing">Väntar på parkoppling</string>
+    <string name="diaconn_firmware_version">Version</string>
+    <string name="invalidpairing">Ogiltig parkopplingsinformation. Begär ny parkoppling</string>
+    <string name="gettingpumpsettings">Hämtar pumpinställningar</string>
+    <string name="gettingpumptime">Hämtar tid och datum i pumpen</string>
+    <string name="largetimediff">Stor tidsskillnad:\nTiden i pumpen skiljer mer än 1,5 timme.\nVänligen justera tiden manuellt på pumpen och se till att det går att läsa historiken från pumpen utan oväntat beteende.\nOm möjligt, töm historiken i pumpen innan tidsomställning alternativt stäng av loopen i minst DIA timmar efter den senaste felaktiga historikloggen, men minst DIA timmar från nu.</string>
+    <string name="largetimedifftitle">Stor tidsskillnad</string>
+    <string name="approachingdailylimit">Maximal daglig dos snart nådd</string>
+    <string name="startingbolus">Påbörjar bolus</string>
+    <string name="waitingforestimatedbolusend">Väntar på att bolus slutförs</string>
+    <string name="gettingbolusstatus">Hämtar status för bolus</string>
+    <string name="stoppingtempbasal">Stoppar temp basal</string>
+    <string name="settingtempbasal">Ställer in temp basal</string>
+    <string name="settingextendedbolus">Ställer in förlängd bolus</string>
+    <string name="stoppingextendedbolus">Stoppar förlängd bolus</string>
+    <string name="updatingbasalrates">Uppdaterar basaldoser</string>
+    <string name="description_pump_diaconn_g8">Pumpintegration för Diaconn G8-pumpar</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">G8</string>
+    <string name="maxbolusviolation">Max bolus nådd</string>
+    <string name="commanderror">Kommandofel</string>
+    <string name="speederror">Felaktig hastighet</string>
+    <string name="insulinlimitviolation">Insulingräns nådd</string>
+    <string name="boluserrorcode">Angivet: %1$.2f enheter. Levererat: %2$.2f enheter. Felkod: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Värdet har inte angetts korrekt</string>
+    <string name="diaconn_g8_bt_name_title">Diaconn G8 Bluetooth-enhet</string>
+    <string name="diaconn_g8_password_title">Pumplösenord</string>
+    <string name="bolusspeed">Bolushastighet</string>
+    <string name="selectedpump">Vald pump</string>
+    <string name="diaconn_g8_useextended_title">Använd förlängd bolus för &gt;200%% temp basal</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Visa förlängd bolus som %%</string>
+    <string name="diaconn_g8_bluetooth_status">Bluetooth-status</string>
+    <string name="diagonn_g8_tdd_label">TDD</string>
+    <string name="bolus_step">Bolussteg</string>
+    <string name="basal_step">Basalsteg</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <string name="diagonn_g8_useroptions">ANVÄNDARALTERNATIV</string>
+    <string name="pairfirst">Vänligen parkoppla pumpen med din telefon</string>
+    <string name="processinghistory">"Behandlar "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Temp basal</string>
+    <string name="diaconng8_pump_settings">Inställningar för Diaconn pump</string>
+    <string name="diaconn_g8_pumpalarm">Ljud</string>
+    <string name="diaconn_g8_pumpalarm_sound">ljud</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">vibration</string>
+    <string name="diaconn_g8_pumpalarm_silent">ljudlös</string>
+    <string name="diaconn_g8_pumpalarmlevel">Larmets styrka</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">låg</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">mellan</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">hög</string>
+    <string name="diaconn_g8_screentimeout">LCD på, tid [second]</string>
+    <string name="diaconn_g8_saveuseroptions">SPARA ALTERNATIV TILL PUMP</string>
+    <string name="diaconn_g8_language">Språk</string>
+    <string name="diaconn_g8_bolus_speed">Bolushastighet</string>
+    <string name="diaconn_g8_pumplang_chiness">Kinesiska</string>
+    <string name="diaconn_g8_pumplang_korean">Koreanska</string>
+    <string name="diaconn_g8_pumplang_english">Engelska</string>
+    <string name="diaconn_g8_screentimeout_10">"10 "</string>
+    <string name="diaconn_g8_pumpscreentimeout_10">10</string>
+    <string name="diaconn_g8_pumpscreentimeout_20">20</string>
+    <string name="diaconn_g8_pumpscreentimeout_30">30</string>
+    <string name="diaconn_g8_pumpalarm_low">låg</string>
+    <string name="injectionblocked">Bolus blockerad</string>
+    <string name="batterywarning">Batterivarning</string>
+    <string name="insulinlackwarning">Nivåvarning insulinreservoar</string>
+    <string name="needbatteryreplace">Batteribyte krävs</string>
+    <string name="needinsullinreplace">Reservoarbyte krävs</string>
+    <string name="pumpversion">pump_version</string>
+    <string name="apsIncarnationNo">aps_incarnation_no</string>
+    <string name="pumpserialno">Serienummer</string>
+    <string name="diaconn_g8_loginsulinchange_title">Logga reservoarbyten</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Logga reservoarbyte automatiskt när det upptäcks i historiken</string>
+    <string name="diaconn_g8_logcanulachange_title">Logga nålbyte</string>
+    <string name="diaconn_g8_logcanulachange_summary">Logga kanylbyte automatiskt när det upptäcks i historiken</string>
+    <string name="diaconn_g8_logbatterychange_summary">Logga batteribyte automatiskt när det upptäcks i historiken</string>
+    <string name="diaconn_g8_logbatterychange_title">Logga batteribyten</string>
+    <string name="diaconn_g8_logsyncinprogress">Synkronisering pågår</string>
+    <string name="diaconn_g8_loginsulinshorage">Nivåvarning insulinreservoar</string>
+    <string name="diaconn_g8_logbatteryshorage">Nivåvarning pumpbatteri</string>
+    <string name="diaconn_g8_logneedleprime">Förfyllning nål:%1$.2fU</string>
+    <string name="diaconn_g8_loginjectorprime">Förfyllning :%1$.2fU</string>
+    <string name="diaconn_g8_logtubeprime">Förfyllning slang:%1$.2fU</string>
+    <string name="diaconn_g8_resetfactoryreset">Återställ efter fabriksåterställning</string>
+    <string name="diaconn_g8_resetemergencyoff">Återställ efter nödavstängning</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Återställ efter batteribyte</string>
+    <string name="diaconn_g8_resetaftercalibration">Återställ efter kalibrering</string>
+    <string name="diaconn_g8_resetpreshipment">Återställ efter fabriksinställning</string>
+    <string name="diaconn_g8_resetunexpected">Oväntad systemåterställning</string>
+    <string name="diaconn_g8_reasoncomplete">Slutförd</string>
+    <string name="diaconn_g8_reasoninjectonblock">Bolusblockering</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Pumpbatteri slut</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Slut på insulin</string>
+    <string name="diaconn_g8_reasonuserstop">Användaren pausat</string>
+    <string name="diaconn_g8_reasonsystemreset">Systemåterställning</string>
+    <string name="diaconn_g8_reasonother">Övrigt</string>
+    <string name="diaconn_g8_reasonemergencystop">Nödstopp</string>
+    <string name="diacon_g8_blockbasal">BASAL</string>
+    <string name="diacon_g8_blockmealbolus">MÅLTIDSBOLUS</string>
+    <string name="diacon_g8_blocknormalbolus">NORMAL BOLUS</string>
+    <string name="diacon_g8_blocksquarebolus">FÖRLÄNGD BOLUS</string>
+    <string name="diacon_g8_blockdualbolus">KOMBIBOLUS</string>
+    <string name="diacon_g8_blockreplacetube">BYT SLANG</string>
+    <string name="diacon_g8_blockreplaceneedle">BYT NÅL</string>
+    <string name="diacon_g8_blockreplacesyringe">BYT KANYL</string>
+    <string name="diaconn_g8_logalarmblock">Ocklusion (%s)</string>
+    <string name="diaconn_g8_lgorelease">basaldos (%s)</string>
+    <string name="diaconn_g8_lgosuspend">basal avstängd (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Normal slutförd</string>
+    <string name="diaconn_g8_logdualsquarestart">Kombi startad</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Kombi slutförd</string>
+    <string name="diaconn_g8_logsquarestart">Förlängd startad</string>
+    <string name="diaconn_g8_logsquaresuccess">Förlängd slutförd</string>
+    <string name="diaconn_g8_logmealfail">Misslyckades ange måltid</string>
+    <string name="diaconn_g8_logsuccess">Slutfört</string>
+    <string name="diaconn_g8_logmealsuccess">Lyckades ange måltid</string>
+    <string name="diaconn_g8_errorcode_1">Kan inte kontrollera pga CRC-fel i överföringen.</string>
+    <string name="diaconn_g8_errorcode_2">Kan inte ställas in pga indatafel.</string>
+    <string name="diaconn_g8_errorcode_3">Kan inte ställas in pga ett protokollspecifikationsfel.</string>
+    <string name="diaconn_g8_errorcode_4">Måltiden tidsmäts. Kan inte ta bolus.</string>
+    <string name="diaconn_g8_errorcode_6">Avbruten av pumpen</string>
+    <string name="diaconn_g8_errorcode_7">Tar till andra åtgärder. Begränsar appinställningar.</string>
+    <string name="diaconn_g8_errorcode_8">Under en pågående bolus är ny bolus begränsad.</string>
+    <string name="diaconn_g8_errorcode_9">Återuppta basaldos</string>
+    <string name="diaconn_g8_errorcode_10">Avbruten på grund av att pumpen inte svarar.</string>
+    <string name="diaconn_g8_errorcode_11">Bolus är inte möjlig på grund av lågt batteri.</string>
+    <string name="diaconn_g8_errorcode_12">Bolus inte tillåten pga låg reservoarnivå.</string>
+    <string name="diaconn_g8_errorcode_13">Bolus blockerad eftersom det kommer överskrida gränsen.</string>
+    <string name="diaconn_g8_errorcode_14">Bolus blockerad eftersom den kommer överstiga max daglig dos.</string>
+    <string name="diaconn_g8_errorcode_15">Efter att konfigurationen är klar, kan basaldosen påbörjas.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Kommandot levererades inte. Vänligen försök igen.</string>
+    <string name="diaconn_g8_logtubechange_title">Logga slangbyte</string>
+    <string name="diaconn_g8_logtubechange_summary">Lägg till händelse \"slangbyte\" när den upptäcks i historiken</string>
+    <string name="diaconn_g8_logtempstart">Temp basal start</string>
+    <string name="diaconn_g8_errorcode_32">Under LGS är bolus begränsad</string>
+    <string name="diaconn_g8_errorcode_33">LGS status är redan PÅ.</string>
+    <string name="diaconn_g8_errorcode_34">LGS status är redan AV.</string>
+    <string name="diaconn_g8_errorcode_35">\"Temp basal start\" ignoreras när temp basal redan är aktiv</string>
+    <string name="diaconn_g8_errorcode_36">\"Temp basal stopp\" ignoreras när ingen temp basal är aktiv</string>
+</resources>
diff --git a/diaconn/src/main/res/values-tr-rTR/strings.xml b/diaconn/src/main/res/values-tr-rTR/strings.xml
index 3ea04e700df..9123a000607 100644
--- a/diaconn/src/main/res/values-tr-rTR/strings.xml
+++ b/diaconn/src/main/res/values-tr-rTR/strings.xml
@@ -1,2 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="resetpairing">Eşleştirmeyi Sıfırla</string>
+    <string name="diaconn_nodeviceavailable">Kullanılabilir Cihaz yok</string>
+    <string name="diaconn_pairing">Diaconn Pompa Eşleştirme</string>
+    <string name="pumperror">Pompa Hatası</string>
+    <string name="diaconn_g8_history_alarm">Alarmlar</string>
+    <string name="diaconn_g8_history_basalhours">Bazal Saatler</string>
+    <string name="diaconn_g8_history_bolus">Boluslar</string>
+    <string name="diaconn_g8_history_dailyinsulin">Günlük İnsülin</string>
+    <string name="diaconn_g8_history_errors">Hatalar</string>
+    <string name="diaconn_g8_history_prime">Doldurma</string>
+    <string name="diaconn_g8_history_refill">Yeniden doldurun</string>
+    <string name="diaconn_g8_history_suspend">Askıya almak</string>
+    <string name="diaconn_g8_pairingok">Eşleştirme tamam</string>
+    <string name="diaconn_g8_waitingforpairing">Eşleştirme için bekleyin</string>
+    <string name="diaconn_firmware_version">Versiyon</string>
+    <string name="invalidpairing">Geçersiz eşleştirme bilgisi. Yeniden eşleştirme isteniyor</string>
+    <string name="gettingpumpsettings">Pompa ayarları alınıyor</string>
+    <string name="gettingpumptime">Pompa zamanı alınıyor</string>
+    <string name="largetimediff">Büyük zaman farkı:\nPompadaki süre 1,5 saatten fazla kapalı.\nLütfen zamanı pompada manuel olarak ayarlayın ve pompadan geçmişi okumanın beklenmeyen davranışlara neden olmadığından emin olun.\nMümkünse zamanı değiştirmeden önce geçmişi kaldırın veya son yanlış geçmiş girişinden sonra bir DIA için kapalı döngüyü devre dışı bırakın.</string>
+    <string name="largetimedifftitle">Büyük zaman farkı</string>
+    <string name="approachingdailylimit">İnsülin günlük sınırına yaklaşıyor</string>
+    <string name="startingbolus">Bolus gönderimini başlatma</string>
+    <string name="waitingforestimatedbolusend">Tahmini bolus sonu bekleniyor</string>
+    <string name="gettingbolusstatus">Bolus Durumu Alınıyor</string>
+    <string name="stoppingtempbasal">Geçici bazal durdurma</string>
+    <string name="settingtempbasal">Geçici bazal ayarı</string>
+    <string name="settingextendedbolus">Yayma bolus ayarı</string>
+    <string name="stoppingextendedbolus">Yayma bolus durdurma</string>
+    <string name="updatingbasalrates">Bazal oranların güncellenmesi</string>
+    <string name="description_pump_diaconn_g8">Diaconn G8 Pompaları için Pompa Entegrasyonu</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation">Maksimum bolus ihlali</string>
+    <string name="commanderror">Komut hatası</string>
+    <string name="speederror">Hız hatası</string>
+    <string name="insulinlimitviolation">İnsülin limit ihlali</string>
+    <string name="boluserrorcode">İstenen: %1$.2fU Teslim edilen: %2$.2fU Hata kodu: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Değer düzgün ayarlanmadı</string>
+    <string name="diaconn_g8_bt_name_title">Diaconn G8 Bluetooth cihazı</string>
+    <string name="diaconn_g8_password_title">Pompa Şifresi</string>
+    <string name="bolusspeed">Bolus hızı</string>
+    <string name="selectedpump">Seçilen pompa</string>
+    <string name="diaconn_g8_useextended_title">&gt;%%200 için yayma bolus kullanın</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Yayma bolusu %% olarak görselleştir</string>
+    <string name="diaconn_g8_bluetooth_status">Bluetooth Durumu</string>
+    <string name="diagonn_g8_tdd_label">TDD</string>
+    <string name="bolus_step">Bolus Adımı</string>
+    <string name="basal_step">Bazal Adımı</string>
+    <string name="pump_firmware_label">Yazılım</string>
+    <string name="diagonn_g8_useroptions">KULLANICI SEÇENEKLERİ</string>
+    <string name="pairfirst">Lütfen pompanızı telefonunuzla eşleştirin!</string>
+    <string name="processinghistory">"Etkinlik İşleniyor "</string>
+    <string name="apslastLogNum">aps_son_log_num</string>
+    <string name="apsWrappingCount">aps_sarım_sayım</string>
+    <string name="diaconn_g8_history_tempbasal">Geçici Bazal</string>
+    <string name="diaconng8_pump_settings">Diaconn pompa Ayarları</string>
+    <string name="diaconn_g8_pumpalarm">Ses</string>
+    <string name="diaconn_g8_pumpalarm_sound">ses</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">titreşim</string>
+    <string name="diaconn_g8_pumpalarm_silent">sessize al</string>
+    <string name="diaconn_g8_pumpalarmlevel">Alarm yoğunluğu</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">düşük</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">orta</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">yüksek</string>
+    <string name="diaconn_g8_screentimeout">LCD açık kalma süresi [second]</string>
+    <string name="diaconn_g8_saveuseroptions">POMPA SEÇENEĞİNİ KAYDET</string>
+    <string name="diaconn_g8_language">Dil</string>
+    <string name="diaconn_g8_bolus_speed">Bolus hızı</string>
+    <string name="diaconn_g8_pumplang_chiness">Çince</string>
+    <string name="diaconn_g8_pumplang_korean">Korece</string>
+    <string name="diaconn_g8_pumplang_english">İngilizce</string>
+    <string name="diaconn_g8_screentimeout_10">"10 "</string>
+    <string name="diaconn_g8_pumpscreentimeout_10">10</string>
+    <string name="diaconn_g8_pumpscreentimeout_20">20</string>
+    <string name="diaconn_g8_pumpscreentimeout_30">30</string>
+    <string name="diaconn_g8_pumpalarm_low">düşük</string>
+    <string name="injectionblocked">Enjeksiyon Blokesi</string>
+    <string name="batterywarning">Pil Uyarısı</string>
+    <string name="insulinlackwarning">İnsülin Eksikliği Uyarısı</string>
+    <string name="needbatteryreplace">Pil değişimi gerekli</string>
+    <string name="needinsullinreplace">İnsülin değişimi gerekli</string>
+    <string name="pumpversion">pompa_versiyonu</string>
+    <string name="apsIncarnationNo">aps_enkarnasyon_no</string>
+    <string name="pumpserialno">pompa_seri_no</string>
+    <string name="diaconn_g8_loginsulinchange_title">Rezervuar değişikliği günlüğe kaydet</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Geçmişte tespit edildiğinde careportal\'a \"İnsülin Değişimi\" olayı ekleyin</string>
+    <string name="diaconn_g8_logcanulachange_title">Kanül değişikliğini günlüğe kaydetme</string>
+    <string name="diaconn_g8_logcanulachange_summary">Geçmişte tespit edildiğinde careportal\'a \"Kanül Değişikliği\" olayı ekleyin</string>
+    <string name="diaconn_g8_logbatterychange_summary">Geçmişte tespit edildiğinde careportal\'a \"Pil Değişikliği\" olayı ekleyin</string>
+    <string name="diaconn_g8_logbatterychange_title">Pil değişimini günlüğe kaydet</string>
+    <string name="diaconn_g8_logsyncinprogress">Günlük Senkronizasyonu devam ediyor</string>
+    <string name="diaconn_g8_loginsulinshorage">İnsülin eksikliği</string>
+    <string name="diaconn_g8_logbatteryshorage">Pil bitiyor</string>
+    <string name="diaconn_g8_logneedleprime">İğne başlama :%1$.2fU</string>
+    <string name="diaconn_g8_loginjectorprime">Enjectör başlama :%1$.2fU</string>
+    <string name="diaconn_g8_logtubeprime">Tüp değişimi başlama :%1$.2fU</string>
+    <string name="diaconn_g8_resetfactoryreset">Fabrika ayarlarına sıfırladıktan sonra sıfırla</string>
+    <string name="diaconn_g8_resetemergencyoff">Acil Durum Kapatıldıktan Sonra Sıfırla</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Pil değişiminden sonra sıfırla</string>
+    <string name="diaconn_g8_resetaftercalibration">Kalibrasyondan sonra sıfırla</string>
+    <string name="diaconn_g8_resetpreshipment">Sevk-öncesi kurulumdan sonra sıfırla</string>
+    <string name="diaconn_g8_resetunexpected">Beklenmeyen sistem sıfırlaması</string>
+    <string name="diaconn_g8_reasoncomplete">Tamamlayınız</string>
+    <string name="diaconn_g8_reasoninjectonblock">Enjeksiyon bloğu</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Pil bitiyor</string>
+    <string name="diaconn_g8_reasoninsulinshortage">İnsülin bitiyor</string>
+    <string name="diaconn_g8_reasonuserstop">Kullanıcı durdurma</string>
+    <string name="diaconn_g8_reasonsystemreset">Sistem yeniden başlatma</string>
+    <string name="diaconn_g8_reasonother">Diğer</string>
+    <string name="diaconn_g8_reasonemergencystop">Acil stop</string>
+    <string name="diacon_g8_blockbasal">BAZAL</string>
+    <string name="diacon_g8_blockmealbolus">YEMEK BOLUSU</string>
+    <string name="diacon_g8_blocknormalbolus">NORMAL BOLUS</string>
+    <string name="diacon_g8_blocksquarebolus">KARE BOLUS</string>
+    <string name="diacon_g8_blockdualbolus">İKİLİ BOLUS</string>
+    <string name="diacon_g8_blockreplacetube">TÜPÜ DEĞİŞTİR</string>
+    <string name="diacon_g8_blockreplaceneedle">İĞNE DEĞİŞTİR</string>
+    <string name="diacon_g8_blockreplacesyringe">ŞIRINGA DEĞİŞTİR</string>
+    <string name="diaconn_g8_logalarmblock">Enjeksiyon Bloğu (%s)</string>
+    <string name="diaconn_g8_lgorelease">bazal salınım (%s)</string>
+    <string name="diaconn_g8_lgosuspend">bazal askıya alma (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">İkili Normal Başarılı</string>
+    <string name="diaconn_g8_logdualsquarestart">İkili Yayma Başladı</string>
+    <string name="diaconn_g8_logdualsquaresuccess">İkili Yayma başarılı</string>
+    <string name="diaconn_g8_logsquarestart">Yayma Başladı</string>
+    <string name="diaconn_g8_logsquaresuccess">Yayma Başarılı</string>
+    <string name="diaconn_g8_logmealfail">Yemek Başarısız</string>
+    <string name="diaconn_g8_logsuccess">Başarılı</string>
+    <string name="diaconn_g8_logmealsuccess">Yemek başarılı</string>
+    <string name="diaconn_g8_errorcode_1">Paket CRC hatası nedeniyle arama yapılamıyor.</string>
+    <string name="diaconn_g8_errorcode_2">Giriş parametresi hatasına ayarlanamaz.</string>
+    <string name="diaconn_g8_errorcode_3">Protokol spesifikasyon hatasına ayarlanamaz.</string>
+    <string name="diaconn_g8_errorcode_4">Zamanlanmış yeme, enjekte edilemez.</string>
+    <string name="diaconn_g8_errorcode_6">Pompa tarafından iptal edildi</string>
+    <string name="diaconn_g8_errorcode_7">Diğer işlemleri yapmak, uygulama ayarlarını sınırlamak.</string>
+    <string name="diaconn_g8_errorcode_8">Başka bir Bolus enjeksiyonu sırasında enjeksiyon kısıtlanır.</string>
+    <string name="diaconn_g8_errorcode_9">Bazal enjeksiyonun devam ettirilmesini gerektirir</string>
+    <string name="diaconn_g8_errorcode_10">Pompa yanıt vermediği için iptal edildi.</string>
+    <string name="diaconn_g8_errorcode_11">Düşük pil nedeniyle enjeksiyon mümkün değildir.</string>
+    <string name="diaconn_g8_errorcode_12">İnsülin eksikliği, enjekte edilemez.</string>
+    <string name="diaconn_g8_errorcode_13">Limiti bir kez aştığı için enjekte edemezsiniz.</string>
+    <string name="diaconn_g8_errorcode_14">Günlük enjeksiyon limitini aştığı için enjeksiyon yapılamaz.</string>
+    <string name="diaconn_g8_errorcode_15">Bazal kurulum tamamlandıktan sonra bazal enjeksiyon yapılabilir.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Komut teslim edilmedi. Lütfen tekrar deneyin.</string>
+    <string name="diaconn_g8_logtubechange_title">Tüp değişim günlüğü</string>
+    <string name="diaconn_g8_logtubechange_summary">Geçmişte tespit edildiğinde Not\'a \"Tüp Değişikliği\" olayı ekleyin</string>
+    <string name="diaconn_g8_logtempstart">Geçici Bazal Başlat</string>
+    <string name="diaconn_g8_errorcode_32">LGS çalışırken, enjeksiyon kısıtlanır</string>
+    <string name="diaconn_g8_errorcode_33">LGS durumu AÇIK, AÇ Komutu reddedildi.</string>
+    <string name="diaconn_g8_errorcode_34">LGS durumu KAPALI, KAPAT komutu reddedildi.</string>
+    <string name="diaconn_g8_errorcode_35">Geçici bazal çalışırken Geçici bazal başlatma reddedilir</string>
+    <string name="diaconn_g8_errorcode_36">Geçici bazal çalışmıyorken Geçici bazal durdurma reddedilir</string>
+</resources>
diff --git a/diaconn/src/main/res/values/strings.xml b/diaconn/src/main/res/values/strings.xml
index 3a51a9ff15a..686e5ededc8 100644
--- a/diaconn/src/main/res/values/strings.xml
+++ b/diaconn/src/main/res/values/strings.xml
@@ -142,7 +142,7 @@
     <string name="diaconn_g8_logmealfail">Meal Failed</string>
     <string name="diaconn_g8_logsuccess">Success</string>
     <string name="diaconn_g8_logmealsuccess">Meal Success</string>
-    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
+    <string name="key_diaconn_g8_logtubechange" translatable="false">diaconn_g8_logtubechange</string>
     <string name="diaconn_g8_errorcode_1">Can\'t lookup due to packet CRC error.</string>
     <string name="diaconn_g8_errorcode_2">Can\'t be set to an input parameter error.</string>
     <string name="diaconn_g8_errorcode_3">Can\'t be set to a protocol specification error.</string>
diff --git a/gradle/android_dependencies.gradle b/gradle/android_dependencies.gradle
index a7125100946..eb031288c21 100644
--- a/gradle/android_dependencies.gradle
+++ b/gradle/android_dependencies.gradle
@@ -7,10 +7,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
     buildFeatures {
         viewBinding true
     }
@@ -30,8 +26,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     lintOptions {
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index 8278203eae0..76ee9adfd40 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -39,7 +39,7 @@
 public class InsightAlertService extends DaggerService implements InsightConnectionService.StateCallback {
 
     @Inject AAPSLogger aapsLogger;
-    @Inject ResourceHelper resourceHelper;
+    @Inject ResourceHelper rh;
     @Inject AlertUtils alertUtils;
 
     private static final int NOTIFICATION_ID = 31345;
@@ -309,11 +309,11 @@ private void showNotification(Alert alert) {
             case ACTIVE:
                 Intent muteIntent = new Intent(this, InsightAlertService.class).putExtra("command", "mute");
                 PendingIntent mutePendingIntent = PendingIntent.getService(this, 1, muteIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
-                notificationBuilder.addAction(0, resourceHelper.gs(R.string.mute_alert), mutePendingIntent);
+                notificationBuilder.addAction(0, rh.gs(R.string.mute_alert), mutePendingIntent);
             case SNOOZED:
                 Intent confirmIntent = new Intent(this, InsightAlertService.class).putExtra("command", "confirm");
                 PendingIntent confirmPendingIntent = PendingIntent.getService(this, 2, confirmIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
-                notificationBuilder.addAction(0, resourceHelper.gs(R.string.confirm), confirmPendingIntent);
+                notificationBuilder.addAction(0, rh.gs(R.string.confirm), confirmPendingIntent);
         }
 
         Notification notification = notificationBuilder.build();
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
index 4a16e1aee04..56653c22164 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
@@ -21,8 +21,8 @@
 
 import dagger.android.support.DaggerFragment;
 import info.nightscout.androidaps.insight.R;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.interfaces.CommandQueue;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.TBROverNotificationBlock;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBasalRate;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBolus;
@@ -41,9 +41,9 @@
 
 public class LocalInsightFragment extends DaggerFragment implements View.OnClickListener {
     @Inject LocalInsightPlugin localInsightPlugin;
-    @Inject CommandQueueProvider commandQueue;
-    @Inject RxBusWrapper rxBus;
-    @Inject ResourceHelper resourceHelper;
+    @Inject CommandQueue commandQueue;
+    @Inject RxBus rxBus;
+    @Inject ResourceHelper rh;
     @Inject FabricPrivacy fabricPrivacy;
     @Inject DateUtil dateUtil;
     @Inject AapsSchedulers aapsSchedulers;
@@ -226,9 +226,9 @@ private void getConnectionStatusItem(List<View> statusItems) {
                 string = R.string.recovering;
                 break;
         }
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.insight_status), resourceHelper.gs(string)));
+        statusItems.add(getStatusItem(rh.gs(R.string.insight_status), rh.gs(string)));
         if (state == InsightState.RECOVERING) {
-            statusItems.add(getStatusItem(resourceHelper.gs(R.string.recovery_duration), localInsightPlugin.getConnectionService().getRecoveryDuration() / 1000 + "s"));
+            statusItems.add(getStatusItem(rh.gs(R.string.recovery_duration), localInsightPlugin.getConnectionService().getRecoveryDuration() / 1000 + "s"));
         }
     }
 
@@ -244,11 +244,11 @@ private void getLastConnectedItem(List<View> statusItems) {
                 double lastConnectionMinAgo = agoMsc / 60d / 1000d;
                 String ago;
                 if (lastConnectionMinAgo < 60) {
-                    ago = dateUtil.minAgo(resourceHelper, lastConnection);
+                    ago = dateUtil.minAgo(rh, lastConnection);
                 } else {
-                    ago = dateUtil.hourAgo(lastConnection, resourceHelper);
+                    ago = dateUtil.hourAgo(lastConnection, rh);
                 }
-                statusItems.add(getStatusItem(resourceHelper.gs(R.string.last_connected),
+                statusItems.add(getStatusItem(rh.gs(R.string.last_connected),
                         dateUtil.timeString(lastConnection) + " (" + ago + ")"));
         }
     }
@@ -275,12 +275,12 @@ private void getOperatingModeItem(List<View> statusItems) {
                 string = R.string.paused;
                 break;
         }
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.operating_mode), resourceHelper.gs(string)));
+        statusItems.add(getStatusItem(rh.gs(R.string.operating_mode), rh.gs(string)));
     }
 
     private void getBatteryStatusItem(List<View> statusItems) {
         if (localInsightPlugin.getBatteryStatus() == null) return;
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.battery_label),
+        statusItems.add(getStatusItem(rh.gs(R.string.battery_label),
                 localInsightPlugin.getBatteryStatus().getBatteryAmount() + "%"));
     }
 
@@ -290,45 +290,45 @@ private void getCartridgeStatusItem(List<View> statusItems) {
         String status;
         if (cartridgeStatus.isInserted())
             status = DecimalFormatter.INSTANCE.to2Decimal(localInsightPlugin.getCartridgeStatus().getRemainingAmount()) + "U";
-        else status = resourceHelper.gs(R.string.not_inserted);
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.reservoir_label), status));
+        else status = rh.gs(R.string.not_inserted);
+        statusItems.add(getStatusItem(rh.gs(R.string.reservoir_label), status));
     }
 
     private void getTDDItems(List<View> statusItems) {
         if (localInsightPlugin.getTotalDailyDose() == null) return;
         TotalDailyDose tdd = localInsightPlugin.getTotalDailyDose();
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.tdd_bolus), DecimalFormatter.INSTANCE.to2Decimal(tdd.getBolus())));
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.tdd_basal), DecimalFormatter.INSTANCE.to2Decimal(tdd.getBasal())));
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.tdd_total), DecimalFormatter.INSTANCE.to2Decimal(tdd.getBolusAndBasal())));
+        statusItems.add(getStatusItem(rh.gs(R.string.tdd_bolus), DecimalFormatter.INSTANCE.to2Decimal(tdd.getBolus())));
+        statusItems.add(getStatusItem(rh.gs(R.string.tdd_basal), DecimalFormatter.INSTANCE.to2Decimal(tdd.getBasal())));
+        statusItems.add(getStatusItem(rh.gs(R.string.tdd_total), DecimalFormatter.INSTANCE.to2Decimal(tdd.getBolusAndBasal())));
     }
 
     private void getBaseBasalRateItem(List<View> statusItems) {
         if (localInsightPlugin.getActiveBasalRate() == null) return;
         ActiveBasalRate activeBasalRate = localInsightPlugin.getActiveBasalRate();
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.basebasalrate_label),
+        statusItems.add(getStatusItem(rh.gs(R.string.basebasalrate_label),
                 DecimalFormatter.INSTANCE.to2Decimal(activeBasalRate.getActiveBasalRate()) + " U/h (" + activeBasalRate.getActiveBasalProfileName() + ")"));
     }
 
     private void getTBRItem(List<View> statusItems) {
         if (localInsightPlugin.getActiveTBR() == null) return;
         ActiveTBR activeTBR = localInsightPlugin.getActiveTBR();
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.tempbasal_label),
-                resourceHelper.gs(R.string.tbr_formatter, activeTBR.getPercentage(), activeTBR.getInitialDuration() - activeTBR.getRemainingDuration(), activeTBR.getInitialDuration())));
+        statusItems.add(getStatusItem(rh.gs(R.string.tempbasal_label),
+                rh.gs(R.string.tbr_formatter, activeTBR.getPercentage(), activeTBR.getInitialDuration() - activeTBR.getRemainingDuration(), activeTBR.getInitialDuration())));
     }
 
     private void getLastBolusItem(List<View> statusItems) {
         if (localInsightPlugin.lastBolusAmount == 0 || localInsightPlugin.lastBolusTimestamp == 0) return;
         long agoMsc = System.currentTimeMillis() - localInsightPlugin.lastBolusTimestamp;
         double bolusMinAgo = agoMsc / 60d / 1000d;
-        String unit = resourceHelper.gs(R.string.insulin_unit_shortname);
+        String unit = rh.gs(R.string.insulin_unit_shortname);
         String ago;
         if (bolusMinAgo < 60) {
-            ago = dateUtil.minAgo(resourceHelper, localInsightPlugin.lastBolusTimestamp);
+            ago = dateUtil.minAgo(rh, localInsightPlugin.lastBolusTimestamp);
         } else {
-            ago = dateUtil.hourAgo(localInsightPlugin.lastBolusTimestamp, resourceHelper);
+            ago = dateUtil.hourAgo(localInsightPlugin.lastBolusTimestamp, rh);
         }
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.insight_last_bolus),
-                resourceHelper.gs(R.string.insight_last_bolus_formater, localInsightPlugin.lastBolusAmount, unit, ago)));
+        statusItems.add(getStatusItem(rh.gs(R.string.insight_last_bolus),
+                rh.gs(R.string.insight_last_bolus_formater, localInsightPlugin.lastBolusAmount, unit, ago)));
     }
 
     private void getBolusItems(List<View> statusItems) {
@@ -337,15 +337,15 @@ private void getBolusItems(List<View> statusItems) {
             String label;
             switch (activeBolus.getBolusType()) {
                 case MULTIWAVE:
-                    label = resourceHelper.gs(R.string.multiwave_bolus);
+                    label = rh.gs(R.string.multiwave_bolus);
                     break;
                 case EXTENDED:
-                    label = resourceHelper.gs(R.string.extended_bolus);
+                    label = rh.gs(R.string.extended_bolus);
                     break;
                 default:
                     continue;
             }
-            statusItems.add(getStatusItem(label, resourceHelper.gs(R.string.eb_formatter, activeBolus.getRemainingAmount(), activeBolus.getInitialAmount(), activeBolus.getRemainingDuration())));
+            statusItems.add(getStatusItem(label, rh.gs(R.string.eb_formatter, activeBolus.getRemainingAmount(), activeBolus.getInitialAmount(), activeBolus.getRemainingDuration())));
         }
     }
 }
\ No newline at end of file
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index c93a7e895f8..83956aaeeab 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -41,7 +41,7 @@
 import info.nightscout.androidaps.insight.database.InsightPumpID;
 import info.nightscout.androidaps.insight.database.InsightPumpID.EventType;
 import info.nightscout.androidaps.insight.R;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.CommandQueue;
 import info.nightscout.androidaps.interfaces.Config;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.Constraints;
@@ -55,7 +55,7 @@
 import info.nightscout.androidaps.interfaces.PumpSync.PumpState.TemporaryBasal;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
@@ -137,10 +137,10 @@
 public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constraints, InsightConnectionService.StateCallback {
 
     private final AAPSLogger aapsLogger;
-    private final RxBusWrapper rxBus;
-    private final ResourceHelper resourceHelper;
+    private final RxBus rxBus;
+    private final ResourceHelper rh;
     private final SP sp;
-    private final CommandQueueProvider commandQueue;
+    private final CommandQueue commandQueue;
     private final ProfileFunction profileFunction;
     private final Context context;
     private final DateUtil dateUtil;
@@ -197,10 +197,10 @@ public void onServiceDisconnected(ComponentName name) {
     public LocalInsightPlugin(
             HasAndroidInjector injector,
             AAPSLogger aapsLogger,
-            RxBusWrapper rxBus,
-            ResourceHelper resourceHelper,
+            RxBus rxBus,
+            ResourceHelper rh,
             SP sp,
-            CommandQueueProvider commandQueue,
+            CommandQueue commandQueue,
             ProfileFunction profileFunction,
             Context context,
             Config config,
@@ -216,12 +216,12 @@ public LocalInsightPlugin(
                         .description(R.string.description_pump_insight_local)
                         .fragmentClass(LocalInsightFragment.class.getName())
                         .preferencesId(config.getAPS() ? R.xml.pref_insight_local_full : R.xml.pref_insight_local_pumpcontrol),
-                injector, aapsLogger, resourceHelper, commandQueue
+                injector, aapsLogger, rh, commandQueue
 
         );
         this.aapsLogger = aapsLogger;
         this.rxBus = rxBus;
-        this.resourceHelper = resourceHelper;
+        this.rh = rh;
         this.sp = sp;
         this.commandQueue = commandQueue;
         this.profileFunction = profileFunction;
@@ -280,7 +280,7 @@ protected void onStart() {
 
     private void createNotificationChannel() {
         NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        NotificationChannel channel = new NotificationChannel(ALERT_CHANNEL_ID, resourceHelper.gs(R.string.insight_alert_notification_channel), NotificationManager.IMPORTANCE_HIGH);
+        NotificationChannel channel = new NotificationChannel(ALERT_CHANNEL_ID, rh.gs(R.string.insight_alert_notification_channel), NotificationManager.IMPORTANCE_HIGH);
         channel.setSound(null, null);
         notificationManager.createNotificationChannel(channel);
     }
@@ -385,7 +385,7 @@ private void updatePumpTimeIfNeeded() throws Exception {
             SetDateTimeMessage setDateTimeMessage = new SetDateTimeMessage();
             setDateTimeMessage.setPumpTime(pumpTime);
             connectionService.requestMessage(setDateTimeMessage).await();
-            Notification notification = new Notification(Notification.INSIGHT_DATE_TIME_UPDATED, resourceHelper.gs(R.string.pump_time_updated), Notification.INFO, 60);
+            Notification notification = new Notification(Notification.INSIGHT_DATE_TIME_UPDATED, rh.gs(R.string.pump_time_updated), Notification.INFO, 60);
             rxBus.send(new EventNewNotification(notification));
         }
     }
@@ -492,7 +492,7 @@ public PumpEnactResult setNewBasalProfile(Profile profile) {
             profileBlock.setProfileBlocks(profileBlocks);
             ParameterBlockUtil.writeConfigurationBlock(connectionService, profileBlock);
             rxBus.send(new EventDismissNotification(Notification.FAILED_UPDATE_PROFILE));
-            Notification notification = new Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60);
+            Notification notification = new Notification(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, 60);
             rxBus.send(new EventNewNotification(notification));
             result.success(true)
                     .enacted(true)
@@ -504,17 +504,17 @@ public PumpEnactResult setNewBasalProfile(Profile profile) {
             }
         } catch (AppLayerErrorException e) {
             aapsLogger.info(LTag.PUMP, "Exception while setting profile: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
-            Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
             rxBus.send(new EventNewNotification(notification));
             result.comment(ExceptionTranslator.getString(context, e));
         } catch (InsightException e) {
             aapsLogger.info(LTag.PUMP, "Exception while setting profile: " + e.getClass().getCanonicalName());
-            Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
             rxBus.send(new EventNewNotification(notification));
             result.comment(ExceptionTranslator.getString(context, e));
         } catch (Exception e) {
             aapsLogger.error("Exception while setting profile", e);
-            Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
+            Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
             rxBus.send(new EventNewNotification(notification));
             result.comment(ExceptionTranslator.getString(context, e));
         }
@@ -588,7 +588,7 @@ public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
                 EventOverviewBolusProgress.Treatment t = new EventOverviewBolusProgress.Treatment(0, 0, detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB);
                 final EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
                 bolusingEvent.setT(t);
-                bolusingEvent.setStatus(resourceHelper.gs(R.string.insight_delivered, 0d, insulin));
+                bolusingEvent.setStatus(rh.gs(R.string.insight_delivered, 0d, insulin));
                 bolusingEvent.setPercent(0);
                 rxBus.send(bolusingEvent);
                 int trials = 0;
@@ -627,14 +627,14 @@ public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
                         trials = -1;
                         int percentBefore = bolusingEvent.getPercent();
                         bolusingEvent.setPercent((int) (100D / activeBolus.getInitialAmount() * (activeBolus.getInitialAmount() - activeBolus.getRemainingAmount())));
-                        bolusingEvent.setStatus(resourceHelper.gs(R.string.insight_delivered, activeBolus.getInitialAmount() - activeBolus.getRemainingAmount(), activeBolus.getInitialAmount()));
+                        bolusingEvent.setStatus(rh.gs(R.string.insight_delivered, activeBolus.getInitialAmount() - activeBolus.getRemainingAmount(), activeBolus.getInitialAmount()));
                         if (percentBefore != bolusingEvent.getPercent())
                             rxBus.send(bolusingEvent);
                     } else {
                         synchronized ($bolusLock) {
                             if (bolusCancelled || trials == -1 || trials++ >= 5) {
                                 if (!bolusCancelled) {
-                                    bolusingEvent.setStatus(resourceHelper.gs(R.string.insight_delivered, insulin, insulin));
+                                    bolusingEvent.setStatus(rh.gs(R.string.insight_delivered, insulin, insulin));
                                     bolusingEvent.setPercent(100);
                                     rxBus.send(bolusingEvent);
                                 }
@@ -1081,28 +1081,28 @@ public PumpDescription getPumpDescription() {
     @NonNull @Override
     public String shortStatus(boolean veryShort) {
         StringBuilder ret = new StringBuilder();
-        if (connectionService.getLastConnected() != 0) {
+        if (connectionService != null && connectionService.getLastConnected() != 0) {
             long agoMsec = dateUtil.now() - connectionService.getLastConnected();
             int agoMin = (int) (agoMsec / 60d / 1000d);
-            ret.append(resourceHelper.gs(R.string.short_status_last_connected, agoMin)).append("\n");
+            ret.append(rh.gs(R.string.short_status_last_connected, agoMin)).append("\n");
         }
         if (activeTBR != null) {
-            ret.append(resourceHelper.gs(R.string.short_status_tbr, activeTBR.getPercentage(),
+            ret.append(rh.gs(R.string.short_status_tbr, activeTBR.getPercentage(),
                     activeTBR.getInitialDuration() - activeTBR.getRemainingDuration(), activeTBR.getInitialDuration())).append("\n");
         }
         if (activeBoluses != null) for (ActiveBolus activeBolus : activeBoluses) {
             if (activeBolus.getBolusType() == BolusType.STANDARD) continue;
-            ret.append(resourceHelper.gs(activeBolus.getBolusType() == BolusType.MULTIWAVE ? R.string.short_status_multiwave : R.string.short_status_extended,
+            ret.append(rh.gs(activeBolus.getBolusType() == BolusType.MULTIWAVE ? R.string.short_status_multiwave : R.string.short_status_extended,
                     activeBolus.getRemainingAmount(), activeBolus.getInitialAmount(), activeBolus.getRemainingDuration())).append("\n");
         }
         if (!veryShort && totalDailyDose != null) {
-            ret.append(resourceHelper.gs(R.string.short_status_tdd, totalDailyDose.getBolusAndBasal())).append("\n");
+            ret.append(rh.gs(R.string.short_status_tdd, totalDailyDose.getBolusAndBasal())).append("\n");
         }
         if (cartridgeStatus != null) {
-            ret.append(resourceHelper.gs(R.string.short_status_reservoir, cartridgeStatus.getRemainingAmount())).append("\n");
+            ret.append(rh.gs(R.string.short_status_reservoir, cartridgeStatus.getRemainingAmount())).append("\n");
         }
         if (batteryStatus != null) {
-            ret.append(resourceHelper.gs(R.string.short_status_battery, batteryStatus.getBatteryAmount())).append("\n");
+            ret.append(rh.gs(R.string.short_status_battery, batteryStatus.getBatteryAmount())).append("\n");
         }
         return ret.toString();
     }
@@ -1289,7 +1289,7 @@ private void processTubeFilledEvent(String serial, TubeFilledEvent event) {
         long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
                 event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
         if (event.getAmount() > 0.0)               // Don't record event if amount is null
-            logNote(timestamp, resourceHelper.gs(R.string.tube_changed));
+            logNote(timestamp, rh.gs(R.string.tube_changed));
     }
 
     private void processSniffingDoneEvent(String serial, SniffingDoneEvent event) {
@@ -1319,17 +1319,17 @@ private void processOperatingModeChangedEvent(String serial, List<InsightPumpID>
                 pumpID.setEventType(EventType.PumpStarted);
                 pumpStartedEvents.add(pumpID);
                 if (sp.getBoolean("insight_log_operating_mode_changes", false))
-                    logNote(timestamp, resourceHelper.gs(R.string.pump_started));
+                    logNote(timestamp, rh.gs(R.string.pump_started));
                 break;
             case STOPPED:
                 pumpID.setEventType(EventType.PumpStopped);
                 if (sp.getBoolean("insight_log_operating_mode_changes", false))
-                    logNote(timestamp, resourceHelper.gs(R.string.pump_stopped));
+                    logNote(timestamp, rh.gs(R.string.pump_stopped));
                 break;
             case PAUSED:
                 pumpID.setEventType(EventType.PumpPaused);
                 if (sp.getBoolean("insight_log_operating_mode_changes", false))
-                    logNote(timestamp, resourceHelper.gs(R.string.pump_paused));
+                    logNote(timestamp, rh.gs(R.string.pump_paused));
                 break;
         }
         insightDbHelper.createOrUpdate(pumpID);
@@ -1542,7 +1542,7 @@ private void processOccurrenceOfAlertEvent(OccurrenceOfAlertEvent event) {
                 break;
         }
         if (code != null)
-            logNote(timestamp, resourceHelper.gs(R.string.insight_alert_formatter, resourceHelper.gs(code), resourceHelper.gs(title)));
+            logNote(timestamp, rh.gs(R.string.insight_alert_formatter, rh.gs(code), rh.gs(title)));
     }
 
     private long parseDate(int year, int month, int day, int hour, int minute, int second) {
@@ -1579,22 +1579,22 @@ private void uploadCareportalEvent(long date, DetailedBolusInfo.EventType event)
 
     @NonNull @Override
     public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, @NonNull Profile profile) {
-        percentRate.setIfGreater(getAapsLogger(), 0, String.format(resourceHelper.gs(R.string.limitingpercentrate), 0, resourceHelper.gs(R.string.itmustbepositivevalue)), this);
-        percentRate.setIfSmaller(getAapsLogger(), getPumpDescription().getMaxTempPercent(), String.format(resourceHelper.gs(R.string.limitingpercentrate), getPumpDescription().getMaxTempPercent(), resourceHelper.gs(R.string.pumplimit)), this);
+        percentRate.setIfGreater(getAapsLogger(), 0, String.format(rh.gs(R.string.limitingpercentrate), 0, rh.gs(R.string.itmustbepositivevalue)), this);
+        percentRate.setIfSmaller(getAapsLogger(), getPumpDescription().getMaxTempPercent(), String.format(rh.gs(R.string.limitingpercentrate), getPumpDescription().getMaxTempPercent(), rh.gs(R.string.pumplimit)), this);
         return percentRate;
     }
 
     @NonNull @Override
     public Constraint<Double> applyBolusConstraints(@NonNull Constraint<Double> insulin) {
         if (!limitsFetched) return insulin;
-        insulin.setIfSmaller(getAapsLogger(), maximumBolusAmount, String.format(resourceHelper.gs(R.string.limitingbolus), maximumBolusAmount, resourceHelper.gs(R.string.pumplimit)), this);
+        insulin.setIfSmaller(getAapsLogger(), maximumBolusAmount, String.format(rh.gs(R.string.limitingbolus), maximumBolusAmount, rh.gs(R.string.pumplimit)), this);
         if (insulin.value() < minimumBolusAmount) {
 
             //TODO: Add function to Constraints or use different approach
             // This only works if the interface of the InsightPlugin is called last.
             // If not, another constraint could theoretically set the value between 0 and minimumBolusAmount
 
-            insulin.set(getAapsLogger(), 0d, String.format(resourceHelper.gs(R.string.limitingbolus), minimumBolusAmount, resourceHelper.gs(R.string.pumplimit)), this);
+            insulin.set(getAapsLogger(), 0d, String.format(rh.gs(R.string.limitingbolus), minimumBolusAmount, rh.gs(R.string.pumplimit)), this);
         }
         return insulin;
     }
@@ -1633,7 +1633,7 @@ public void onPumpPaired() {
 
     @Override
     public void onTimeoutDuringHandshake() {
-        Notification notification = new Notification(Notification.INSIGHT_TIMEOUT_DURING_HANDSHAKE, resourceHelper.gs(R.string.timeout_during_handshake), Notification.URGENT);
+        Notification notification = new Notification(Notification.INSIGHT_TIMEOUT_DURING_HANDSHAKE, rh.gs(R.string.timeout_during_handshake), Notification.URGENT);
         new Handler(Looper.getMainLooper()).post(() -> rxBus.send(new EventNewNotification(notification)));
     }
 
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
index 11f000ef32d..92278161041 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
@@ -10,9 +10,9 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class AlertUtils @Inject constructor(private val resourceHelper: ResourceHelper) {
+class AlertUtils @Inject constructor(private val rh: ResourceHelper) {
 
-    fun getAlertCode(alertType: AlertType) = resourceHelper.gs(when (alertType) {
+    fun getAlertCode(alertType: AlertType) = rh.gs(when (alertType) {
         AlertType.REMINDER_01    -> R.string.alert_r1_code
         AlertType.REMINDER_02    -> R.string.alert_r2_code
         AlertType.REMINDER_03    -> R.string.alert_r3_code
@@ -41,7 +41,7 @@ class AlertUtils @Inject constructor(private val resourceHelper: ResourceHelper)
         AlertType.ERROR_13       -> R.string.alert_e13_code
     })
 
-    fun getAlertTitle(alertType: AlertType) = resourceHelper.gs(when (alertType) {
+    fun getAlertTitle(alertType: AlertType) = rh.gs(when (alertType) {
         AlertType.REMINDER_01    -> R.string.alert_r1_title
         AlertType.REMINDER_02    -> R.string.alert_r2_title
         AlertType.REMINDER_03    -> R.string.alert_r3_title
@@ -79,28 +79,28 @@ class AlertUtils @Inject constructor(private val resourceHelper: ResourceHelper)
             AlertType.REMINDER_02    -> null
             AlertType.REMINDER_03    -> null
             AlertType.REMINDER_04    -> null
-            AlertType.REMINDER_07    -> resourceHelper.gs(R.string.alert_r7_description, alert.tbrAmount, DecimalFormat("#0").format(hours.toLong()) + ":" + DecimalFormat("00").format(minutes.toLong()))
-            AlertType.WARNING_31     -> resourceHelper.gs(R.string.alert_w31_description, decimalFormat.format(alert.cartridgeAmount))
-            AlertType.WARNING_32     -> resourceHelper.gs(R.string.alert_w32_description)
-            AlertType.WARNING_33     -> resourceHelper.gs(R.string.alert_w33_description)
-            AlertType.WARNING_34     -> resourceHelper.gs(R.string.alert_w34_description)
-            AlertType.WARNING_36     -> resourceHelper.gs(R.string.alert_w36_description, alert.tbrAmount, DecimalFormat("#0").format(hours.toLong()) + ":" + DecimalFormat("00").format(minutes.toLong()))
-            AlertType.WARNING_38     -> resourceHelper.gs(R.string.alert_w38_description, decimalFormat.format(alert.programmedBolusAmount), decimalFormat.format(alert.deliveredBolusAmount))
+            AlertType.REMINDER_07    -> rh.gs(R.string.alert_r7_description, alert.tbrAmount, DecimalFormat("#0").format(hours.toLong()) + ":" + DecimalFormat("00").format(minutes.toLong()))
+            AlertType.WARNING_31     -> rh.gs(R.string.alert_w31_description, decimalFormat.format(alert.cartridgeAmount))
+            AlertType.WARNING_32     -> rh.gs(R.string.alert_w32_description)
+            AlertType.WARNING_33     -> rh.gs(R.string.alert_w33_description)
+            AlertType.WARNING_34     -> rh.gs(R.string.alert_w34_description)
+            AlertType.WARNING_36     -> rh.gs(R.string.alert_w36_description, alert.tbrAmount, DecimalFormat("#0").format(hours.toLong()) + ":" + DecimalFormat("00").format(minutes.toLong()))
+            AlertType.WARNING_38     -> rh.gs(R.string.alert_w38_description, decimalFormat.format(alert.programmedBolusAmount), decimalFormat.format(alert.deliveredBolusAmount))
             AlertType.WARNING_39     -> null
-            AlertType.MAINTENANCE_20 -> resourceHelper.gs(R.string.alert_m20_description)
-            AlertType.MAINTENANCE_21 -> resourceHelper.gs(R.string.alert_m21_description)
-            AlertType.MAINTENANCE_22 -> resourceHelper.gs(R.string.alert_m22_description)
-            AlertType.MAINTENANCE_23 -> resourceHelper.gs(R.string.alert_m23_description)
-            AlertType.MAINTENANCE_24 -> resourceHelper.gs(R.string.alert_m24_description)
-            AlertType.MAINTENANCE_25 -> resourceHelper.gs(R.string.alert_m25_description)
-            AlertType.MAINTENANCE_26 -> resourceHelper.gs(R.string.alert_m26_description)
-            AlertType.MAINTENANCE_27 -> resourceHelper.gs(R.string.alert_m27_description)
-            AlertType.MAINTENANCE_28 -> resourceHelper.gs(R.string.alert_m28_description)
-            AlertType.MAINTENANCE_29 -> resourceHelper.gs(R.string.alert_m29_description)
-            AlertType.MAINTENANCE_30 -> resourceHelper.gs(R.string.alert_m30_description)
-            AlertType.ERROR_6        -> resourceHelper.gs(R.string.alert_e6_description)
-            AlertType.ERROR_10       -> resourceHelper.gs(R.string.alert_e10_description)
-            AlertType.ERROR_13       -> resourceHelper.gs(R.string.alert_e13_description)
+            AlertType.MAINTENANCE_20 -> rh.gs(R.string.alert_m20_description)
+            AlertType.MAINTENANCE_21 -> rh.gs(R.string.alert_m21_description)
+            AlertType.MAINTENANCE_22 -> rh.gs(R.string.alert_m22_description)
+            AlertType.MAINTENANCE_23 -> rh.gs(R.string.alert_m23_description)
+            AlertType.MAINTENANCE_24 -> rh.gs(R.string.alert_m24_description)
+            AlertType.MAINTENANCE_25 -> rh.gs(R.string.alert_m25_description)
+            AlertType.MAINTENANCE_26 -> rh.gs(R.string.alert_m26_description)
+            AlertType.MAINTENANCE_27 -> rh.gs(R.string.alert_m27_description)
+            AlertType.MAINTENANCE_28 -> rh.gs(R.string.alert_m28_description)
+            AlertType.MAINTENANCE_29 -> rh.gs(R.string.alert_m29_description)
+            AlertType.MAINTENANCE_30 -> rh.gs(R.string.alert_m30_description)
+            AlertType.ERROR_6        -> rh.gs(R.string.alert_e6_description)
+            AlertType.ERROR_10       -> rh.gs(R.string.alert_e10_description)
+            AlertType.ERROR_13       -> rh.gs(R.string.alert_e13_description)
         }
     }
 
diff --git a/insight/src/main/res/values-bg-rBG/alert_descriptions.xml b/insight/src/main/res/values-bg-rBG/alert_descriptions.xml
index e50451e0ab3..244b6cc5786 100644
--- a/insight/src/main/res/values-bg-rBG/alert_descriptions.xml
+++ b/insight/src/main/res/values-bg-rBG/alert_descriptions.xml
@@ -2,7 +2,9 @@
 <resources>
     <string name="alert_r7_description"><![CDATA[Количество: <b>%1$d%%</b>\nПродължителност: <b>%2$s h</b>]]></string>
     <string name="alert_w31_description"><![CDATA[Резервоар съдържание: <b>%1$s U</b>]]></string>
+    <string name="alert_w32_description">Сменете на батерията.</string>
     <string name="alert_w33_description">Задаване на време и дата.</string>
+    <string name="alert_w34_description">Свържете с Accu-Chek поддръжка.</string>
     <string name="alert_w36_description"><![CDATA[Количество: <b>%1$d%%</b><br/>Продължителност: <b>%2$s ч</b>]]></string>
     <string name="alert_w38_description"><![CDATA[Програмирани: <b>%1$s Е</b><br/>Доставени: <b>%2$s Е</b>]]></string>
     <string name="alert_m20_description">Поставете резервоар.</string>
@@ -11,7 +13,9 @@
     <string name="alert_m23_description">Проверете статуса на помпата.</string>
     <string name="alert_m24_description">Сменете сет.</string>
     <string name="alert_m25_description">Свържете с Accu-Chek поддръжка.</string>
+    <string name="alert_m26_description">Промяна резервоар.</string>
     <string name="alert_m27_description">Рестартирайте прехвърляне на данни.</string>
+    <string name="alert_m28_description">Проверете статуса на помпата.</string>
     <string name="alert_m29_description">Задайте тип батерия.</string>
     <string name="alert_m30_description">Задайте тип резевоар.</string>
     <string name="alert_e6_description">Сменете батерията и резервоарът.</string>
diff --git a/insight/src/main/res/values-bg-rBG/alert_titles.xml b/insight/src/main/res/values-bg-rBG/alert_titles.xml
index 14ba108de54..26025edc393 100644
--- a/insight/src/main/res/values-bg-rBG/alert_titles.xml
+++ b/insight/src/main/res/values-bg-rBG/alert_titles.xml
@@ -3,6 +3,7 @@
     <string name="alert_r1_title">Доставен болус</string>
     <string name="alert_r2_title">Пропуснат болус</string>
     <string name="alert_r3_title">Аларма часовник</string>
+    <string name="alert_r4_title">Сменете сет</string>
     <string name="alert_r7_title">Временен базал приключен</string>
     <string name="alert_w31_title">Малко инсулин в резервоарът</string>
     <string name="alert_w32_title">Изтощена батерия</string>
diff --git a/insight/src/main/res/values-bg-rBG/strings.xml b/insight/src/main/res/values-bg-rBG/strings.xml
index 55e34c8ba6b..1cf9437089f 100644
--- a/insight/src/main/res/values-bg-rBG/strings.xml
+++ b/insight/src/main/res/values-bg-rBG/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% за %2$d / %3$d мин</string>
     <string name="multiwave_bolus">Двувълнов болус</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U за %3$d мин</string>
+    <string name="insight_last_bolus">Последен болус</string>
     <string name="searching_for_devices">Търсене на устройства...</string>
     <string name="pairing_completed">Сдвояване завършено</string>
     <string name="code_compare">Съвпадат ли кодовете, показани на това устройство и на Вашата помпа?</string>
@@ -41,6 +42,7 @@
     <string name="pump_paused">Помпата е на пауза</string>
     <string name="short_status_last_connected">Последно свързване: преди %1$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">ТДД: %1$.2f</string>
     <string name="short_status_reservoir">Рез.: %1$.2fE</string>
diff --git a/insight/src/main/res/values-cs-rCZ/strings.xml b/insight/src/main/res/values-cs-rCZ/strings.xml
index c1382dadd30..a8fca7d3939 100644
--- a/insight/src/main/res/values-cs-rCZ/strings.xml
+++ b/insight/src/main/res/values-cs-rCZ/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% for %2$d / %3$d min</string>
     <string name="multiwave_bolus">Duální bolus</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U for %3$d min</string>
+    <string name="insight_last_bolus">Poslední bolus</string>
     <string name="searching_for_devices">Vyhledávání zařízení…</string>
     <string name="pairing_completed">Párování dokončeno</string>
     <string name="code_compare">Souhlasí kódy zobrazené na tomto zařízení a na pumpě?</string>
diff --git a/insight/src/main/res/values-de-rDE/strings.xml b/insight/src/main/res/values-de-rDE/strings.xml
index be00de0eb52..4a1032acfb3 100644
--- a/insight/src/main/res/values-de-rDE/strings.xml
+++ b/insight/src/main/res/values-de-rDE/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% für %2$d / %3$d min</string>
     <string name="multiwave_bolus">Multiwave-Bolus</string>
     <string name="eb_formatter">%1$.2f / %2$.2f IE für %3$d min</string>
+    <string name="insight_last_bolus">Letzter Bolus</string>
     <string name="searching_for_devices">Geräte werden gesucht…</string>
     <string name="pairing_completed">Kopplung abgeschlossen</string>
     <string name="code_compare">Stimmen die Codes auf diesem Gerät und auf deiner Pumpe überein?</string>
diff --git a/insight/src/main/res/values-es-rES/alert_descriptions.xml b/insight/src/main/res/values-es-rES/alert_descriptions.xml
index 2515d640378..d22617f2b44 100644
--- a/insight/src/main/res/values-es-rES/alert_descriptions.xml
+++ b/insight/src/main/res/values-es-rES/alert_descriptions.xml
@@ -4,6 +4,7 @@
     <string name="alert_w31_description"><![CDATA[Contenido del cartucho: <b>%1$s U</b>]]></string>
     <string name="alert_w32_description">Cambiar batería.</string>
     <string name="alert_w33_description">Establecer fecha/hora.</string>
+    <string name="alert_w34_description">Póngase en contacto con el soporte Accu-Chek.</string>
     <string name="alert_w36_description"><![CDATA[Cantidad: <b>%1$d%%</b><br/>Duración: <b>%2$s h</b>]]></string>
     <string name="alert_w38_description"><![CDATA[Programado: <b>%1$s U</b><br/>Administrado: <b>%2$s U</b>]]></string>
     <string name="alert_m20_description">Insertar reservorio.</string>
@@ -12,7 +13,9 @@
     <string name="alert_m23_description">Comprobar estado del infusor.</string>
     <string name="alert_m24_description">Cambiar set de infusión.</string>
     <string name="alert_m25_description">Contacte con el soporte de Accu-Chek.</string>
+    <string name="alert_m26_description">Cambiar reservorio.</string>
     <string name="alert_m27_description">Reiniciar descarga de datos.</string>
+    <string name="alert_m28_description">Comprobar estado de la bomba.</string>
     <string name="alert_m29_description">Establecer tipo de batería.</string>
     <string name="alert_m30_description">Establecer tipo de reservorio.</string>
     <string name="alert_e6_description">Cambiar pila y reservorio.</string>
diff --git a/insight/src/main/res/values-es-rES/alert_titles.xml b/insight/src/main/res/values-es-rES/alert_titles.xml
index e6db8be79ec..ad6387d2d71 100644
--- a/insight/src/main/res/values-es-rES/alert_titles.xml
+++ b/insight/src/main/res/values-es-rES/alert_titles.xml
@@ -3,6 +3,7 @@
     <string name="alert_r1_title">Poner bolo</string>
     <string name="alert_r2_title">Bolos perdidos</string>
     <string name="alert_r3_title">Reloj de alarma</string>
+    <string name="alert_r4_title">Cambiar set de infusión</string>
     <string name="alert_r7_title">TBR completada</string>
     <string name="alert_w31_title">Reservorio bajo</string>
     <string name="alert_w32_title">Pila baja</string>
diff --git a/insight/src/main/res/values-es-rES/strings.xml b/insight/src/main/res/values-es-rES/strings.xml
index d1e71d28a5b..99835140246 100644
--- a/insight/src/main/res/values-es-rES/strings.xml
+++ b/insight/src/main/res/values-es-rES/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% durante %2$d / %3$d minutos</string>
     <string name="multiwave_bolus">Bolus multionda</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U durante %3$d min</string>
+    <string name="insight_last_bolus">Último Bolo</string>
     <string name="searching_for_devices">Buscando dispositivos…</string>
     <string name="pairing_completed">Sincronización completada</string>
     <string name="code_compare">¿Coinciden los códigos mostrados en este dispositivo y en su infusor?</string>
diff --git a/insight/src/main/res/values-fr-rFR/strings.xml b/insight/src/main/res/values-fr-rFR/strings.xml
index 940054731bf..a2186100846 100644
--- a/insight/src/main/res/values-fr-rFR/strings.xml
+++ b/insight/src/main/res/values-fr-rFR/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% pour %2$d / %3$d min</string>
     <string name="multiwave_bolus">Bolus mixte</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U pour %3$d min</string>
+    <string name="insight_last_bolus">Dernier bolus</string>
     <string name="searching_for_devices">Recherche d\'appareils en cours…</string>
     <string name="pairing_completed">Appairage terminé</string>
     <string name="code_compare">Les codes affichés sur cet appareil et sur la pompe sont-ils identiques ?</string>
diff --git a/insight/src/main/res/values-hu-rHU/alert_codes.xml b/insight/src/main/res/values-hu-rHU/alert_codes.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/insight/src/main/res/values-hu-rHU/alert_codes.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/insight/src/main/res/values-hu-rHU/alert_descriptions.xml b/insight/src/main/res/values-hu-rHU/alert_descriptions.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/insight/src/main/res/values-hu-rHU/alert_descriptions.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/insight/src/main/res/values-hu-rHU/alert_titles.xml b/insight/src/main/res/values-hu-rHU/alert_titles.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/insight/src/main/res/values-hu-rHU/alert_titles.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/insight/src/main/res/values-hu-rHU/exceptions.xml b/insight/src/main/res/values-hu-rHU/exceptions.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/insight/src/main/res/values-hu-rHU/exceptions.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/insight/src/main/res/values-hu-rHU/strings.xml b/insight/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/insight/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/insight/src/main/res/values-it-rIT/strings.xml b/insight/src/main/res/values-it-rIT/strings.xml
index 96fd8d02e47..ab9bb89df79 100644
--- a/insight/src/main/res/values-it-rIT/strings.xml
+++ b/insight/src/main/res/values-it-rIT/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% per %2$d / %3$d min</string>
     <string name="multiwave_bolus">Bolo multiwave</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U per %3$d min</string>
+    <string name="insight_last_bolus">Ultimo bolo</string>
     <string name="searching_for_devices">Ricerca dispositivi…</string>
     <string name="pairing_completed">Associazione completata</string>
     <string name="code_compare">I codici mostrati su questo dispositivo e sul micro combaciano?</string>
diff --git a/insight/src/main/res/values-iw-rIL/strings.xml b/insight/src/main/res/values-iw-rIL/strings.xml
index 1c5eed6792a..7076fcc8490 100644
--- a/insight/src/main/res/values-iw-rIL/strings.xml
+++ b/insight/src/main/res/values-iw-rIL/strings.xml
@@ -20,7 +20,8 @@
     <string name="tdd_total">מינון יומי מצטבר כולל</string>
     <string name="tbr_formatter">%1$d%% למשך %2$d/%3$d דק\'</string>
     <string name="multiwave_bolus">בולוס רב שלבי</string>
-    <string name="eb_formatter">%1$.2f / %2$.2f יח\' במשך %3$d דק\'</string>
+    <string name="eb_formatter">%1$.2f / %2$.2f יח\' למשך %3$d דק\'</string>
+    <string name="insight_last_bolus">בולוס אחרון</string>
     <string name="searching_for_devices">מחפש התקנים…</string>
     <string name="pairing_completed">הצימוד הושלם</string>
     <string name="code_compare">האם הקודים המוצגים בהתקן זה ובמשאבה זהים?</string>
diff --git a/insight/src/main/res/values-lt-rLT/strings.xml b/insight/src/main/res/values-lt-rLT/strings.xml
index a01feab4698..daf025ad85f 100644
--- a/insight/src/main/res/values-lt-rLT/strings.xml
+++ b/insight/src/main/res/values-lt-rLT/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% - %2$d / %3$d min</string>
     <string name="multiwave_bolus">Daugiabangis bolusas</string>
     <string name="eb_formatter">%1$.2f / %2$.2f vv per %3$d min</string>
+    <string name="insight_last_bolus">Paskutinis bolusas</string>
     <string name="searching_for_devices">Ieškoma įrenginių…</string>
     <string name="pairing_completed">Sujungimas sėkmingas</string>
     <string name="code_compare">Ar kodas, kurį matote įrenginyje, sutampa su pompos kodu?</string>
diff --git a/insight/src/main/res/values-nl-rNL/alert_descriptions.xml b/insight/src/main/res/values-nl-rNL/alert_descriptions.xml
index 37cf984a5e3..f3a1fa3e252 100644
--- a/insight/src/main/res/values-nl-rNL/alert_descriptions.xml
+++ b/insight/src/main/res/values-nl-rNL/alert_descriptions.xml
@@ -4,6 +4,7 @@
     <string name="alert_w31_description"><![CDATA[Inhoud ampul: <b>%1$s E</b>]]></string>
     <string name="alert_w32_description">Wissel batterij.</string>
     <string name="alert_w33_description">Stel tijd/datum in.</string>
+    <string name="alert_w34_description">Contacteer Accu-Chek klantenservice.</string>
     <string name="alert_w36_description"><![CDATA[Hoeveelheid: <b>%1$d%%</b><br/>Duur: <b>%2$s uur</b>]]></string>
     <string name="alert_w38_description"><![CDATA[Ingesteld: <b>%1$s E</b><br/>Toegediend: <b>%2$s E</b>]]></string>
     <string name="alert_m20_description">Plaats ampul.</string>
@@ -12,9 +13,12 @@
     <string name="alert_m23_description">Controleer pompstatus.</string>
     <string name="alert_m24_description">Vervang infuusset.</string>
     <string name="alert_m25_description">Contacteer Accu-Chek klantenservice.</string>
+    <string name="alert_m26_description">Vervang ampul.</string>
     <string name="alert_m27_description">Start downloaden gegevens opnieuw.</string>
+    <string name="alert_m28_description">Controleer pompstatus.</string>
     <string name="alert_m29_description">Stel type batterij in.</string>
     <string name="alert_m30_description">Stel type ampul in.</string>
     <string name="alert_e6_description">Vervang batterij en ampul.</string>
+    <string name="alert_e10_description">Vervang ampul.</string>
     <string name="alert_e13_description">Wijzig taal.</string>
 </resources>
diff --git a/insight/src/main/res/values-nl-rNL/alert_titles.xml b/insight/src/main/res/values-nl-rNL/alert_titles.xml
index 8f6b00918fb..4210352e5ae 100644
--- a/insight/src/main/res/values-nl-rNL/alert_titles.xml
+++ b/insight/src/main/res/values-nl-rNL/alert_titles.xml
@@ -3,6 +3,7 @@
     <string name="alert_r1_title">Bolus toedienen</string>
     <string name="alert_r2_title">Gemiste Bolus</string>
     <string name="alert_r3_title">Wekkerfunctie</string>
+    <string name="alert_r4_title">Vervang infuusset</string>
     <string name="alert_r7_title">TBR einde</string>
     <string name="alert_w31_title">Ampul bijna leeg</string>
     <string name="alert_w32_title">Batterij bijna leeg</string>
diff --git a/insight/src/main/res/values-nl-rNL/strings.xml b/insight/src/main/res/values-nl-rNL/strings.xml
index 745c89b32ca..2efcf95fbd8 100644
--- a/insight/src/main/res/values-nl-rNL/strings.xml
+++ b/insight/src/main/res/values-nl-rNL/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% gedurende %2$d / %3$d min</string>
     <string name="multiwave_bolus">Multiwave-Bolus</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U gedurende %3$d min</string>
+    <string name="insight_last_bolus">Laatste bolus</string>
     <string name="searching_for_devices">Bezig met zoeken naar apparaten…</string>
     <string name="pairing_completed">Koppeling voltooid</string>
     <string name="code_compare">Worden dezelfde codes weergegeven op dit apparaat als op je pomp?</string>
diff --git a/insight/src/main/res/values-no-rNO/strings.xml b/insight/src/main/res/values-no-rNO/strings.xml
index 6ef3826240f..14871c36c70 100644
--- a/insight/src/main/res/values-no-rNO/strings.xml
+++ b/insight/src/main/res/values-no-rNO/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% i %2$d / %3$d min</string>
     <string name="multiwave_bolus">Kombinasjonsbolus</string>
     <string name="eb_formatter">%1$.2f / %2$.2f E i %3$d min</string>
+    <string name="insight_last_bolus">Siste bolus</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>
diff --git a/insight/src/main/res/values-pl-rPL/alert_descriptions.xml b/insight/src/main/res/values-pl-rPL/alert_descriptions.xml
index f0afecc15c2..9c79083c51b 100644
--- a/insight/src/main/res/values-pl-rPL/alert_descriptions.xml
+++ b/insight/src/main/res/values-pl-rPL/alert_descriptions.xml
@@ -2,6 +2,7 @@
 <resources>
     <string name="alert_r7_description"><![CDATA[<b>%1$d%%</b>\nCzas trwania: <b>%2$s h</b>]]></string>
     <string name="alert_w31_description"><![CDATA[Ilość w zbiorniku: <b>%1$s U</b>]]></string>
+    <string name="alert_w32_description">Wymień baterię.</string>
     <string name="alert_w33_description">Ustaw czas/datę.</string>
     <string name="alert_w34_description">Skontaktuj się z obsługa Accu-Chek.</string>
     <string name="alert_w36_description"><![CDATA[Wartość: <b>%1$d%%</b><br/>Czas trwania: <b>%2$s h</b>]]></string>
@@ -12,9 +13,12 @@
     <string name="alert_m23_description">Sprawdź status pompy.</string>
     <string name="alert_m24_description">Wymień zestaw infuzyjny.</string>
     <string name="alert_m25_description">Skontaktuj się z obsługa techniczną Accu-Chek.</string>
+    <string name="alert_m26_description">Zmień zbiornik.</string>
     <string name="alert_m27_description">Ponownie uruchom pobieranie danych.</string>
+    <string name="alert_m28_description">Sprawdź status pompy.</string>
     <string name="alert_m29_description">Ustaw typ baterii.</string>
     <string name="alert_m30_description">Ustaw typ zbiornika.</string>
     <string name="alert_e6_description">Zmień baterię i nabój.</string>
+    <string name="alert_e10_description">Zmień zbiornik.</string>
     <string name="alert_e13_description">Zmień język.</string>
 </resources>
diff --git a/insight/src/main/res/values-pl-rPL/strings.xml b/insight/src/main/res/values-pl-rPL/strings.xml
index e0639bee112..717cf0a20ba 100644
--- a/insight/src/main/res/values-pl-rPL/strings.xml
+++ b/insight/src/main/res/values-pl-rPL/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% na %2$d / %3$d min</string>
     <string name="multiwave_bolus">Bolus złożony (wielofalowy)</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U na %3$d min</string>
+    <string name="insight_last_bolus">Ostatni bolus</string>
     <string name="searching_for_devices">Wyszukiwanie urządzeń…</string>
     <string name="pairing_completed">Parowanie zakończone</string>
     <string name="code_compare">Czy kody wyświetlone na tym urządzeniu i na twojej pompie pasują?</string>
@@ -41,6 +42,7 @@
     <string name="pump_paused">Pompa wstrzymana</string>
     <string name="short_status_last_connected">Połączenie: %1$d min temu</string>
     <string name="short_status_tbr">TBR: %1$d%% na %2$d / %3$d min</string>
+    <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>
diff --git a/insight/src/main/res/values-ro-rRO/strings.xml b/insight/src/main/res/values-ro-rRO/strings.xml
index 1da4857f87a..f005b68beaa 100644
--- a/insight/src/main/res/values-ro-rRO/strings.xml
+++ b/insight/src/main/res/values-ro-rRO/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% pentru %2$d / %3$d min</string>
     <string name="multiwave_bolus">Bolus multiwave</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U pentru %3$d min</string>
+    <string name="insight_last_bolus">Ultimul Bolus</string>
     <string name="searching_for_devices">Căutare dispozitive…</string>
     <string name="pairing_completed">Asociere reușită</string>
     <string name="code_compare">Sunt identice codurile afișate aici și cele de pe pompă?</string>
diff --git a/insight/src/main/res/values-ru-rRU/strings.xml b/insight/src/main/res/values-ru-rRU/strings.xml
index 346976391e1..2c34e92dfc3 100644
--- a/insight/src/main/res/values-ru-rRU/strings.xml
+++ b/insight/src/main/res/values-ru-rRU/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% за %2$d / %3$d мин</string>
     <string name="multiwave_bolus">Мульти-болюс</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U за %3$d мин</string>
+    <string name="insight_last_bolus">Предыдущий болюс</string>
     <string name="searching_for_devices">Поиск устройств…</string>
     <string name="pairing_completed">Сопряжение выполнено</string>
     <string name="code_compare">Коды на этом устройстве и на вашей помпе совпадают?</string>
diff --git a/insight/src/main/res/values-sk-rSK/strings.xml b/insight/src/main/res/values-sk-rSK/strings.xml
index 5d6873bc4e9..b8fb7f6d8e2 100644
--- a/insight/src/main/res/values-sk-rSK/strings.xml
+++ b/insight/src/main/res/values-sk-rSK/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% pre %2$d / %3$d min</string>
     <string name="multiwave_bolus">Duálny bolus</string>
     <string name="eb_formatter">%1$.2f / %2$.2f JI pre %3$d min</string>
+    <string name="insight_last_bolus">Posledný bolus</string>
     <string name="searching_for_devices">Vyhľadávam zariadenia...</string>
     <string name="pairing_completed">Párovanie dokončené</string>
     <string name="code_compare">Zhodujú sa kódy zobrazené na tomto zariadení a na pumpe?</string>
diff --git a/insight/src/main/res/values-sv-rSE/strings.xml b/insight/src/main/res/values-sv-rSE/strings.xml
index 6c491057b55..1ca1a271517 100644
--- a/insight/src/main/res/values-sv-rSE/strings.xml
+++ b/insight/src/main/res/values-sv-rSE/strings.xml
@@ -21,6 +21,7 @@
     <string name="tbr_formatter">%1$d%% i %2$d / %3$d min</string>
     <string name="multiwave_bolus">Kombi-bolus</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U i %3$d min</string>
+    <string name="insight_last_bolus">Senaste bolus</string>
     <string name="searching_for_devices">Söker enheter…</string>
     <string name="pairing_completed">Parkoppling lyckades</string>
     <string name="code_compare">Stämmer koderna överens mellan denna enhet och din pump?</string>
diff --git a/insight/src/main/res/values-tr-rTR/alert_descriptions.xml b/insight/src/main/res/values-tr-rTR/alert_descriptions.xml
index e78a6ed2eca..13c5d12c28c 100644
--- a/insight/src/main/res/values-tr-rTR/alert_descriptions.xml
+++ b/insight/src/main/res/values-tr-rTR/alert_descriptions.xml
@@ -2,7 +2,9 @@
 <resources>
     <string name="alert_r7_description"><![CDATA[Miktar: <b>%1$d%%</b>\nSüre: </b>%2$s st.</b>]]></string>
     <string name="alert_w31_description"><![CDATA[Rezervuar içeriği: <b>%1$s U</b>]]></string>
+    <string name="alert_w32_description">Pili değiştirin.</string>
     <string name="alert_w33_description">Tarihi/saati ayarlayın.</string>
+    <string name="alert_w34_description">Accu-Chek desteğine başvurun.</string>
     <string name="alert_w36_description"><![CDATA[Miktar: <b>%1$d%%</b><br/>Süre: <b>%2$s st.</b>]]></string>
     <string name="alert_w38_description"><![CDATA[Programlandı: <b>%1$s U</b><br/>gönderildi: <b>%2$s U</b>]]></string>
     <string name="alert_m20_description">Rezervuar yerleştirin.</string>
@@ -11,9 +13,12 @@
     <string name="alert_m23_description">Pompa durumunu kontrol edin.</string>
     <string name="alert_m24_description">İnfüzyon seti değiştirin.</string>
     <string name="alert_m25_description">Accu-Chek desteğine başvurun.</string>
+    <string name="alert_m26_description">Rezervuar değiştir.</string>
     <string name="alert_m27_description">Veri karşıdan yüklemeyi yeniden başlatın.</string>
+    <string name="alert_m28_description">Pompa durumunu kontrol edin.</string>
     <string name="alert_m29_description">Pil tipini ayarlayın.</string>
     <string name="alert_m30_description">Rezervuar türünü ayarlayın.</string>
     <string name="alert_e6_description">Pil ve Rezervuarı değiştirin.</string>
+    <string name="alert_e10_description">Rezervuar değiştir.</string>
     <string name="alert_e13_description">Dili değiştir.</string>
 </resources>
diff --git a/insight/src/main/res/values-tr-rTR/alert_titles.xml b/insight/src/main/res/values-tr-rTR/alert_titles.xml
index f2e34230f40..a471280b562 100644
--- a/insight/src/main/res/values-tr-rTR/alert_titles.xml
+++ b/insight/src/main/res/values-tr-rTR/alert_titles.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="alert_r1_title">Gönderilen Bolus</string>
-    <string name="alert_r2_title">Başarısız Bolus</string>
+    <string name="alert_r1_title">Bolus Gönder</string>
+    <string name="alert_r2_title">Eksik Bolus</string>
     <string name="alert_r3_title">Çalar saat</string>
+    <string name="alert_r4_title">İnfüzyon seti değiştirin</string>
     <string name="alert_r7_title">Geçici Bazal Oranı tamamlandı</string>
     <string name="alert_w31_title">Rezervuar düşük</string>
     <string name="alert_w32_title">Pil düşük</string>
@@ -10,9 +11,9 @@
     <string name="alert_w34_title">Garanti sonu</string>
     <string name="alert_w36_title">Geçici Bazal Oranı iptal edildi</string>
     <string name="alert_w38_title">Bolus iptal edildi</string>
-    <string name="alert_w39_title">Loantime uyarısı</string>
-    <string name="alert_m20_title">Rezervuar yerleştirilmemiş</string>
-    <string name="alert_m21_title">Rezervuar bitti</string>
+    <string name="alert_w39_title">Kiralama süresi uyarısı</string>
+    <string name="alert_m20_title">Rezervuar takılı değil</string>
+    <string name="alert_m21_title">Rezervuar boş</string>
     <string name="alert_m22_title">Pil bitti</string>
     <string name="alert_m23_title">Otomatik kapatma - pompa durdu</string>
     <string name="alert_m24_title">Tıkanma</string>
diff --git a/insight/src/main/res/values-tr-rTR/strings.xml b/insight/src/main/res/values-tr-rTR/strings.xml
index 72ed8b5242a..ad1eb346804 100644
--- a/insight/src/main/res/values-tr-rTR/strings.xml
+++ b/insight/src/main/res/values-tr-rTR/strings.xml
@@ -1,58 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="enable_tbr_over_notification">GBO bitti bildirimini etkinleştir\n(pompa ayarlarında)</string>
-    <string name="disable_tbr_over_notification">GBO bitti bildirimini iptal et\n(pompa ayarlarında)</string>
+    <string name="enable_tbr_over_notification">GBO (Geçici Bazal oran) bitti bildirimini etkinleştir\n(pompa ayarlarında)</string>
+    <string name="disable_tbr_over_notification">GBO (Geçici bazal oran) bitti bildirimini iptal et\n(pompa ayarlarında)</string>
     <string name="not_paired">Eşleştirilemedi</string>
     <string name="recovering">Kurtarılıyor</string>
     <string name="insight_status">Durum</string>
     <string name="recovery_duration">Kurtarma süresi</string>
-    <string name="last_connected">Enson bağlantı</string>
+    <string name="last_connected">Son bağlantı</string>
     <string name="start_pump">Pompayı başlat</string>
     <string name="stop_pump">Pompayı durdur</string>
     <string name="started">Başlatıldı</string>
     <string name="stopped">Durduruldu</string>
-    <string name="paused">Durduruldu</string>
+    <string name="paused">Duraklatıldı</string>
     <string name="operating_mode">Çalışma Modu</string>
     <string name="description_pump_insight_local">Accu-Chek Insight pompaları için pompa entegrasyonu</string>
     <string name="not_inserted">Takılmamış</string>
     <string name="tdd_bolus">GTD Bolus</string>
     <string name="tdd_basal">GTD Bazal</string>
     <string name="tdd_total">GTD Toplam</string>
-    <string name="tbr_formatter">%1$d%% için %2$d / %3$d dak</string>
-    <string name="multiwave_bolus">Çokdalgalı Bolus</string>
-    <string name="eb_formatter">%1$.2f / %2$.2f U for %3$d dak.</string>
+    <string name="tbr_formatter">%2$d / %3$d dk için %%1$d%</string>
+    <string name="multiwave_bolus">Çoklu yayma Bolus</string>
+    <string name="eb_formatter">%3$d dk. %1$.2f / %2$.2f Ü</string>
+    <string name="insight_last_bolus">Son Bolus</string>
     <string name="searching_for_devices">Cihazlar aranıyor…</string>
     <string name="pairing_completed">Eşleştirme tamamlandı</string>
-    <string name="code_compare">Bu cihazda ve pompanızda görüntülenen kodlar aynı mı?</string>
+    <string name="code_compare">Bu cihazda ve pompanızda görüntülenen kodlar uyuşuyor mu?</string>
     <string name="insight_pairing">Insight eşleştirme</string>
     <string name="insight_local">Accu-Chek Insight</string>
+    <string name="insight_delivered">%1$.2f Ü / %2$.2f Ü gönderildi</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Hortum değişti</string>
     <string name="insightpump_shortname">Sight</string>
+    <string name="insight_alert_notification_channel">Insight Pump Uyarıları</string>
+    <string name="disable_vibration">Manuel bolus iletiminde titreşimleri devre dışı bırakın</string>
+    <string name="disable_vibration_summary">Bolus ve yayma bolus için (yalnızca Insight üretici yazılımı 3.x ile kullanılabilir)</string>
+    <string name="disable_vibration_auto">Otomatik bolus iletiminde titreşimleri devre dışı bırakın</string>
+    <string name="disable_vibration_auto_summary">TBR emülasyonlu SMB ve Geçici Bazal için (yalnızca Insight üretici yazılımı 3.x ile kullanılabilir)</string>
     <string name="timeout_during_handshake">El sıkışma sırasında zaman aşımı olduğunda - bluetoothu sıfırla</string>
     <string name="pump_stopped">Pompa durduruldu</string>
     <string name="pump_started">Pompa başlatıldı</string>
     <string name="pump_paused">Pompa duraklatıldı</string>
     <string name="short_status_last_connected">Son bağl: %1$d dak. önce</string>
-    <string name="short_status_tbr">TBR: %1$d%% für %2$d / %3$d min</string>
-    <string name="short_status_multiwave">Multiwave: %1$.2f / %2$.2f U for %3$d min</string>
+    <string name="short_status_tbr">%2$d / %3$d dk. GBO: %%1$d%</string>
+    <string name="short_status_extended">Yayma: %1$.2f / %2$.2f U for %3$d dak</string>
+    <string name="short_status_multiwave">%3$d dk. Çoklu yayma: %1$.2f / %2$.2f Ü</string>
     <string name="short_status_tdd">GTD: %1$.2f</string>
-    <string name="short_status_battery">Pil.: %1$d%%</string>
+    <string name="short_status_reservoir">Rezerv.: %1$.2f Ü</string>
+    <string name="short_status_battery">Pil: %%1$d%</string>
     <string name="confirm">Onaylayın</string>
     <string name="mute_alert">Sessiz</string>
     <string name="release_software_version">Yayın yazılım sürümü</string>
+    <string name="ui_processor_software_version">UI işlemci yazılım sürümü</string>
     <string name="pc_processor_software_version">PC yazılım işlemci sürümü</string>
-    <string name="bt_info_page_version">BT bilgilendirme sayfası sürümü</string>
+    <string name="md_tel_processor_software_version">MD tel işlemci yazılım sürümü</string>
+    <string name="safety_processor_software_version">Güvenlik işlemcisi yazılım sürümü</string>
+    <string name="bt_info_page_version">BT bilgi sayfası sürümü</string>
     <string name="bluetooth_address">Bluetooth adresi</string>
     <string name="system_id_appendix">Sistem Kimliği ID eki</string>
     <string name="manufacturing_date">Üretim tarihi</string>
-    <string name="delete_pairing">Eşleştirme sil</string>
+    <string name="delete_pairing">Eşleştirmeyi sil</string>
     <string name="log_site_changes">İnfüzyon değişimini kayıt altına al</string>
     <string name="log_reservoir_changes">Rezerveor değişimini kayıt altına al</string>
     <string name="log_tube_changes">Hortum değişimlerini kaydet</string>
     <string name="log_battery_changes">Pil değişimlerini kaydet</string>
+    <string name="log_operating_mode_changes">Çalışma modu değişikliklerini günlüğe kaydet</string>
     <string name="log_alerts">Günlük uyarıları</string>
-    <string name="max_recovery_duration">Max. kurtarma süresi [s]</string>
+    <string name="enable_tbr_emulation">TBR emulasyonunu etkinleştir</string>
+    <string name="enable_tbr_emulation_summary">%%250 sınırını atlamak için TBR\'ler yerine yayma bolus kullanın</string>
+    <string name="disconnect_delay">Bağlantı kesme gecikmesi [s]</string>
+    <string name="max_recovery_duration">Maks. kurtarma süresi [s]</string>
     <string name="min_recovery_duration">Min. Kurtarma süresi [s]</string>
     <string name="pump_alert">Pompa alarmı</string>
     <string name="pairing_information">Eşleşme bilgisi</string>
diff --git a/medtronic/Changelog.txt b/medtronic/Changelog.txt
new file mode 100644
index 00000000000..fc0b934b1cd
--- /dev/null
+++ b/medtronic/Changelog.txt
@@ -0,0 +1,11 @@
+
+V1 - Medtronic initial implementation
+... lots of changes
+
+
+V2 - Rewrite into kotlin, new database (for v3.0)
+0001 - initial version
+0002 - some fixes
+0003 - SMB fix (798)
+0004 - Zero TBR Duration fix (798), refactoring of TempBasalProcessDTO
+0005 - fixes to MedtronicHistoryEntry lateinit problem
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index 275b70bbdba..5d24a8c03e4 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -14,11 +14,11 @@ import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.events.EventTempBasalChange
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState
 import info.nightscout.androidaps.plugins.pump.common.events.EventRefreshButtonState
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
@@ -52,10 +52,10 @@ class MedtronicFragment : DaggerFragment() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var dateUtil: DateUtil
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
     @Inject lateinit var warnColors: WarnColors
@@ -90,7 +90,7 @@ class MedtronicFragment : DaggerFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.rlStatus.text = resourceHelper.gs(RileyLinkServiceState.NotStarted.resourceId)
+        binding.rlStatus.text = rh.gs(RileyLinkServiceState.NotStarted.resourceId)
 
         binding.pumpStatusIcon.setTextColor(Color.WHITE)
         @SuppressLint("SetTextI18n")
@@ -194,17 +194,17 @@ class MedtronicFragment : DaggerFragment() {
         val rileyLinkError = medtronicPumpPlugin.rileyLinkService.error
         binding.rlStatus.text =
             when {
-                rileyLinkServiceData.rileyLinkServiceState == RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
-                rileyLinkServiceData.rileyLinkServiceState.isConnecting                        -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
-                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError == null   -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
-                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError != null   -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.MedtronicPump))
-                else                                                                           -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState == RileyLinkServiceState.NotStarted -> rh.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState.isConnecting                        -> "{fa-bluetooth-b spin}   " + rh.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError == null   -> "{fa-bluetooth-b}   " + rh.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError != null   -> "{fa-bluetooth-b}   " + rh.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.MedtronicPump))
+                else                                                                           -> "{fa-bluetooth-b}   " + rh.gs(resourceId)
             }
         binding.rlStatus.setTextColor(if (rileyLinkError != null) Color.RED else Color.WHITE)
 
         binding.errors.text =
             rileyLinkServiceData.rileyLinkError?.let {
-                resourceHelper.gs(it.getResourceId(RileyLinkTargetDevice.MedtronicPump))
+                rh.gs(it.getResourceId(RileyLinkTargetDevice.MedtronicPump))
             } ?: "-"
 
         when (medtronicPumpStatus.pumpDeviceState) {
@@ -217,22 +217,22 @@ class MedtronicFragment : DaggerFragment() {
             PumpDeviceState.ErrorWhenCommunicating,
             PumpDeviceState.TimeoutWhenCommunicating,
             PumpDeviceState.InvalidConfiguration ->
-                binding.pumpStatusIcon.text = " " + resourceHelper.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
+                binding.pumpStatusIcon.text = " " + rh.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
 
             PumpDeviceState.Active               -> {
                 val cmd = medtronicUtil.getCurrentCommand()
                 if (cmd == null)
-                    binding.pumpStatusIcon.text = " " + resourceHelper.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
+                    binding.pumpStatusIcon.text = " " + rh.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
                 else {
                     aapsLogger.debug(LTag.PUMP, "Command: $cmd")
                     val cmdResourceId = cmd.resourceId //!!
                     if (cmd == MedtronicCommandType.GetHistoryData) {
                         binding.pumpStatusIcon.text = medtronicUtil.frameNumber?.let {
-                            resourceHelper.gs(cmdResourceId!!, medtronicUtil.pageNumber, medtronicUtil.frameNumber)
+                            rh.gs(cmdResourceId!!, medtronicUtil.pageNumber, medtronicUtil.frameNumber)
                         }
-                            ?: resourceHelper.gs(R.string.medtronic_cmd_desc_get_history_request, medtronicUtil.pageNumber)
+                            ?: rh.gs(R.string.medtronic_cmd_desc_get_history_request, medtronicUtil.pageNumber)
                     } else {
-                        binding.pumpStatusIcon.text = " " + (cmdResourceId?.let { resourceHelper.gs(it) }
+                        binding.pumpStatusIcon.text = " " + (cmdResourceId?.let { rh.gs(it) }
                             ?: cmd.commandDescription)
                     }
                 }
@@ -253,8 +253,8 @@ class MedtronicFragment : DaggerFragment() {
 
     private fun displayNotConfiguredDialog() {
         context?.let {
-            OKDialog.show(it, resourceHelper.gs(R.string.medtronic_warning),
-                resourceHelper.gs(R.string.medtronic_error_operation_not_possible_no_configuration), null)
+            OKDialog.show(it, rh.gs(R.string.medtronic_warning),
+                rh.gs(R.string.medtronic_error_operation_not_possible_no_configuration), null)
         }
     }
 
@@ -268,7 +268,7 @@ class MedtronicFragment : DaggerFragment() {
 
         // last connection
         if (medtronicPumpStatus.lastConnection != 0L) {
-            val minAgo = dateUtil.minAgo(resourceHelper, medtronicPumpStatus.lastConnection)
+            val minAgo = dateUtil.minAgo(rh, medtronicPumpStatus.lastConnection)
             val min = (System.currentTimeMillis() - medtronicPumpStatus.lastConnection) / 1000 / 60
             if (medtronicPumpStatus.lastConnection + 60 * 1000 > System.currentTimeMillis()) {
                 binding.lastConnection.setText(R.string.medtronic_pump_connected_now)
@@ -276,17 +276,17 @@ class MedtronicFragment : DaggerFragment() {
             } else if (medtronicPumpStatus.lastConnection + 30 * 60 * 1000 < System.currentTimeMillis()) {
 
                 if (min < 60) {
-                    binding.lastConnection.text = resourceHelper.gs(R.string.minago, min)
+                    binding.lastConnection.text = rh.gs(R.string.minago, min)
                 } else if (min < 1440) {
                     val h = (min / 60).toInt()
-                    binding.lastConnection.text = (resourceHelper.gq(R.plurals.duration_hours, h, h) + " "
-                        + resourceHelper.gs(R.string.ago))
+                    binding.lastConnection.text = (rh.gq(R.plurals.duration_hours, h, h) + " "
+                        + rh.gs(R.string.ago))
                 } else {
                     val h = (min / 60).toInt()
                     val d = h / 24
                     // h = h - (d * 24);
-                    binding.lastConnection.text = (resourceHelper.gq(R.plurals.duration_days, d, d) + " "
-                        + resourceHelper.gs(R.string.ago))
+                    binding.lastConnection.text = (rh.gq(R.plurals.duration_days, d, d) + " "
+                        + rh.gs(R.string.ago))
                 }
                 binding.lastConnection.setTextColor(Color.RED)
             } else {
@@ -301,27 +301,27 @@ class MedtronicFragment : DaggerFragment() {
         if (bolus != null && bolusTime != null) {
             val agoMsc = System.currentTimeMillis() - bolusTime.time
             val bolusMinAgo = agoMsc.toDouble() / 60.0 / 1000.0
-            val unit = resourceHelper.gs(R.string.insulin_unit_shortname)
+            val unit = rh.gs(R.string.insulin_unit_shortname)
             val ago = when {
-                agoMsc < 60 * 1000 -> resourceHelper.gs(R.string.medtronic_pump_connected_now)
-                bolusMinAgo < 60   -> dateUtil.minAgo(resourceHelper, bolusTime.time)
-                else               -> dateUtil.hourAgo(bolusTime.time, resourceHelper)
+                agoMsc < 60 * 1000 -> rh.gs(R.string.medtronic_pump_connected_now)
+                bolusMinAgo < 60   -> dateUtil.minAgo(rh, bolusTime.time)
+                else               -> dateUtil.hourAgo(bolusTime.time, rh)
             }
-            binding.lastBolus.text = resourceHelper.gs(R.string.mdt_last_bolus, bolus, unit, ago)
+            binding.lastBolus.text = rh.gs(R.string.mdt_last_bolus, bolus, unit, ago)
         } else {
             binding.lastBolus.text = ""
         }
 
         // base basal rate
         binding.baseBasalRate.text = ("(" + medtronicPumpStatus.activeProfileName + ")  "
-            + resourceHelper.gs(R.string.pump_basebasalrate, medtronicPumpPlugin.baseBasalRate))
+            + rh.gs(R.string.pump_basebasalrate, medtronicPumpPlugin.baseBasalRate))
 
         // TBR
         var tbrStr = ""
         val tbrRemainingTime: Int? = medtronicPumpStatus.tbrRemainingTime
 
         if (tbrRemainingTime != null) {
-            tbrStr = resourceHelper.gs(R.string.mdt_tbr_remaining, medtronicPumpStatus.tempBasalAmount, tbrRemainingTime)
+            tbrStr = rh.gs(R.string.mdt_tbr_remaining, medtronicPumpStatus.tempBasalAmount, tbrRemainingTime)
         }
         binding.tempBasal.text = tbrStr
 
@@ -334,7 +334,7 @@ class MedtronicFragment : DaggerFragment() {
         warnColors.setColorInverse(binding.pumpStateBattery, medtronicPumpStatus.batteryRemaining.toDouble(), 25.0, 10.0)
 
         // reservoir
-        binding.reservoir.text = resourceHelper.gs(R.string.reservoirvalue, medtronicPumpStatus.reservoirRemainingUnits, medtronicPumpStatus.reservoirFullUnits)
+        binding.reservoir.text = rh.gs(R.string.reservoirvalue, medtronicPumpStatus.reservoirRemainingUnits, medtronicPumpStatus.reservoirFullUnits)
         warnColors.setColorInverse(binding.reservoir, medtronicPumpStatus.reservoirRemainingUnits, 50.0, 20.0)
 
         medtronicPumpPlugin.rileyLinkService.verifyConfiguration()
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
index 36b1c0f7dd9..5b86577182d 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.interfaces.PumpSync.TemporaryBasalType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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
@@ -32,6 +32,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ResetRileyLinkConfigurationTask
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTaskExecutor
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask
+import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
 import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
@@ -70,12 +71,12 @@ import javax.inject.Singleton
 class MedtronicPumpPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    rxBus: RxBus,
     context: Context,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     activePlugin: ActivePlugin,
     sp: SP,
-    commandQueue: CommandQueueProvider,
+    commandQueue: CommandQueue,
     fabricPrivacy: FabricPrivacy,
     private val medtronicUtil: MedtronicUtil,
     private val medtronicPumpStatus: MedtronicPumpStatus,
@@ -95,7 +96,7 @@ class MedtronicPumpPlugin @Inject constructor(
     .preferencesId(R.xml.pref_medtronic)
     .description(R.string.description_pump_medtronic),  //
     PumpType.MEDTRONIC_522_722,  // we default to most basic model, correct model from config is loaded later
-    injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil, aapsSchedulers, pumpSync, pumpSyncStorage
+    injector, rh, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil, aapsSchedulers, pumpSync, pumpSyncStorage
 ), Pump, RileyLinkPumpDevice, info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncEntriesCreator {
 
     private lateinit var rileyLinkMedtronicService: RileyLinkMedtronicService
@@ -111,7 +112,7 @@ class MedtronicPumpPlugin @Inject constructor(
     private var isBusy = false
 
     override fun onStart() {
-        aapsLogger.debug(LTag.PUMP, deviceID() + " started.")
+        aapsLogger.debug(LTag.PUMP, deviceID() + " started. (V2.0005)")
         serviceConnection = object : ServiceConnection {
             override fun onServiceDisconnected(name: ComponentName) {
                 aapsLogger.debug(LTag.PUMP, "RileyLinkMedtronicService is disconnected")
@@ -140,9 +141,9 @@ class MedtronicPumpPlugin @Inject constructor(
 
     override fun updatePreferenceSummary(pref: Preference) {
         super.updatePreferenceSummary(pref)
-        if (pref.key == resourceHelper.gs(R.string.key_rileylink_mac_address)) {
+        if (pref.key == rh.gs(R.string.key_rileylink_mac_address)) {
             val value = sp.getStringOrNull(R.string.key_rileylink_mac_address, null)
-            pref.summary = value ?: resourceHelper.gs(R.string.not_set_short)
+            pref.summary = value ?: rh.gs(R.string.not_set_short)
         }
     }
 
@@ -177,14 +178,14 @@ class MedtronicPumpPlugin @Inject constructor(
 
     private fun migrateSettings() {
         if ("US (916 MHz)" == sp.getString(MedtronicConst.Prefs.PumpFrequency, "US (916 MHz)")) {
-            sp.putString(MedtronicConst.Prefs.PumpFrequency, resourceHelper.gs(R.string.key_medtronic_pump_frequency_us_ca))
+            sp.putString(MedtronicConst.Prefs.PumpFrequency, rh.gs(R.string.key_medtronic_pump_frequency_us_ca))
         }
         val encoding = sp.getString(MedtronicConst.Prefs.Encoding, "RileyLink 4b6b Encoding")
         if ("RileyLink 4b6b Encoding" == encoding) {
-            sp.putString(MedtronicConst.Prefs.Encoding, resourceHelper.gs(R.string.key_medtronic_pump_encoding_4b6b_rileylink))
+            sp.putString(MedtronicConst.Prefs.Encoding, rh.gs(R.string.key_medtronic_pump_encoding_4b6b_rileylink))
         }
         if ("Local 4b6b Encoding" == encoding) {
-            sp.putString(MedtronicConst.Prefs.Encoding, resourceHelper.gs(R.string.key_medtronic_pump_encoding_4b6b_local))
+            sp.putString(MedtronicConst.Prefs.Encoding, rh.gs(R.string.key_medtronic_pump_encoding_4b6b_local))
         }
     }
 
@@ -233,7 +234,7 @@ class MedtronicPumpPlugin @Inject constructor(
     }
 
     override fun getPumpInfo(): RileyLinkPumpInfo {
-        val frequency = resourceHelper.gs(if (medtronicPumpStatus.pumpFrequency == "medtronic_pump_frequency_us_ca") R.string.medtronic_pump_frequency_us_ca else R.string.medtronic_pump_frequency_worldwide)
+        val frequency = rh.gs(if (medtronicPumpStatus.pumpFrequency == "medtronic_pump_frequency_us_ca") R.string.medtronic_pump_frequency_us_ca else R.string.medtronic_pump_frequency_worldwide)
         val model = if (!medtronicUtil.isModelSet) "???" else "Medtronic " + medtronicPumpStatus.medtronicDeviceType.pumpModel
         val serialNumber = medtronicPumpStatus.serialNumber
         return RileyLinkPumpInfo(frequency, model, serialNumber)
@@ -338,7 +339,7 @@ class MedtronicPumpPlugin @Inject constructor(
         var resetTime = false
         if (isPumpNotReachable) {
             aapsLogger.error("Pump unreachable.")
-            medtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable, resourceHelper, rxBus)
+            medtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable, rh, rxBus)
             return
         }
         medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus)
@@ -407,7 +408,7 @@ class MedtronicPumpPlugin @Inject constructor(
         if (isRefresh) {
             if (isPumpNotReachable) {
                 aapsLogger.error(logPrefix + "initializePump::Pump unreachable.")
-                medtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable, resourceHelper, rxBus)
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable, rh, rxBus)
                 setRefreshButtonEnabled(true)
                 return true
             }
@@ -420,7 +421,7 @@ class MedtronicPumpPlugin @Inject constructor(
         } else {
             if (medtronicPumpStatus.medtronicDeviceType !== medtronicUtil.medtronicPumpModel) {
                 aapsLogger.warn(LTag.PUMP, logPrefix + "Configured pump is not the same as one detected.")
-                medtronicUtil.sendNotification(MedtronicNotificationType.PumpTypeNotSame, resourceHelper, rxBus)
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpTypeNotSame, rh, rxBus)
             }
         }
         pumpState = PumpDriverState.Connected
@@ -468,6 +469,7 @@ class MedtronicPumpPlugin @Inject constructor(
             }
         }
 
+    @Synchronized
     override fun isThisProfileSet(profile: Profile): Boolean {
         aapsLogger.debug(LTag.PUMP, "isThisProfileSet: basalInitalized=" + medtronicPumpStatus.basalProfileStatus)
         if (!isInitialized) return true
@@ -565,13 +567,13 @@ class MedtronicPumpPlugin @Inject constructor(
                 aapsLogger.info(LTag.PUMP, String.format(Locale.ENGLISH, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is %d s. Set time on pump.", timeDiff))
                 rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.SetRealTimeClock)
                 if (clock.timeDifference == 0) {
-                    val notification = Notification(Notification.INSIGHT_DATE_TIME_UPDATED, resourceHelper.gs(R.string.pump_time_updated), Notification.INFO, 60)
+                    val notification = Notification(Notification.INSIGHT_DATE_TIME_UPDATED, rh.gs(R.string.pump_time_updated), Notification.INFO, 60)
                     rxBus.send(EventNewNotification(notification))
                 }
             } else {
                 if (clock.localDeviceTime.year > 2015) {
                     aapsLogger.error(String.format(Locale.ENGLISH, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference over 24h requested [diff=%d s]. Doing nothing.", timeDiff))
-                    medtronicUtil.sendNotification(MedtronicNotificationType.TimeChangeOver24h, resourceHelper, rxBus)
+                    medtronicUtil.sendNotification(MedtronicNotificationType.TimeChangeOver24h, rh, rxBus)
                 }
             }
         } else {
@@ -580,6 +582,7 @@ class MedtronicPumpPlugin @Inject constructor(
         scheduleNextRefresh(MedtronicStatusRefreshType.PumpTime, 0)
     }
 
+    @Synchronized
     override fun deliverBolus(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
         aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::deliverBolus - " + BolusDeliveryType.DeliveryPrepared)
         setRefreshButtonEnabled(false)
@@ -587,9 +590,9 @@ class MedtronicPumpPlugin @Inject constructor(
             return PumpEnactResult(injector) //
                 .success(false) //
                 .enacted(false) //
-                .comment(resourceHelper.gs(R.string.medtronic_cmd_bolus_could_not_be_delivered_no_insulin,
-                    medtronicPumpStatus.reservoirRemainingUnits,
-                    detailedBolusInfo.insulin))
+                .comment(rh.gs(R.string.medtronic_cmd_bolus_could_not_be_delivered_no_insulin,
+                               medtronicPumpStatus.reservoirRemainingUnits,
+                               detailedBolusInfo.insulin))
         }
         bolusDeliveryType = BolusDeliveryType.DeliveryPrepared
         if (isPumpNotReachable) {
@@ -628,7 +631,7 @@ class MedtronicPumpPlugin @Inject constructor(
                     // LOG.debug("MedtronicPumpPlugin::deliverBolus - Delivery Canceled after Bolus started.");
                     Thread(Runnable {
                         SystemClock.sleep(2000)
-                        runAlarm(context, resourceHelper.gs(R.string.medtronic_cmd_cancel_bolus_not_supported), resourceHelper.gs(R.string.medtronic_warning), R.raw.boluserror)
+                        runAlarm(context, rh.gs(R.string.medtronic_cmd_cancel_bolus_not_supported), rh.gs(R.string.medtronic_warning), R.raw.boluserror)
                     }).start()
                 }
                 val now = System.currentTimeMillis()
@@ -691,6 +694,7 @@ class MedtronicPumpPlugin @Inject constructor(
 
     // if enforceNew===true current temp basal is canceled 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
+    @Synchronized
     override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: TemporaryBasalType): PumpEnactResult {
         setRefreshButtonEnabled(false)
         if (isPumpNotReachable) {
@@ -742,6 +746,7 @@ class MedtronicPumpPlugin @Inject constructor(
                 return PumpEnactResult(injector).success(false).enacted(false)
                     .comment(R.string.medtronic_cmd_cant_cancel_tbr_stop_op)
             } else {
+                //cancelTBRWithTemporaryId()
                 aapsLogger.info(LTag.PUMP, logPrefix + "setTempBasalAbsolute - Current TBR cancelled.")
             }
         }
@@ -760,8 +765,9 @@ class MedtronicPumpPlugin @Inject constructor(
             medtronicPumpStatus.tempBasalAmount = absoluteRate
             medtronicPumpStatus.tempBasalLength = durationInMinutes
 
-            val tempData = info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR(absoluteRate, true, durationInMinutes, tbrType)
+            val tempData = PumpDbEntryTBR(absoluteRate, true, durationInMinutes, tbrType)
 
+            medtronicPumpStatus.runningTBRWithTemp = tempData
             pumpSyncStorage.addTemporaryBasalRateWithTempId(tempData, true, this)
 
             incrementStatistics(MedtronicConst.Statistics.TBRsSet)
@@ -771,6 +777,63 @@ class MedtronicPumpPlugin @Inject constructor(
         }
     }
 
+    @Deprecated("Not used, TBRs fixed in history, should be removed.")
+    private fun cancelTBRWithTemporaryId() {
+        val tbrs : MutableList<PumpDbEntryTBR> = pumpSyncStorage.getTBRs()
+        if (tbrs.size > 0 && medtronicPumpStatus.runningTBRWithTemp!=null) {
+            aapsLogger.info(LTag.PUMP, logPrefix + "cancelTBRWithTemporaryId - TBR items: ${tbrs.size}")
+
+            var item : PumpDbEntryTBR? = null
+
+            if (tbrs.size==1) {
+                item = tbrs.get(0);
+            } else {
+                for (tbr in tbrs) {
+                    if (tbr.date == medtronicPumpStatus.runningTBRWithTemp!!.date) {
+                        item = tbr
+                        break;
+                    }
+                }
+            }
+
+            if (item!=null) {
+
+                aapsLogger.debug(LTag.PUMP, "DD: cancelTBRWithTemporaryId: tempIdEntry=${item}")
+
+                val differenceS = (System.currentTimeMillis() - item.date) / 1000
+
+                aapsLogger.debug(LTag.PUMP, "syncTemporaryBasalWithTempId " +
+                    "[date=${item.date}, " +
+                    "rate=${item.rate}, " +
+                    "duration=${differenceS} s, " +
+                    "isAbsolute=${!item.isAbsolute}, temporaryId=${item.temporaryId}, " +
+                    "pumpId=NO, pumpType=${medtronicPumpStatus.pumpType}, " +
+                    "pumpSerial=${medtronicPumpStatus.serialNumber}]")
+
+                val result = pumpSync.syncTemporaryBasalWithTempId(
+                    timestamp = item.date,
+                    rate = item.rate,
+                    duration= differenceS * 1000L,
+                    isAbsolute = item.isAbsolute,
+                    temporaryId = item.temporaryId,
+                    type = item.tbrType,
+                    pumpId = null,
+                    pumpType = medtronicPumpStatus.pumpType,
+                    pumpSerial = medtronicPumpStatus.serialNumber)
+
+                aapsLogger.debug(LTag.PUMP, "syncTemporaryBasalWithTempId - Result: $result")
+            }
+
+        } else {
+            aapsLogger.info(LTag.PUMP, logPrefix + "cancelTBRWithTemporaryId - TBR items: ${tbrs.size}, runningTBRWithTemp=${medtronicPumpStatus.runningTBRWithTemp}")
+        }
+
+        if (medtronicPumpStatus.runningTBRWithTemp!=null) {
+            medtronicPumpStatus.runningTBRWithTemp = null
+        }
+    }
+
+    @Synchronized
     override fun setTempBasalPercent(percent: Int, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: TemporaryBasalType): PumpEnactResult {
         return if (percent == 0) {
             setTempBasalAbsolute(0.0, durationInMinutes, profile, enforceNew, tbrType)
@@ -966,6 +1029,7 @@ class MedtronicPumpPlugin @Inject constructor(
         }
     }
 
+    @Synchronized
     override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult {
         aapsLogger.info(LTag.PUMP, logPrefix + "cancelTempBasal - started")
         if (isPumpNotReachable) {
@@ -1001,32 +1065,33 @@ class MedtronicPumpPlugin @Inject constructor(
             aapsLogger.info(LTag.PUMP, logPrefix + "cancelTempBasal - Cancel TBR successful.")
 
             val runningTBR = medtronicPumpStatus.runningTBR
-
+            // TODO
             if (runningTBR != null) {
                 if (medtronicHistoryData.isTBRActive(runningTBR)) {
 
                     val differenceTime = System.currentTimeMillis() - runningTBR.date
-                    val tbrData = runningTBR.tbrData!!
+                    //val tbrData = runningTBR
 
                     val result = pumpSync.syncTemporaryBasalWithPumpId(
                         runningTBR.date,
-                        tbrData.rate,
+                        runningTBR.rate,
                         differenceTime,
-                        tbrData.isAbsolute,
-                        tbrData.tbrType,
+                        runningTBR.isAbsolute,
+                        runningTBR.tbrType,
                         runningTBR.pumpId!!,
                         runningTBR.pumpType,
                         runningTBR.serialNumber)
 
                     val differenceTimeMin = Math.floor(differenceTime / (60.0 * 1000.0))
 
-                    aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "canceling running TBR - syncTemporaryBasalWithPumpId [date=%d, pumpId=%d, rate=%.2f U, duration=%d, pumpSerial=%s] - Result: %b",
-                        runningTBR.date, runningTBR.pumpId,
-                        tbrData.rate, differenceTimeMin.toInt(),
-                        medtronicPumpStatus.serialNumber, result))
+                    aapsLogger.debug(LTag.PUMP, "canceling running TBR - syncTemporaryBasalWithPumpId [date=${runningTBR.date}, " +
+                        "pumpId=${runningTBR.pumpId}, rate=${runningTBR.rate} U, duration=${differenceTimeMin.toInt()}, " +
+                        "pumpSerial=${medtronicPumpStatus.serialNumber}] - Result: $result")
                 }
             }
 
+            //cancelTBRWithTemporaryId()
+
             PumpEnactResult(injector).success(true).enacted(true) //
                 .isTempCancel(true)
         }
@@ -1044,6 +1109,7 @@ class MedtronicPumpPlugin @Inject constructor(
         return medtronicPumpStatus.serialNumber
     }
 
+    @Synchronized
     override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
         aapsLogger.info(LTag.PUMP, logPrefix + "setNewBasalProfile")
 
@@ -1070,7 +1136,7 @@ class MedtronicPumpPlugin @Inject constructor(
             return PumpEnactResult(injector) //
                 .success(false) //
                 .enacted(false) //
-                .comment(resourceHelper.gs(R.string.medtronic_cmd_set_profile_pattern_overflow, profileInvalid))
+                .comment(rh.gs(R.string.medtronic_cmd_set_profile_pattern_overflow, profileInvalid))
         }
         val responseTask = rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.SetBasalProfileSTD,
             arrayListOf(basalProfile))
@@ -1134,7 +1200,7 @@ class MedtronicPumpPlugin @Inject constructor(
                 if (rileyLinkMedtronicService.verifyConfiguration()) {
                     serviceTaskExecutor.startTask(WakeAndTuneTask(injector))
                 } else {
-                    runAlarm(context, resourceHelper.gs(R.string.medtronic_error_operation_not_possible_no_configuration), resourceHelper.gs(R.string.medtronic_warning), R.raw.boluserror)
+                    runAlarm(context, rh.gs(R.string.medtronic_error_operation_not_possible_no_configuration), rh.gs(R.string.medtronic_warning), R.raw.boluserror)
                 }
             }
 
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt
index 86c04e3e903..1c64e92ec83 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt
@@ -94,6 +94,10 @@ class MedtronicConverter @Inject constructor(
     }
 
     fun decodeTime(rawContent: ByteArray): LocalDateTime? {
+        if (rawContent.size < 7) {
+            aapsLogger.error(LTag.PUMPCOMM, "decodeTime: Byte array too short")
+            return null
+        }
         val hours = ByteUtil.asUINT8(rawContent[0])
         val minutes = ByteUtil.asUINT8(rawContent[1])
         val seconds = ByteUtil.asUINT8(rawContent[2])
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt
index dc38b626015..8776906d951 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt
@@ -14,13 +14,13 @@ import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil
  */
 abstract class MedtronicHistoryEntry : MedtronicHistoryEntryInterface {
 
-    lateinit var rawData: List<Byte>
+    var rawData: List<Byte> = listOf()
 
     protected var sizes = IntArray(3)
 
-    lateinit var head: ByteArray
-    lateinit var datetime: ByteArray
-    lateinit var body: ByteArray
+    var head: ByteArray = byteArrayOf()
+    var datetime: ByteArray = byteArrayOf()
+    var body: ByteArray = byteArrayOf()
 
     var id: Long = 0
 
@@ -41,7 +41,13 @@ abstract class MedtronicHistoryEntry : MedtronicHistoryEntryInterface {
     /**
      * Pump id that will be used with AAPS object (time * 1000 + historyType (max is FF = 255)
      */
-    open var pumpId: Long = 0L
+    var pumpId: Long = 0L
+        get() {
+            if (field == 0L) {
+                field = generatePumpId()
+            }
+            return field
+        }
 
     /**
      * if history object is already linked to AAPS object (either Treatment, TempBasal or TDD (tdd's
@@ -158,7 +164,7 @@ abstract class MedtronicHistoryEntry : MedtronicHistoryEntryInterface {
             sb.append("]")
             return sb.toString()
         }
-        if (head.size != 0) {
+        if (head!=null && head.size != 0) {
             sb.append(", head=")
             sb.append(ByteUtil.shortHexString(head))
         }
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt
index 0bc1e8106e4..c16bf5c3625 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt
@@ -92,14 +92,6 @@ class PumpHistoryEntry : MedtronicHistoryEntry() {
         }
     }
 
-    override var pumpId: Long = 0L
-        get() {
-            if (field == 0L) {
-                field = generatePumpId()
-            }
-            return field
-        }
-
     fun hasBolusChanged(entry: PumpHistoryEntry): Boolean {
         if (entryType == PumpHistoryEntryType.Bolus) {
             val thisOne: BolusDTO = this.decodedData["Object"] as BolusDTO
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt
index 621a17666b6..1288c9d279a 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO
@@ -27,8 +27,8 @@ import javax.inject.Singleton
 @Singleton
 class MedtronicUIPostprocessor @Inject constructor(
     private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
+    private val rxBus: RxBus,
+    private val rh: ResourceHelper,
     private val medtronicUtil: MedtronicUtil,
     private val medtronicPumpStatus: MedtronicPumpStatus,
     private val medtronicPumpPlugin: MedtronicPumpPlugin) {
@@ -114,7 +114,7 @@ class MedtronicUIPostprocessor @Inject constructor(
             MedtronicCommandType.PumpModel           -> {
                 if (medtronicPumpStatus.medtronicDeviceType !== medtronicUtil.medtronicPumpModel) {
                     aapsLogger.warn(LTag.PUMP, "Configured pump is different then pump detected !")
-                    medtronicUtil.sendNotification(MedtronicNotificationType.PumpTypeNotSame, resourceHelper, rxBus)
+                    medtronicUtil.sendNotification(MedtronicNotificationType.PumpTypeNotSame, rh, rxBus)
                 }
             }
 
@@ -154,12 +154,12 @@ class MedtronicUIPostprocessor @Inject constructor(
             checkValue = settings["PCFG_BASAL_PROFILES_ENABLED"]!!
             if ("Yes" != checkValue.value) {
                 aapsLogger.error(LTag.PUMP, "Basal profiles are not enabled on pump.")
-                medtronicUtil.sendNotification(MedtronicNotificationType.PumpBasalProfilesNotEnabled, resourceHelper, rxBus)
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpBasalProfilesNotEnabled, rh, rxBus)
             } else {
                 checkValue = settings["PCFG_ACTIVE_BASAL_PROFILE"]!!
                 if ("STD" != checkValue.value) {
                     aapsLogger.error("Basal profile set on pump is incorrect (must be STD).")
-                    medtronicUtil.sendNotification(MedtronicNotificationType.PumpIncorrectBasalProfileSelected, resourceHelper, rxBus)
+                    medtronicUtil.sendNotification(MedtronicNotificationType.PumpIncorrectBasalProfileSelected, rh, rxBus)
                 }
             }
         }
@@ -168,7 +168,7 @@ class MedtronicUIPostprocessor @Inject constructor(
         if (settings.containsKey("PCFG_TEMP_BASAL_TYPE")) {
             if ("Units" != settings["PCFG_TEMP_BASAL_TYPE"]!!.value) {
                 aapsLogger.error("Wrong TBR type set on pump (must be Absolute).")
-                medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongTBRTypeSet, resourceHelper, rxBus)
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongTBRTypeSet, rh, rxBus)
             }
         }
 
@@ -177,7 +177,7 @@ class MedtronicUIPostprocessor @Inject constructor(
             checkValue = settings["PCFG_MAX_BOLUS"]!!
             if (!MedtronicUtil.isSame(checkValue.value.toDouble(), medtronicPumpStatus.maxBolus!!)) {
                 aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Wrong Max Bolus set on Pump (current=%s, required=%.2f).", checkValue.value, medtronicPumpStatus.maxBolus))
-                medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongMaxBolusSet, resourceHelper, rxBus, medtronicPumpStatus.maxBolus)
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongMaxBolusSet, rh, rxBus, medtronicPumpStatus.maxBolus)
             }
         }
 
@@ -185,7 +185,7 @@ class MedtronicUIPostprocessor @Inject constructor(
             checkValue = settings["PCFG_MAX_BASAL"]!!
             if (!MedtronicUtil.isSame(checkValue.value.toDouble(), medtronicPumpStatus.maxBasal!!)) {
                 aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Wrong Max Basal set on Pump (current=%s, required=%.2f).", checkValue.value, medtronicPumpStatus.maxBasal))
-                medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongMaxBasalSet, resourceHelper, rxBus, medtronicPumpStatus.maxBasal)
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongMaxBasalSet, rh, rxBus, medtronicPumpStatus.maxBasal)
             }
         }
     }
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt
index a401e061fab..1dfbb50a2d8 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
@@ -24,7 +24,7 @@ import javax.inject.Inject
  */
 class MedtronicUITask {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var medtronicPumpStatus: MedtronicPumpStatus
     @Inject lateinit var medtronicUtil: MedtronicUtil
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt
index e558a22f885..edd3de2c353 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry
+import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryBolus
 import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil
@@ -61,7 +62,6 @@ class MedtronicHistoryData @Inject constructor(
     private var pumpTime: ClockDTO? = null
     private var lastIdUsed: Long = 0
     private var gson: Gson = GsonBuilder().excludeFieldsWithoutExposeAnnotation().create()
-    private var gsonCore: Gson = GsonBuilder().create()
 
     /**
      * Add New History entries
@@ -113,7 +113,7 @@ class MedtronicHistoryData @Inject constructor(
         val newHistory2: MutableList<PumpHistoryEntry> = mutableListOf()
         var tbrs: MutableList<PumpHistoryEntry> = mutableListOf()
         val bolusEstimates: MutableList<PumpHistoryEntry> = mutableListOf()
-        val atechDate = DateTimeUtil.toATechDate(GregorianCalendar())
+        val aTechDate = DateTimeUtil.toATechDate(GregorianCalendar())
 
         //aapsLogger.debug(LTag.PUMP, "Filter new entries: Before {}", newHistory);
         if (!isCollectionEmpty(newHistory)) {
@@ -127,7 +127,7 @@ class MedtronicHistoryData @Inject constructor(
                         newHistory2.add(pumpHistoryEntry)
                     } else {
                         if (type === PumpHistoryEntryType.EndResultTotals) {
-                            if (!DateTimeUtil.isSameDay(atechDate, pumpHistoryEntry.atechDateTime)) {
+                            if (!DateTimeUtil.isSameDay(aTechDate, pumpHistoryEntry.atechDateTime)) {
                                 newHistory2.add(pumpHistoryEntry)
                             }
                         } else {
@@ -232,7 +232,7 @@ class MedtronicHistoryData @Inject constructor(
     }
 
     private fun isCollectionNotEmpty(col: List<*>?): Boolean {
-        return col != null && !col.isEmpty()
+        return col != null && col.isNotEmpty()
     }
 
     fun isPumpSuspended(): Boolean {
@@ -279,6 +279,7 @@ class MedtronicHistoryData @Inject constructor(
         return newAndAll2
     }
 
+    @Suppress("SameParameterValue")
     private fun filterPumpSuspend(newAndAll: MutableList<PumpHistoryEntry>, filterCount: Int): MutableList<PumpHistoryEntry> {
         if (newAndAll.size <= filterCount) {
             return newAndAll
@@ -295,7 +296,7 @@ class MedtronicHistoryData @Inject constructor(
      */
     fun processNewHistoryData() {
 
-        // Prime (for reseting autosense)
+        // Prime (for resetting autosense)
         val primeRecords: MutableList<PumpHistoryEntry> = getFilteredItems(PumpHistoryEntryType.Prime)
         aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: Prime [count=%d, items=%s]", primeRecords.size, gson.toJson(primeRecords)))
         if (isCollectionNotEmpty(primeRecords)) {
@@ -357,8 +358,7 @@ class MedtronicHistoryData @Inject constructor(
         }
 
         // 'Delivery Suspend'
-        val suspends: MutableList<TempBasalProcessDTO>
-        suspends = try {
+        val suspends: MutableList<TempBasalProcessDTO> = try {
             getSuspendRecords()
         } catch (ex: Exception) {
             aapsLogger.error("ProcessHistoryData: Error getting Suspend entries: " + ex.message, ex)
@@ -460,6 +460,7 @@ class MedtronicHistoryData @Inject constructor(
         }
     }
 
+    @Suppress("unused")
     private enum class ProcessHistoryRecord(val description: String) {
         Bolus("Bolus"),
         TBR("TBR"),
@@ -490,41 +491,42 @@ class MedtronicHistoryData @Inject constructor(
             var temporaryId: Long? = null
 
             if (!multiwave) {
-                val entryWithTempId = findDbEntry(bolus, boluses)
+                @Suppress("Unchecked_Cast")
+                val entryWithTempId = findDbEntry(bolus, boluses as MutableList<PumpDbEntry>) as PumpDbEntryBolus?
 
                 aapsLogger.debug(LTag.PUMP, "DD: entryWithTempId=$entryWithTempId")
 
                 if (entryWithTempId != null) {
-                    aapsLogger.debug(LTag.PUMP, String.format("DD: entryWithTempId.bolusData=%s", if (entryWithTempId.bolusData == null) "null" else entryWithTempId.bolusData))
+                    //aapsLogger.debug(LTag.PUMP, String.format("DD: entryWithTempId.bolusData=%s", if (entryWithTempId.bolusData == null) "null" else entryWithTempId.bolusData))
 
                     temporaryId = entryWithTempId.temporaryId
                     pumpSyncStorage.removeBolusWithTemporaryId(temporaryId)
                     boluses.remove(entryWithTempId)
-                    type = entryWithTempId.bolusData!!.bolusType
+                    type = entryWithTempId.bolusType
                 }
             }
 
             if (temporaryId != null) {
                 val result = pumpSync.syncBolusWithTempId(
-                    tryToGetByLocalTime(bolus.atechDateTime),
-                    deliveredAmount,
-                    temporaryId,
-                    type,
-                    bolus.pumpId,
-                    medtronicPumpStatus.pumpType,
-                    medtronicPumpStatus.serialNumber)
+                    timestamp = tryToGetByLocalTime(bolus.atechDateTime),
+                    amount = deliveredAmount,
+                    temporaryId = temporaryId,
+                    type = null,
+                    pumpId = bolus.pumpId,
+                    pumpType = medtronicPumpStatus.pumpType,
+                    pumpSerial = medtronicPumpStatus.serialNumber)
 
                 aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "syncBolusWithTempId [date=%d, temporaryId=%d, pumpId=%d, insulin=%.2f, pumpSerial=%s] - Result: %b",
                     bolus.atechDateTime, temporaryId, bolus.pumpId, deliveredAmount,
                     medtronicPumpStatus.serialNumber, result))
             } else {
                 val result = pumpSync.syncBolusWithPumpId(
-                    tryToGetByLocalTime(bolus.atechDateTime),
-                    deliveredAmount,
-                    type,
-                    bolus.pumpId,
-                    medtronicPumpStatus.pumpType,
-                    medtronicPumpStatus.serialNumber)
+                    timestamp = tryToGetByLocalTime(bolus.atechDateTime),
+                    amount = deliveredAmount,
+                    type = null,
+                    pumpId = bolus.pumpId,
+                    pumpType = medtronicPumpStatus.pumpType,
+                    pumpSerial = medtronicPumpStatus.serialNumber)
 
                 aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "syncBolusWithPumpId [date=%d, pumpId=%d, insulin=%.2f, pumpSerial=%s] - Result: %b",
                     bolus.atechDateTime, bolus.pumpId, deliveredAmount,
@@ -567,63 +569,44 @@ class MedtronicHistoryData @Inject constructor(
     }
 
     private fun processTBREntries(entryList: MutableList<PumpHistoryEntry>) {
-        Collections.reverse(entryList)
+        entryList.reverse()
         val tbr = entryList[0].getDecodedDataEntry("Object") as TempBasalPair
-        var readOldItem = false
-        if (tbr.isCancelTBR) {
-            val oneMoreEntryFromHistory = getOneMoreEntryFromHistory(PumpHistoryEntryType.TempBasalCombined)
+//        var readOldItem = false
+
+        val oneMoreEntryFromHistory = getOneMoreEntryFromHistory(PumpHistoryEntryType.TempBasalCombined)
+
+        if (tbr.isCancelTBR) { // if we have cancel we need to limit previous TBR with this cancel
             if (oneMoreEntryFromHistory != null) {
                 entryList.add(0, oneMoreEntryFromHistory)
-                readOldItem = true
             } else {
                 entryList.removeAt(0)
             }
-        }
-
-        val tbrRecords = pumpSyncStorage.getTBRs()
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, ProcessHistoryRecord.TBR.description + " List (before filter): %s, FromDb=%s", gson.toJson(entryList),
-            tbrRecords))
-        var processDTO: TempBasalProcessDTO? = null
-        val processList: MutableList<TempBasalProcessDTO> = mutableListOf()
-        for (treatment in entryList) {
-            val tbr2 = treatment.getDecodedDataEntry("Object") as TempBasalPair
-            if (tbr2.isCancelTBR) {
-                if (processDTO != null) {
-                    processDTO.itemTwo = treatment
-                    processDTO.cancelPresent = true
-                    if (readOldItem) {
-                        processDTO.processOperation = TempBasalProcessDTO.Operation.Edit
-                        readOldItem = false
-                    }
-                } else {
-                    aapsLogger.warn(LTag.PUMP, "processDTO was null - shouldn't happen, ignoring item. ItemTwo=$treatment")
-                }
-            } else {
-                if (processDTO != null) {
-                    processList.add(processDTO)
+        } else {
+            if (oneMoreEntryFromHistory != null) {
+                val tbrPrev = oneMoreEntryFromHistory.getDecodedDataEntry("Object") as TempBasalPair
+                if (tbrPrev.isZeroTBR) {  // if we had Zere TBR in last previous TBR, then we need to limit it, so we need to process it too
+                    entryList.add(0, oneMoreEntryFromHistory)
                 }
-                processDTO = TempBasalProcessDTO(
-                    itemOne = treatment,
-                    processOperation = TempBasalProcessDTO.Operation.Add,
-                    aapsLogger = aapsLogger,
-                    objectType = TempBasalProcessDTO.ObjectType.TemporaryBasal
-                )
             }
         }
-        if (processDTO != null) {
-            processList.add(processDTO)
-        }
+
+        val tbrRecords = pumpSyncStorage.getTBRs()
+
+        val processList: MutableList<TempBasalProcessDTO> = createTBRProcessList(entryList);
+
         if (processList.isNotEmpty()) {
             for (tempBasalProcessDTO in processList) {
 
-                aapsLogger.debug(LTag.PUMP, "DD: tempBasalProcessDTO.itemOne: " + gson.toJson(tempBasalProcessDTO.itemOne))
-                aapsLogger.debug(LTag.PUMP, "DD: tempBasalProcessDTO.itemTwo: " + (if (tempBasalProcessDTO.itemTwo == null) "null" else gson.toJson(tempBasalProcessDTO.itemTwo!!)))
+                aapsLogger.debug(LTag.PUMP, "DD: tempBasalProcessDTO: " + tempBasalProcessDTO.toTreatmentString())
+                //aapsLogger.debug(LTag.PUMP, "DD: tempBasalProcessDTO.itemOne: " + gson.toJson(tempBasalProcessDTO.itemOne))
+                //aapsLogger.debug(LTag.PUMP, "DD: tempBasalProcessDTO.itemTwo: " + (if (tempBasalProcessDTO.itemTwo == null) "null" else gson.toJson(tempBasalProcessDTO.itemTwo!!)))
 
-                val entryWithTempId = findDbEntry(tempBasalProcessDTO.itemOne, tbrRecords)
+                @Suppress("Unchecked_Cast")
+                val entryWithTempId = findDbEntry(tempBasalProcessDTO.itemOne, tbrRecords  as MutableList<PumpDbEntry>) as PumpDbEntryTBR?
 
-                aapsLogger.debug(LTag.PUMP, "DD: entryWithTempId: " + (if (entryWithTempId == null) "null" else entryWithTempId.toString()))
+                aapsLogger.debug(LTag.PUMP, "DD: entryWithTempId: " + (entryWithTempId?.toString() ?: "null"))
 
-                val tbrEntry = tempBasalProcessDTO.itemOneTbr //.getDecodedDataEntry("Object") as TempBasalPair
+                val tbrEntry = tempBasalProcessDTO.itemOneTbr
 
                 aapsLogger.debug(LTag.PUMP, String.format("DD: tbrEntry=%s, tempBasalProcessDTO=%s", gson.toJson(tbrEntry), gson.toJson(tempBasalProcessDTO)))
 
@@ -646,14 +629,14 @@ class MedtronicHistoryData @Inject constructor(
                             tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime),
                             tbrEntry.insulinRate,
                             tempBasalProcessDTO.durationAsSeconds * 1000L,
-                            !tbrEntry.isPercent,
+                            isAbsolute = !tbrEntry.isPercent,
                             entryWithTempId.temporaryId,
                             PumpSync.TemporaryBasalType.NORMAL,
                             tempBasalProcessDTO.pumpId,
                             medtronicPumpStatus.pumpType,
                             medtronicPumpStatus.serialNumber)
 
-                        aapsLogger.debug(LTag.PUMP, "syncTemporaryBasalWithTempId - Result: ${result}")
+                        aapsLogger.debug(LTag.PUMP, "syncTemporaryBasalWithTempId - Result: $result")
 
                         pumpSyncStorage.removeTemporaryBasalWithTemporaryId(entryWithTempId.temporaryId)
                         tbrRecords.remove(entryWithTempId)
@@ -697,16 +680,16 @@ class MedtronicHistoryData @Inject constructor(
                         if (isTBRActive(startTimestamp = tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime),
                                 durationSeconds = tempBasalProcessDTO.durationAsSeconds)) {
                             if (medtronicPumpStatus.runningTBR == null) {
-                                medtronicPumpStatus.runningTBR = info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry(0L,
-                                    tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime),
-                                    medtronicPumpStatus.pumpType,
-                                    medtronicPumpStatus.serialNumber,
-                                    null,
-                                    PumpDbEntryTBR(rate = tbrEntry.insulinRate,
-                                        isAbsolute = !tbrEntry.isPercent,
-                                        durationInSeconds = tempBasalProcessDTO.durationAsSeconds,
-                                        tbrType = PumpSync.TemporaryBasalType.NORMAL),
-                                    tempBasalProcessDTO.pumpId)
+                                medtronicPumpStatus.runningTBR = PumpDbEntryTBR(
+                                    temporaryId = 0L,
+                                    date = tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime),
+                                    pumpType = medtronicPumpStatus.pumpType,
+                                    serialNumber = medtronicPumpStatus.serialNumber,
+                                    rate = tbrEntry.insulinRate,
+                                    isAbsolute = !tbrEntry.isPercent,
+                                    durationInSeconds = tempBasalProcessDTO.durationAsSeconds,
+                                    tbrType = PumpSync.TemporaryBasalType.NORMAL,
+                                    pumpId = tempBasalProcessDTO.pumpId)
                             }
                         }
                     } else {
@@ -717,10 +700,62 @@ class MedtronicHistoryData @Inject constructor(
         } // collection
     }
 
-    fun isTBRActive(dbEntry: PumpDbEntry): Boolean {
+    fun createTBRProcessList(entryList: MutableList<PumpHistoryEntry>) : MutableList<TempBasalProcessDTO> {
+
+        aapsLogger.debug(LTag.PUMP, "${ProcessHistoryRecord.TBR.description}  List (before filter): ${gson.toJson(entryList)}")
+
+        var processDTO: TempBasalProcessDTO? = null
+        val processList: MutableList<TempBasalProcessDTO> = mutableListOf()
+        for (treatment in entryList) {
+            val tbr2 = treatment.getDecodedDataEntry("Object") as TempBasalPair
+            if (tbr2.isCancelTBR) {
+                if (processDTO != null) {
+                    processDTO.itemTwo = treatment
+                } else {
+                    aapsLogger.warn(LTag.PUMP, "processDTO was null - shouldn't happen, ignoring item. ItemTwo=$treatment")
+                }
+            } else {
+                if (processDTO != null) {
+                    processList.add(processDTO)
+                }
+                processDTO = TempBasalProcessDTO(
+                    itemOne = treatment,
+                    aapsLogger = aapsLogger,
+                    objectType = TempBasalProcessDTO.ObjectType.TemporaryBasal
+                )
+            }
+        }
+        if (processDTO != null) {
+            processList.add(processDTO)
+        }
+
+        var previousItem: TempBasalProcessDTO? = null
+
+        // fix for Zero TBRs
+        for (tempBasalProcessDTO in processList) {
+            if (previousItem!=null) {
+
+                var pheEnd = PumpHistoryEntry()
+                pheEnd.atechDateTime = DateTimeUtil.getATDWithAddedSeconds(tempBasalProcessDTO.itemOne.atechDateTime, -2)
+                pheEnd.addDecodedData("Object", TempBasalPair(0.0, false, 0))
+
+                previousItem.itemTwo = pheEnd
+
+                previousItem = null
+            }
+            if (tempBasalProcessDTO.itemOneTbr!!.isZeroTBR) {
+                previousItem = tempBasalProcessDTO
+            }
+        }
+
+        return processList
+    }
+
+
+    fun isTBRActive(dbEntry: PumpDbEntryTBR): Boolean {
         return isTBRActive(
             startTimestamp = dbEntry.date,
-            durationSeconds = dbEntry.tbrData!!.durationInSeconds)
+            durationSeconds = dbEntry.durationInSeconds)
     }
 
     fun isTBRActive(startTimestamp: Long, durationSeconds: Int): Boolean {
@@ -732,14 +767,12 @@ class MedtronicHistoryData @Inject constructor(
     /**
      * findDbEntry - finds Db entries in database, while theoretically this should have same dateTime they
      * don't. Entry on pump is few seconds before treatment in AAPS, and on manual boluses on pump there
-     * is no treatment at all. For now we look fro tratment that was from 0s - 1m59s within pump entry.
+     * is no treatment at all. For now we look fro treatment that was from 0s - 1m59s within pump entry.
      *
      * @param treatment          Pump Entry
-     * @param entriesFromHistory entries from history
+     * @param temporaryEntries entries from history
      * @return DbObject from AAPS (if found)
-     */
-
-    /**
+     *
      * Looks at all boluses that have temporaryId and find one that is correct for us (if such entry exists)
      */
     private fun findDbEntry(treatment: PumpHistoryEntry, temporaryEntries: MutableList<PumpDbEntry>): PumpDbEntry? {
@@ -754,7 +787,7 @@ class MedtronicHistoryData @Inject constructor(
         this.pumpTime?.let { proposedTime += (it.timeDifference * 1000) }
 
         val proposedTimeDiff: LongArray = longArrayOf(proposedTime - (2 * 60 * 1000), proposedTime + (2L * 60L * 1000L))
-        val tempEntriesList: MutableList<info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry> = mutableListOf()
+        val tempEntriesList: MutableList<PumpDbEntry> = mutableListOf()
 
         for (temporaryEntry in temporaryEntries) {
             if (temporaryEntry.date > proposedTimeDiff[0] && temporaryEntry.date < proposedTimeDiff[1]) {
@@ -776,7 +809,7 @@ class MedtronicHistoryData @Inject constructor(
                     sec = 59
                 }
                 val diff = sec * 1000
-                val outList: MutableList<info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry> = mutableListOf()
+                val outList = mutableListOf<PumpDbEntry>()
                 for (treatment1 in tempEntriesList) {
                     if (treatment1.date > proposedTime - diff && treatment1.date < proposedTime + diff) {
                         outList.add(treatment1)
@@ -846,7 +879,7 @@ class MedtronicHistoryData @Inject constructor(
                 // full resume suspends (S R S R)
                 filtered2Items.addAll(filteredItems)
             } else if (filteredItems.size % 2 == 0 && filteredItems[0].entryType === PumpHistoryEntryType.SuspendPump) {
-                // not full suspends, need to retrive one more record and discard first one (R S R S) -> ([S] R S R [xS])
+                // not full suspends, need to retrieve one more record and discard first one (R S R S) -> ([S] R S R [xS])
                 filteredItems.removeAt(0)
                 val oneMoreEntryFromHistory = getOneMoreEntryFromHistory(PumpHistoryEntryType.SuspendPump)
                 if (oneMoreEntryFromHistory != null) {
@@ -873,12 +906,11 @@ class MedtronicHistoryData @Inject constructor(
             }
             if (filtered2Items.size > 0) {
                 sort(filtered2Items)
-                Collections.reverse(filtered2Items)
+                filtered2Items.reverse()
                 var i = 0
                 while (i < filtered2Items.size) {
                     val tbrProcess = TempBasalProcessDTO(
                         itemOne = filtered2Items[i],
-                        processOperation = TempBasalProcessDTO.Operation.Add,
                         aapsLogger = aapsLogger,
                         objectType = TempBasalProcessDTO.ObjectType.Suspend)
 
@@ -956,7 +988,6 @@ class MedtronicHistoryData @Inject constructor(
         if (items.size > 0) {
             val tbrProcess = TempBasalProcessDTO(
                 itemOne = items[items.size - 1],
-                processOperation = TempBasalProcessDTO.Operation.Add,
                 aapsLogger = aapsLogger,
                 objectType = TempBasalProcessDTO.ObjectType.Suspend)
 
@@ -972,7 +1003,6 @@ class MedtronicHistoryData @Inject constructor(
         if (items.size > 0) {
             val tbrProcess = TempBasalProcessDTO(
                 itemOne = items[0],
-                processOperation = TempBasalProcessDTO.Operation.Add,
                 aapsLogger = aapsLogger,
                 objectType = TempBasalProcessDTO.ObjectType.Suspend)
 
@@ -989,7 +1019,7 @@ class MedtronicHistoryData @Inject constructor(
 
     private fun getOneMoreEntryFromHistory(entryType: PumpHistoryEntryType): PumpHistoryEntry? {
         val filteredItems: List<PumpHistoryEntry?> = getFilteredItems(allHistory, entryType)
-        return if (filteredItems.size == 0) null else filteredItems[0]
+        return if (filteredItems.isEmpty()) null else filteredItems[0]
     }
 
     private fun filterTDDs(tdds: MutableList<PumpHistoryEntry>): MutableList<PumpHistoryEntry> {
@@ -1002,8 +1032,8 @@ class MedtronicHistoryData @Inject constructor(
         return if (tddsOut.size == 0) tdds else tddsOut
     }
 
-    private fun tryToGetByLocalTime(atechDateTime: Long): Long {
-        return DateTimeUtil.toMillisFromATD(atechDateTime)
+    private fun tryToGetByLocalTime(aTechDateTime: Long): Long {
+        return DateTimeUtil.toMillisFromATD(aTechDateTime)
     }
 
     private fun getTDDType(): PumpHistoryEntryType {
@@ -1028,7 +1058,7 @@ class MedtronicHistoryData @Inject constructor(
     fun hasBasalProfileChanged(): Boolean {
         val filteredItems: List<PumpHistoryEntry?> = getFilteredItems(PumpHistoryEntryType.ChangeBasalProfile_NewProfile)
         aapsLogger.debug(LTag.PUMP, "hasBasalProfileChanged. Items: " + gson.toJson(filteredItems))
-        return filteredItems.size > 0
+        return filteredItems.isNotEmpty()
     }
 
     fun processLastBasalProfileChange(pumpType: PumpType, mdtPumpStatus: MedtronicPumpStatus) {
@@ -1071,19 +1101,19 @@ class MedtronicHistoryData @Inject constructor(
     }
 
     private fun preProcessTBRs(TBRs_Input: MutableList<PumpHistoryEntry>): MutableList<PumpHistoryEntry> {
-        val TBRs: MutableList<PumpHistoryEntry> = mutableListOf()
+        val tbrs: MutableList<PumpHistoryEntry> = mutableListOf()
         val map: MutableMap<String?, PumpHistoryEntry?> = HashMap()
         for (pumpHistoryEntry in TBRs_Input) {
             if (map.containsKey(pumpHistoryEntry.DT)) {
                 medtronicPumpHistoryDecoder.decodeTempBasal(map[pumpHistoryEntry.DT]!!, pumpHistoryEntry)
                 pumpHistoryEntry.setEntryType(medtronicUtil.medtronicPumpModel, PumpHistoryEntryType.TempBasalCombined)
-                TBRs.add(pumpHistoryEntry)
+                tbrs.add(pumpHistoryEntry)
                 map.remove(pumpHistoryEntry.DT)
             } else {
                 map[pumpHistoryEntry.DT] = pumpHistoryEntry
             }
         }
-        return TBRs
+        return tbrs
     }
 
     private fun getFilteredItems(entryTypes: Set<PumpHistoryEntryType>?): MutableList<PumpHistoryEntry> {
@@ -1100,7 +1130,7 @@ class MedtronicHistoryData @Inject constructor(
         } else {
             val filteredItems: List<PumpHistoryEntry?> = getFilteredItems(entryTypes)
             aapsLogger.debug(LTag.PUMP, "Items: $filteredItems")
-            filteredItems.size > 0
+            filteredItems.isNotEmpty()
         }
     }
 
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt
index 4a995855086..92eee8f170b 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt
@@ -9,10 +9,10 @@ import org.joda.time.LocalDateTime
 class RLHistoryItemMedtronic(private val medtronicCommandType: MedtronicCommandType) :
     RLHistoryItem(LocalDateTime(), RLHistoryItemSource.MedtronicCommand, RileyLinkTargetDevice.MedtronicPump) {
 
-    override fun getDescription(resourceHelper: ResourceHelper): String {
+    override fun getDescription(rh: ResourceHelper): String {
         return if (RLHistoryItemSource.MedtronicCommand == source) {
             medtronicCommandType.name
-        } else super.getDescription(resourceHelper)
+        } else super.getDescription(rh)
     }
 
 }
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt
index fcc7e719968..3c489345524 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt
@@ -91,6 +91,9 @@ class TempBasalPair : TempBasalPair {
     val isCancelTBR: Boolean
         get() = MedtronicUtil.isSame(insulinRate, 0.0) && durationMinutes == 0
 
+    val isZeroTBR: Boolean
+        get() = MedtronicUtil.isSame(insulinRate, 0.0) && durationMinutes != 0
+
     val description: String
         get() {
             if (isCancelTBR) {
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt
index a0ce5241de7..b4b3b6cefbf 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt
@@ -4,9 +4,9 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
+import java.lang.StringBuilder
 
 class TempBasalProcessDTO constructor(var itemOne: PumpHistoryEntry,
-                                      var processOperation: Operation = Operation.None,
                                       var aapsLogger: AAPSLogger,
                                       var objectType: ObjectType = ObjectType.TemporaryBasal) {
 
@@ -21,8 +21,6 @@ class TempBasalProcessDTO constructor(var itemOne: PumpHistoryEntry,
     var itemOneTbr: TempBasalPair? = null
     var itemTwoTbr: TempBasalPair? = null
 
-    var cancelPresent: Boolean = false
-
     val atechDateTime: Long
         get() = itemOne.atechDateTime
 
@@ -31,26 +29,26 @@ class TempBasalProcessDTO constructor(var itemOne: PumpHistoryEntry,
 
     val durationAsSeconds: Int
         get() {
-            aapsLogger.debug(LTag.PUMP, "durationAsSeconds: [objectType=$objectType]")
+            //aapsLogger.debug(LTag.PUMP, "durationAsSeconds: [objectType=$objectType]")
             if (objectType == ObjectType.TemporaryBasal) {
                 if (itemTwo == null) {
                     if (itemOneTbr != null) {
-                        aapsLogger.debug("TemporaryBasalPair - itemOneSingle: $itemOneTbr")
+                        //aapsLogger.debug("TemporaryBasalPair - itemOneSingle: $itemOneTbr")
                         return itemOneTbr!!.durationMinutes * 60
                     } else {
-                        aapsLogger.error("Couldn't find TempBasalPair in entry: $itemOne")
+                        //aapsLogger.error("Couldn't find TempBasalPair in entry: $itemOne")
                         return 0
                     }
                 } else {
-                    aapsLogger.debug(LTag.PUMP, "Found 2 items for duration: itemOne=$itemOne, itemTwo=$itemTwo")
+                    //aapsLogger.debug(LTag.PUMP, "Found 2 items for duration: itemOne=$itemOne, itemTwo=$itemTwo")
                     val secondsDiff = DateTimeUtil.getATechDateDiferenceAsSeconds(itemOne.atechDateTime, itemTwo!!.atechDateTime)
-                    aapsLogger.debug(LTag.PUMP, "Difference in seconds: $secondsDiff")
+                    //aapsLogger.debug(LTag.PUMP, "Difference in seconds: $secondsDiff")
                     return secondsDiff
                 }
             } else {
-                aapsLogger.debug(LTag.PUMP, "Found 2 items for duration (in SuspendMode): itemOne=$itemOne, itemTwo=$itemTwo")
+                //aapsLogger.debug(LTag.PUMP, "Found 2 items for duration (in SuspendMode): itemOne=$itemOne, itemTwo=$itemTwo")
                 val secondsDiff = DateTimeUtil.getATechDateDiferenceAsSeconds(itemOne.atechDateTime, itemTwo!!.atechDateTime)
-                aapsLogger.debug(LTag.PUMP, "Difference in seconds: $secondsDiff")
+                //aapsLogger.debug(LTag.PUMP, "Difference in seconds: $secondsDiff")
                 return secondsDiff
             }
         }
@@ -61,8 +59,31 @@ class TempBasalProcessDTO constructor(var itemOne: PumpHistoryEntry,
         }
     }
 
+    fun toTreatmentString(): String {
+        val stringBuilder = StringBuilder()
+
+        stringBuilder.append(itemOne.DT)
+
+        if (itemTwo!=null) {
+            stringBuilder.append(" - ")
+            stringBuilder.append(itemTwo!!.DT)
+        }
+
+        var dur = durationAsSeconds
+
+        stringBuilder.append("  " + durationAsSeconds + " s (" + durationAsSeconds/60 + ")")
+
+        if (itemTwoTbr!=null) {
+            stringBuilder.append("  " + itemOneTbr!!.insulinRate + " / " + itemTwoTbr!!.insulinRate)
+        } else {
+            stringBuilder.append("  " + itemOneTbr!!.insulinRate)
+        }
+
+        return stringBuilder.toString()
+    }
+
     override fun toString(): String {
-        return "ItemOne: $itemOne, ItemTwo: $itemTwo, Duration: $durationAsSeconds, Operation: $processOperation, ObjectType: $objectType"
+        return "ItemOne: $itemOne, ItemTwo: $itemTwo, Duration: $durationAsSeconds, ObjectType: $objectType"
     }
 
     enum class Operation {
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt
index 492b5b9ddb8..f78bc4ad356 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt
@@ -23,7 +23,7 @@ import javax.inject.Inject
 class MedtronicHistoryActivity : DaggerActivity() {
 
     @Inject lateinit var medtronicHistoryData: MedtronicHistoryData
-    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rh: ResourceHelper
 
     lateinit var historyTypeSpinner: Spinner
     lateinit var statusView: TextView
@@ -96,7 +96,7 @@ class MedtronicHistoryActivity : DaggerActivity() {
         recyclerViewAdapter = RecyclerViewAdapter(filteredHistoryList)
         recyclerView.adapter = recyclerViewAdapter
         statusView.visibility = View.GONE
-        typeListFull = getTypeList(PumpHistoryEntryGroup.getTranslatedList(resourceHelper))
+        typeListFull = getTypeList(PumpHistoryEntryGroup.getTranslatedList(rh))
         val spinnerAdapter = ArrayAdapter(this, R.layout.spinner_centered, typeListFull)
         historyTypeSpinner.adapter = spinnerAdapter
         historyTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt
index 109ae89acda..0351a4c3914 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt
@@ -1,12 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.driver
 
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice
+import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.BasalProfileStatus
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
@@ -21,9 +22,9 @@ import javax.inject.Singleton
  * Created by andy on 4/28/18.
  */
 @Singleton
-class MedtronicPumpStatus @Inject constructor(private val resourceHelper: ResourceHelper,
+class MedtronicPumpStatus @Inject constructor(private val rh: ResourceHelper,
                                               private val sp: SP,
-                                              private val rxBus: RxBusWrapper,
+                                              private val rxBus: RxBus,
                                               private val rileyLinkUtil: RileyLinkUtil
 ) : info.nightscout.androidaps.plugins.pump.common.data.PumpStatus(PumpType.MEDTRONIC_522_722) {
 
@@ -32,7 +33,8 @@ class MedtronicPumpStatus @Inject constructor(private val resourceHelper: Resour
     var pumpFrequency: String? = null
     var maxBolus: Double? = null
     var maxBasal: Double? = null
-    var runningTBR: info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry? = null
+    var runningTBR: PumpDbEntryTBR? = null
+    var runningTBRWithTemp: PumpDbEntryTBR? = null
 
     // statuses
     var pumpDeviceState = PumpDeviceState.NeverContacted
@@ -105,7 +107,7 @@ class MedtronicPumpStatus @Inject constructor(private val resourceHelper: Resour
     fun getBatteryTypeByDescription(batteryTypeStr: String?): BatteryType? {
         if (batteryTypeByDescMap.size == 0) {
             for (value in BatteryType.values()) {
-                batteryTypeByDescMap[resourceHelper.gs(value.description)] = value
+                batteryTypeByDescMap[rh.gs(value.description)] = value
             }
         }
         return if (batteryTypeByDescMap.containsKey(batteryTypeStr)) {
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt
index 30d7f123dfb..ee888982273 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt
@@ -69,10 +69,10 @@ class RileyLinkMedtronicService  // This empty constructor must be kept, otherwi
      * If you have customized RileyLinkServiceData you need to override this
      */
     override fun initRileyLinkServiceData() {
-        frequencies = arrayOf(resourceHelper.gs(R.string.key_medtronic_pump_frequency_us_ca),
-            resourceHelper.gs(R.string.key_medtronic_pump_frequency_worldwide))
-        // frequencies[0] = resourceHelper.gs(R.string.key_medtronic_pump_frequency_us_ca)
-        // frequencies[1] = resourceHelper.gs(R.string.key_medtronic_pump_frequency_worldwide)
+        frequencies = arrayOf(rh.gs(R.string.key_medtronic_pump_frequency_us_ca),
+            rh.gs(R.string.key_medtronic_pump_frequency_worldwide))
+        // frequencies[0] = rh.gs(R.string.key_medtronic_pump_frequency_us_ca)
+        // frequencies[1] = rh.gs(R.string.key_medtronic_pump_frequency_worldwide)
         rileyLinkServiceData.targetDevice = RileyLinkTargetDevice.MedtronicPump
         setPumpIDString(sp.getString(MedtronicConst.Prefs.PumpSerial, "000000"))
 
@@ -138,11 +138,11 @@ class RileyLinkMedtronicService  // This empty constructor must be kept, otherwi
             medtronicPumpStatus.errorDescription = "-"
             val serialNr = sp.getStringOrNull(MedtronicConst.Prefs.PumpSerial, null)
             if (serialNr == null) {
-                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_serial_not_set)
+                medtronicPumpStatus.errorDescription = rh.gs(R.string.medtronic_error_serial_not_set)
                 return false
             } else {
                 if (!serialNr.matches(regexSN.toRegex())) {
-                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_serial_invalid)
+                    medtronicPumpStatus.errorDescription = rh.gs(R.string.medtronic_error_serial_invalid)
                     return false
                 } else {
                     if (serialNr != medtronicPumpStatus.serialNumber) {
@@ -153,12 +153,12 @@ class RileyLinkMedtronicService  // This empty constructor must be kept, otherwi
             }
             val pumpTypePref = sp.getStringOrNull(MedtronicConst.Prefs.PumpType, null)
             if (pumpTypePref == null) {
-                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_type_not_set)
+                medtronicPumpStatus.errorDescription = rh.gs(R.string.medtronic_error_pump_type_not_set)
                 return false
             } else {
                 val pumpTypePart = pumpTypePref.substring(0, 3)
                 if (!pumpTypePart.matches("[0-9]{3}".toRegex())) {
-                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_type_invalid)
+                    medtronicPumpStatus.errorDescription = rh.gs(R.string.medtronic_error_pump_type_invalid)
                     return false
                 } else {
                     val pumpType = medtronicPumpStatus.medtronicPumpMap[pumpTypePart]!!
@@ -170,11 +170,11 @@ class RileyLinkMedtronicService  // This empty constructor must be kept, otherwi
             }
             val pumpFrequency = sp.getStringOrNull(MedtronicConst.Prefs.PumpFrequency, null)
             if (pumpFrequency == null) {
-                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_frequency_not_set)
+                medtronicPumpStatus.errorDescription = rh.gs(R.string.medtronic_error_pump_frequency_not_set)
                 return false
             } else {
                 if (pumpFrequency != frequencies[0] && pumpFrequency != frequencies[1]) {
-                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_frequency_invalid)
+                    medtronicPumpStatus.errorDescription = rh.gs(R.string.medtronic_error_pump_frequency_invalid)
                     return false
                 } else {
                     medtronicPumpStatus.pumpFrequency = pumpFrequency
@@ -189,11 +189,11 @@ class RileyLinkMedtronicService  // This empty constructor must be kept, otherwi
             val rileyLinkAddress = sp.getStringOrNull(RileyLinkConst.Prefs.RileyLinkAddress, null)
             if (rileyLinkAddress == null) {
                 aapsLogger.debug(LTag.PUMP, "RileyLink address invalid: null")
-                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_rileylink_address_invalid)
+                medtronicPumpStatus.errorDescription = rh.gs(R.string.medtronic_error_rileylink_address_invalid)
                 return false
             } else {
                 if (!rileyLinkAddress.matches(regexMac.toRegex())) {
-                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_rileylink_address_invalid)
+                    medtronicPumpStatus.errorDescription = rh.gs(R.string.medtronic_error_rileylink_address_invalid)
                     aapsLogger.debug(LTag.PUMP, "RileyLink address invalid: %s", rileyLinkAddress)
                 } else {
                     if (rileyLinkAddress != this.rileyLinkAddress) {
@@ -216,7 +216,7 @@ class RileyLinkMedtronicService  // This empty constructor must be kept, otherwi
             }
             val encodingTypeStr = sp.getStringOrNull(MedtronicConst.Prefs.Encoding, null)
                 ?: return false
-            val newEncodingType = RileyLinkEncodingType.getByDescription(encodingTypeStr, resourceHelper)
+            val newEncodingType = RileyLinkEncodingType.getByDescription(encodingTypeStr, rh)
             if (encodingType == null) {
                 encodingType = newEncodingType
             } else if (encodingType != newEncodingType) {
@@ -231,7 +231,7 @@ class RileyLinkMedtronicService  // This empty constructor must be kept, otherwi
             }
 
             //String bolusDebugEnabled = sp.getStringOrNull(MedtronicConst.Prefs.BolusDebugEnabled, null);
-            //boolean bolusDebug = bolusDebugEnabled != null && bolusDebugEnabled.equals(resourceHelper.gs(R.string.common_on));
+            //boolean bolusDebug = bolusDebugEnabled != null && bolusDebugEnabled.equals(rh.gs(R.string.common_on));
             //MedtronicHistoryData.doubleBolusDebug = bolusDebug;
             rileyLinkServiceData.showBatteryLevel = sp.getBoolean(RileyLinkConst.Prefs.ShowBatteryLevel, false)
             reconfigureService(forceRileyLinkAddressRenewal)
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt
index 41fe26d79fa..612c63f4d25 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.util
 import com.google.gson.GsonBuilder
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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
@@ -33,7 +33,7 @@ import kotlin.experimental.or
 @Singleton
 class MedtronicUtil @Inject constructor(
     private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val rileyLinkUtil: RileyLinkUtil,
     private val medtronicPumpStatus: MedtronicPumpStatus
 ) {
@@ -93,23 +93,23 @@ class MedtronicUtil @Inject constructor(
         return ByteUtil.concat(input.size.toByte(), input)
     }
 
-    fun sendNotification(notificationType: MedtronicNotificationType, resourceHelper: ResourceHelper, rxBus: RxBusWrapper) {
+    fun sendNotification(notificationType: MedtronicNotificationType, rh: ResourceHelper, rxBus: RxBus) {
         val notification = Notification( //
             notificationType.notificationType,  //
-            resourceHelper.gs(notificationType.resourceId),  //
+            rh.gs(notificationType.resourceId),  //
             notificationType.notificationUrgency)
         rxBus.send(EventNewNotification(notification))
     }
 
-    fun sendNotification(notificationType: MedtronicNotificationType, resourceHelper: ResourceHelper, rxBus: RxBusWrapper, vararg parameters: Any?) {
+    fun sendNotification(notificationType: MedtronicNotificationType, rh: ResourceHelper, rxBus: RxBus, vararg parameters: Any?) {
         val notification = Notification( //
             notificationType.notificationType,  //
-            resourceHelper.gs(notificationType.resourceId, *parameters),  //
+            rh.gs(notificationType.resourceId, *parameters),  //
             notificationType.notificationUrgency)
         rxBus.send(EventNewNotification(notification))
     }
 
-    fun dismissNotification(notificationType: MedtronicNotificationType, rxBus: RxBusWrapper) {
+    fun dismissNotification(notificationType: MedtronicNotificationType, rxBus: RxBus) {
         rxBus.send(EventDismissNotification(notificationType.notificationType))
     }
 
diff --git a/medtronic/src/main/res/values-bg-rBG/strings.xml b/medtronic/src/main/res/values-bg-rBG/strings.xml
index fcb54883c46..0bc2bcc785b 100644
--- a/medtronic/src/main/res/values-bg-rBG/strings.xml
+++ b/medtronic/src/main/res/values-bg-rBG/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (батерия)</string>
     <string name="medtronic_bolus_debugging">Болус/Корекция подробно</string>
     <!-- MDT Fragment -->
+    <string name="rl_battery_label">Батерия на RileyLink</string>
     <!-- MDT Errors -->
     <string name="medtronic_errors">Грешки</string>
     <string name="medtronic_error_serial_not_set">Сериен номер не е зададен.</string>
diff --git a/medtronic/src/main/res/values-es-rES/strings.xml b/medtronic/src/main/res/values-es-rES/strings.xml
index bb5eb21200d..e6a898ff177 100644
--- a/medtronic/src/main/res/values-es-rES/strings.xml
+++ b/medtronic/src/main/res/values-es-rES/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (vista extendida)</string>
     <string name="medtronic_bolus_debugging">Bolos/Depuración de Tratamientos</string>
     <!-- MDT Fragment -->
+    <string name="rl_battery_label">Batería RileyLink</string>
     <!-- MDT Errors -->
     <string name="medtronic_errors">Errores</string>
     <string name="medtronic_error_serial_not_set">Nº serie no establecido.</string>
@@ -64,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Recuperar el historial - Página %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Recuperar el historial - Página %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Obtener la hora de la infusora</string>
+    <string name="medtronic_cmd_desc_set_time">Establecer hora de la bomba</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Comprobar Estado Batería</string>
     <string name="medtronic_cmd_desc_get_settings">Obtener la configuración</string>
     <string name="medtronic_cmd_desc_get_model">Obtener el modelo de la infusora</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Obtener el perfil basal</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Establecer el perfil basal</string>
     <string name="medtronic_cmd_desc_get_tbr">Obtener la basal temporal</string>
     <string name="medtronic_cmd_desc_set_tbr">Establecer la basal temporal</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Cancelar base temporal</string>
     <string name="medtronic_cmd_desc_set_bolus">Fijar Bolo</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Comprobar Insulina Restante</string>
     <string name="medtronic_pump_status_pump_unreachable">Infusora no alcanzable</string>
     <string name="medtronic_warning">Alerta</string>
     <!-- medtronic_warning -->
@@ -84,4 +89,5 @@
     <string name="pump_time_updated">Hora del infusor actualizada</string>
     <string name="set_neutral_temps_title">Establecer basales temporales neutras</string>
     <string name="set_neutral_temps_summary">Si está activado, cancelará un basal temporal antes del final de cada hora. Este método puede ayudar a evitar que algunas bombas pitan/vibran al final de la hora.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min restantes)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-hu-rHU/strings.xml b/medtronic/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..7dd05e59656
--- /dev/null
+++ b/medtronic/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Fragment -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <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_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+</resources>
diff --git a/medtronic/src/main/res/values-nl-rNL/strings.xml b/medtronic/src/main/res/values-nl-rNL/strings.xml
index f6a8644b043..94fa8a6514b 100644
--- a/medtronic/src/main/res/values-nl-rNL/strings.xml
+++ b/medtronic/src/main/res/values-nl-rNL/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (Uitgebreide weergave)</string>
     <string name="medtronic_bolus_debugging">Bolus/Behandelingen Debuggen</string>
     <!-- MDT Fragment -->
+    <string name="rl_battery_label">Batterij van de rileylink</string>
     <!-- MDT Errors -->
     <string name="medtronic_errors">Foutmeldingen</string>
     <string name="medtronic_error_serial_not_set">Serie# niet ingesteld.</string>
@@ -64,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Ophalen Geschiedenis - Pagina %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Ophalen Geschiedenis - Pagina %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Haal Pomp Tijd op</string>
+    <string name="medtronic_cmd_desc_set_time">Stel de Pomp Tijd in</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Haal batterijstatus op</string>
     <string name="medtronic_cmd_desc_get_settings">Ophalen Instellingen</string>
     <string name="medtronic_cmd_desc_get_model">Ophalen Pomp Model</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Ophalen Basaal Profiel</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Instellen Basaal Profiel</string>
     <string name="medtronic_cmd_desc_get_tbr">Ophalen Tijdelijke Basaal</string>
     <string name="medtronic_cmd_desc_set_tbr">Instellen Tijdelijke Basaal</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Tijdelijk basaal annuleren</string>
     <string name="medtronic_cmd_desc_set_bolus">Instellen Bolus</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Haal Resterende Insuline op</string>
     <string name="medtronic_pump_status_pump_unreachable">Pomp niet bereikbaar</string>
     <string name="medtronic_warning">Waarschuwing</string>
     <!-- medtronic_warning -->
@@ -84,4 +89,5 @@
     <string name="pump_time_updated">Pomp tijd bijgewerkt</string>
     <string name="set_neutral_temps_title">Stel neutraal tijdelijk basaal in</string>
     <string name="set_neutral_temps_summary">Als deze optie is ingeschakeld, wordt een tijdelijk basaal geannuleerd vlak voor het einde van elk uur. Handige optie voor sommige pompen die elk uur piepen/vibreren zolang een tijdelijk basaal actief is.</string>
+    <string name="mdt_tbr_remaining">%1$.1f E/u (%2$d min resterend)</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 b7f68062f65..754ad11ea88 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 Fragment -->
+    <string name="rl_battery_label">Bateria RileyLink</string>
     <!-- MDT Errors -->
     <string name="medtronic_errors">Błędy</string>
     <string name="medtronic_error_serial_not_set">Numer seryjny # nie ustawiony.</string>
@@ -64,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Pobierz historię - strona %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Pobierz historię - strona %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Pobierz czas pompy</string>
+    <string name="medtronic_cmd_desc_set_time">Ustaw czas pompy</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Pobierz status baterii</string>
     <string name="medtronic_cmd_desc_get_settings">Pobierz ustawienia</string>
     <string name="medtronic_cmd_desc_get_model">Pobierz model pompy</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Pobierz profil dawki bazowej</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Ustaw profil dawki bazowej</string>
     <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_cancel_tbr">Anuluj tymczasową dawkę bazową</string>
     <string name="medtronic_cmd_desc_set_bolus">Ustaw bolus</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Pobierz ile pozostało insuliny</string>
     <string name="medtronic_pump_status_pump_unreachable">Pompa nieosiągalna</string>
     <string name="medtronic_warning">Ostrzeżenie</string>
     <!-- medtronic_warning -->
@@ -84,4 +89,5 @@
     <string name="pump_time_updated">Czas pompy uaktualniony</string>
     <string name="set_neutral_temps_title">Ustawiaj neutralne bazy tymczasowe</string>
     <string name="set_neutral_temps_summary">Jeśli ta opcja jest włączona, anuluje tymczasową wartość bazową przed końcem każdej godziny. Może to pomóc wyciszyć alarmy/wibracje związane z TBR występujące co godzinę w niektórych pompach.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/h (pozostało %2$d min)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-ro-rRO/strings.xml b/medtronic/src/main/res/values-ro-rRO/strings.xml
index 952eb0746b4..974c3f6e8d4 100644
--- a/medtronic/src/main/res/values-ro-rRO/strings.xml
+++ b/medtronic/src/main/res/values-ro-rRO/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (Afișare extinsă)</string>
     <string name="medtronic_bolus_debugging">Depanare Bolus/Tratamente</string>
     <!-- MDT Fragment -->
+    <string name="rl_battery_label">Baterie RileyLink</string>
     <!-- MDT Errors -->
     <string name="medtronic_errors">Erori</string>
     <string name="medtronic_error_serial_not_set">Număr serial nesetat.</string>
@@ -64,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Preia istoricul - Pagina %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Preia istoricul - Pagina %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Preia timpul din pompă</string>
+    <string name="medtronic_cmd_desc_set_time">Setează timpul pe pompa</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Obține starea bateriei</string>
     <string name="medtronic_cmd_desc_get_settings">Preia setările</string>
     <string name="medtronic_cmd_desc_get_model">Preia modelul de pompă</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Preia profilul bazalelor</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Setează profilul bazalelor</string>
     <string name="medtronic_cmd_desc_get_tbr">Preia bazala temporară</string>
     <string name="medtronic_cmd_desc_set_tbr">Setează bazala temporară</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Anulează Bazala Temporară</string>
     <string name="medtronic_cmd_desc_set_bolus">Setează bolusul</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Obţine insulina rămasă</string>
     <string name="medtronic_pump_status_pump_unreachable">Pompă indisponibilă</string>
     <string name="medtronic_warning">Atenție</string>
     <!-- medtronic_warning -->
@@ -84,4 +89,5 @@
     <string name="pump_time_updated">Timpul din pompă a fost actualizat</string>
     <string name="set_neutral_temps_title">Setați bazale temporare neutre</string>
     <string name="set_neutral_temps_summary">Dacă este activată, va anula o bazală temporară înainte de sfârșitul fiecărei ore. Aceasta metoda poate ajuta la oprirea vibrațiilor/bipurilor orare pe anumite pompe.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min ramase)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-tr-rTR/strings.xml b/medtronic/src/main/res/values-tr-rTR/strings.xml
index 9e838d93136..b6cbb0dd8ee 100644
--- a/medtronic/src/main/res/values-tr-rTR/strings.xml
+++ b/medtronic/src/main/res/values-tr-rTR/strings.xml
@@ -1,9 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Medtronic için pompa entegrasyonu, RileyLink cihazı ve özel Pompa Modeli gerektirir</string>
     <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Pompa Seri Numarası</string>
+    <string name="medtronic_pump_type">Pompa Tipi</string>
+    <string name="medtronic_pump_frequency">Pompa Frekansı</string>
+    <string name="medtronic_pump_bolus_delay">Bolus göndermeden önceki bekleme süresi (sn)</string>
+    <string name="medtronic_pump_max_bolus">Pompadaki Maks Bolus (U)</string>
+    <string name="medtronic_pump_max_basal">Pompadaki Maks Bazal (Ü/s)</string>
+    <string name="medtronic_pump_encoding">Medtronic Kodlama</string>
+    <string name="medtronic_pump_frequency_us_ca">ABD &amp; Kanada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Dünya geneli (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Yazılım 4b6b Kodlama</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Donanım 4b6b Kodlama</string>
+    <string name="medtronic_custom_action_wake_and_tune">Uyan ve Ayarla</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Bolus Bloğunu Temizle</string>
+    <string name="medtronic_custom_action_reset_rileylink">RileyLink Yapılandırmasını Sıfırla</string>
+    <string name="medtronic_pump_battery_select">Pil Türü (Güç Görünümü)</string>
+    <string name="medtronic_pump_battery_no">Seçilmedi (Basit görünüm)</string>
+    <string name="medtronic_pump_battery_alkaline">Alkali (Genişletilmiş görünüm)</string>
+    <string name="medtronic_pump_battery_lithium">Lityum (Genişletilmiş görünüm)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Genişletilmiş görünüm)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Genişletilmiş görünüm)</string>
+    <string name="medtronic_bolus_debugging">Bolus/Tedavilerde Hata Ayıklama</string>
     <!-- MDT Fragment -->
+    <string name="rl_battery_label">RileyLink Pili</string>
     <!-- MDT Errors -->
+    <string name="medtronic_errors">Hatalar</string>
+    <string name="medtronic_error_serial_not_set">Seri no # ayarlanmadı.</string>
+    <string name="medtronic_error_serial_invalid">Seri no # geçersiz.</string>
+    <string name="medtronic_error_pump_type_not_set">Pompa Tipi ayarlanmadı.</string>
+    <string name="medtronic_error_pump_type_invalid">Pompa Tipi desteklenmiyor.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Pompa Frekansı ayarlanmadı.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Pompa Frekansı desteklenmiyor.</string>
+    <string name="medtronic_error_rileylink_address_invalid">RileyLink Adresi geçersiz.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Algılanan pompa tipi, yapılandırılmış tiple aynı değil.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Bazal profiller/şablon ayarı pompada etkinleştirilmemiştir. Pompada etkinleştirin.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Pompada ayarlanan bazal profili yanlış (STD olmalıdır).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Pompada yanlış TBR (geçici bazal oranı) tipi ayarlanmış (Mutlak olmalıdır).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Pompada Yanlış Maksimum Bolus ayarlanmış (%1$.2f olmalıdır).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Pompada Yanlış Maksimum Bazal ayarlanmış (%1$.2f olmalıdır).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Çalıştırmak mümkün değil.\n\n Bu işlemi kullanmadan önce Medtronic Pompayı yapılandırmanız gerekir.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">24 saatten fazla zaman değişikliği istendi.</string>
     <!-- MDT History -->
     <!--    <string name="medtronic_history_group_basal">Basals</string>-->
     <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
@@ -11,9 +50,44 @@
     <!--    <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 Pompa Geçmişi</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">Pompa üzerinde ayarlandıktan sonra Bolus\'u iptal ettiniz. Medtronic Pompa iptali desteklemediğinden, elle iptal etmeniz gerekecektir. Pompayı Askıya Al moduna getirin ve ardından Devam et\'e basın. (yine de iptal etmek istiyorsanız). Uygulama, bir sonraki güncellemede (5 dakikadan daha kısa sürede) değişiklikleri alacaktır.</string>
+    <string name="medtronic_cmd_cant_read_tbr">Mevcut TBR (geçici bazal oranı) okunamadı.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Mevcut TBR (geçici bazal oranı) iptal edilemedi. İşlem durduruldu.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Profil kümesi başarısız oldu, çünkü aşağıdaki şablonlar çok büyük bazal orana sahip: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus gönderilemedi.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus gönderilemedi, çünkü mevcut insülin miktarı (%1$.2f) gereken bolustan (%2$.2f) az.</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR (geçici bazal oranı) ayarlanamadı.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Mevcut TBR (geçici bazal oranı) iptal edilemedi.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Bazal profil ayarlanamadı.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Bazal profil aynı olduğu için tekrar ayarlanmayacaktır.</string>
+    <string name="medtronic_cmd_desc_get_history">Geçmiş Alınıyor - Sayfa %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Geçmiş Alınıyor - Sayfa %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Pompa zamanı alınıyor</string>
+    <string name="medtronic_cmd_desc_set_time">Pompa Zamanını Ayarla</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Pil Durumu alınıyor</string>
+    <string name="medtronic_cmd_desc_get_settings">Ayarlar alınıyor</string>
+    <string name="medtronic_cmd_desc_get_model">Pompa Modeli alınıyor</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Bazal Profili alınıyor</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Bazal Profili Ayarla</string>
+    <string name="medtronic_cmd_desc_get_tbr">Geçici Bazal alınıyor</string>
+    <string name="medtronic_cmd_desc_set_tbr">Geçici Bazalı Ayarla</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Geçici Bazal İptal Et</string>
+    <string name="medtronic_cmd_desc_set_bolus">Bolusu Ayarla</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Kalan İnsülin alınıyor</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pompa\'ya ulaşılamıyor</string>
+    <string name="medtronic_warning">Uyarı</string>
     <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Şimdi</string>
     <!-- combo_pump_connected_now -->
+    <string name="ago">önce</string>
+    <string name="medtronic_notification_check_time_date">Pompa saati güncellemesi gerekli</string>
     <!-- combo_notification_check_time_date -->
+    <string name="common_on">Aç</string>
+    <string name="common_off">Kapa</string>
     <string name="pump_time_updated">Pompa zamanı güncellendi</string>
+    <string name="set_neutral_temps_title">Sık kullanılan Geçici Bazalları ayarla</string>
+    <string name="set_neutral_temps_summary">Etkinleştirilirse, her saatin sonunda geçici bazali iptal eder. Bu yöntem, bazı pompaların saatte bip sesini/titremesini durdurmaya yardımcı olabilir.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/sa (%2$d dk. kaldı)</string>
 </resources>
diff --git a/medtronic/src/main/res/xml/pref_medtronic.xml b/medtronic/src/main/res/xml/pref_medtronic.xml
index cdd786d1830..d0d3049afc4 100644
--- a/medtronic/src/main/res/xml/pref_medtronic.xml
+++ b/medtronic/src/main/res/xml/pref_medtronic.xml
@@ -98,7 +98,11 @@
             android:title="RileyLink Configuration">
             <intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEConfigActivity" />
         </Preference>
-
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_orange_use_scanning"
+            android:summary="@string/orange_use_scanning_level_summary"
+            android:title="@string/orange_use_scanning_level" />
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_riley_link_show_battery_level"
diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt
index bbb4fcea865..081d8f78ccb 100644
--- a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt
+++ b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RawHistoryPage
@@ -26,7 +26,7 @@ import org.mockito.Mock
 class MedtronicPumpHistoryDecoderUTest : TestBase() {
 
     @Mock lateinit var injector: HasAndroidInjector
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock(answer = Answers.RETURNS_DEEP_STUBS) lateinit var activePlugin: ActivePlugin
     @Mock lateinit var rileyLinkUtil: RileyLinkUtil
     @Mock lateinit var sp: SP
@@ -34,10 +34,10 @@ class MedtronicPumpHistoryDecoderUTest : TestBase() {
     private var medtronicPumpStatus: MedtronicPumpStatus? = null
     private var medtronicUtil: MedtronicUtil? = null
     private var decoder: MedtronicPumpHistoryDecoder? = null
-    var rxBusWrapper = RxBusWrapper(TestAapsSchedulers())
+    var rxBusWrapper = RxBus(TestAapsSchedulers(), aapsLogger)
     @Before fun setup() {
         medtronicPumpStatus =
-            MedtronicPumpStatus(resourceHelper, sp, rxBusWrapper, rileyLinkUtil)
+            MedtronicPumpStatus(rh, sp, rxBusWrapper, rileyLinkUtil)
         medtronicUtil =
             MedtronicUtil(aapsLogger, rxBusWrapper, rileyLinkUtil, medtronicPumpStatus!!)
         decoder = MedtronicPumpHistoryDecoder(aapsLogger, medtronicUtil!!, ByteUtil())
diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt
new file mode 100644
index 00000000000..4f9fef20c15
--- /dev/null
+++ b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt
@@ -0,0 +1,91 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data
+
+import java.lang.reflect.Type
+import com.google.gson.reflect.TypeToken
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.internal.LinkedTreeMap
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair
+import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.hamcrest.Matchers.notNullValue
+import org.junit.Assert.*
+
+import org.junit.Test
+import org.mockito.Mock
+import java.io.File
+import java.net.URL
+
+class MedtronicHistoryDataUTest : TestBase() {
+
+    @Mock lateinit var activePlugin: ActivePlugin
+    @Mock lateinit var medtronicUtil: MedtronicUtil
+    @Mock lateinit var medtronicPumpHistoryDecoder: MedtronicPumpHistoryDecoder
+    @Mock lateinit var medtronicPumpStatus: MedtronicPumpStatus
+    @Mock lateinit var pumpSync: PumpSync
+    @Mock lateinit var pumpSyncStorage: PumpSyncStorage
+    @Mock lateinit var sp: SP
+
+
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+
+        }
+    }
+
+
+
+    @Test
+    fun createTBRProcessList() {
+
+        var unitToTest = MedtronicHistoryData(packetInjector, aapsLogger, sp, activePlugin,
+        medtronicUtil,   medtronicPumpHistoryDecoder,
+        medtronicPumpStatus,
+        pumpSync,
+        pumpSyncStorage)
+
+
+        val gson = Gson()
+
+        val fileText = ClassLoader.getSystemResource("tbr_data.json").readText()
+
+        val listType: Type = object : TypeToken<MutableList<PumpHistoryEntry?>?>() {}.getType()
+        val yourClassList: MutableList<PumpHistoryEntry> = gson.fromJson(fileText, listType)
+
+        for (pumpHistoryEntry in yourClassList) {
+            val stringObject = pumpHistoryEntry.decodedData["Object"] as LinkedTreeMap<String,Object>
+
+            val rate : Double = stringObject.get("insulinRate") as Double
+            val durationMinutes: Double = stringObject.get("durationMinutes") as Double
+            val durationMinutesInt : Int = durationMinutes.toInt()
+
+            var  tmbPair = TempBasalPair(rate, false, durationMinutesInt)
+
+            pumpHistoryEntry.decodedData.remove("Object")
+            pumpHistoryEntry.addDecodedData("Object", tmbPair)
+        }
+
+        System.out.println("TBR Pre-Process List: " + gson.toJson(yourClassList))
+
+        val createTBRProcessList = unitToTest.createTBRProcessList(yourClassList)
+
+        System.out.println("TBR Process List: " + createTBRProcessList.size)
+
+        for (tempBasalProcessDTO in createTBRProcessList) {
+            System.out.println(tempBasalProcessDTO.toTreatmentString())
+        }
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/medtronic/src/test/resources/tbr_data.json b/medtronic/src/test/resources/tbr_data.json
new file mode 100644
index 00000000000..7e2aa44b849
--- /dev/null
+++ b/medtronic/src/test/resources/tbr_data.json
@@ -0,0 +1,1761 @@
+[{
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 01:35:08",
+	"atechDateTime": 20211031013508,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 01:39:47",
+	"atechDateTime": 20211031013947,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 01:39:49",
+	"atechDateTime": 20211031013949,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.1500000000000001,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 01:49:41",
+	"atechDateTime": 20211031014941,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 01:49:43",
+	"atechDateTime": 20211031014943,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.8,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 01:54:59",
+	"atechDateTime": 20211031015459,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 01:55:05",
+	"atechDateTime": 20211031015505,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 01:59:43",
+	"atechDateTime": 20211031015943,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:04:45",
+	"atechDateTime": 20211031020445,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.55,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:09:47",
+	"atechDateTime": 20211031020947,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:09:48",
+	"atechDateTime": 20211031020948,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.35000000000000003,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:14:56",
+	"atechDateTime": 20211031021456,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:14:57",
+	"atechDateTime": 20211031021457,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.3000000000000003,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:25:16",
+	"atechDateTime": 20211031022516,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:25:18",
+	"atechDateTime": 20211031022518,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.85,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:29:50",
+	"atechDateTime": 20211031022950,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:29:51",
+	"atechDateTime": 20211031022951,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.25,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:34:45",
+	"atechDateTime": 20211031023445,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:34:47",
+	"atechDateTime": 20211031023447,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.0500000000000003,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:45:16",
+	"atechDateTime": 20211031024516,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:45:18",
+	"atechDateTime": 20211031024518,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.75,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:50:16",
+	"atechDateTime": 20211031025016,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:50:18",
+	"atechDateTime": 20211031025018,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:54:45",
+	"atechDateTime": 20211031025445,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:54:46",
+	"atechDateTime": 20211031025446,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.75,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 02:59:47",
+	"atechDateTime": 20211031025947,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 03:05:16",
+	"atechDateTime": 20211031030516,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.85,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 03:10:07",
+	"atechDateTime": 20211031031007,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 03:10:08",
+	"atechDateTime": 20211031031008,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.05,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 03:15:11",
+	"atechDateTime": 20211031031511,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 03:15:13",
+	"atechDateTime": 20211031031513,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 03:35:16",
+	"atechDateTime": 20211031033516,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 03:35:18",
+	"atechDateTime": 20211031033518,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 3.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 03:49:50",
+	"atechDateTime": 20211031034950,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 03:49:52",
+	"atechDateTime": 20211031034952,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.35000000000000003,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 03:55:07",
+	"atechDateTime": 20211031035507,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 03:55:08",
+	"atechDateTime": 20211031035508,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.9000000000000004,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:00:16",
+	"atechDateTime": 20211031040016,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:04:45",
+	"atechDateTime": 20211031040445,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.2,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:09:47",
+	"atechDateTime": 20211031040947,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:09:49",
+	"atechDateTime": 20211031040949,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:14:44",
+	"atechDateTime": 20211031041444,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.7000000000000002,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:24:42",
+	"atechDateTime": 20211031042442,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:24:43",
+	"atechDateTime": 20211031042443,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.05,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:30:16",
+	"atechDateTime": 20211031043016,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:30:18",
+	"atechDateTime": 20211031043018,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.2,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:34:45",
+	"atechDateTime": 20211031043445,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:34:47",
+	"atechDateTime": 20211031043447,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.35,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:44:43",
+	"atechDateTime": 20211031044443,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:44:44",
+	"atechDateTime": 20211031044444,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.85,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:49:41",
+	"atechDateTime": 20211031044941,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:49:43",
+	"atechDateTime": 20211031044943,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.35,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:54:44",
+	"atechDateTime": 20211031045444,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:54:45",
+	"atechDateTime": 20211031045445,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.8,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 04:59:51",
+	"atechDateTime": 20211031045951,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:04:44",
+	"atechDateTime": 20211031050444,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.35,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:09:46",
+	"atechDateTime": 20211031050946,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:09:47",
+	"atechDateTime": 20211031050947,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 3.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:15:16",
+	"atechDateTime": 20211031051516,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:15:18",
+	"atechDateTime": 20211031051518,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.5,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:20:07",
+	"atechDateTime": 20211031052007,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:20:08",
+	"atechDateTime": 20211031052008,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:34:44",
+	"atechDateTime": 20211031053444,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.6,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:39:46",
+	"atechDateTime": 20211031053946,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:39:47",
+	"atechDateTime": 20211031053947,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:49:48",
+	"atechDateTime": 20211031054948,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:49:49",
+	"atechDateTime": 20211031054949,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.4000000000000004,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 05:59:45",
+	"atechDateTime": 20211031055945,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 06:05:43",
+	"atechDateTime": 20211031060543,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 06:10:14",
+	"atechDateTime": 20211031061014,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 06:10:15",
+	"atechDateTime": 20211031061015,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.25,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 06:35:13",
+	"atechDateTime": 20211031063513,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 06:35:15",
+	"atechDateTime": 20211031063515,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.35,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 06:50:13",
+	"atechDateTime": 20211031065013,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 06:50:14",
+	"atechDateTime": 20211031065014,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.15000000000000002,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 06:51:08",
+	"atechDateTime": 20211031065108,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 06:51:10",
+	"atechDateTime": 20211031065110,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.9000000000000001,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 06:54:45",
+	"atechDateTime": 20211031065445,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 06:54:47",
+	"atechDateTime": 20211031065447,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:00:15",
+	"atechDateTime": 20211031070015,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:04:46",
+	"atechDateTime": 20211031070446,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.35,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:14:56",
+	"atechDateTime": 20211031071456,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:14:58",
+	"atechDateTime": 20211031071458,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.35000000000000003,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:19:53",
+	"atechDateTime": 20211031071953,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:19:55",
+	"atechDateTime": 20211031071955,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:25:20",
+	"atechDateTime": 20211031072520,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:25:22",
+	"atechDateTime": 20211031072522,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:39:46",
+	"atechDateTime": 20211031073946,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:44:44",
+	"atechDateTime": 20211031074444,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:44:46",
+	"atechDateTime": 20211031074446,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 3.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:55:14",
+	"atechDateTime": 20211031075514,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 07:55:16",
+	"atechDateTime": 20211031075516,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:00:17",
+	"atechDateTime": 20211031080017,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:04:46",
+	"atechDateTime": 20211031080446,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.1,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:14:48",
+	"atechDateTime": 20211031081448,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:14:50",
+	"atechDateTime": 20211031081450,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.55,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:29:46",
+	"atechDateTime": 20211031082946,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:29:48",
+	"atechDateTime": 20211031082948,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.4000000000000004,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:40:27",
+	"atechDateTime": 20211031084027,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:40:28",
+	"atechDateTime": 20211031084028,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.8,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:49:46",
+	"atechDateTime": 20211031084946,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:49:48",
+	"atechDateTime": 20211031084948,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.85,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:56:11",
+	"atechDateTime": 20211031085611,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:56:13",
+	"atechDateTime": 20211031085613,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.35,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 08:56:26",
+	"atechDateTime": 20211031085626,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 09:00:49",
+	"atechDateTime": 20211031090049,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 3.6,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 09:04:43",
+	"atechDateTime": 20211031090443,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 09:04:44",
+	"atechDateTime": 20211031090444,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 09:15:16",
+	"atechDateTime": 20211031091516,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 09:15:18",
+	"atechDateTime": 20211031091518,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.05,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 09:19:47",
+	"atechDateTime": 20211031091947,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 09:19:49",
+	"atechDateTime": 20211031091949,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.25,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 09:30:02",
+	"atechDateTime": 20211031093002,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 09:30:04",
+	"atechDateTime": 20211031093004,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 60,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 09:54:44",
+	"atechDateTime": 20211031095444,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.0500000000000003,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 09:59:51",
+	"atechDateTime": 20211031095951,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:05:22",
+	"atechDateTime": 20211031100522,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.8,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:09:45",
+	"atechDateTime": 20211031100945,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:09:47",
+	"atechDateTime": 20211031100947,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.2000000000000002,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:24:48",
+	"atechDateTime": 20211031102448,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:24:49",
+	"atechDateTime": 20211031102449,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.5,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:30:19",
+	"atechDateTime": 20211031103019,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:30:20",
+	"atechDateTime": 20211031103020,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.6000000000000001,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:35:16",
+	"atechDateTime": 20211031103516,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:35:17",
+	"atechDateTime": 20211031103517,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 3.4000000000000004,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:41:00",
+	"atechDateTime": 20211031104100,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:41:02",
+	"atechDateTime": 20211031104102,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 5.3500000000000005,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:49:48",
+	"atechDateTime": 20211031104948,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:49:49",
+	"atechDateTime": 20211031104949,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.2000000000000002,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 10:59:44",
+	"atechDateTime": 20211031105944,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:05:18",
+	"atechDateTime": 20211031110518,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.9000000000000001,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:10:34",
+	"atechDateTime": 20211031111034,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:10:35",
+	"atechDateTime": 20211031111035,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 1.4500000000000002,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:14:48",
+	"atechDateTime": 20211031111448,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:14:50",
+	"atechDateTime": 20211031111450,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:30:15",
+	"atechDateTime": 20211031113015,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.5,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:45:43",
+	"atechDateTime": 20211031114543,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:45:44",
+	"atechDateTime": 20211031114544,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.25,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:50:12",
+	"atechDateTime": 20211031115012,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:50:13",
+	"atechDateTime": 20211031115013,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.05,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:54:45",
+	"atechDateTime": 20211031115445,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:54:46",
+	"atechDateTime": 20211031115446,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.8000000000000003,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 11:59:49",
+	"atechDateTime": 20211031115949,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:04:47",
+	"atechDateTime": 20211031120447,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 3.25,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:14:46",
+	"atechDateTime": 20211031121446,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:14:48",
+	"atechDateTime": 20211031121448,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 3.5500000000000003,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:19:45",
+	"atechDateTime": 20211031121945,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:19:47",
+	"atechDateTime": 20211031121947,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.2,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:20:24",
+	"atechDateTime": 20211031122024,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:20:26",
+	"atechDateTime": 20211031122026,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.15,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:24:52",
+	"atechDateTime": 20211031122452,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:24:53",
+	"atechDateTime": 20211031122453,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 0.05,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:25:01",
+	"atechDateTime": 20211031122501,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:25:03",
+	"atechDateTime": 20211031122503,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.15,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:34:45",
+	"atechDateTime": 20211031123445,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:34:47",
+	"atechDateTime": 20211031123447,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 2.95,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:39:47",
+	"atechDateTime": 20211031123947,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:39:49",
+	"atechDateTime": 20211031123949,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 30,
+			"insulinRate": 3.6,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:41:18",
+	"atechDateTime": 20211031124118,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 0,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}, {
+	"entryType": "TempBasalCombined",
+	"DT": "31.10.2021 12:41:19",
+	"atechDateTime": 20211031124119,
+	"decodedData": {
+		"Object": {
+			"durationMinutes": 60,
+			"insulinRate": 0.0,
+			"isPercent": false
+		}
+	}
+}]
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/definition/OmnipodCommandType.java b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/definition/OmnipodCommandType.java
deleted file mode 100644
index f76e6a0471a..00000000000
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/definition/OmnipodCommandType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.common.definition;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.common.R;
-
-/**
- * Created by andy on 4.8.2019
- */
-public enum OmnipodCommandType {
-    INITIALIZE_POD(R.string.omnipod_common_cmd_initialize_pod), // First step of Pod activation
-    INSERT_CANNULA(R.string.omnipod_common_cmd_insert_cannula), // Second step of Pod activation
-    DEACTIVATE_POD(R.string.omnipod_common_cmd_deactivate_pod), //
-    SET_BASAL_PROFILE(R.string.omnipod_common_cmd_set_basal_schedule), //
-    SET_BOLUS(R.string.omnipod_common_cmd_set_bolus), //
-    CANCEL_BOLUS(R.string.omnipod_common_cmd_cancel_bolus), //
-    SET_TEMPORARY_BASAL(R.string.omnipod_common_cmd_set_tbr), //
-    CANCEL_TEMPORARY_BASAL(R.string.omnipod_common_cmd_cancel_tbr_by_driver), //
-    DISCARD_POD(R.string.omnipod_common_cmd_discard_pod), //
-    GET_POD_STATUS(R.string.omnipod_common_cmd_get_pod_status), //
-    SET_TIME(R.string.omnipod_common_cmd_set_time), //
-    CONFIGURE_ALERTS(R.string.omnipod_common_cmd_configure_alerts), //
-    ACKNOWLEDGE_ALERTS(R.string.omnipod_common_cmd_silence_alerts), //
-    READ_POD_PULSE_LOG(R.string.omnipod_common_cmd_read_pulse_log), //
-    SUSPEND_DELIVERY(R.string.omnipod_common_cmd_suspend_delivery),
-    RESUME_DELIVERY(R.string.omnipod_common_cmd_resume_delivery),
-    PLAY_TEST_BEEP(R.string.omnipod_common_cmd_play_test_beep);
-
-    private final int resourceId;
-
-    OmnipodCommandType(int resourceId) {
-        this.resourceId = resourceId;
-    }
-
-    public int getResourceId() {
-        return resourceId;
-    }
-}
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/definition/OmnipodCommandType.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/definition/OmnipodCommandType.kt
new file mode 100644
index 00000000000..333faef1e9a
--- /dev/null
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/definition/OmnipodCommandType.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.common.definition
+
+import info.nightscout.androidaps.plugins.pump.omnipod.common.R
+
+/**
+ * Created by andy on 4.8.2019
+ */
+enum class OmnipodCommandType(val resourceId: Int) {
+
+    INITIALIZE_POD(R.string.omnipod_common_cmd_initialize_pod),  // First step of Pod activation
+    INSERT_CANNULA(R.string.omnipod_common_cmd_insert_cannula),  // Second step of Pod activation
+    DEACTIVATE_POD(R.string.omnipod_common_cmd_deactivate_pod),  //
+    SET_BASAL_PROFILE(R.string.omnipod_common_cmd_set_basal_schedule),  //
+    SET_BOLUS(R.string.omnipod_common_cmd_set_bolus),  //
+    CANCEL_BOLUS(R.string.omnipod_common_cmd_cancel_bolus),  //
+    SET_TEMPORARY_BASAL(R.string.omnipod_common_cmd_set_tbr),  //
+    CANCEL_TEMPORARY_BASAL(R.string.omnipod_common_cmd_cancel_tbr_by_driver),  //
+    DISCARD_POD(R.string.omnipod_common_cmd_discard_pod),  //
+    GET_POD_STATUS(R.string.omnipod_common_cmd_get_pod_status),  //
+    SET_TIME(R.string.omnipod_common_cmd_set_time),  //
+    CONFIGURE_ALERTS(R.string.omnipod_common_cmd_configure_alerts),  //
+    ACKNOWLEDGE_ALERTS(R.string.omnipod_common_cmd_silence_alerts),  //
+    READ_POD_PULSE_LOG(R.string.omnipod_common_cmd_read_pulse_log),  //
+    SUSPEND_DELIVERY(R.string.omnipod_common_cmd_suspend_delivery), RESUME_DELIVERY(R.string.omnipod_common_cmd_resume_delivery), PLAY_TEST_BEEP(R.string.omnipod_common_cmd_play_test_beep);
+
+}
\ No newline at end of file
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt
index 1b394cf7d81..c8b37b41210 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt
@@ -2,8 +2,10 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activat
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 
 abstract class InitializePodViewModel(
     injector: HasAndroidInjector,
-    logger: AAPSLogger
-) : PodActivationActionViewModelBase(injector, logger)
\ No newline at end of file
+    logger: AAPSLogger,
+    aapsSchedulers: AapsSchedulers
+) : PodActivationActionViewModelBase(injector, logger, aapsSchedulers)
\ No newline at end of file
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt
index a07ce28eabf..191dfff131c 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt
@@ -2,8 +2,10 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activat
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 
 abstract class InsertCannulaViewModel(
     injector: HasAndroidInjector,
-    logger: AAPSLogger
-) : PodActivationActionViewModelBase(injector, logger)
\ No newline at end of file
+    logger: AAPSLogger,
+    aapsSchedulers: AapsSchedulers
+) : PodActivationActionViewModelBase(injector, logger, aapsSchedulers)
\ No newline at end of file
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt
index b71ede17bf1..4b6c4333513 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activat
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.viewmodel.ActionViewModelBase
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 
 abstract class PodActivationActionViewModelBase(
     injector: HasAndroidInjector,
-    logger: AAPSLogger
-) : ActionViewModelBase(injector, logger) {
+    logger: AAPSLogger,
+    aapsSchedulers: AapsSchedulers
+) : ActionViewModelBase(injector, logger, aapsSchedulers) {
 
     abstract fun isPodInAlarm(): Boolean
 
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt
index d3c0ac8aaa5..0fcebf1b68c 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt
@@ -6,16 +6,18 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.Single
 import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.addTo
 import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.rxkotlin.subscribeBy
 
 abstract class ActionViewModelBase(
     protected val injector: HasAndroidInjector,
-    protected val logger: AAPSLogger
+    protected val logger: AAPSLogger,
+    private val aapsSchedulers: AapsSchedulers
 ) : ViewModelBase() {
+
     protected val disposable = CompositeDisposable()
 
     private val _isActionExecutingLiveData = MutableLiveData(false)
@@ -26,17 +28,23 @@ abstract class ActionViewModelBase(
 
     fun executeAction() {
         _isActionExecutingLiveData.postValue(true)
-        disposable += doExecuteAction().subscribeBy(
-            onSuccess = { result ->
-                _isActionExecutingLiveData.postValue(false)
-                _actionResultLiveData.postValue(result)
-            },
-            onError = { throwable ->
-                logger.error(LTag.PUMP, "Caught exception in while executing action in ActionViewModelBase", throwable)
-                _isActionExecutingLiveData.postValue(false)
-                _actionResultLiveData.postValue(PumpEnactResult(injector).success(false).comment(
-                    throwable.message ?: "Caught exception in while executing action in ActionViewModelBase"))
-            })
+        disposable += doExecuteAction()
+            .subscribeOn(aapsSchedulers.io)
+            .observeOn(aapsSchedulers.main)
+            .subscribeBy(
+                onSuccess = { result ->
+                    _isActionExecutingLiveData.postValue(false)
+                    _actionResultLiveData.postValue(result)
+                },
+                onError = { throwable ->
+                    logger.error(LTag.PUMP, "Caught exception in while executing action in ActionViewModelBase", throwable)
+                    _isActionExecutingLiveData.postValue(false)
+                    _actionResultLiveData.postValue(
+                        PumpEnactResult(injector).success(false).comment(
+                            throwable.message ?: "Caught exception in while executing action in ActionViewModelBase"
+                        )
+                    )
+                })
     }
 
     override fun onCleared() {
@@ -44,6 +52,5 @@ abstract class ActionViewModelBase(
         disposable.clear()
     }
 
-
     protected abstract fun doExecuteAction(): Single<PumpEnactResult>
 }
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt
index 541013e82f1..e34d16109cd 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactiv
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.viewmodel.ActionViewModelBase
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 
 abstract class DeactivatePodViewModel(
     injector: HasAndroidInjector,
-    logger: AAPSLogger
-) : ActionViewModelBase(injector, logger) {
+    logger: AAPSLogger,
+    aapsSchedulers: AapsSchedulers
+) : ActionViewModelBase(injector, logger, aapsSchedulers) {
 
     abstract fun discardPod()
 }
\ No newline at end of file
diff --git a/omnipod-common/src/main/res/values-bg-rBG/strings.xml b/omnipod-common/src/main/res/values-bg-rBG/strings.xml
index e35fcaa95a6..a03088237fd 100644
--- a/omnipod-common/src/main/res/values-bg-rBG/strings.xml
+++ b/omnipod-common/src/main/res/values-bg-rBG/strings.xml
@@ -2,6 +2,14 @@
 <resources>
     <!-- Omnipod - Keys -->
     <!-- Omnipod - Pod Management -->
+    <string name="omnipod_common_pod_management_title">Управление на Pod</string>
+    <string name="omnipod_common_pod_management_heading_actions">Действия</string>
+    <string name="omnipod_common_pod_management_heading_tools">Инструменти</string>
+    <string name="omnipod_common_pod_management_button_activate_pod">Активирай Pod</string>
+    <string name="omnipod_common_pod_management_button_deactivate_pod">Деактивирай под</string>
+    <string name="omnipod_common_pod_management_button_discard_pod">Премахни Pod</string>
+    <string name="omnipod_common_pod_management_discard_pod_confirmation">Ако натиснете OK, състоянието на Pod ще бъде нулирано и няма да можете да общувате с него повече. Правете това, само ако вече не можете да се свързвате с него. Ако все още можете да общувате с Pod, моля, използвайте опцията <b>Деактивирай Pod</b>!</string>
+    <string name="omnipod_common_pod_management_button_play_test_beep">Възпроизвеждане на тестов звук</string>
     <!-- Omnipod - Error -->
     <!-- Omnipod - Confirmation -->
     <!-- Omnipod - Overview -->
diff --git a/omnipod-common/src/main/res/values-es-rES/strings.xml b/omnipod-common/src/main/res/values-es-rES/strings.xml
index e35fcaa95a6..ff2b9b73ab9 100644
--- a/omnipod-common/src/main/res/values-es-rES/strings.xml
+++ b/omnipod-common/src/main/res/values-es-rES/strings.xml
@@ -2,7 +2,28 @@
 <resources>
     <!-- Omnipod - Keys -->
     <!-- Omnipod - Pod Management -->
+    <string name="omnipod_common_pod_management_title">Administración de Pod</string>
+    <string name="omnipod_common_pod_management_heading_actions">Acciones</string>
+    <string name="omnipod_common_pod_management_heading_tools">Herramientas</string>
+    <string name="omnipod_common_pod_management_button_activate_pod">Activar Pod</string>
+    <string name="omnipod_common_pod_management_button_deactivate_pod">Desactivar Pod</string>
+    <string name="omnipod_common_pod_management_button_discard_pod">Descartar Pod</string>
+    <string name="omnipod_common_pod_management_button_play_test_beep">Reproducir pitido de prueba</string>
+    <string name="omnipod_common_pod_management_button_playing_test_beep">Reproduciendo pitido de prueba…</string>
+    <string name="omnipod_common_pod_management_button_pod_history">Historial de Pod</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_common_error_pod_not_attached">Ningún pod activo</string>
+    <string name="omnipod_common_error_set_basal_failed">Error al establecer el perfil basal.</string>
+    <string name="omnipod_common_error_bolus_did_not_succeed">Bolo no entregado.</string>
+    <string name="omnipod_common_error_set_initial_basal_schedule_no_profile">Ningún perfil basal está activo. Asegúrese de activar su perfil basal.</string>
+    <string name="omnipod_common_error_failed_to_refresh_status">Error al actualizar el estado</string>
+    <string name="omnipod_common_error_failed_to_refresh_status_on_startup">Error al actualizar el estado al iniciar</string>
+    <string name="omnipod_common_error_failed_to_suspend_delivery">Error al suspender la entrega</string>
+    <string name="omnipod_common_error_failed_to_set_time">Error al establecer la hora</string>
+    <string name="omnipod_common_error_failed_to_resume_delivery">Error al aceptar la entrega</string>
+    <string name="omnipod_common_error_failed_to_initialize_pod">Error al iniciar el Pod</string>
+    <string name="omnipod_common_error_pod_suspended">Pod suspendido</string>
+    <string name="omnipod_common_error_failed_to_play_test_beep">Error al reproducir el pitido de prueba</string>
     <!-- Omnipod - Confirmation -->
     <!-- Omnipod - Overview -->
     <!-- Omnipod - Wizard Base -->
diff --git a/omnipod-common/src/main/res/values-hu-rHU/strings.xml b/omnipod-common/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..e35fcaa95a6
--- /dev/null
+++ b/omnipod-common/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Wizard Base -->
+    <!-- Omnipod - Pod Activation Wizard -->
+    <!-- Omnipod - Pod Deactivation Wizard -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Commands -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - Short status -->
+    <!-- Omnipod - Other -->
+    <!-- Omnipod - Times -->
+</resources>
diff --git a/omnipod-common/src/main/res/values-it-rIT/strings.xml b/omnipod-common/src/main/res/values-it-rIT/strings.xml
index 4bb95f407bd..8a08de56f6b 100644
--- a/omnipod-common/src/main/res/values-it-rIT/strings.xml
+++ b/omnipod-common/src/main/res/values-it-rIT/strings.xml
@@ -113,6 +113,8 @@
     <string name="omnipod_common_preferences_category_confirmation_beeps">BIP di conferma</string>
     <string name="omnipod_common_preferences_category_notifications">Notifiche</string>
     <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Suono notifiche TBR incerto abilitato</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Suono notifiche SMB incerto abilitato</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Suono notifiche bolo incerto abilitato</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Nessun pod attivo</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Configurazione in corso (attesa attivazione pod)</string>
diff --git a/omnipod-common/src/main/res/values-iw-rIL/strings.xml b/omnipod-common/src/main/res/values-iw-rIL/strings.xml
index c4ad088c4e6..ceaec0b0150 100644
--- a/omnipod-common/src/main/res/values-iw-rIL/strings.xml
+++ b/omnipod-common/src/main/res/values-iw-rIL/strings.xml
@@ -56,12 +56,12 @@
     <string name="omnipod_common_overview_pod_expiry_date">תפוגת הפוד</string>
     <string name="omnipod_common_overview_last_connection">חיבור אחרון</string>
     <string name="omnipod_common_overview_last_bolus">בולוס אחרון</string>
-    <string name="omnipod_common_overview_temp_basal_rate">ערך בזאלי זמני</string>
+    <string name="omnipod_common_overview_temp_basal_rate">מינון בזאלי זמני</string>
     <string name="omnipod_common_overview_base_basal_rate">ערך בזאלי בסיסי</string>
     <string name="omnipod_common_overview_reservoir">מכל</string>
     <string name="omnipod_common_overview_pod_active_alerts">התראות פוד פעילות</string>
     <string name="omnipod_common_overview_firmware_version">גרסת קושחה</string>
-    <string name="omnipod_common_overview_time_on_pod">זמן פעילות הפוד</string>
+    <string name="omnipod_common_overview_time_on_pod">השעה בפוד</string>
     <string name="omnipod_common_overview_temp_basal_value">%1$.2f יח\'\\ש\' @ %2$s (%3$d\%4$d דק\')</string>
     <string name="omnipod_common_overview_reservoir_value">נותרו %1$.2f יח\' </string>
     <string name="omnipod_common_overview_reservoir_value_over50">נותרו יותר מ-50 יח\'</string>
diff --git a/omnipod-common/src/main/res/values-lt-rLT/strings.xml b/omnipod-common/src/main/res/values-lt-rLT/strings.xml
index f1350859d86..5bf2b1e9463 100644
--- a/omnipod-common/src/main/res/values-lt-rLT/strings.xml
+++ b/omnipod-common/src/main/res/values-lt-rLT/strings.xml
@@ -111,6 +111,10 @@
     <string name="omnipod_common_preferences_category_other">Kiti</string>
     <string name="omnipod_common_preferences_category_alerts">Perspėjimai</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Patvirtinimo signalai</string>
+    <string name="omnipod_common_preferences_category_notifications">Pranešimai</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Įjungtas garsas neaiškiems laikinos bazės perspėjimams</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Įjungtas garsas        neaiškiems SMB perspėjimams</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Įjungtas garsas neaiškiems bolusų perspėjimams</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Nėra aktyvaus Pod</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Vykdomas nustatymas (laukiama Pod aktyvavimo)</string>
diff --git a/omnipod-common/src/main/res/values-nl-rNL/strings.xml b/omnipod-common/src/main/res/values-nl-rNL/strings.xml
index e35fcaa95a6..5b70885110d 100644
--- a/omnipod-common/src/main/res/values-nl-rNL/strings.xml
+++ b/omnipod-common/src/main/res/values-nl-rNL/strings.xml
@@ -2,17 +2,194 @@
 <resources>
     <!-- Omnipod - Keys -->
     <!-- Omnipod - Pod Management -->
+    <string name="omnipod_common_pod_management_title">Pod Management</string>
+    <string name="omnipod_common_pod_management_heading_actions">Acties</string>
+    <string name="omnipod_common_pod_management_heading_tools">Hulpmiddelen</string>
+    <string name="omnipod_common_pod_management_button_activate_pod">Activeer Pod</string>
+    <string name="omnipod_common_pod_management_button_deactivate_pod">Deactiveer Pod</string>
+    <string name="omnipod_common_pod_management_button_discard_pod">Pod verwijderen</string>
+    <string name="omnipod_common_pod_management_discard_pod_confirmation">Als je de Pod verwijderd, kun je er niet meer mee communiceren. Doe dit alleen als communicatie met de Pod aanhoudend mislukt. Als je nog steeds kunt communiceren met de Pod, gebruik dan de <b>Pod deactiveren</b> optie.\n\nVerwijder de Pod van je lichaam als je ervoor kiest om door te gaan!</string>
+    <string name="omnipod_common_pod_management_button_play_test_beep">Testpieptoon afspelen</string>
+    <string name="omnipod_common_pod_management_button_playing_test_beep">Testpieptoon wordt afgespeeld…</string>
+    <string name="omnipod_common_pod_management_button_pod_history">Pod Historie</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_common_error_pod_not_attached">Geen actieve Pod</string>
+    <string name="omnipod_common_error_set_basal_failed">Instellen van basaal profiel mislukt.</string>
+    <string name="omnipod_common_error_bolus_did_not_succeed">Bolus mislukt.</string>
+    <string name="omnipod_common_error_failed_to_set_profile_empty_profile">Instellen basaal profiel mislukt: leeg profiel ontvangen. Zorg er voor dat je basaal profiel geactiveerd is.</string>
+    <string name="omnipod_common_error_set_initial_basal_schedule_no_profile">Er is geen basaal profiel actief. Activeer je basaal profiel.</string>
+    <string name="omnipod_common_error_unsupported_custom_command">Niet-ondersteunde aangepaste opdracht: %1$s</string>
+    <string name="omnipod_common_error_failed_to_refresh_status">Verversen van status is mislukt</string>
+    <string name="omnipod_common_error_failed_to_refresh_status_on_startup">Status vernieuwen mislukt bij opstarten</string>
+    <string name="omnipod_common_error_failed_to_silence_alerts">Meldingen negeren mislukt</string>
+    <string name="omnipod_common_error_failed_to_suspend_delivery">Onderbreken van insulinetoediening is mislukt</string>
+    <string name="omnipod_common_error_failed_to_set_time">Instellen van de tijd is mislukt</string>
+    <string name="omnipod_common_error_failed_to_resume_delivery">Hervatten van insulinetoediening is mislukt</string>
+    <string name="omnipod_common_error_failed_to_initialize_pod">Het initialiseren van de Pod is mislukt</string>
+    <string name="omnipod_common_error_failed_to_insert_cannula">Het inbrengen van de canule is mislukt</string>
+    <string name="omnipod_common_error_pod_fault_activation_time_exceeded">De activeringstijd van de pod is overschreden. Deze Pod kan niet meer geactiveerd worden.</string>
+    <string name="omnipod_common_error_failed_to_verify_activation_progress">Controleren van activatiestatus is mislukt. Probeer het opnieuw.</string>
+    <string name="omnipod_common_error_pod_suspended">Pod onderbroken</string>
+    <string name="omnipod_common_error_failed_to_play_test_beep">Testpiep afspelen mislukt</string>
+    <string name="omnipod_common_error_time_out_of_sync">De tijd op de Pod wijkt af. Werk de tijd bij op het Omnipod-tabblad.</string>
+    <string name="omnipod_common_error_unexpected_exception">Er is een onverwachte fout opgetreden. A.u.b. rapporteren! (%1$s: %2$s).</string>
     <!-- Omnipod - Confirmation -->
+    <string name="omnipod_common_confirmation">Bevestiging</string>
+    <string name="omnipod_common_confirmation_time_or_timezone_change">Tijd en/of tijdzone gewijzigd op de Pod.</string>
+    <string name="omnipod_common_confirmation_expiration_alerts_updated">De instellingen voor meldingen zijn bijgewerkt in de Pod.</string>
+    <string name="omnipod_common_confirmation_time_on_pod_updated">De tijd in de Pod is geüpdatet.</string>
+    <string name="omnipod_common_confirmation_suspended_delivery">Alle insulinetoediening is onderbroken.</string>
+    <string name="omnipod_common_confirmation_silenced_alerts">Actieve alarmen zijn op stil gezet.</string>
+    <string name="omnipod_common_confirmation_delivery_resumed">Insulinetoediening is hervat.</string>
     <!-- Omnipod - Overview -->
+    <string name="omnipod_common_overview_button_set_time">Tijd instellen</string>
+    <string name="omnipod_common_overview_button_suspend_delivery">Onderbreken</string>
+    <string name="omnipod_common_overview_button_resume_delivery">Toediening hervatten</string>
+    <string name="omnipod_common_overview_button_pod_management">Pod Beheer</string>
+    <string name="omnipod_common_overview_button_silence_alerts">Alarmen Stil</string>
+    <string name="omnipod_common_overview_pod_status">Pod Status</string>
+    <string name="omnipod_common_overview_total_delivered">Totaal toegediend</string>
+    <string name="omnipod_common_overview_total_delivered_value">%1$.2f E</string>
+    <string name="omnipod_common_overview_pod_unique_id">Uniek ID</string>
+    <string name="omnipod_common_overview_lot_number">LOT Nummer</string>
+    <string name="omnipod_common_overview_pod_sequence_number">Volgnummer</string>
+    <string name="omnipod_common_overview_pod_expiry_date">Pod verloopt</string>
+    <string name="omnipod_common_overview_last_connection">Laatste verbinding</string>
+    <string name="omnipod_common_overview_last_bolus">Laatste bolus</string>
+    <string name="omnipod_common_overview_temp_basal_rate">Tijdelijke basaalstand</string>
+    <string name="omnipod_common_overview_base_basal_rate">Basis basaalstand</string>
+    <string name="omnipod_common_overview_reservoir">Reservoir</string>
+    <string name="omnipod_common_overview_pod_active_alerts">Actieve pod alarmen</string>
+    <string name="omnipod_common_overview_firmware_version">Firmware versie</string>
+    <string name="omnipod_common_overview_time_on_pod">Tijd op Pod</string>
+    <string name="omnipod_common_overview_temp_basal_value">%1$.2fE/u @%2$s (%3$d/%4$d minuten)</string>
+    <string name="omnipod_common_overview_reservoir_value">%1$.2f E over</string>
+    <string name="omnipod_common_overview_reservoir_value_over50">Meer dan 50 E over</string>
+    <string name="omnipod_common_overview_errors">Storing</string>
     <!-- Omnipod - Wizard Base -->
+    <string name="omnipod_common_wizard_button_cancel">Afbreken</string>
+    <string name="omnipod_common_wizard_button_finish">Voltooien</string>
+    <string name="omnipod_common_wizard_button_next">Volgende</string>
+    <string name="omnipod_common_wizard_button_retry">Opnieuw proberen</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Deactiveer Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Pod weggooien</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Je hebt nog niet alle stappen voltooid. Weet je zeker dat je wilt afsluiten?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Afsluiten</string>
     <!-- Omnipod - Pod Activation Wizard -->
+    <string name="omnipod_common_pod_activation_wizard_start_pod_activation_title">Pod vullen</string>
+    <string name="omnipod_common_pod_activation_wizard_initialize_pod_title">Pod initialiseren</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_title">Plaats de Pod</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_text">Bereid het plaatsen voor. Verwijder de beschermkap van de naald en haal de papiertjes van de sticker.\n\nMocht je zien dat de canule uitsteekt, druk dan op <b>Annuleren</b> en begin opnieuw met een andere Pod.\n\nBevestig de Pod op de huid. Druk op <b>Volgende</b> om de canule te gaan inschieten en de insulinetoediening te laten starten.</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">Als je op <b>OK</b>drukt, wordt de canule ingebracht. Zorg ervoor dat de Pod op de huid geplakt is.</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_title">Canule inbrengen</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_text">De basaalstand wordt ingesteld en de canule wordt ingebracht.\n\nWanneer de canule succesvol is ingebracht, kun je op <b>Volgende</b> drukken.</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_title">Pod geactiveerd</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_text">De nieuwe Pod is nu actief.\n\nJe basaalprofiel is ingeladen in de Pod en de canule is ingebracht.\n\nControleer of de canule correct is geplaatst en vervang de Pod als je denkt dat er iets is misgegaan.</string>
     <!-- Omnipod - Pod Deactivation Wizard -->
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_title">Deactiveer Pod</string>
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text">Druk op <b>Volgende</b> om de Pod te deactiveren.\n\n<b>Opmerking:</b> Hiermee wordt de insulinetoediening gestopt en wordt de Pod gedeactiveerd.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_title">Pod wordt gedeactiveerd</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_text">De Pod wordt gedeactiveerd.\n\nWanneer de Pod succesvol gedeactiveerd is, kan er op <b>Volgende</b> worden gedrukt.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_title">Pod gedeactiveerd</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_text">Pod gedeactiveerd.\n\nVerwijder de Pod van je lichaam en recycle deze.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_title">Pod is verwijderd</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_text">De Pod status is verwijderd. De insuline levering is mogelijk niet onderbroken omdat de Pod niet correct gedeactiveerd is!\n\nVerwijder de Pod van je lichaam en recycle deze.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod_confirmation">Als de Pod wordt verwijderd, kan er niet meer mee gecommuniceerd worden. Doe dit alleen indien alle communicatie met de Pod aanhoudend mislukt. Weet je zeker dat je de Pod wilt verwijderen?</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod">Pod verwijderen</string>
     <!-- Omnipod - Preferences -->
+    <string name="omnipod_common_preferences_bolus_beeps_enabled">Bolus pieptonen ingeschakeld</string>
+    <string name="omnipod_common_preferences_basal_beeps_enabled">Basaal pieptonen ingeschakeld</string>
+    <string name="omnipod_common_preferences_smb_beeps_enabled">SMB pieptonen ingeschakeld</string>
+    <string name="omnipod_common_preferences_tbr_beeps_enabled">TBR pieptonen ingeschakeld</string>
+    <string name="omnipod_common_preferences_suspend_delivery_button_enabled">Knop voor het onderbreken van insuline toediening weergeven op het Omnipod-tabblad</string>
+    <string name="omnipod_common_preferences_time_change_enabled">Zomertijd-/tijdzonedetectie ingeschakeld</string>
+    <string name="omnipod_common_preferences_expiration_reminder_enabled">Herinnering vervaldatum ingeschakeld</string>
+    <string name="omnipod_common_preferences_expiration_reminder_hours_before_shutdown">Aantal uur voordat de Pod stopt</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_enabled">Pieptonen voor \"Reservoir bijna leeg\" ingeschakeld</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_units">Aantal eenheden</string>
+    <string name="omnipod_common_preferences_automatically_silence_alerts">Podwaarschuwingen automatisch bevestigen</string>
+    <string name="omnipod_common_preferences_category_other">Andere</string>
+    <string name="omnipod_common_preferences_category_alerts">Waarschuwingen</string>
+    <string name="omnipod_common_preferences_category_confirmation_beeps">Bevestigings pieptonen</string>
+    <string name="omnipod_common_preferences_category_notifications">Notificaties</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Geluid voor onzekere TBR notificaties ingeschakeld</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Geluid voor onzekere SMB notificaties ingeschakeld</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Geluid voor onzekere bolus notificaties ingeschakeld</string>
     <!-- Omnipod - Pod Status -->
+    <string name="omnipod_common_pod_status_no_active_pod">Geen actieve Pod</string>
+    <string name="omnipod_common_pod_status_waiting_for_activation">Setup wordt uitgevoerd (in afwachting van Pod activering)</string>
+    <string name="omnipod_common_pod_status_waiting_for_cannula_insertion">Setup wordt uitgevoerd (in afwachting van het inbrengen van de canule)</string>
+    <string name="omnipod_common_pod_status_running">Actief</string>
+    <string name="omnipod_common_pod_status_suspended">Onderbroken</string>
+    <string name="omnipod_common_pod_status_pod_fault">Pod fout</string>
+    <string name="omnipod_common_pod_status_activation_time_exceeded">Activatie tijd verlopen</string>
+    <string name="omnipod_common_pod_status_inactive">Inactief</string>
+    <string name="omnipod_common_pod_status_pod_fault_description">Pod foutmelding: %1$03d %2$s</string>
     <!-- Omnipod - Commands -->
+    <string name="omnipod_common_cmd_deactivate_pod">Deactiveer Pod</string>
+    <string name="omnipod_common_cmd_discard_pod">Pod verwerpen</string>
+    <string name="omnipod_common_cmd_set_bolus">Bolus instellen</string>
+    <string name="omnipod_common_cmd_cancel_bolus">Annuleer Bolus</string>
+    <string name="omnipod_common_cmd_set_tbr">Instellen Tijdelijk Basaal</string>
+    <string name="omnipod_common_cmd_cancel_tbr_by_driver">Tijdelijk basaal annuleren (intern door driver)</string>
+    <string name="omnipod_common_cmd_cancel_tbr">Tijdelijk basaal annuleren</string>
+    <string name="omnipod_common_cmd_set_basal_schedule">Basaalprofiel instellen</string>
+    <string name="omnipod_common_cmd_get_pod_status">Pod status verversen</string>
+    <string name="omnipod_common_cmd_get_pod_info">Pod info verversen</string>
+    <string name="omnipod_common_cmd_set_time">Tijd instellen</string>
+    <string name="omnipod_common_cmd_configure_alerts">Configureer alarmen</string>
+    <string name="omnipod_common_cmd_silence_alerts">Alarmen dempen</string>
+    <string name="omnipod_common_cmd_suspend_delivery">Onderbreek toediening</string>
+    <string name="omnipod_common_cmd_resume_delivery">Toediening hervatten</string>
+    <string name="omnipod_common_cmd_unknown_entry">Onbekende invoer</string>
+    <string name="omnipod_common_cmd_initialize_pod">Pod initialiseren</string>
+    <string name="omnipod_common_cmd_insert_cannula">Canule inbrengen</string>
+    <string name="omnipod_common_cmd_read_pulse_log">Pulslog uitlezen</string>
+    <string name="omnipod_common_cmd_set_fake_suspended_tbr">Vals tijdelijk basaal omdat insuline toediening onderbroken is</string>
+    <string name="omnipod_common_cmd_cancel_fake_suspended_tbr">Annuleren van vals tijdelijk basaal wat was aangemaakt vanwege Pod onderbreking</string>
+    <string name="omnipod_common_cmd_split_tbr">Tijdelijke basaal gesplitst als gevolg van een onzekere fout bij annulering</string>
+    <string name="omnipod_common_cmd_beep_config">Pieptoon instellingen</string>
+    <string name="omnipod_common_cmd_play_test_beep">Test pieptoon afspelen</string>
     <!-- Omnipod - Alerts -->
+    <string name="omnipod_common_alert_finish_pairing_reminder">Herinnering koppeling afronden</string>
+    <string name="omnipod_common_alert_finish_setup_reminder_reminder">Herinnering setup afronden</string>
+    <string name="omnipod_common_alert_expiration">Pod verloopt binnenkort</string>
+    <string name="omnipod_common_alert_expiration_advisory">Pod verloopt binnenkort</string>
+    <string name="omnipod_common_alert_shutdown_imminent">Schakelt zeer binnenkort uit</string>
+    <string name="omnipod_common_alert_low_reservoir">Laag reservoir niveau</string>
+    <string name="omnipod_common_alert_unknown_alert">Onbekend alarm</string>
     <!-- Omnipod - Short status -->
+    <string name="omnipod_common_short_status_no_active_pod">Geen actieve Pod</string>
+    <string name="omnipod_common_short_status_last_connection">Laatste verbinding: %1$d min geleden</string>
+    <string name="omnipod_common_short_status_last_bolus">Laatste bolus: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_temp_basal">Tijdelijk: %1$s</string>
+    <string name="omnipod_common_short_status_extended_bolus">Verlengd: %1$s</string>
+    <string name="omnipod_common_short_status_reservoir">Reservoir: %1$sE</string>
     <!-- Omnipod - Other -->
+    <string name="omnipod_common_yes">Ja</string>
+    <string name="omnipod_common_no">Nee</string>
+    <string name="omnipod_common_ok">OK</string>
+    <string name="omnipod_common_cancel">Afbreken</string>
+    <string name="omnipod_common_warning">Waarschuwing</string>
     <!-- Omnipod - Times -->
+    <string name="omnipod_common_moments_ago">Zojuist</string>
+    <string name="omnipod_common_less_than_a_minute_ago">Minder dan een minuut geleden</string>
+    <string name="omnipod_common_composite_time">%1$s en %2$s</string>
+    <string name="omnipod_common_time_ago">%1$s geleden</string>
+    <plurals name="omnipod_common_minutes">
+        <item quantity="one">%1$d minuten</item>
+        <item quantity="other">%1$d minuten</item>
+    </plurals>
+    <plurals name="omnipod_common_hours">
+        <item quantity="one">%1$d uur</item>
+        <item quantity="other">%1$d uren</item>
+    </plurals>
+    <plurals name="omnipod_common_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dagen</item>
+    </plurals>
+    <plurals name="omnipod_common_pod_alerts">
+        <item quantity="one">Pod Alarm: %1$s</item>
+        <item quantity="other">Pod Alarmen: %1$s</item>
+    </plurals>
 </resources>
diff --git a/omnipod-common/src/main/res/values-no-rNO/strings.xml b/omnipod-common/src/main/res/values-no-rNO/strings.xml
index 38fd6e20033..258e97569ee 100644
--- a/omnipod-common/src/main/res/values-no-rNO/strings.xml
+++ b/omnipod-common/src/main/res/values-no-rNO/strings.xml
@@ -111,6 +111,10 @@
     <string name="omnipod_common_preferences_category_other">Annet</string>
     <string name="omnipod_common_preferences_category_alerts">Varsler</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Bekreftelse lyd</string>
+    <string name="omnipod_common_preferences_category_notifications">Varsler</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Lydvarsel for ubekreftet temp basal dosering (TBR) er aktivert</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Lydvarsel for ubekreftet SMB er aktivert</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Lydvarsel for ubekreftet bolus er aktivert</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Ingen aktiv Pod</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Oppsett pågår (venter på Pod aktivering)</string>
diff --git a/omnipod-common/src/main/res/values-pl-rPL/strings.xml b/omnipod-common/src/main/res/values-pl-rPL/strings.xml
index e35fcaa95a6..9c74115969b 100644
--- a/omnipod-common/src/main/res/values-pl-rPL/strings.xml
+++ b/omnipod-common/src/main/res/values-pl-rPL/strings.xml
@@ -2,17 +2,202 @@
 <resources>
     <!-- Omnipod - Keys -->
     <!-- Omnipod - Pod Management -->
+    <string name="omnipod_common_pod_management_title">Zarządzanie Podem</string>
+    <string name="omnipod_common_pod_management_heading_actions">Akcje</string>
+    <string name="omnipod_common_pod_management_heading_tools">Narzędzia</string>
+    <string name="omnipod_common_pod_management_button_activate_pod">Aktywuj Poda</string>
+    <string name="omnipod_common_pod_management_button_deactivate_pod">Odłącz Poda</string>
+    <string name="omnipod_common_pod_management_button_discard_pod">Usuń Poda</string>
+    <string name="omnipod_common_pod_management_discard_pod_confirmation">Jeśli usuniesz Poda, nie będziesz już mógł się z nim komunikować. Powinieneś to zrobić tylko wtedy, gdy komunikacja z Podem nieustannie zawodzi. Jeśli komunikacja jest nadal możliwa, użyj opcji <b>Deaktywuj Poda</b>.\n\nJeśli chcesz kontynuować, pamiętaj, aby usunąć Poda ze swojego ciała!</string>
+    <string name="omnipod_common_pod_management_button_play_test_beep">Odtwarzaj test dźwięku</string>
+    <string name="omnipod_common_pod_management_button_playing_test_beep">Odtwarzam test dźwięku…</string>
+    <string name="omnipod_common_pod_management_button_pod_history">Historia Poda</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_common_error_pod_not_attached">Brak aktywnego Poda</string>
+    <string name="omnipod_common_error_set_basal_failed">Ustawienie profilu bazy nie powiodło się.</string>
+    <string name="omnipod_common_error_bolus_did_not_succeed">Bolus nie powiódł się.</string>
+    <string name="omnipod_common_error_failed_to_set_profile_empty_profile">Ustawienie profilu dawki bazowej nie powiodło się: odebrano pusty profil. Upewnij się, by aktywować swój profil dawki bazowej.</string>
+    <string name="omnipod_common_error_set_initial_basal_schedule_no_profile">Żaden profil dawki bazowej nie jest aktywny. Upewnij się, by aktywować swój profil dawki bazowej.</string>
+    <string name="omnipod_common_error_unsupported_custom_command">Nieobsługiwane polecenie niestandardowe: %1$s</string>
+    <string name="omnipod_common_error_failed_to_refresh_status">Nie udało się odświeżyć statusu</string>
+    <string name="omnipod_common_error_failed_to_refresh_status_on_startup">Nie udało się odświeżyć statusu przy starcie</string>
+    <string name="omnipod_common_error_failed_to_silence_alerts">Nie udało się wyciszyć alertów</string>
+    <string name="omnipod_common_error_failed_to_suspend_delivery">Nie udało się zawiesić podawania</string>
+    <string name="omnipod_common_error_failed_to_set_time">Nie udało się ustawić czasu</string>
+    <string name="omnipod_common_error_failed_to_resume_delivery">Nie udało się wznowić podawania</string>
+    <string name="omnipod_common_error_failed_to_initialize_pod">Nie udało się zainicjować Poda</string>
+    <string name="omnipod_common_error_failed_to_insert_cannula">Nie udało się wprowadzić wkłucia</string>
+    <string name="omnipod_common_error_pod_fault_activation_time_exceeded">Przekroczono czas aktywacji Poda. Ten Pod nie może być już aktywowany.</string>
+    <string name="omnipod_common_error_failed_to_verify_activation_progress">Weryfikacja postępu aktywacji nie powiodła się. Spróbuj ponownie.</string>
+    <string name="omnipod_common_error_pod_suspended">Pod wstrzymany</string>
+    <string name="omnipod_common_error_failed_to_play_test_beep">Nie powiodło się odtwarzanie dźwięku testowego</string>
+    <string name="omnipod_common_error_time_out_of_sync">Zegar Pod-a jest rozsynchronizowany. Proszę zaktualizować czas w zakładce Omnipod.</string>
+    <string name="omnipod_common_error_unexpected_exception">Wystąpił nieoczekiwany błąd. Proszę zgłosić! (%1$s: %2$s).</string>
     <!-- Omnipod - Confirmation -->
+    <string name="omnipod_common_confirmation">Potwierdzenie</string>
+    <string name="omnipod_common_confirmation_time_or_timezone_change">Zmieniono czas i/lub strefę czasową na Podzie.</string>
+    <string name="omnipod_common_confirmation_expiration_alerts_updated">Konfiguracja alarmów w Podzie została zaktualizowana.</string>
+    <string name="omnipod_common_confirmation_time_on_pod_updated">Czas w Podzie został zaktualizowany.</string>
+    <string name="omnipod_common_confirmation_suspended_delivery">Podawanie insuliny zostało całkowicie zawieszone.</string>
+    <string name="omnipod_common_confirmation_silenced_alerts">Aktywne alarmy zostały wyciszone.</string>
+    <string name="omnipod_common_confirmation_delivery_resumed">Podawanie insuliny zostało wznowione.</string>
     <!-- Omnipod - Overview -->
+    <string name="omnipod_common_overview_button_set_time">Ustaw czas</string>
+    <string name="omnipod_common_overview_button_suspend_delivery">Wstrzymaj</string>
+    <string name="omnipod_common_overview_button_resume_delivery">Wznów podawanie</string>
+    <string name="omnipod_common_overview_button_pod_management">Zarządzanie Podem</string>
+    <string name="omnipod_common_overview_button_silence_alerts">Wycisz alarmy</string>
+    <string name="omnipod_common_overview_pod_status">Status Poda</string>
+    <string name="omnipod_common_overview_total_delivered">Łącznie dostarczono</string>
+    <string name="omnipod_common_overview_total_delivered_value">%1$.2f U</string>
+    <string name="omnipod_common_overview_pod_unique_id">Unikalny ID</string>
+    <string name="omnipod_common_overview_lot_number">Numer LOT</string>
+    <string name="omnipod_common_overview_pod_sequence_number">Numer sekwencji</string>
+    <string name="omnipod_common_overview_pod_expiry_date">Pod traci ważność</string>
+    <string name="omnipod_common_overview_last_connection">Ostatnie połączenie</string>
+    <string name="omnipod_common_overview_last_bolus">Ostatni bolus</string>
+    <string name="omnipod_common_overview_temp_basal_rate">Tymczasowa dawka bazowa</string>
+    <string name="omnipod_common_overview_base_basal_rate">Podstawowa dawka bazowa</string>
+    <string name="omnipod_common_overview_reservoir">Zbiornik</string>
+    <string name="omnipod_common_overview_pod_active_alerts">Aktywne alarmy Poda</string>
+    <string name="omnipod_common_overview_firmware_version">Wersja oprogramowania</string>
+    <string name="omnipod_common_overview_time_on_pod">Czas na Podzie</string>
+    <string name="omnipod_common_overview_temp_basal_value">%1$.2fU/h @%2$s (%3$d/%4$d minut)</string>
+    <string name="omnipod_common_overview_reservoir_value">pozostało %1$.2f U</string>
+    <string name="omnipod_common_overview_reservoir_value_over50">Pozostało ponad 50 U</string>
+    <string name="omnipod_common_overview_errors">Błędy</string>
     <!-- Omnipod - Wizard Base -->
+    <string name="omnipod_common_wizard_button_cancel">Anuluj</string>
+    <string name="omnipod_common_wizard_button_finish">Zakończ</string>
+    <string name="omnipod_common_wizard_button_next">Dalej</string>
+    <string name="omnipod_common_wizard_button_retry">Ponów</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Odłącz Poda</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Usuń Poda</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Nie ukończyłeś jeszcze wszystkich kroków. Czy na pewno chcesz zakończyć?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Wyjście</string>
     <!-- Omnipod - Pod Activation Wizard -->
+    <string name="omnipod_common_pod_activation_wizard_start_pod_activation_title">Wypełnij Poda</string>
+    <string name="omnipod_common_pod_activation_wizard_initialize_pod_title">Zainicjalizuj Poda</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_title">Zamocuj Poda</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_text">\nPrzygotuj miejsca wkłucia. Zdejmij osłonkę igły, zabezpieczenie plastra i przymocuj Pod do skóry w miejscu wkłucia.\n\nJeśli kaniula odkleja się, proszę wciśnij <b>Anuluj</b> i odczep Poda.\n\nNaciśnij <b>Dalej</b> w celu wprowadzenia kaniuli i rozpoczęcia podawania dawki bazowej.</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">Po naciśnięciu <b>OK</b>zostanie wprowadzone wkłucie. Należy upewnić się, że podpięto Poda do miejsca wkłucia.</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_title">Załóż wkłucie</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_text">Próbuję ustawić początkowy plan dawki bazowej i wprowadzić wkłucie.\n\nKiedy wkłucie zostanie prawidłowo wprowadzone, możesz nacisnąć <b>Dalej</b>.</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_title">Pod aktywowany</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_text">Nowy Pod jest teraz aktywny.\n\nTwój plan dawki bazowej został zaprogramowany i wprowadzono wkłucie.\n\nSprawdź, czy wkłucie zostało założone poprawnie i zmień Poda, jeśli uważasz, że nie nie zostało.</string>
     <!-- Omnipod - Pod Deactivation Wizard -->
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_title">Odłącz Pod</string>
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text">Naciśnij <b>Dalej</b> w celu deaktywacji Poda.\n\n<b>Uwaga:</b> To spowoduje zawieszenie wszystkich dostaw insuliny i dezaktywuje Poda.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_title">Deaktywuję Poda</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_text">Deaktywuję Poda.\n\nPo pomyślnej dezaktywacji można nacisnąć <b>Dalej</b>.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_title">Pod dezaktywowany</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_text">Twój Pod został zdezaktywowany.\n\nUsuń Poda z ciała i zutylizuj go.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_title">Pod usunięty</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_text">Pod został usunięty. Nie zawieszono podawania insuliny, ponieważ Pod nie został prawidłowo zdezaktywowany!\n\nProszę usunąć Poda z ciała i zutylizować go.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod_confirmation">Jeśli usuniesz Poda, nie będziesz już mógł się z nim komunikować. Powinieneś to zrobić tylko wtedy, gdy komunikacja z Podem nieustannie zawodzi. Czy na pewno chcesz odwołać Poda?</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod">Usuń Poda</string>
     <!-- Omnipod - Preferences -->
+    <string name="omnipod_common_preferences_bolus_beeps_enabled">Sygnał dźwiękowy bolusa włączony</string>
+    <string name="omnipod_common_preferences_basal_beeps_enabled">Sygnał dźwiękowy bazy włączony</string>
+    <string name="omnipod_common_preferences_smb_beeps_enabled">Sygnał dźwiękowy SMB włączony</string>
+    <string name="omnipod_common_preferences_tbr_beeps_enabled">Sygnał dźwiękowy TBR (tymczasowej dawki bazowej) włączony</string>
+    <string name="omnipod_common_preferences_suspend_delivery_button_enabled">Pokaż przycisk wstrzymania podawania w zakładce Omnipod</string>
+    <string name="omnipod_common_preferences_time_change_enabled">Włączone wykrywanie strefy czasowej DST</string>
+    <string name="omnipod_common_preferences_expiration_reminder_enabled">Przypomnienie o utracie ważności włączone</string>
+    <string name="omnipod_common_preferences_expiration_reminder_hours_before_shutdown">Godziny przed wyłączeniem</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_enabled">Włączony alert o niskim poziomie w zbiorniczku</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_units">Liczba jednostek</string>
+    <string name="omnipod_common_preferences_automatically_silence_alerts">Automatycznie wycisz alarmy Poda</string>
+    <string name="omnipod_common_preferences_category_other">Inne</string>
+    <string name="omnipod_common_preferences_category_alerts">Alerty</string>
+    <string name="omnipod_common_preferences_category_confirmation_beeps">Dźwięki potwierdzenia</string>
+    <string name="omnipod_common_preferences_category_notifications">Powiadomienia</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Dźwięk dla powiadomień o niepewnych TBR włączony</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Dźwięk dla powiadomień o niepewnych SMB włączony</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Dźwięk dla powiadomień o niepewnych bolusach włączony</string>
     <!-- Omnipod - Pod Status -->
+    <string name="omnipod_common_pod_status_no_active_pod">Brak akt. Poda</string>
+    <string name="omnipod_common_pod_status_waiting_for_activation">Konfiguracja w toku (oczekiwanie na aktywację Poda)</string>
+    <string name="omnipod_common_pod_status_waiting_for_cannula_insertion">Konfiguracja w toku (oczekiwanie na wprowadzenie kaniuli)</string>
+    <string name="omnipod_common_pod_status_running">W działaniu</string>
+    <string name="omnipod_common_pod_status_suspended">Wstrzymany</string>
+    <string name="omnipod_common_pod_status_pod_fault">Błąd Poda</string>
+    <string name="omnipod_common_pod_status_activation_time_exceeded">Przekroczono czas aktywacji</string>
+    <string name="omnipod_common_pod_status_inactive">Nieaktywny</string>
+    <string name="omnipod_common_pod_status_pod_fault_description">Błąd Poda: %1$03d %2$s</string>
     <!-- Omnipod - Commands -->
+    <string name="omnipod_common_cmd_deactivate_pod">Odłącz Pod</string>
+    <string name="omnipod_common_cmd_discard_pod">Usuń Poda</string>
+    <string name="omnipod_common_cmd_set_bolus">Podanie bolusa</string>
+    <string name="omnipod_common_cmd_cancel_bolus">Anulowanie bolusa</string>
+    <string name="omnipod_common_cmd_set_tbr">Ustaw tymczasową dawkę bazową</string>
+    <string name="omnipod_common_cmd_cancel_tbr_by_driver">Anuluj tymczasową dawkę bazową (wewnętrznie przez sterownik)</string>
+    <string name="omnipod_common_cmd_cancel_tbr">Anuluj tymczasową dawkę bazową</string>
+    <string name="omnipod_common_cmd_set_basal_schedule">Ustaw harmonogram Dawki bazowej</string>
+    <string name="omnipod_common_cmd_get_pod_status">Pobierz status Poda</string>
+    <string name="omnipod_common_cmd_get_pod_info">Pobierz informacje o Podzie</string>
+    <string name="omnipod_common_cmd_set_time">Ustaw czas</string>
+    <string name="omnipod_common_cmd_configure_alerts">Konfigurowanie alarmów</string>
+    <string name="omnipod_common_cmd_silence_alerts">Wycisz alarmy</string>
+    <string name="omnipod_common_cmd_suspend_delivery">Wstrzymaj podawanie</string>
+    <string name="omnipod_common_cmd_resume_delivery">Wznów podawanie</string>
+    <string name="omnipod_common_cmd_unknown_entry">Nieznany Wpis</string>
+    <string name="omnipod_common_cmd_initialize_pod">Zainicjalizuj Poda</string>
+    <string name="omnipod_common_cmd_insert_cannula">Załóż wkłucie</string>
+    <string name="omnipod_common_cmd_read_pulse_log">Odczytaj Pulse Log</string>
+    <string name="omnipod_common_cmd_set_fake_suspended_tbr">Ustaw fikcyjną tymczasową dawkę bazową, ponieważ Pod jest zawieszony</string>
+    <string name="omnipod_common_cmd_cancel_fake_suspended_tbr">Anuluj fikcyjną tymczasową dawkę bazową, która została wprowadzona, ponieważ Pod był zawieszony</string>
+    <string name="omnipod_common_cmd_split_tbr">Podziel tymczasową dawkę bazową z powodu niepewności w anulowaniu</string>
+    <string name="omnipod_common_cmd_beep_config">Konfiguracja dźwięków</string>
+    <string name="omnipod_common_cmd_play_test_beep">Odtwarzaj test dźwięku</string>
     <!-- Omnipod - Alerts -->
+    <string name="omnipod_common_alert_finish_pairing_reminder">Zakończ przypomnienie parowania</string>
+    <string name="omnipod_common_alert_finish_setup_reminder_reminder">Zakończ przypomnienie o konfiguracji</string>
+    <string name="omnipod_common_alert_expiration">Pod wkrótce straci ważność</string>
+    <string name="omnipod_common_alert_expiration_advisory">Pod wkrótce straci ważność</string>
+    <string name="omnipod_common_alert_shutdown_imminent">Wyłączenie jest nieuchronne</string>
+    <string name="omnipod_common_alert_low_reservoir">Niski poziom w zbiorniku</string>
+    <string name="omnipod_common_alert_unknown_alert">Nieznany alarm</string>
     <!-- Omnipod - Short status -->
+    <string name="omnipod_common_short_status_no_active_pod">Brak akt. Poda</string>
+    <string name="omnipod_common_short_status_last_connection">Ost.Poł.: %1$d m. temu</string>
+    <string name="omnipod_common_short_status_last_bolus">Ost.Bolus: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_temp_basal">Tymcz.: %1$s</string>
+    <string name="omnipod_common_short_status_extended_bolus">Rozsz.: %1$s</string>
+    <string name="omnipod_common_short_status_reservoir">Zbior.: %1$sU</string>
     <!-- Omnipod - Other -->
+    <string name="omnipod_common_yes">Tak</string>
+    <string name="omnipod_common_no">Nie</string>
+    <string name="omnipod_common_ok">OK</string>
+    <string name="omnipod_common_cancel">Anuluj</string>
+    <string name="omnipod_common_warning">Ostrzeżenie</string>
     <!-- Omnipod - Times -->
+    <string name="omnipod_common_moments_ago">Moment temu</string>
+    <string name="omnipod_common_less_than_a_minute_ago">Mniej niż minutę temu</string>
+    <string name="omnipod_common_composite_time">%1$s i %2$s</string>
+    <string name="omnipod_common_time_ago">%1$s temu</string>
+    <plurals name="omnipod_common_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 minuty</item>
+    </plurals>
+    <plurals name="omnipod_common_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_common_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="omnipod_common_pod_alerts">
+        <item quantity="one">Alarm Poda: %1$s</item>
+        <item quantity="few">Alarmy Poda: %1$s</item>
+        <item quantity="many">Alarmy Poda: %1$s</item>
+        <item quantity="other">Alarmy Poda: %1$s</item>
+    </plurals>
 </resources>
diff --git a/omnipod-common/src/main/res/values-ro-rRO/strings.xml b/omnipod-common/src/main/res/values-ro-rRO/strings.xml
index 2aae9e4e448..9bcc89ba4ea 100644
--- a/omnipod-common/src/main/res/values-ro-rRO/strings.xml
+++ b/omnipod-common/src/main/res/values-ro-rRO/strings.xml
@@ -111,6 +111,11 @@
     <string name="omnipod_common_preferences_category_other">Altele</string>
     <string name="omnipod_common_preferences_category_alerts">Alerte</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Beep-uri de confirmare</string>
+    <string name="omnipod_common_preferences_category_notifications">Notificări</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Sunet pentru notificări RBT incerte activat</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Sunet pentru
+        notificări SMB incerte activat</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Sunet pentru notificări bolus incert activat</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Niciun Pod activ</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Setare în desfășurare (se așteaptă activarea Pod-ului)</string>
diff --git a/omnipod-common/src/main/res/values-ru-rRU/strings.xml b/omnipod-common/src/main/res/values-ru-rRU/strings.xml
index 8be8ada62d2..d7fe97eac01 100644
--- a/omnipod-common/src/main/res/values-ru-rRU/strings.xml
+++ b/omnipod-common/src/main/res/values-ru-rRU/strings.xml
@@ -111,6 +111,10 @@
     <string name="omnipod_common_preferences_category_other">Другое</string>
     <string name="omnipod_common_preferences_category_alerts">Оповещения</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Звуковые сигналы подтверждения</string>
+    <string name="omnipod_common_preferences_category_notifications">Уведомления</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Звук для неопределенных уведомлений TBR включен</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Звук для неопределенных SMB уведомлений включен</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Звук для неопределенных уведомлений болюса включен</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Нет активных Pod</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Выполняется настройка (ожидание активации Pod)</string>
diff --git a/omnipod-common/src/main/res/values-sv-rSE/strings.xml b/omnipod-common/src/main/res/values-sv-rSE/strings.xml
index b23def69f56..53b940ebddb 100644
--- a/omnipod-common/src/main/res/values-sv-rSE/strings.xml
+++ b/omnipod-common/src/main/res/values-sv-rSE/strings.xml
@@ -111,6 +111,10 @@
     <string name="omnipod_common_preferences_category_other">Annat</string>
     <string name="omnipod_common_preferences_category_alerts">Varningar</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Bekräftelsepip</string>
+    <string name="omnipod_common_preferences_category_notifications">Aviseringar</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Ljud ifall AAPS är osäker om temp basal aktiverades</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Ljud ifall AAPS är osäker om SMB leverades</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Ljud ifall AAPS är osäker om bolus levererades</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Ingen aktiv pod</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Konfiguration pågår (väntar på Pod-aktivering)</string>
@@ -184,4 +188,8 @@
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dagar</item>
     </plurals>
+    <plurals name="omnipod_common_pod_alerts">
+        <item quantity="one">Pod-varning: %1$s</item>
+        <item quantity="other">Pod-varningar: %1$s</item>
+    </plurals>
 </resources>
diff --git a/omnipod-common/src/main/res/values-tr-rTR/strings.xml b/omnipod-common/src/main/res/values-tr-rTR/strings.xml
index e35fcaa95a6..4671b48f008 100644
--- a/omnipod-common/src/main/res/values-tr-rTR/strings.xml
+++ b/omnipod-common/src/main/res/values-tr-rTR/strings.xml
@@ -2,17 +2,194 @@
 <resources>
     <!-- Omnipod - Keys -->
     <!-- Omnipod - Pod Management -->
+    <string name="omnipod_common_pod_management_title">Pod Yönetimi</string>
+    <string name="omnipod_common_pod_management_heading_actions">Eylemler</string>
+    <string name="omnipod_common_pod_management_heading_tools">Araçlar</string>
+    <string name="omnipod_common_pod_management_button_activate_pod">Pod Etkinleştir</string>
+    <string name="omnipod_common_pod_management_button_deactivate_pod">Pod\'u Devre Dışı Bırak</string>
+    <string name="omnipod_common_pod_management_button_discard_pod">Pod\'u Çıkart</string>
+    <string name="omnipod_common_pod_management_discard_pod_confirmation">Pod\'u çıkartırsanız, artık onunla iletişim kuramazsınız. Bunu yalnızca Pod ile tüm iletişim sürekli olarak başarısız olduğunda yapmalısınız. Hala Pod ile iletişim kurabiliyorsanız, lütfen <b>Pod\'u Devre Dışı Bırak</b> seçeneğini kullanın.\n\nDevam etmek istiyorsanız, lütfen Pod\'u vücudunuzdan çıkardığınızdan emin olun!</string>
+    <string name="omnipod_common_pod_management_button_play_test_beep">Test Bip Sesi Çal</string>
+    <string name="omnipod_common_pod_management_button_playing_test_beep">Test Bip Sesi Çalınıyor…</string>
+    <string name="omnipod_common_pod_management_button_pod_history">Pod Geçmişi</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_common_error_pod_not_attached">Aktif Pod Yok</string>
+    <string name="omnipod_common_error_set_basal_failed">Bazal profil ayarlanamadı.</string>
+    <string name="omnipod_common_error_bolus_did_not_succeed">Bolus başarılı olmadı.</string>
+    <string name="omnipod_common_error_failed_to_set_profile_empty_profile">Bazal profil ayarlanamadı: boş bir profil alındı. Bazal profilinizi etkinleştirdiğinizden emin olun.</string>
+    <string name="omnipod_common_error_set_initial_basal_schedule_no_profile">Hiçbir bazal profil aktif değil. Bazal profilinizi etkinleştirdiğinizden emin olun.</string>
+    <string name="omnipod_common_error_unsupported_custom_command">Desteklenmeyen özel komut: %1$s</string>
+    <string name="omnipod_common_error_failed_to_refresh_status">Yenileme Hatası</string>
+    <string name="omnipod_common_error_failed_to_refresh_status_on_startup">Başlangıçta yenileme hatası</string>
+    <string name="omnipod_common_error_failed_to_silence_alerts">Uyarılar susturulamadı</string>
+    <string name="omnipod_common_error_failed_to_suspend_delivery">İletim durdurulamadı</string>
+    <string name="omnipod_common_error_failed_to_set_time">Zaman ayarlanamadı</string>
+    <string name="omnipod_common_error_failed_to_resume_delivery">İletim devam ettirilemedi</string>
+    <string name="omnipod_common_error_failed_to_initialize_pod">Pod başlatılamadı</string>
+    <string name="omnipod_common_error_failed_to_insert_cannula">Kanül yerleştirmede hata</string>
+    <string name="omnipod_common_error_pod_fault_activation_time_exceeded">Pod\'un etkinleştirme süresi aşıldı. Bu Pod artık etkinleştirilemez.</string>
+    <string name="omnipod_common_error_failed_to_verify_activation_progress">Etkinleştirme ilerleme doğrulanamadı. Lütfen tekrar deneyiniz.</string>
+    <string name="omnipod_common_error_pod_suspended">Pod askıya alındı</string>
+    <string name="omnipod_common_error_failed_to_play_test_beep">Test bip sesi çalınamadı</string>
+    <string name="omnipod_common_error_time_out_of_sync">Pod\'daki saat senkronize değil. Lütfen Omnipod sekmesindeki saati güncelleyin.</string>
+    <string name="omnipod_common_error_unexpected_exception">Beklenmedik bir hata oluştu. Lütfen raporlayın! (%1$s: %2$s).</string>
     <!-- Omnipod - Confirmation -->
+    <string name="omnipod_common_confirmation">Onaylama</string>
+    <string name="omnipod_common_confirmation_time_or_timezone_change">Pod saat ve/veya saat dilimi değişti.</string>
+    <string name="omnipod_common_confirmation_expiration_alerts_updated">Pod alarm yapılandırması güncellendi.</string>
+    <string name="omnipod_common_confirmation_time_on_pod_updated">Pod saati güncellendi.</string>
+    <string name="omnipod_common_confirmation_suspended_delivery">Tüm insülin iletimi durduruldu.</string>
+    <string name="omnipod_common_confirmation_silenced_alerts">Etkin alarmlar susturuldu.</string>
+    <string name="omnipod_common_confirmation_delivery_resumed">İnsülin iletimi yeniden başlatıldı.</string>
     <!-- Omnipod - Overview -->
+    <string name="omnipod_common_overview_button_set_time">Saati ayarla</string>
+    <string name="omnipod_common_overview_button_suspend_delivery">Askıya alınan</string>
+    <string name="omnipod_common_overview_button_resume_delivery">İletime devam et</string>
+    <string name="omnipod_common_overview_button_pod_management">Pod Yntm</string>
+    <string name="omnipod_common_overview_button_silence_alerts">Alarmları Sustur</string>
+    <string name="omnipod_common_overview_pod_status">Pod Durumu</string>
+    <string name="omnipod_common_overview_total_delivered">Toplam İletilen</string>
+    <string name="omnipod_common_overview_total_delivered_value">%1$.2f U</string>
+    <string name="omnipod_common_overview_pod_unique_id">Özgün kimlik</string>
+    <string name="omnipod_common_overview_lot_number">Parti Numarası</string>
+    <string name="omnipod_common_overview_pod_sequence_number">Sıra Numarası</string>
+    <string name="omnipod_common_overview_pod_expiry_date">Pod Sona Erme</string>
+    <string name="omnipod_common_overview_last_connection">Son Bağlantı</string>
+    <string name="omnipod_common_overview_last_bolus">Son Bolus</string>
+    <string name="omnipod_common_overview_temp_basal_rate">Geçici Bazal Oranı</string>
+    <string name="omnipod_common_overview_base_basal_rate">Bazal Oranı</string>
+    <string name="omnipod_common_overview_reservoir">Rezervuar</string>
+    <string name="omnipod_common_overview_pod_active_alerts">Etkin Pod Alarmları</string>
+    <string name="omnipod_common_overview_firmware_version">Firmware versiyonu</string>
+    <string name="omnipod_common_overview_time_on_pod">Pod üzerindeki zaman</string>
+    <string name="omnipod_common_overview_temp_basal_value">%1$.2fÜ/s @%2$s (%3$d/%4$d dakika)</string>
+    <string name="omnipod_common_overview_reservoir_value">%1$.2f Ü kaldı</string>
+    <string name="omnipod_common_overview_reservoir_value_over50">50 Ü üzeri</string>
+    <string name="omnipod_common_overview_errors">Hatalar</string>
     <!-- Omnipod - Wizard Base -->
+    <string name="omnipod_common_wizard_button_cancel">İptal</string>
+    <string name="omnipod_common_wizard_button_finish">Bitti</string>
+    <string name="omnipod_common_wizard_button_next">Sonraki</string>
+    <string name="omnipod_common_wizard_button_retry">Tekrar dene</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Pod\'u Devre Dışı Bırak</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Pod\'u Çıkart</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Henüz tüm adımları tamamlamadınız. Çıkmak istediğinize emin misin?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Çıkış</string>
     <!-- Omnipod - Pod Activation Wizard -->
+    <string name="omnipod_common_pod_activation_wizard_start_pod_activation_title">Podu Doldur</string>
+    <string name="omnipod_common_pod_activation_wizard_initialize_pod_title">Pod\'u Başlat</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_title">Pod\'u Ekle</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_text">İnfüzyon bölgesini hazırlayın. Pod\'un iğne kapağını ve yapışkan desteğini çıkarın ve Pod\'u infüzyon bölgesine takın.\n\nKanül dışarı çıkarsa, lütfen <b>İptal</b>\'e basın ve Pod\'unuzu atın.\n\nKanülü yerleştirmek ve bazal iletimini başlatmak için <b>İleri</b>\'ye basın.</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_confirm_insert_cannula_text"><b>Tamam</b>\'a bastığınızda kanül yerleştirilecektir. Pod\'u infüzyon bölgenize taktığınızdan emin olun.</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_title">Kanül Yerleştir</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_text">Başlangıç bazal programını ayarlanacak ve kanül yerleştirilecek\n\nKanül başarıyla yerleştirildiğinde, <b>İleri</b>\'ye basabilirsiniz.</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_title">Pod Etkinleştirildi</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_text">Yeni Pod artık aktif.\n\nBazal planınız programlandı ve kanül yerleştirildi.\n\nLütfen kanülün doğru şekilde takıldığından emin olun. Düzgün takılmadığını düşünüyorsanız Pod\'unuzu değiştirin.</string>
     <!-- Omnipod - Pod Deactivation Wizard -->
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_title">Pod\'u Devre Dışı Bırak</string>
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text">Pod\'u devre dışı bırakmak için <b>İleri</b>\'ye basın.\n\n<b>Not:</b> Bu, tüm insülin iletimini askıya alacak ve Pod\'u devre dışı bırakacaktır.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_title">Pod Devre dışı bırakılıyor</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_text">Pod devre dışı bırakılıyor.\n\nDevre dışı bırakma başarıyla tamamlandığında, <b>İleri</b>\'ye basabilirsiniz.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_title">Pod Devre dışı bırakıldı</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_text">Pod\'unuz devre dışı bırakıldı.\n\nLütfen Pod\'u vücudunuzdan çıkarın ve geri dönüşüme atın.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_title">Pod Çıkarıldı</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_text">Pod durumu \"çıkarıldı\". Pod düzgün devre dışı bırakılmadığı için insülin iletimi askıya alınmadı!\n\nLütfen Podu vücudunuzdan çıkarın ve geri dönüşüme atın.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod_confirmation">Pod\'u çıkartırsanız, artık onunla iletişim kuramazsınız. Bunu yalnızca Pod ile tüm iletişim sürekli olarak başarısız olduğunda yapmalısınız. Pod\'u çıkartmak istediğinizden emin misiniz?</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod">Pod\'u Çıkart</string>
     <!-- Omnipod - Preferences -->
+    <string name="omnipod_common_preferences_bolus_beeps_enabled">Bolus bip sesleri etkinleştirildi</string>
+    <string name="omnipod_common_preferences_basal_beeps_enabled">Bazal bip sesleri etkinleştirildi</string>
+    <string name="omnipod_common_preferences_smb_beeps_enabled">SMB bip sesleri etkinleştirildi</string>
+    <string name="omnipod_common_preferences_tbr_beeps_enabled">GBO (TBR) bip sesleri etkinleştirildi</string>
+    <string name="omnipod_common_preferences_suspend_delivery_button_enabled">Omnipod sekmesinde İletimi Askıya Al düğmesini göster</string>
+    <string name="omnipod_common_preferences_time_change_enabled">DST/Saat dilimi algılama etkinleştirildi</string>
+    <string name="omnipod_common_preferences_expiration_reminder_enabled">Süre sonu hatırlatıcısı etkinleştirildi</string>
+    <string name="omnipod_common_preferences_expiration_reminder_hours_before_shutdown">Kapanmadan saatler önce</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_enabled">Düşük rezervuar uyarısı etkinleştirildi</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_units">Ünite</string>
+    <string name="omnipod_common_preferences_automatically_silence_alerts">Pod uyarılarını otomatik olarak sustur</string>
+    <string name="omnipod_common_preferences_category_other">Diğer</string>
+    <string name="omnipod_common_preferences_category_alerts">Alarmlar</string>
+    <string name="omnipod_common_preferences_category_confirmation_beeps">Onay Bipleri</string>
+    <string name="omnipod_common_preferences_category_notifications">Bildirimler</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Belirsiz GBO(TBR) bildirimleri için ses etkinleştirildi</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Belirsiz SMB bildirimleri için ses etkinleştirildi</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Belirsiz bolus bildirimleri için ses etkinleştirildi</string>
     <!-- Omnipod - Pod Status -->
+    <string name="omnipod_common_pod_status_no_active_pod">Aktif Pod Yok</string>
+    <string name="omnipod_common_pod_status_waiting_for_activation">Kurulum devam ediyor (Pod aktivasyonu bekleniyor)</string>
+    <string name="omnipod_common_pod_status_waiting_for_cannula_insertion">Kurulum devam ediyor (kanül yerleştirme bekleniyor)</string>
+    <string name="omnipod_common_pod_status_running">Çalışıyor</string>
+    <string name="omnipod_common_pod_status_suspended">Askıya Alındı</string>
+    <string name="omnipod_common_pod_status_pod_fault">Pod Hatası</string>
+    <string name="omnipod_common_pod_status_activation_time_exceeded">Aktivasyon süresi aşıldı</string>
+    <string name="omnipod_common_pod_status_inactive">İnaktif</string>
+    <string name="omnipod_common_pod_status_pod_fault_description">Pod Hatası: %1$03d %2$s</string>
     <!-- Omnipod - Commands -->
+    <string name="omnipod_common_cmd_deactivate_pod">Pod\'u Devre Dışı Bırak</string>
+    <string name="omnipod_common_cmd_discard_pod">Pod\'u Çıkart</string>
+    <string name="omnipod_common_cmd_set_bolus">Bolusu Ayarla</string>
+    <string name="omnipod_common_cmd_cancel_bolus">Bolusu İptal Et</string>
+    <string name="omnipod_common_cmd_set_tbr">Geçici Bazalı Ayarla</string>
+    <string name="omnipod_common_cmd_cancel_tbr_by_driver">Geçici Bazal\'i İptal Et (dahili olarak sürücü tarafından)</string>
+    <string name="omnipod_common_cmd_cancel_tbr">Geçici Bazalı İptal Et</string>
+    <string name="omnipod_common_cmd_set_basal_schedule">Bazal Planı Ayarla</string>
+    <string name="omnipod_common_cmd_get_pod_status">Pod Durumu</string>
+    <string name="omnipod_common_cmd_get_pod_info">Pod Bilgisi</string>
+    <string name="omnipod_common_cmd_set_time">Saati Ayarla</string>
+    <string name="omnipod_common_cmd_configure_alerts">Alarmları Yapılandır</string>
+    <string name="omnipod_common_cmd_silence_alerts">Sessiz Alarmlar</string>
+    <string name="omnipod_common_cmd_suspend_delivery">İletimi Askıya Al</string>
+    <string name="omnipod_common_cmd_resume_delivery">İletime devam et</string>
+    <string name="omnipod_common_cmd_unknown_entry">Bilinmeyen Giriş</string>
+    <string name="omnipod_common_cmd_initialize_pod">Pod\'u Başlat</string>
+    <string name="omnipod_common_cmd_insert_cannula">Kanül Yerleştir</string>
+    <string name="omnipod_common_cmd_read_pulse_log">Nabız Kaydını Oku</string>
+    <string name="omnipod_common_cmd_set_fake_suspended_tbr">Pod askıya alındığından sahte geçici bazal ayarlayın</string>
+    <string name="omnipod_common_cmd_cancel_fake_suspended_tbr">Sahte geçici bazalı iptal edin</string>
+    <string name="omnipod_common_cmd_split_tbr">İptaldeki belirsiz başarısızlık nedeniyle geçici bazal bölünmüş</string>
+    <string name="omnipod_common_cmd_beep_config">Bip Yapılandırması</string>
+    <string name="omnipod_common_cmd_play_test_beep">Test Bip Sesi Çal</string>
     <!-- Omnipod - Alerts -->
+    <string name="omnipod_common_alert_finish_pairing_reminder">Eşleştirme hatırlatıcısını bitir</string>
+    <string name="omnipod_common_alert_finish_setup_reminder_reminder">Kurulum hatırlatıcısını bitir</string>
+    <string name="omnipod_common_alert_expiration">Pod yakında sona erecek</string>
+    <string name="omnipod_common_alert_expiration_advisory">Pod yakında sona erecek</string>
+    <string name="omnipod_common_alert_shutdown_imminent">Her an kapanabilir</string>
+    <string name="omnipod_common_alert_low_reservoir">Düşük Rezervuar</string>
+    <string name="omnipod_common_alert_unknown_alert">Bilinmeyen Alarm</string>
     <!-- Omnipod - Short status -->
+    <string name="omnipod_common_short_status_no_active_pod">Aktif Pod Yok</string>
+    <string name="omnipod_common_short_status_last_connection">Son bağl: %1$d dak. önce</string>
+    <string name="omnipod_common_short_status_last_bolus">SonBolus: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_temp_basal">Geçici: %1$s</string>
+    <string name="omnipod_common_short_status_extended_bolus">Yayma: %1$s</string>
+    <string name="omnipod_common_short_status_reservoir">Rezerv: %1$sU</string>
     <!-- Omnipod - Other -->
+    <string name="omnipod_common_yes">Evet</string>
+    <string name="omnipod_common_no">Hayır</string>
+    <string name="omnipod_common_ok">Tamam</string>
+    <string name="omnipod_common_cancel">İptal</string>
+    <string name="omnipod_common_warning">Uyarı</string>
     <!-- Omnipod - Times -->
+    <string name="omnipod_common_moments_ago">Dakika önce</string>
+    <string name="omnipod_common_less_than_a_minute_ago">Bir dakikadan az bir süre önce</string>
+    <string name="omnipod_common_composite_time">%1$s ve %2$s</string>
+    <string name="omnipod_common_time_ago">%1$s dak önce</string>
+    <plurals name="omnipod_common_minutes">
+        <item quantity="one">%1$d dakika</item>
+        <item quantity="other">%1$d dakika</item>
+    </plurals>
+    <plurals name="omnipod_common_hours">
+        <item quantity="one">%1$d saat</item>
+        <item quantity="other">%1$d saat</item>
+    </plurals>
+    <plurals name="omnipod_common_days">
+        <item quantity="one">%1$d gün</item>
+        <item quantity="other">%1$d gün</item>
+    </plurals>
+    <plurals name="omnipod_common_pod_alerts">
+        <item quantity="one">Pod Alarmı: %1$s</item>
+        <item quantity="other">Pod Alarmları: %1$s</item>
+    </plurals>
 </resources>
diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle
index b9dd868a073..7ed945c1aa1 100644
--- a/omnipod-dash/build.gradle
+++ b/omnipod-dash/build.gradle
@@ -22,10 +22,12 @@ detekt { // TODO move to `subprojects` section in global build.gradle
 
 dependencies {
     implementation project(':core')
+    implementation project(':pump-common')
     implementation project(':omnipod-common')
 
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-rxjava2:$room_version"
+    implementation project(path: ':pump-common')
     kapt "androidx.room:room-compiler:$room_version"
     implementation 'com.github.guepardoapps:kulid:2.0.0.0'
 }
diff --git a/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt b/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt
index df9b08ef744..fd67a2a6ef2 100644
--- a/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt
+++ b/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt
@@ -5,6 +5,7 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.guepardoapps.kulid.ULID
+import info.nightscout.androidaps.logging.AAPSLoggerTest
 import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.DashHistoryDatabase
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.HistoryRecordDao
@@ -34,7 +35,7 @@ class DashHistoryTest {
             DashHistoryDatabase::class.java
         ).build()
         dao = database.historyRecordDao()
-        dashHistory = DashHistory(dao, HistoryMapper())
+        dashHistory = DashHistory(dao, HistoryMapper(), AAPSLoggerTest())
     }
 
     @Test
diff --git a/omnipod-dash/src/main/AndroidManifest.xml b/omnipod-dash/src/main/AndroidManifest.xml
index 180d3b98ce8..4f6d8178c6e 100644
--- a/omnipod-dash/src/main/AndroidManifest.xml
+++ b/omnipod-dash/src/main/AndroidManifest.xml
@@ -11,5 +11,6 @@
         <activity android:name=".ui.wizard.activation.DashPodActivationWizardActivity" />
         <activity android:name=".ui.wizard.deactivation.DashPodDeactivationWizardActivity" />
         <activity android:name=".ui.DashPodManagementActivity" />
+        <activity android:name=".ui.DashPodHistoryActivity" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 31070b87731..f304c327579 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -18,7 +18,7 @@ import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 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
@@ -36,6 +36,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.CommandConfirmed
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BasalValuesRecord
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusRecord
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.TempBasalRecord
@@ -76,7 +77,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
     private val profileFunction: ProfileFunction,
     private val history: DashHistory,
     private val pumpSync: PumpSync,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val context: Context,
     private val aapsSchedulers: AapsSchedulers,
     private val fabricPrivacy: FabricPrivacy,
@@ -84,9 +85,9 @@ class OmnipodDashPumpPlugin @Inject constructor(
 
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
-    commandQueue: CommandQueueProvider
-) : PumpPluginBase(pluginDescription, injector, aapsLogger, resourceHelper, commandQueue), Pump {
+    rh: ResourceHelper,
+    commandQueue: CommandQueue
+) : PumpPluginBase(pluginDescription, injector, aapsLogger, rh, commandQueue), Pump {
     @Volatile var bolusCanceled = false
     @Volatile var bolusDeliveryInProgress = false
 
@@ -234,7 +235,6 @@ class OmnipodDashPumpPlugin @Inject constructor(
     override fun connect(reason: String) {
         aapsLogger.info(LTag.PUMP, "connect reason=$reason")
         podStateManager.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.CONNECTING
-
         synchronized(this) {
             stopConnecting?.let {
                 aapsLogger.warn(LTag.PUMP, "Already connecting: $stopConnecting")
@@ -243,7 +243,6 @@ class OmnipodDashPumpPlugin @Inject constructor(
             val stop = CountDownLatch(1)
             stopConnecting = stop
         }
-
         thread(
             start = true,
             name = "ConnectionThread",
@@ -252,6 +251,9 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 stopConnecting?.let {
                     val error = omnipodManager.connect(it).ignoreElements().blockingGet()
                     aapsLogger.info(LTag.PUMPCOMM, "connect error=$error")
+                    if (error == null) {
+                        podStateManager.incrementSuccessfulConnectionAttemptsAfterRetries()
+                    }
                 }
             } finally {
                 synchronized(this) {
@@ -269,6 +271,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
 
     override fun stopConnecting() {
         aapsLogger.info(LTag.PUMP, "stopConnecting")
+        podStateManager.incrementFailedConnectionsAfterRetries()
         stopConnecting?.countDown()
         omnipodManager.disconnect(true)
     }
@@ -309,8 +312,8 @@ class OmnipodDashPumpPlugin @Inject constructor(
     )
 
     private fun checkPodKaput(): Completable = Completable.defer {
-        val tbr = pumpSync.expectedPumpState().temporaryBasal
         if (podStateManager.isPodKaput) {
+            val tbr = pumpSync.expectedPumpState().temporaryBasal
             if (tbr == null || tbr.rate != 0.0) {
                 pumpSync.syncTemporaryBasalWithPumpId(
                     timestamp = System.currentTimeMillis(),
@@ -339,20 +342,24 @@ class OmnipodDashPumpPlugin @Inject constructor(
                     aapsLogger.info(LTag.PUMP, "syncBolusWithPumpId on CANCEL_BOLUS returned: $sync")
                 }
             }
-            showNotification(
-                Notification.OMNIPOD_POD_FAULT,
-                podStateManager.alarmType.toString(),
-                Notification.URGENT,
-                R.raw.boluserror
-            )
             if (!podStateManager.alarmSynced) {
-                pumpSync.insertAnnouncement(
-                    error = podStateManager.alarmType?.toString() ?: "Unknown pod failure",
-                    pumpId = Random.Default.nextLong(),
-                    pumpType = PumpType.OMNIPOD_DASH,
-                    pumpSerial = serialNumber()
-                )
-                podStateManager.alarmSynced = true
+                podStateManager.alarmType?.let {
+                    if (!commandQueue.isCustomCommandInQueue(CommandDeactivatePod::class.java)) {
+                        showNotification(
+                            Notification.OMNIPOD_POD_FAULT,
+                            it.toString(),
+                            Notification.URGENT,
+                            R.raw.boluserror
+                        )
+                    }
+                    pumpSync.insertAnnouncement(
+                        error = it.toString(),
+                        pumpId = Random.Default.nextLong(),
+                        pumpType = PumpType.OMNIPOD_DASH,
+                        pumpSerial = serialNumber()
+                    )
+                    podStateManager.alarmSynced = true
+                }
             }
         }
         Completable.complete()
@@ -363,8 +370,12 @@ class OmnipodDashPumpPlugin @Inject constructor(
             return PumpEnactResult(injector).success(true).enacted(true)
         }
         aapsLogger.debug(LTag.PUMP, "setNewBasalProfile profile=$profile")
-        val basalProgram = mapProfileToBasalProgram(profile)
+        return setNewBasalProfile(profile, OmnipodCommandType.SET_BASAL_PROFILE)
+    }
+
+    private fun setNewBasalProfile(profile: Profile, historyType: OmnipodCommandType): PumpEnactResult {
         var deliverySuspended = false
+        val basalProgram = mapProfileToBasalProgram(profile)
         return executeProgrammingCommand(
             pre = suspendDeliveryIfActive().doOnComplete {
                 if (podStateManager.activeCommand == null) {
@@ -372,7 +383,10 @@ class OmnipodDashPumpPlugin @Inject constructor(
                     deliverySuspended = true
                 }
             },
-            historyEntry = history.createRecord(commandType = OmnipodCommandType.SET_BASAL_PROFILE),
+            historyEntry = history.createRecord(
+                commandType = historyType,
+                basalProfileRecord = BasalValuesRecord(profile.getBasalValues().toList())
+            ),
             activeCommandEntry = { historyId ->
                 podStateManager.createActiveCommand(historyId, basalProgram = basalProgram)
             },
@@ -446,19 +460,19 @@ class OmnipodDashPumpPlugin @Inject constructor(
             .subscribe(
                 {
                     if (it.isChanged(
-                            resourceHelper,
+                            rh,
                             R.string.key_omnipod_common_expiration_reminder_enabled
                         ) ||
                         it.isChanged(
-                                resourceHelper,
+                                rh,
                                 R.string.key_omnipod_common_expiration_reminder_hours_before_shutdown
                             ) ||
                         it.isChanged(
-                                resourceHelper,
+                                rh,
                                 R.string.key_omnipod_common_low_reservoir_alert_enabled
                             ) ||
                         it.isChanged(
-                                resourceHelper,
+                                rh,
                                 R.string.key_omnipod_common_low_reservoir_alert_units
                             )
                     ) {
@@ -519,7 +533,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
             // Omnipod only reports reservoir level when there's < 1023 pulses left
             return podStateManager.pulsesRemaining?.let {
                 it * PodConstants.POD_PULSE_BOLUS_UNITS
-            } ?: 75.0
+            } ?: 50.0
         }
 
     override val batteryLevel: Int
@@ -614,15 +628,20 @@ class OmnipodDashPumpPlugin @Inject constructor(
                         )
                     }
                 }
-            }.toSingleDefault(
+            }.toSingle {
                 PumpEnactResult(injector).success(true).enacted(true).bolusDelivered(deliveredBolusAmount)
+            }.onErrorReturnItem(
+                // success if canceled
+                PumpEnactResult(injector).success(bolusCanceled).enacted(false)
             )
-                .onErrorReturnItem(
-                    // success if canceled
-                    PumpEnactResult(injector).success(bolusCanceled).enacted(false)
-                )
                 .blockingGet()
-            aapsLogger.info(LTag.PUMP, "deliverTreatment result: $ret")
+            aapsLogger.info(
+                LTag.PUMP,
+                "deliverTreatment result: $ret. " +
+                    "deliveredBolusAmount=$deliveredBolusAmount. " +
+                    "ret bolus=${ret.bolusDelivered}" +
+                    "bolusCanceled=$bolusCanceled"
+            )
             return ret
         } finally {
             bolusCanceled = false
@@ -678,7 +697,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
             }
             val percent = (waited.toFloat() / estimatedDeliveryTimeSeconds) * 100
             updateBolusProgressDialog(
-                resourceHelper.gs(R.string.bolusdelivering, requestedBolusAmount),
+                rh.gs(R.string.dash_bolusdelivering, requestedBolusAmount),
                 percent.toInt()
             )
         }
@@ -704,7 +723,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 val remainingUnits = podStateManager.lastBolus!!.bolusUnitsRemaining
                 val percent = ((requestedBolusAmount - remainingUnits) / requestedBolusAmount) * 100
                 updateBolusProgressDialog(
-                    resourceHelper.gs(R.string.bolusdelivering, requestedBolusAmount),
+                    rh.gs(R.string.bolusdelivering, requestedBolusAmount),
                     percent.toInt()
                 )
 
@@ -1017,28 +1036,28 @@ class OmnipodDashPumpPlugin @Inject constructor(
 
     override fun shortStatus(veryShort: Boolean): String {
         if (!podStateManager.isActivationCompleted) {
-            return resourceHelper.gs(R.string.omnipod_common_short_status_no_active_pod)
+            return rh.gs(R.string.omnipod_common_short_status_no_active_pod)
         }
         var ret = ""
         if (podStateManager.lastUpdatedSystem != 0L) {
             val agoMsec: Long = System.currentTimeMillis() - podStateManager.lastUpdatedSystem
             val agoMin = (agoMsec / 60.0 / 1000.0).toInt()
-            ret += resourceHelper.gs(R.string.omnipod_common_short_status_last_connection, agoMin) + "\n"
+            ret += rh.gs(R.string.omnipod_common_short_status_last_connection, agoMin) + "\n"
         }
         podStateManager.lastBolus?.run {
-            ret += resourceHelper.gs(
+            ret += rh.gs(
                 R.string.omnipod_common_short_status_last_bolus, to2Decimal(this.deliveredUnits() ?: this.requestedUnits),
                 DateFormat.format("HH:mm", Date(this.startTime))
             ) + "\n"
         }
-        val (temporaryBasal, extendedBolus, _, profile) = pumpSync.expectedPumpState()
+        val temporaryBasal = pumpSync.expectedPumpState().temporaryBasal
         temporaryBasal?.run {
-            ret += resourceHelper.gs(
+            ret += rh.gs(
                 R.string.omnipod_common_short_status_temp_basal,
                 this.toStringFull(dateUtil)
             ) + "\n"
         }
-        ret += resourceHelper.gs(
+        ret += rh.gs(
             R.string.omnipod_common_short_status_reservoir,
             podStateManager.pulsesRemaining?.let { reservoirLevel.toString() } ?: "50+"
         )
@@ -1086,7 +1105,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
             else -> {
                 aapsLogger.warn(LTag.PUMP, "Unsupported custom command: " + customCommand.javaClass.name)
                 PumpEnactResult(injector).success(false).enacted(false).comment(
-                    resourceHelper.gs(
+                    rh.gs(
                         R.string.omnipod_common_error_unsupported_custom_command,
                         customCommand.javaClass.name
                     )
@@ -1139,7 +1158,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
         return profileFunction.getProfile()?.let {
             executeProgrammingCommand(
                 pre = observeDeliverySuspended(),
-                historyEntry = history.createRecord(OmnipodCommandType.RESUME_DELIVERY),
+                historyEntry = history.createRecord(OmnipodCommandType.RESUME_DELIVERY, basalProfileRecord = BasalValuesRecord(it.getBasalValues().toList())),
                 command = omnipodManager.setBasalProgram(mapProfileToBasalProgram(it), hasBasalBeepEnabled())
                     .ignoreElements()
             ).doFinally {
@@ -1153,24 +1172,29 @@ class OmnipodDashPumpPlugin @Inject constructor(
     }
 
     private fun deactivatePod(): PumpEnactResult {
+        var success = true
         val ret = executeProgrammingCommand(
             historyEntry = history.createRecord(OmnipodCommandType.DEACTIVATE_POD),
             command = omnipodManager.deactivatePod().ignoreElements(),
-            checkNoActiveCommand = false,
-            post = createFakeTBRWhenNoActivePod(),
+            checkNoActiveCommand = false
         ).doOnComplete {
-            rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_FAULT))
+            if (podStateManager.activeCommand != null) {
+                success = false
+            } else {
+                podStateManager.reset()
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_FAULT))
+            }
         }.toPumpEnactResult()
-
-        if (podStateManager.activeCommand != null) {
+        if (!success) {
             ret.success(false)
         }
         return ret
     }
 
     private fun handleTimeChange(): PumpEnactResult {
-        // TODO
-        return PumpEnactResult(injector).success(false).enacted(false).comment("NOT IMPLEMENTED")
+        return profileFunction.getProfile()?.let {
+            setNewBasalProfile(it, OmnipodCommandType.SET_TIME)
+        } ?: PumpEnactResult(injector).success(false).enacted(false).comment("No profile active")
     }
 
     private fun updateAlertConfiguration(): PumpEnactResult {
@@ -1180,14 +1204,20 @@ class OmnipodDashPumpPlugin @Inject constructor(
         val lowReservoirAlertEnabled = sp.getBoolean(R.string.key_omnipod_common_low_reservoir_alert_enabled, true)
         val lowReservoirAlertUnits = sp.getInt(R.string.key_omnipod_common_low_reservoir_alert_units, 10)
 
-        if (!podStateManager.differentAlertSettings(
+        when {
+            podStateManager.sameAlertSettings(
                 expirationReminderEnabled,
                 expirationHours,
                 lowReservoirAlertEnabled,
                 lowReservoirAlertUnits
-            )
-        ) {
-            return PumpEnactResult(injector).success(true).enacted(false)
+            ) -> {
+                aapsLogger.debug(LTag.PUMP, "Ignoring updateAlertConfiguration because the settings did not change")
+                return PumpEnactResult(injector).success(true).enacted(false)
+            }
+            !podStateManager.isPodRunning -> {
+                aapsLogger.debug(LTag.PUMP, "Ignoring updateAlertConfiguration because there is no active pod")
+                return PumpEnactResult(injector).success(true).enacted(false)
+            }
         }
 
         val podLifeLeft = Duration.between(ZonedDateTime.now(), podStateManager.expiry)
@@ -1229,7 +1259,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 expirationReminderEnabled,
                 expirationHours
             ).andThen(
-                podStateManager.updateExpirationAlertSettings(
+                podStateManager.updateLowReservoirAlertSettings(
                     lowReservoirAlertEnabled,
                     lowReservoirAlertUnits
                 )
@@ -1252,14 +1282,20 @@ class OmnipodDashPumpPlugin @Inject constructor(
             "Time, Date and/or TimeZone changed. [timeChangeType=" + timeChangeType.name + ", eventHandlingEnabled=" + eventHandlingEnabled + "]"
         )
 
-        if (timeChangeType == TimeChangeType.TimeChanged) {
-            aapsLogger.info(LTag.PUMP, "Ignoring time change because it is not a DST or TZ change")
-            return
-        } else if (!podStateManager.isPodRunning) {
-            aapsLogger.info(LTag.PUMP, "Ignoring time change because no Pod is active")
-            return
+        when {
+            !eventHandlingEnabled -> {
+                aapsLogger.info(LTag.PUMP, "Ignoring time change because automatic time handling is disabled in configuration")
+                return
+            }
+            timeChangeType == TimeChangeType.TimeChanged -> {
+                aapsLogger.info(LTag.PUMP, "Ignoring time change because it is not a DST or TZ change")
+                return
+            }
+            !podStateManager.isPodRunning -> {
+                aapsLogger.info(LTag.PUMP, "Ignoring time change because no Pod is active")
+                return
+            }
         }
-
         aapsLogger.info(LTag.PUMP, "Handling time change")
 
         commandQueue.customCommand(CommandHandleTimeChange(false), null)
@@ -1453,7 +1489,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
     }
 
     private fun showErrorDialog(message: String, sound: Int) {
-        runAlarm(context, message, resourceHelper.gs(R.string.error), sound)
+        runAlarm(context, message, rh.gs(R.string.error), sound)
     }
 
     private fun showNotification(id: Int, message: String, urgency: Int, sound: Int?) {
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt
index cbd7e428040..c565d67abca 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt
@@ -11,6 +11,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodD
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodDashBleManagerImpl
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManagerImpl
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.DashPodHistoryActivity
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.DashPodManagementActivity
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.OmnipodDashOverviewFragment
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.DashPodActivationWizardActivity
@@ -21,6 +22,9 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivati
 abstract class OmnipodDashModule {
     // ACTIVITIES
 
+    @ContributesAndroidInjector
+    abstract fun contributesDashPodHistoryActivity(): DashPodHistoryActivity
+
     @ContributesAndroidInjector
     abstract fun contributesDashPodManagementActivity(): DashPodManagementActivity
 
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt
index 718df1597b8..4f3f6828920 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt
@@ -23,8 +23,6 @@ interface OmnipodDashManager {
 
     fun suspendDelivery(hasBasalBeepEnabled: Boolean): Observable<PodEvent>
 
-    fun setTime(): Observable<PodEvent>
-
     fun setTempBasal(rate: Double, durationInMinutes: Short, tempBasalBeeps: Boolean): Observable<PodEvent>
 
     fun stopTempBasal(hasTempBasalBeepEnabled: Boolean): Observable<PodEvent>
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
index 923109c5c18..0d62eb9a68d 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
@@ -196,7 +196,7 @@ class OmnipodDashManagerImpl @Inject constructor(
                 DefaultStatusResponse::class
             )
         }.doOnComplete {
-            podStateManager.timeZone = TimeZone.getDefault()
+            podStateManager.updateTimeZone()
         }
     }
 
@@ -506,12 +506,6 @@ class OmnipodDashManagerImpl @Inject constructor(
         ).interceptPodEvents()
     }
 
-    override fun setTime(): Observable<PodEvent> {
-        // TODO
-        logger.error(LTag.PUMPCOMM, "NOT IMPLEMENTED: setTime()")
-        return Observable.empty()
-    }
-
     private fun observeSendProgramTempBasalCommand(rate: Double, durationInMinutes: Short, tempBasalBeeps: Boolean): Observable<PodEvent> {
         return Observable.defer {
             bleManager.sendCommand(
@@ -641,7 +635,6 @@ class OmnipodDashManagerImpl @Inject constructor(
             observeConnectToPod,
             observeSendDeactivateCommand
         ).interceptPodEvents()
-            .doOnComplete(podStateManager::reset)
     }
 
     inner class PodEventInterceptor : Consumer<PodEvent> {
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
index a70ff39266b..fdf7fa7bfb1 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
@@ -30,9 +30,8 @@ class OmnipodDashBleManagerImpl @Inject constructor(
 ) : OmnipodDashBleManager {
 
     private val busy = AtomicBoolean(false)
-    private val bluetoothManager: BluetoothManager =
-        context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
-    private val bluetoothAdapter: BluetoothAdapter = bluetoothManager.adapter
+    private val bluetoothAdapter: BluetoothAdapter?
+        get() = (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter
     private var connection: Connection? = null
     private val ids = Ids(podState)
 
@@ -123,7 +122,8 @@ class OmnipodDashBleManagerImpl @Inject constructor(
                 val podAddress =
                     podState.bluetoothAddress
                         ?: throw FailedToConnectException("Missing bluetoothAddress, activate the pod first")
-                val podDevice = bluetoothAdapter.getRemoteDevice(podAddress)
+                val podDevice = bluetoothAdapter?.getRemoteDevice(podAddress)
+                    ?: throw ConnectException("Bluetooth not available")
                 val conn = connection
                     ?: Connection(podDevice, aapsLogger, context, podState)
                 connection = conn
@@ -193,7 +193,9 @@ class OmnipodDashBleManagerImpl @Inject constructor(
             aapsLogger.info(LTag.PUMPBTCOMM, "Starting new pod activation")
 
             emitter.onNext(PodEvent.Scanning)
-            val podScanner = PodScanner(aapsLogger, bluetoothAdapter)
+            val adapter = bluetoothAdapter
+                ?: throw ConnectException("Bluetooth not available")
+            val podScanner = PodScanner(aapsLogger, adapter)
             val podAddress = podScanner.scanForPod(
                 PodScanner.SCAN_FOR_SERVICE_UUID,
                 PodScanner.POD_ID_NOT_ACTIVATED
@@ -201,7 +203,7 @@ class OmnipodDashBleManagerImpl @Inject constructor(
             podState.bluetoothAddress = podAddress
 
             emitter.onNext(PodEvent.BluetoothConnecting)
-            val podDevice = bluetoothAdapter.getRemoteDevice(podAddress)
+            val podDevice = adapter.getRemoteDevice(podAddress)
             val conn = Connection(podDevice, aapsLogger, context, podState)
             connection = conn
             conn.connect(ConnectionWaitCondition(timeoutMs = 3 * Connection.BASE_CONNECT_TIMEOUT_MS))
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
index d27a3b28c49..fa384443175 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
@@ -33,8 +33,11 @@ interface OmnipodDashPodStateManager {
     var bluetoothConnectionState: BluetoothConnectionState
     var connectionAttempts: Int
     var successfulConnections: Int
+    val successfulConnectionAttemptsAfterRetries: Int
+    val failedConnectionsAfterRetries: Int
 
-    var timeZone: TimeZone
+    val timeZoneId: String?
+    val timeZoneUpdated: Long?
     val sameTimeZone: Boolean // The TimeZone is the same on the phone and on the pod
     val lastUpdatedSystem: Long // System.currentTimeMillis()
     val lastStatusResponseReceived: Long
@@ -85,6 +88,9 @@ interface OmnipodDashPodStateManager {
     fun updateFromPairing(uniqueId: Id, pairResult: PairResult)
     fun reset()
     fun connectionSuccessRatio(): Float
+    fun incrementSuccessfulConnectionAttemptsAfterRetries()
+    fun incrementFailedConnectionsAfterRetries()
+    fun updateTimeZone()
 
     fun createActiveCommand(
         historyId: String,
@@ -105,7 +111,7 @@ interface OmnipodDashPodStateManager {
        - after getPodStatus was successful(we have an up-to-date podStatus)
      */
     fun recoverActivationFromPodStatus(): String?
-    fun differentAlertSettings(expirationReminderEnabled: Boolean, expirationHours: Int, lowReservoirAlertEnabled: Boolean, lowReservoirAlertUnits: Int): Boolean
+    fun sameAlertSettings(expirationReminderEnabled: Boolean, expirationHours: Int, lowReservoirAlertEnabled: Boolean, lowReservoirAlertUnits: Int): Boolean
     fun updateExpirationAlertSettings(expirationReminderEnabled: Boolean, expirationHours: Int): Completable
     fun updateLowReservoirAlertSettings(lowReservoirAlertEnabled: Boolean, lowReservoirAlertUnits: Int): Completable
 
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index bc02649cb0f..2c79549a0da 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -5,7 +5,7 @@ import com.google.gson.Gson
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.EventOmnipodDashPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id
@@ -23,6 +23,8 @@ import io.reactivex.Single
 import java.io.Serializable
 import java.time.Duration
 import java.time.Instant
+import java.time.ZoneId
+import java.time.ZoneOffset
 import java.time.ZonedDateTime
 import java.util.*
 import javax.inject.Inject
@@ -32,7 +34,7 @@ import javax.inject.Singleton
 class OmnipodDashPodStateManagerImpl @Inject constructor(
     private val logger: AAPSLogger,
     private val sharedPreferences: SP,
-    private val rxBus: RxBusWrapper
+    private val rxBus: RxBus
 ) : OmnipodDashPodStateManager {
 
     private var podState: PodState
@@ -114,25 +116,35 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
             podState.successfulConnections = value
         }
 
-    override var timeZone: TimeZone
-        get() = TimeZone.getTimeZone(podState.timeZone)
-        set(tz) {
-            podState.timeZone = tz.toZoneId().normalized().id
-            store()
-        }
+    override val successfulConnectionAttemptsAfterRetries: Int
+        @Synchronized
+        get() = podState.successfulConnectionAttemptsAfterRetries
+
+    @Synchronized
+    override fun incrementSuccessfulConnectionAttemptsAfterRetries() {
+        podState.successfulConnectionAttemptsAfterRetries++
+    }
+
+    override val failedConnectionsAfterRetries: Int
+        @Synchronized
+        get() = podState.failedConnectionsAfterRetries
+
+    override fun incrementFailedConnectionsAfterRetries() {
+        podState.failedConnectionsAfterRetries++
+    }
+
+    override val timeZoneId: String?
+        get() = podState.timeZone
 
     override val sameTimeZone: Boolean
         get() {
             val now = System.currentTimeMillis()
             val currentTimezone = TimeZone.getDefault()
             val currentOffset = currentTimezone.getOffset(now)
-            val podOffset = timeZone.getOffset(now)
+            val podOffset = podState.timeZoneOffset
             logger.debug(
                 LTag.PUMPCOMM,
-                "sameTimeZone currentTimezone=${currentTimezone.getDisplayName(
-                    true,
-                    TimeZone.SHORT
-                )} " +
+                "sameTimeZone " +
                     "currentOffset=$currentOffset " +
                     "podOffset=$podOffset"
             )
@@ -219,8 +231,9 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         get() {
             val minutesSinceActivation = podState.minutesSinceActivation
             val activationTime = podState.activationTime
-            if ((activationTime != null) && (minutesSinceActivation != null)) {
-                return ZonedDateTime.ofInstant(Instant.ofEpochMilli(activationTime), timeZone.toZoneId())
+            val timeZoneOffset = podState.timeZoneOffset
+            if ((activationTime != null) && (minutesSinceActivation != null) && (timeZoneOffset != null)) {
+                return ZonedDateTime.ofInstant(Instant.ofEpochMilli(activationTime), ZoneId.ofOffset("", ZoneOffset.ofTotalSeconds(timeZoneOffset / 1000)))
                     .plusMinutes(minutesSinceActivation.toLong())
                     .plus(Duration.ofMillis(System.currentTimeMillis() - lastUpdatedSystem))
             }
@@ -229,9 +242,25 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
 
     override val timeDrift: Duration?
         get() {
-            return Duration.between(ZonedDateTime.now(), time)
+            return time?.let {
+                return Duration.between(ZonedDateTime.now(), it)
+            } ?: null
+        }
+
+    override val timeZoneUpdated: Long?
+        get() {
+            return podState.timeZoneUpdated
         }
 
+    override fun updateTimeZone() {
+        val timeZone = TimeZone.getDefault()
+        val now = System.currentTimeMillis()
+
+        podState.timeZoneOffset = timeZone.getOffset(now)
+        podState.timeZone = timeZone.id
+        podState.timeZoneUpdated = now
+    }
+
     override val expiry: ZonedDateTime?
         get() {
             val podLifeInHours = podLifeInHours
@@ -435,7 +464,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         }
     }
 
-    override fun differentAlertSettings(
+    override fun sameAlertSettings(
         expirationReminderEnabled: Boolean,
         expirationHours: Int,
         lowReservoirAlertEnabled: Boolean,
@@ -627,13 +656,10 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
     }
 
     override fun connectionSuccessRatio(): Float {
-        if (connectionAttempts == 0) {
+        if (failedConnectionsAfterRetries + successfulConnectionAttemptsAfterRetries == 0) {
             return 0.0F
-        } else if (connectionAttempts <= successfulConnections) {
-            // Prevent bogus quality > 1 during initialisation
-            return 1.0F
         }
-        return successfulConnections.toFloat() / connectionAttempts.toFloat()
+        return successfulConnectionAttemptsAfterRetries.toFloat() / (successfulConnectionAttemptsAfterRetries + failedConnectionsAfterRetries)
     }
 
     override fun reset() {
@@ -675,6 +701,8 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
             OmnipodDashPodStateManager.BluetoothConnectionState.DISCONNECTED
         var connectionAttempts = 0
         var successfulConnections = 0
+        var successfulConnectionAttemptsAfterRetries = 0
+        var failedConnectionsAfterRetries = 0
         var messageSequenceNumber: Short = 0
         var sequenceNumberOfLastProgrammingCommand: Short? = null
         var activationTime: Long? = null
@@ -682,8 +710,9 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         var bluetoothAddress: String? = null
         var ltk: ByteArray? = null
         var eapAkaSequenceNumber: Long = 1
-        var bolusPulsesRemaining: Short = 0
-        var timeZone: String = "" // TimeZone ID (e.g. "Europe/Amsterdam")
+        var timeZone: String? = null // TimeZone ID (e.g. "Europe/Amsterdam")
+        var timeZoneOffset: Int? = null
+        var timeZoneUpdated: Long? = null
         var alarmSynced: Boolean = false
 
         var bleVersion: SoftwareVersion? = null
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
index f1e91651f74..637d3c383f7 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
@@ -7,11 +7,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.Omnipod
 import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType.SET_BOLUS
 import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType.SET_TEMPORARY_BASAL
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.*
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusRecord
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.HistoryRecord
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.TempBasalRecord
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.*
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.HistoryRecordDao
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.HistoryRecordEntity
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.mapper.HistoryMapper
@@ -40,19 +36,18 @@ class DashHistory @Inject constructor(
 
     fun getById(id: String): HistoryRecord {
         val entry = dao.byIdBlocking(id)
-        if (entry == null) {
-            throw java.lang.IllegalArgumentException("history entry [$id] not found")
-        }
+            ?: throw java.lang.IllegalArgumentException("history entry [$id] not found")
         return historyMapper.entityToDomain(entry)
     }
 
     @Suppress("ReturnCount")
     fun createRecord(
         commandType: OmnipodCommandType,
-        date: Long = System.currentTimeMillis(),
+        date: Long = currentTimeMillis(),
         initialResult: InitialResult = InitialResult.NOT_SENT,
         tempBasalRecord: TempBasalRecord? = null,
         bolusRecord: BolusRecord? = null,
+        basalProfileRecord: BasalValuesRecord? = null,
         resolveResult: ResolvedResult? = null,
         resolvedAt: Long? = null
     ): Single<String> = Single.defer {
@@ -72,6 +67,7 @@ class DashHistory @Inject constructor(
                         commandType = commandType,
                         tempBasalRecord = tempBasalRecord,
                         bolusRecord = bolusRecord,
+                        basalProfileRecord = basalProfileRecord,
                         initialResult = initialResult,
                         resolvedResult = resolveResult,
                         resolvedAt = resolvedAt
@@ -83,7 +79,8 @@ class DashHistory @Inject constructor(
     fun getRecords(): Single<List<HistoryRecord>> =
         dao.all().map { list -> list.map(historyMapper::entityToDomain) }
 
-    fun getRecordsAfter(time: Long): Single<List<HistoryRecordEntity>> = dao.allSince(time)
+    fun getRecordsAfter(time: Long): Single<List<HistoryRecord>> =
+        dao.allSince(time).map { list -> list.map(historyMapper::entityToDomain) }
 
     fun updateFromState(podState: OmnipodDashPodStateManager) = Completable.defer {
         val historyId = podState.activeCommand?.historyId
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt
index f7510c40b12..baef277087a 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt
@@ -18,4 +18,12 @@ data class HistoryRecord(
         val entropy = ULID.getEntropy(id)
         return ByteBuffer.wrap(entropy).long
     }
+
+    fun displayTimestamp(): Long {
+        return date
+    }
+
+    fun isSuccess(): Boolean {
+        return initialResult == InitialResult.SENT && resolvedResult == ResolvedResult.SUCCESS
+    }
 }
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt
index c5ea0ab4b30..f129ab292de 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data
 
 import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.interfaces.Profile
 
 sealed class Record
 
@@ -8,6 +9,8 @@ data class BolusRecord(val amout: Double, val bolusType: BolusType) : Record()
 
 data class TempBasalRecord(val duration: Int, val rate: Double) : Record()
 
+data class BasalValuesRecord(val segments: List<Profile.ProfileValue>) : Record()
+
 enum class BolusType {
     DEFAULT, SMB;
 
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt
index ee92d9ed78d..676ba331682 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data
 
 enum class InitialResult {
-    NOT_SENT, FAILURE_SENDING, UNCONFIRMED, SENT
+    NOT_SENT, FAILURE_SENDING, SENT
 }
 
 enum class ResolvedResult {
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt
index 8d21ea751a1..5f90d9b7c80 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database
 
 import androidx.room.TypeConverter
+import com.google.gson.GsonBuilder
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult
@@ -31,4 +33,17 @@ class Converters {
 
     @TypeConverter
     fun fromOmnipodCommandType(omnipodCommandType: OmnipodCommandType) = omnipodCommandType.name
+
+    @TypeConverter
+    fun toSegments(s: String?): List<Profile.ProfileValue> {
+        s ?: return emptyList()
+        val gson = GsonBuilder().create()
+        return gson.fromJson(s, Array<Profile.ProfileValue>::class.java).toList()
+    }
+
+    @TypeConverter
+    fun fromBasalValues(segments: List<Profile.ProfileValue>): String {
+        val gson = GsonBuilder().create()
+        return gson.toJson(segments)
+    }
 }
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt
index 3014f3eba08..993d49d5649 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt
@@ -18,13 +18,13 @@ abstract class DashHistoryDatabase : RoomDatabase() {
 
     companion object {
 
-        const val VERSION = 1
+        const val VERSION = 2
 
         fun build(context: Context) =
             Room.databaseBuilder(
                 context.applicationContext,
                 DashHistoryDatabase::class.java,
-                "omnipod_dash_history_database.db"
+                "omnipod_dash_history_database.db",
             )
                 .fallbackToDestructiveMigration()
                 .build()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt
index 84ca7f9f4d2..1beaab6bcad 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt
@@ -19,7 +19,7 @@ abstract class HistoryRecordDao {
     @Query("SELECT * from historyrecords")
     abstract fun allBlocking(): List<HistoryRecordEntity>
 
-    @Query("SELECT * from historyrecords WHERE createdAt <= :since")
+    @Query("SELECT * from historyrecords WHERE createdAt >= :since ORDER BY createdAt DESC")
     abstract fun allSince(since: Long): Single<List<HistoryRecordEntity>>
 
     @Query("SELECT * FROM historyrecords WHERE id = :id LIMIT 1")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt
index 18ff9c14d22..c135e24cd53 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt
@@ -4,6 +4,7 @@ import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BasalValuesRecord
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusRecord
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult
@@ -18,6 +19,7 @@ data class HistoryRecordEntity(
     val initialResult: InitialResult,
     @Embedded(prefix = "tempBasalRecord_") val tempBasalRecord: TempBasalRecord?,
     @Embedded(prefix = "bolusRecord_") val bolusRecord: BolusRecord?,
+    @Embedded(prefix = "basalprofile_") val basalProfileRecord: BasalValuesRecord?,
     val resolvedResult: ResolvedResult?,
     val resolvedAt: Long?
 )
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt
index 5266924514a..765c538ee63 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.mapper
 
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BasalValuesRecord
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusRecord
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.HistoryRecord
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.TempBasalRecord
@@ -17,7 +18,8 @@ class HistoryMapper {
             tempBasalRecord = historyRecord.record as? TempBasalRecord,
             bolusRecord = historyRecord.record as? BolusRecord,
             resolvedResult = historyRecord.resolvedResult,
-            resolvedAt = historyRecord.resolvedAt
+            resolvedAt = historyRecord.resolvedAt,
+            basalProfileRecord = historyRecord.record as? BasalValuesRecord
         )
 
     fun entityToDomain(entity: HistoryRecordEntity): HistoryRecord =
@@ -27,7 +29,7 @@ class HistoryMapper {
             date = entity.date,
             initialResult = entity.initialResult,
             commandType = entity.commandType,
-            record = entity.bolusRecord ?: entity.tempBasalRecord,
+            record = entity.bolusRecord ?: entity.tempBasalRecord ?: entity.basalProfileRecord,
             resolvedResult = entity.resolvedResult,
             resolvedAt = entity.resolvedAt
         )
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt
new file mode 100644
index 00000000000..ff04fa5b91c
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt
@@ -0,0 +1,324 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui
+// import info.nightscout.androidaps.plugins.pump.omnipod.dash.definition.PodHistoryEntryType;
+// import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.AapsOmnipodUtil;
+import android.os.Bundle
+import android.os.SystemClock
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Spinner
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil
+import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.*
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import java.util.*
+import javax.inject.Inject
+
+class DashPodHistoryActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var dashHistory: DashHistory
+    @Inject lateinit var aapsSchedulers: AapsSchedulers
+
+    private var historyTypeSpinner: Spinner? = null
+    private var statusView: TextView? = null
+    private var recyclerView: RecyclerView? = null
+    private var linearLayoutManager: LinearLayoutManager? = null
+    private val fullHistoryList: MutableList<HistoryRecord> = ArrayList<HistoryRecord>()
+    private val filteredHistoryList: MutableList<HistoryRecord> = ArrayList<HistoryRecord>()
+    private var recyclerViewAdapter: RecyclerViewAdapter? = null
+    private var manualChange = false
+    private var typeListFull: List<TypeList>? = null
+
+    private fun prepareData() {
+        val gc = GregorianCalendar()
+        gc.add(Calendar.DAY_OF_MONTH, -DAYS_TO_DISPLAY)
+
+        val since = gc.timeInMillis
+        val records = dashHistory.getRecordsAfter(since)
+            .subscribeOn(aapsSchedulers.io)
+            .blockingGet()
+        fullHistoryList.addAll(records)
+    }
+
+    private fun groupForCommandType(type: OmnipodCommandType): PumpHistoryEntryGroup {
+        return when (type) {
+            OmnipodCommandType.INITIALIZE_POD ->
+                PumpHistoryEntryGroup.Prime
+            OmnipodCommandType.INSERT_CANNULA ->
+                PumpHistoryEntryGroup.Prime
+            OmnipodCommandType.DEACTIVATE_POD ->
+                PumpHistoryEntryGroup.Prime
+            OmnipodCommandType.DISCARD_POD ->
+                PumpHistoryEntryGroup.Prime
+
+            OmnipodCommandType.CANCEL_TEMPORARY_BASAL ->
+                PumpHistoryEntryGroup.Basal
+            OmnipodCommandType.SET_BASAL_PROFILE ->
+                PumpHistoryEntryGroup.Basal
+            OmnipodCommandType.SET_TEMPORARY_BASAL ->
+                PumpHistoryEntryGroup.Basal
+            OmnipodCommandType.RESUME_DELIVERY ->
+                PumpHistoryEntryGroup.Basal
+            OmnipodCommandType.SUSPEND_DELIVERY ->
+                PumpHistoryEntryGroup.Basal
+
+            OmnipodCommandType.SET_BOLUS ->
+                PumpHistoryEntryGroup.Bolus
+            OmnipodCommandType.CANCEL_BOLUS ->
+                PumpHistoryEntryGroup.Bolus
+
+            OmnipodCommandType.ACKNOWLEDGE_ALERTS ->
+                PumpHistoryEntryGroup.Alarm
+            OmnipodCommandType.CONFIGURE_ALERTS ->
+                PumpHistoryEntryGroup.Alarm
+            OmnipodCommandType.PLAY_TEST_BEEP ->
+                PumpHistoryEntryGroup.Alarm
+
+            OmnipodCommandType.GET_POD_STATUS ->
+                PumpHistoryEntryGroup.Configuration
+            OmnipodCommandType.SET_TIME ->
+                PumpHistoryEntryGroup.Configuration
+
+            OmnipodCommandType.READ_POD_PULSE_LOG ->
+                PumpHistoryEntryGroup.Unknown
+        }
+    }
+
+    private fun filterHistory(group: PumpHistoryEntryGroup) {
+        filteredHistoryList.clear()
+        aapsLogger.debug(LTag.PUMP, "Items on full list: {}", fullHistoryList.size)
+        if (group === PumpHistoryEntryGroup.All) {
+            filteredHistoryList.addAll(fullHistoryList)
+        } else {
+            filteredHistoryList.addAll(fullHistoryList.filter { groupForCommandType(it.commandType) == group })
+        }
+        recyclerViewAdapter?.let {
+            it.historyList = filteredHistoryList
+            it.notifyDataSetChanged()
+        }
+        aapsLogger.debug(LTag.PUMP, "Items on filtered list: {}", filteredHistoryList.size)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        filterHistory(selectedGroup)
+        setHistoryTypeSpinner()
+    }
+
+    private fun setHistoryTypeSpinner() {
+        manualChange = true
+        val typeList = typeListFull
+        typeList?.let {
+            for (i in it.indices) {
+                if (it[i].entryGroup === selectedGroup) {
+                    historyTypeSpinner!!.setSelection(i)
+                    break
+                }
+            }
+        }
+        SystemClock.sleep(200)
+        manualChange = false
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.omnipod_dash_pod_history_activity)
+        prepareData()
+
+        recyclerView = findViewById(R.id.omnipod_history_recyclerview)
+        recyclerViewAdapter = RecyclerViewAdapter(filteredHistoryList)
+        linearLayoutManager = LinearLayoutManager(this)
+        recyclerView?.run {
+            setHasFixedSize(true)
+            layoutManager = linearLayoutManager
+            adapter = recyclerViewAdapter
+        }
+
+        statusView = findViewById(R.id.omnipod_historystatus)
+        statusView?.run { visibility = View.GONE }
+
+        historyTypeSpinner = findViewById(R.id.omnipod_historytype)
+        typeListFull = getTypeList(PumpHistoryEntryGroup.Companion.getTranslatedList(rh))
+        val spinnerAdapter: ArrayAdapter<TypeList> = ArrayAdapter<TypeList>(this, R.layout.spinner_centered, typeListFull!!)
+        historyTypeSpinner?.run {
+            adapter = spinnerAdapter
+            onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                    if (manualChange) return
+                    val selected = selectedItem as TypeList
+                    selectedGroup = selected.entryGroup
+                    filterHistory(selectedGroup)
+                }
+
+                override fun onNothingSelected(parent: AdapterView<*>?) {
+                    if (manualChange) return
+                    filterHistory(PumpHistoryEntryGroup.All)
+                }
+            }
+        }
+    }
+
+    private fun getTypeList(list: List<PumpHistoryEntryGroup>): List<TypeList> {
+        val typeList = ArrayList<TypeList>()
+        for (pumpHistoryEntryGroup in list) {
+            typeList.add(TypeList(pumpHistoryEntryGroup))
+        }
+        return typeList
+    }
+
+    internal class TypeList(val entryGroup: PumpHistoryEntryGroup) {
+
+        val name: String = entryGroup.translated ?: "XXX TODO"
+
+        override fun toString(): String {
+            return name
+        }
+    }
+
+    inner class RecyclerViewAdapter internal constructor(var historyList: List<HistoryRecord>) : RecyclerView.Adapter<RecyclerViewAdapter.HistoryViewHolder>() {
+
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): HistoryViewHolder {
+            val v: View = LayoutInflater.from(viewGroup.context).inflate(
+                R.layout.omnipod_dash_pod_history_item,
+                viewGroup, false
+            )
+            return HistoryViewHolder(v)
+        }
+
+        override fun onBindViewHolder(holder: HistoryViewHolder, position: Int) {
+            val record: HistoryRecord = historyList[position]
+            record.let {
+                holder.timeView.text = DateTimeUtil.toStringFromTimeInMillis(it.displayTimestamp())
+                setValue(it, holder.valueView)
+                setType(it, holder.typeView)
+            }
+        }
+
+        private fun setTextViewColor(check_result: Boolean, textview: TextView, record: HistoryRecord) {
+            if (check_result && !record.isSuccess()) {
+                // Record says not success
+                textview.setTextColor(android.graphics.Color.YELLOW)
+                return
+            }
+            // On success set color
+            val textColor = when (record.commandType) {
+                // Operational
+                OmnipodCommandType.INITIALIZE_POD,
+                OmnipodCommandType.CONFIGURE_ALERTS,
+                OmnipodCommandType.INSERT_CANNULA,
+                OmnipodCommandType.DEACTIVATE_POD,
+                OmnipodCommandType.DISCARD_POD,
+                OmnipodCommandType.SUSPEND_DELIVERY,
+                OmnipodCommandType.RESUME_DELIVERY,
+                OmnipodCommandType.SET_BASAL_PROFILE -> {
+                    android.graphics.Color.CYAN
+                }
+                // User action
+                OmnipodCommandType.PLAY_TEST_BEEP,
+                OmnipodCommandType.ACKNOWLEDGE_ALERTS,
+                OmnipodCommandType.CANCEL_BOLUS -> {
+                    android.graphics.Color.GREEN
+                }
+                // Insulin treatment
+                OmnipodCommandType.SET_BOLUS,
+                OmnipodCommandType.SET_TEMPORARY_BASAL -> {
+                    android.graphics.Color.WHITE
+                }
+
+                else ->
+                    // Other
+                    android.graphics.Color.LTGRAY
+            }
+            textview.setTextColor(textColor)
+        }
+
+        private fun setType(record: HistoryRecord, typeView: TextView) {
+            typeView.text = rh.gs(record.commandType.resourceId)
+            // Set some color, include result
+            setTextViewColor(check_result = true, typeView, record)
+        }
+
+        private fun setValue(historyEntry: HistoryRecord, valueView: TextView) {
+            valueView.text = historyEntry.toString()
+            // val entryType = historyEntry.commandType
+            if (!historyEntry.isSuccess()) {
+                valueView.text = rh.gs(translatedFailure(historyEntry))
+                return
+            }
+            valueView.text = when (historyEntry.commandType) {
+                OmnipodCommandType.SET_TEMPORARY_BASAL -> {
+                    val tbr = historyEntry.record as TempBasalRecord
+                    tbr.let {
+                        rh.gs(R.string.omnipod_common_history_tbr_value, it.rate, it.duration)
+                    }
+                }
+
+                OmnipodCommandType.SET_BOLUS -> {
+                    val bolus = historyEntry.record as BolusRecord
+                    bolus.let {
+                        rh.gs(R.string.omnipod_common_history_bolus_value, it.amout)
+                    }
+                }
+
+                OmnipodCommandType.SET_BASAL_PROFILE,
+                OmnipodCommandType.SET_TIME,
+                OmnipodCommandType.INSERT_CANNULA,
+                OmnipodCommandType.RESUME_DELIVERY -> {
+                    val basal = historyEntry.record as BasalValuesRecord
+                    ProfileUtil.getBasalProfilesDisplayable(basal.segments.toTypedArray(), PumpType.OMNIPOD_DASH)
+                }
+
+                else ->
+                    ""
+            }
+            // Set some color
+            setTextViewColor(check_result = false, valueView, historyEntry)
+        }
+
+        override fun getItemCount(): Int {
+            return historyList.size
+        }
+
+        inner class HistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+            val timeView: TextView = itemView.findViewById(R.id.omnipod_history_time)
+            val typeView: TextView = itemView.findViewById(R.id.omnipod_history_source)
+            val valueView: TextView = itemView.findViewById(R.id.omnipod_history_description)
+        }
+    }
+
+    private fun translatedFailure(historyEntry: HistoryRecord): Int {
+        return when {
+            historyEntry.initialResult == InitialResult.FAILURE_SENDING ->
+                R.string.omnipod_dash_failed_to_send
+            historyEntry.initialResult == InitialResult.NOT_SENT ->
+                R.string.omnipod_dash_command_not_sent
+            historyEntry.initialResult == InitialResult.SENT &&
+                historyEntry.resolvedResult == ResolvedResult.FAILURE ->
+                R.string.omnipod_dash_command_not_received_by_the_pod
+            else ->
+                R.string.omnipod_dash_unknown
+        }
+    }
+
+    companion object {
+
+        private var selectedGroup: PumpHistoryEntryGroup = PumpHistoryEntryGroup.All
+        const val DAYS_TO_DISPLAY = 5
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
index 0e31e65ff76..f29988232e3 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
@@ -7,8 +7,8 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.extensions.toVisibility
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.interfaces.CommandQueue
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandPlayTestBeep
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
@@ -28,9 +28,9 @@ import javax.inject.Inject
 
 class DashPodManagementActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var context: Context
     @Inject lateinit var aapsSchedulers: AapsSchedulers
@@ -66,7 +66,7 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
         binding.buttonDiscardPod.setOnClickListener {
             OKDialog.showConfirmation(
                 this,
-                resourceHelper.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation),
+                rh.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation),
                 Thread {
                     podStateManager.reset()
                 }
@@ -83,10 +83,10 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
                     override fun run() {
                         if (!result.success) {
                             displayErrorDialog(
-                                resourceHelper.gs(R.string.omnipod_common_warning),
-                                resourceHelper.gs(
+                                rh.gs(R.string.omnipod_common_warning),
+                                rh.gs(
                                     R.string.omnipod_common_two_strings_concatenated_by_colon,
-                                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_play_test_beep),
+                                    rh.gs(R.string.omnipod_common_error_failed_to_play_test_beep),
                                     result.comment
                                 ),
                                 false
@@ -96,6 +96,10 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
                 }
             )
         }
+
+        binding.buttonPodHistory.setOnClickListener {
+            startActivity(Intent(this, DashPodHistoryActivity::class.java))
+        }
     }
 
     override fun onResume() {
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index 00a9cc69680..5c2902ab919 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -14,9 +14,9 @@ import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventPumpStatusChanged
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewButtonsBinding
@@ -50,6 +50,7 @@ import org.apache.commons.lang3.StringUtils
 import java.time.Duration
 import java.time.ZonedDateTime
 import java.util.*
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.collections.ArrayList
 
@@ -57,9 +58,9 @@ import kotlin.collections.ArrayList
 class OmnipodDashOverviewFragment : DaggerFragment() {
 
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var rh: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var omnipodDashPumpPlugin: OmnipodDashPumpPlugin
     @Inject lateinit var podStateManager: OmnipodDashPodStateManager
     @Inject lateinit var sp: SP
@@ -119,9 +120,9 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             commandQueue.customCommand(
                 CommandResumeDelivery(),
                 DisplayResultDialogCallback(
-                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_resume_delivery),
+                    rh.gs(R.string.omnipod_common_error_failed_to_resume_delivery),
                     true
-                ).messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_delivery_resumed))
+                ).messageOnSuccess(rh.gs(R.string.omnipod_common_confirmation_delivery_resumed))
             )
         }
 
@@ -130,7 +131,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             commandQueue.readStatus(
                 "REQUESTED BY USER",
                 DisplayResultDialogCallback(
-                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_refresh_status),
+                    rh.gs(R.string.omnipod_common_error_failed_to_refresh_status),
                     false
                 )
             )
@@ -141,10 +142,10 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             commandQueue.customCommand(
                 CommandSilenceAlerts(),
                 DisplayResultDialogCallback(
-                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_silence_alerts),
+                    rh.gs(R.string.omnipod_common_error_failed_to_silence_alerts),
                     false
                 )
-                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_silenced_alerts))
+                    .messageOnSuccess(rh.gs(R.string.omnipod_common_confirmation_silenced_alerts))
                     .actionOnSuccess { rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_ALERTS)) }
             )
         }
@@ -154,10 +155,10 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             commandQueue.customCommand(
                 CommandSuspendDelivery(),
                 DisplayResultDialogCallback(
-                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_suspend_delivery),
+                    rh.gs(R.string.omnipod_common_error_failed_to_suspend_delivery),
                     true
                 )
-                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_suspended_delivery))
+                    .messageOnSuccess(rh.gs(R.string.omnipod_common_confirmation_suspended_delivery))
             )
         }
 
@@ -165,8 +166,8 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             disablePodActionButtons()
             commandQueue.customCommand(
                 CommandHandleTimeChange(true),
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_set_time), true)
-                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_time_on_pod_updated))
+                DisplayResultDialogCallback(rh.gs(R.string.omnipod_common_error_failed_to_set_time), true)
+                    .messageOnSuccess(rh.gs(R.string.omnipod_common_confirmation_time_on_pod_updated))
             )
         }
         if (buildHelper.isEngineeringMode()) {
@@ -213,6 +214,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
         disposables += rxBus
             .toObservable(EventPumpStatusChanged::class.java)
             .observeOn(aapsSchedulers.main)
+            .delay(30, TimeUnit.MILLISECONDS, aapsSchedulers.main)
             .subscribe(
                 {
                     updateBluetoothConnectionStatus(it)
@@ -245,7 +247,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
     }
 
     private fun updateBluetoothConnectionStatus(event: EventPumpStatusChanged) {
-        var status = event.getStatus(resourceHelper)
+        var status = event.getStatus(rh)
         bluetoothStatusBinding.omnipodDashBluetoothStatus.text = status
     }
 
@@ -254,17 +256,18 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             ?: PLACEHOLDER
 
         val connectionSuccessPercentage = podStateManager.connectionSuccessRatio() * 100
+        val connectionAttempts = podStateManager.failedConnectionsAfterRetries + podStateManager.successfulConnectionAttemptsAfterRetries
         val successPercentageString = String.format("%.2f %%", connectionSuccessPercentage)
         val quality =
-            "${podStateManager.successfulConnections}/${podStateManager.connectionAttempts} :: $successPercentageString"
+            "${podStateManager.successfulConnectionAttemptsAfterRetries}/$connectionAttempts :: $successPercentageString"
         bluetoothStatusBinding.omnipodDashBluetoothConnectionQuality.text = quality
         val connectionStatsColor = when {
-            connectionSuccessPercentage > 90 ->
-                Color.WHITE
-            connectionSuccessPercentage > 60 ->
+            connectionSuccessPercentage < 70 && podStateManager.successfulConnectionAttemptsAfterRetries > 50 ->
+                Color.RED
+            connectionSuccessPercentage < 90 && podStateManager.successfulConnectionAttemptsAfterRetries > 50 ->
                 Color.YELLOW
             else ->
-                Color.RED
+                Color.WHITE
         }
         bluetoothStatusBinding.omnipodDashBluetoothConnectionQuality.setTextColor(connectionStatsColor)
         bluetoothStatusBinding.omnipodDashDeliveryStatus.text = podStateManager.deliveryStatus?.let {
@@ -297,18 +300,26 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             podInfoBinding.uniqueId.text = podStateManager.uniqueId.toString()
             podInfoBinding.podLot.text = podStateManager.lotNumber.toString()
             podInfoBinding.podSequenceNumber.text = podStateManager.podSequenceNumber.toString()
-            podInfoBinding.firmwareVersion.text = resourceHelper.gs(
+            podInfoBinding.firmwareVersion.text = rh.gs(
                 R.string.omnipod_dash_overview_firmware_version_value,
                 podStateManager.firmwareVersion.toString(),
                 podStateManager.bluetoothVersion.toString()
             )
 
-            // Update time on Pod
+            val timeZone = podStateManager.timeZoneId?.let { timeZoneId ->
+                podStateManager.timeZoneUpdated?.let { timeZoneUpdated ->
+                    val tz = TimeZone.getTimeZone(timeZoneId)
+                    val inDST = tz.inDaylightTime(Date(timeZoneUpdated))
+                    val locale = resources.configuration.locales.get(0)
+                    tz.getDisplayName(inDST, TimeZone.SHORT, locale)
+                } ?: PLACEHOLDER
+            } ?: PLACEHOLDER
+
             podInfoBinding.timeOnPod.text = podStateManager.time?.let {
-                resourceHelper.gs(
+                rh.gs(
                     R.string.omnipod_common_time_with_timezone,
                     dateUtil.dateAndTimeString(it.toEpochSecond() * 1000),
-                    podStateManager.timeZone.getDisplayName(true, TimeZone.SHORT)
+                    timeZone
                 )
             } ?: PLACEHOLDER
 
@@ -347,7 +358,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
             podStateManager.alarmType?.let {
                 errors.add(
-                    resourceHelper.gs(
+                    rh.gs(
                         R.string.omnipod_common_pod_status_pod_fault_description,
                         it.value,
                         it.toString()
@@ -358,7 +369,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             // base basal rate
             podInfoBinding.baseBasalRate.text =
                 if (podStateManager.basalProgram != null && !podStateManager.isSuspended) {
-                    resourceHelper.gs(
+                    rh.gs(
                         R.string.pump_basebasalrate,
                         omnipodDashPumpPlugin.model()
                             .determineCorrectBasalSize(podStateManager.basalProgram!!.rateAt(Date()))
@@ -370,7 +381,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             // total delivered
             podInfoBinding.totalDelivered.text =
                 if (podStateManager.isActivationCompleted && podStateManager.pulsesDelivered != null) {
-                    resourceHelper.gs(
+                    rh.gs(
                         R.string.omnipod_common_overview_total_delivered_value,
                         (podStateManager.pulsesDelivered!! * PodConstants.POD_PULSE_BOLUS_UNITS)
                     )
@@ -381,7 +392,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             // reservoir
             if (podStateManager.pulsesRemaining == null) {
                 podInfoBinding.reservoir.text =
-                    resourceHelper.gs(R.string.omnipod_common_overview_reservoir_value_over50)
+                    rh.gs(R.string.omnipod_common_overview_reservoir_value_over50)
                 podInfoBinding.reservoir.setTextColor(Color.WHITE)
             } else {
                 // TODO
@@ -389,7 +400,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                 //    ?: OmnipodConstants.DEFAULT_MAX_RESERVOIR_ALERT_THRESHOLD).toDouble()
                 val lowReservoirThreshold: Short = PodConstants.DEFAULT_MAX_RESERVOIR_ALERT_THRESHOLD
 
-                podInfoBinding.reservoir.text = resourceHelper.gs(
+                podInfoBinding.reservoir.text = rh.gs(
                     R.string.omnipod_common_overview_reservoir_value,
                     (podStateManager.pulsesRemaining!! * PodConstants.POD_PULSE_BOLUS_UNITS)
                 )
@@ -431,7 +442,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             else ->
                 R.string.omnipod_common_alert_unknown_alert
         }
-        return resourceHelper.gs(id)
+        return rh.gs(id)
     }
 
     private fun updateLastConnection() {
@@ -458,29 +469,29 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
     private fun updatePodStatus() {
         podInfoBinding.podStatus.text = if (podStateManager.activationProgress == ActivationProgress.NOT_STARTED) {
-            resourceHelper.gs(R.string.omnipod_common_pod_status_no_active_pod)
+            rh.gs(R.string.omnipod_common_pod_status_no_active_pod)
         } else if (!podStateManager.isActivationCompleted) {
             if (!podStateManager.isUniqueIdSet) {
-                resourceHelper.gs(R.string.omnipod_common_pod_status_waiting_for_activation)
+                rh.gs(R.string.omnipod_common_pod_status_waiting_for_activation)
             } else {
                 if (podStateManager.activationProgress.isBefore(ActivationProgress.PRIME_COMPLETED)) {
-                    resourceHelper.gs(R.string.omnipod_common_pod_status_waiting_for_activation)
+                    rh.gs(R.string.omnipod_common_pod_status_waiting_for_activation)
                 } else {
-                    resourceHelper.gs(R.string.omnipod_common_pod_status_waiting_for_cannula_insertion)
+                    rh.gs(R.string.omnipod_common_pod_status_waiting_for_cannula_insertion)
                 }
             }
         } else {
             if (podStateManager.podStatus!!.isRunning()) {
                 if (podStateManager.isSuspended) {
-                    resourceHelper.gs(R.string.omnipod_common_pod_status_suspended)
+                    rh.gs(R.string.omnipod_common_pod_status_suspended)
                 } else {
-                    resourceHelper.gs(R.string.omnipod_common_pod_status_running)
+                    rh.gs(R.string.omnipod_common_pod_status_running)
                 }
                 /*
             } else if (podStateManager.podStatus == PodProgressStatus.FAULT_EVENT_OCCURRED) {
-                resourceHelper.gs(R.string.omnipod_common_pod_status_pod_fault)
+                rh.gs(R.string.omnipod_common_pod_status_pod_fault)
             } else if (podStateManager.podStatus == PodProgressStatus.INACTIVE) {
-                resourceHelper.gs(R.string.omnipod_common_pod_status_inactive)
+                rh.gs(R.string.omnipod_common_pod_status_inactive)
                  */
             } else {
                 podStateManager.podStatus.toString()
@@ -504,10 +515,10 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
         podStateManager.activeCommand?.let {
             val requestedBolus = it.requestedBolus
             if (requestedBolus != null) {
-                var text = resourceHelper.gs(
+                var text = rh.gs(
                     R.string.omnipod_common_overview_last_bolus_value,
                     omnipodDashPumpPlugin.model().determineCorrectBolusSize(requestedBolus),
-                    resourceHelper.gs(R.string.insulin_unit_shortname),
+                    rh.gs(R.string.insulin_unit_shortname),
                     readableDuration(Duration.ofMillis(SystemClock.elapsedRealtime() - it.createdRealtime))
                 )
                 text += " (uncertain) "
@@ -524,10 +535,10 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             val bolusSize = it.deliveredUnits()
                 ?: it.requestedUnits
 
-            val text = resourceHelper.gs(
+            val text = rh.gs(
                 R.string.omnipod_common_overview_last_bolus_value,
                 omnipodDashPumpPlugin.model().determineCorrectBolusSize(bolusSize),
-                resourceHelper.gs(R.string.insulin_unit_shortname),
+                rh.gs(R.string.insulin_unit_shortname),
                 readableDuration(Duration.ofMillis(System.currentTimeMillis() - it.startTime))
             )
             if (!it.deliveryComplete) {
@@ -547,7 +558,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
             val minutesRunning = Duration.ofMillis(System.currentTimeMillis() - startTime).toMinutes()
 
-            podInfoBinding.tempBasal.text = resourceHelper.gs(
+            podInfoBinding.tempBasal.text = rh.gs(
                 R.string.omnipod_common_overview_temp_basal_value,
                 rate,
                 dateUtil.timeString(startTime),
@@ -631,15 +642,12 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
     }
 
     private fun updateSetTimeButton() {
-        // TODO
-        /*
-        if (podStateManager.isPodRunning && (podStateManager.timeDeviatesMoreThan(Duration.standardMinutes(5)) || commandQueue.isCustomCommandInQueue(CommandHandleTimeChange::class.java))) {
+        if (podStateManager.isActivationCompleted && !podStateManager.sameTimeZone) {
             buttonBinding.buttonSetTime.visibility = View.VISIBLE
-            buttonBinding.buttonSetTime.isEnabled = !podStateManager.isSuspended && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
+            buttonBinding.buttonSetTime.isEnabled = !podStateManager.isSuspended && isQueueEmpty()
         } else {
             buttonBinding.buttonSetTime.visibility = View.GONE
         }
-         */
     }
 
     private fun isAutomaticallySilenceAlertsEnabled(): Boolean {
@@ -670,34 +678,34 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
         val seconds = duration.seconds
         when {
             seconds < 10 -> {
-                return resourceHelper.gs(R.string.omnipod_common_moments_ago)
+                return rh.gs(R.string.omnipod_common_moments_ago)
             }
 
             seconds < 60 -> {
-                return resourceHelper.gs(R.string.omnipod_common_less_than_a_minute_ago)
+                return rh.gs(R.string.omnipod_common_less_than_a_minute_ago)
             }
 
             seconds < 60 * 60 -> { // < 1 hour
-                return resourceHelper.gs(
+                return rh.gs(
                     R.string.omnipod_common_time_ago,
-                    resourceHelper.gq(R.plurals.omnipod_common_minutes, minutes, minutes)
+                    rh.gq(R.plurals.omnipod_common_minutes, minutes, minutes)
                 )
             }
 
             seconds < 24 * 60 * 60 -> { // < 1 day
                 val minutesLeft = minutes % 60
                 if (minutesLeft > 0)
-                    return resourceHelper.gs(
+                    return rh.gs(
                         R.string.omnipod_common_time_ago,
-                        resourceHelper.gs(
+                        rh.gs(
                             R.string.omnipod_common_composite_time,
-                            resourceHelper.gq(R.plurals.omnipod_common_hours, hours, hours),
-                            resourceHelper.gq(R.plurals.omnipod_common_minutes, minutesLeft, minutesLeft)
+                            rh.gq(R.plurals.omnipod_common_hours, hours, hours),
+                            rh.gq(R.plurals.omnipod_common_minutes, minutesLeft, minutesLeft)
                         )
                     )
-                return resourceHelper.gs(
+                return rh.gs(
                     R.string.omnipod_common_time_ago,
-                    resourceHelper.gq(R.plurals.omnipod_common_hours, hours, hours)
+                    rh.gq(R.plurals.omnipod_common_hours, hours, hours)
                 )
             }
 
@@ -705,17 +713,17 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                 val days = hours / 24
                 val hoursLeft = hours % 24
                 if (hoursLeft > 0)
-                    return resourceHelper.gs(
+                    return rh.gs(
                         R.string.omnipod_common_time_ago,
-                        resourceHelper.gs(
+                        rh.gs(
                             R.string.omnipod_common_composite_time,
-                            resourceHelper.gq(R.plurals.omnipod_common_days, days, days),
-                            resourceHelper.gq(R.plurals.omnipod_common_hours, hoursLeft, hoursLeft)
+                            rh.gq(R.plurals.omnipod_common_days, days, days),
+                            rh.gq(R.plurals.omnipod_common_hours, hoursLeft, hoursLeft)
                         )
                     )
-                return resourceHelper.gs(
+                return rh.gs(
                     R.string.omnipod_common_time_ago,
-                    resourceHelper.gq(R.plurals.omnipod_common_days, days, days)
+                    rh.gq(R.plurals.omnipod_common_days, days, days)
                 )
             }
         }
@@ -747,13 +755,13 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             if (result.success) {
                 val messageOnSuccess = this.messageOnSuccess
                 if (messageOnSuccess != null) {
-                    displayOkDialog(resourceHelper.gs(R.string.omnipod_common_confirmation), messageOnSuccess)
+                    displayOkDialog(rh.gs(R.string.omnipod_common_confirmation), messageOnSuccess)
                 }
                 actionOnSuccess?.run()
             } else {
                 displayErrorDialog(
-                    resourceHelper.gs(R.string.omnipod_common_warning),
-                    resourceHelper.gs(
+                    rh.gs(R.string.omnipod_common_warning),
+                    rh.gs(
                         R.string.omnipod_common_two_strings_concatenated_by_colon,
                         errorMessagePrefix,
                         result.comment
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt
index 715387abebb..7920b856e49 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt
@@ -5,13 +5,18 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertTrigger
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.I8n
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.Single
 import io.reactivex.rxkotlin.plusAssign
@@ -24,8 +29,12 @@ class DashInitializePodViewModel @Inject constructor(
     logger: AAPSLogger,
     private val sp: SP,
     private val podStateManager: OmnipodDashPodStateManager,
-    private val resourceHelper: ResourceHelper
-) : InitializePodViewModel(injector, logger) {
+    private val rh: ResourceHelper,
+    private val history: DashHistory,
+    aapsSchedulers: AapsSchedulers
+
+) : InitializePodViewModel(injector, logger, aapsSchedulers) {
+
     override fun isPodInAlarm(): Boolean = false // TODO
 
     override fun isPodActivationTimeExceeded(): Boolean = false // TODO
@@ -41,27 +50,31 @@ class DashInitializePodViewModel @Inject constructor(
             } else
                 null
 
-            super.disposable += omnipodManager.activatePodPart1(lowReservoirAlertTrigger).subscribeBy(
-                onNext = { podEvent ->
-                    logger.debug(
-                        LTag.PUMP,
-                        "Received PodEvent in Pod activation part 1: $podEvent"
-                    )
-                },
-                onError = { throwable ->
-                    logger.error(LTag.PUMP, "Error in Pod activation part 1", throwable)
-                    source.onSuccess(
-                        PumpEnactResult(injector)
-                            .success(false)
-                            .comment(I8n.textFromException(throwable, resourceHelper))
-                    )
-                },
-                onComplete = {
-                    logger.debug("Pod activation part 1 completed")
-                    podStateManager.updateLowReservoirAlertSettings(lowReservoirAlertEnabled, lowReservoirAlertUnits)
-                    source.onSuccess(PumpEnactResult(injector).success(true))
-                }
-            )
+            super.disposable += omnipodManager.activatePodPart1(lowReservoirAlertTrigger)
+                .ignoreElements()
+                .andThen(podStateManager.updateLowReservoirAlertSettings(lowReservoirAlertEnabled, lowReservoirAlertUnits))
+                .andThen(
+                    history.createRecord(
+                        OmnipodCommandType.INITIALIZE_POD,
+                        initialResult = InitialResult.SENT,
+                        resolveResult = ResolvedResult.SUCCESS,
+                        resolvedAt = System.currentTimeMillis(),
+                    ).ignoreElement()
+                )
+                .subscribeBy(
+                    onError = { throwable ->
+                        logger.error(LTag.PUMP, "Error in Pod activation part 1", throwable)
+                        source.onSuccess(
+                            PumpEnactResult(injector)
+                                .success(false)
+                                .comment(I8n.textFromException(throwable, rh))
+                        )
+                    },
+                    onComplete = {
+                        logger.debug("Pod activation part 1 completed")
+                        source.onSuccess(PumpEnactResult(injector).success(true))
+                    }
+                )
         }
 
     @StringRes
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
index 29a574549a0..743e96adbf5 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
@@ -8,18 +8,25 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BasalValuesRecord
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.Constants
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.I8n
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.mapProfileToBasalProgram
+import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.Single
 import io.reactivex.rxkotlin.plusAssign
@@ -31,13 +38,17 @@ class DashInsertCannulaViewModel @Inject constructor(
     private val profileFunction: ProfileFunction,
     private val pumpSync: PumpSync,
     private val podStateManager: OmnipodDashPodStateManager,
-    private val rxBus: RxBusWrapper,
+    private val rxBus: RxBus,
     private val sp: SP,
-    private val resourceHelper: ResourceHelper,
+    private val rh: ResourceHelper,
+    private val fabricPrivacy: FabricPrivacy,
+    private val history: DashHistory,
 
     injector: HasAndroidInjector,
-    logger: AAPSLogger
-) : InsertCannulaViewModel(injector, logger) {
+    logger: AAPSLogger,
+    aapsSchedulers: AapsSchedulers
+) : InsertCannulaViewModel(injector, logger, aapsSchedulers) {
+
     override fun isPodInAlarm(): Boolean = false // TODO
 
     override fun isPodActivationTimeExceeded(): Boolean = false // TODO
@@ -65,16 +76,21 @@ class DashInsertCannulaViewModel @Inject constructor(
                 null
 
             super.disposable += omnipodManager.activatePodPart2(basalProgram, expirationHoursBeforeShutdown)
+                .ignoreElements()
+                .andThen(podStateManager.updateExpirationAlertSettings(expirationReminderEnabled, expirationHours))
+                .andThen(
+                    history.createRecord(
+                        OmnipodCommandType.INSERT_CANNULA,
+                        basalProfileRecord = BasalValuesRecord(profile.getBasalValues().toList()),
+                        initialResult = InitialResult.SENT,
+                        resolveResult = ResolvedResult.SUCCESS,
+                        resolvedAt = System.currentTimeMillis(),
+                    ).ignoreElement()
+                )
                 .subscribeBy(
-                    onNext = { podEvent ->
-                        logger.debug(
-                            LTag.PUMP,
-                            "Received PodEvent in Pod activation part 2: $podEvent"
-                        )
-                    },
                     onError = { throwable ->
                         logger.error(LTag.PUMP, "Error in Pod activation part 2", throwable)
-                        source.onSuccess(PumpEnactResult(injector).success(false).comment(I8n.textFromException(throwable, resourceHelper)))
+                        source.onSuccess(PumpEnactResult(injector).success(false).comment(I8n.textFromException(throwable, rh)))
                     },
                     onComplete = {
                         logger.debug("Pod activation part 2 completed")
@@ -102,9 +118,8 @@ class DashInsertCannulaViewModel @Inject constructor(
                             pumpType = PumpType.OMNIPOD_DASH,
                             pumpSerial = podStateManager.uniqueId?.toString() ?: "n/a"
                         )
-
-                        podStateManager.updateExpirationAlertSettings(expirationReminderEnabled, expirationHours)
                         rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED))
+                        fabricPrivacy.logCustom("OmnipodDashPodActivated")
                         source.onSuccess(PumpEnactResult(injector).success(true))
                     }
                 )
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt
index c3507e5f1d7..6427d25004c 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt
@@ -3,9 +3,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivat
 import androidx.annotation.StringRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
@@ -13,19 +13,21 @@ import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.Comm
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action.DeactivatePodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
 import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.Single
 import javax.inject.Inject
 
 class DashDeactivatePodViewModel @Inject constructor(
     private val podStateManager: OmnipodDashPodStateManager,
-    private val commandQueueProvider: CommandQueueProvider,
-    private val rxBus: RxBusWrapper,
+    private val commandQueue: CommandQueue,
+    private val rxBus: RxBus,
     injector: HasAndroidInjector,
-    logger: AAPSLogger
-) : DeactivatePodViewModel(injector, logger) {
+    logger: AAPSLogger,
+    aapsSchedulers: AapsSchedulers
+) : DeactivatePodViewModel(injector, logger, aapsSchedulers) {
 
     override fun doExecuteAction(): Single<PumpEnactResult> = Single.create { source ->
-        commandQueueProvider.customCommand(
+        commandQueue.customCommand(
             CommandDeactivatePod(),
             object : Callback() {
                 override fun run() {
diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml
new file mode 100644
index 00000000000..be8a49d07a9
--- /dev/null
+++ b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin">
+
+    <LinearLayout
+        android:id="@+id/omnipod_historytop"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="20dp"
+            android:text="@string/omnipod_dash_history_type"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <Spinner
+            android:id="@+id/omnipod_historytype"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="20dp" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:layout_marginEnd="5dp"
+            android:layout_weight="1"
+            android:background="@drawable/pillborder"
+            android:gravity="center_horizontal"
+            android:text="@string/omnipod_dash_history_title" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/omnipod_historystatus"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/omnipod_historytop"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/omnipod_history_recyclerview"
+        android:layout_width="match_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@+id/omnipod_historystatus" />
+
+</RelativeLayout>
diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_item.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_item.xml
new file mode 100644
index 00000000000..93b4bee75a4
--- /dev/null
+++ b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_item.xml
@@ -0,0 +1,31 @@
+<?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"
+    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:text="@string/omnipod_dash_history_item_date"
+        android:textSize="12sp" />
+
+    <TextView
+        android:id="@+id/omnipod_history_source"
+        android:layout_width="132dp"
+        android:layout_height="match_parent"
+        android:text="@string/omnipod_dash_history_item_source"
+        android:textSize="12sp" />
+
+    <TextView
+        android:id="@+id/omnipod_history_description"
+        android:layout_width="fill_parent"
+        android:layout_height="match_parent"
+        android:text="@string/omnipod_dash_history_item_description"
+        android:textSize="12sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml
index 4ea9533d45e..c9d97e870c0 100644
--- a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml
+++ b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml
@@ -111,6 +111,20 @@
                 app:layout_constraintRight_toLeftOf="@+id/Actions_Col_1_Row_2_vertical_guideline"
                 app:layout_constraintTop_toTopOf="parent" />
 
+           <info.nightscout.androidaps.utils.ui.SingleClickButton
+                android:id="@+id/button_pod_history"
+                style="?android:attr/buttonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:drawableTop="@drawable/ic_pod_management_pod_history"
+                android:text="@string/omnipod_common_pod_management_button_pod_history"
+                android:textAllCaps="false"
+                android:visibility="visible"
+                app:layout_constrainedHeight="@+id/Actions_Row_2_horizontal_guideline"
+                app:layout_constraintLeft_toRightOf="@+id/Actions_Col_1_Row_2_vertical_guideline"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/Actions_Col_1_Row_2_vertical_guideline"
                 android:layout_width="wrap_content"
diff --git a/omnipod-dash/src/main/res/values-af-rZA/strings.xml b/omnipod-dash/src/main/res/values-af-rZA/strings.xml
index 0d893756030..942b365512b 100644
--- a/omnipod-dash/src/main/res/values-af-rZA/strings.xml
+++ b/omnipod-dash/src/main/res/values-af-rZA/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-bg-rBG/strings.xml b/omnipod-dash/src/main/res/values-bg-rBG/strings.xml
index 0d893756030..942b365512b 100644
--- a/omnipod-dash/src/main/res/values-bg-rBG/strings.xml
+++ b/omnipod-dash/src/main/res/values-bg-rBG/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-ca-rES/strings.xml b/omnipod-dash/src/main/res/values-ca-rES/strings.xml
index 0d893756030..942b365512b 100644
--- a/omnipod-dash/src/main/res/values-ca-rES/strings.xml
+++ b/omnipod-dash/src/main/res/values-ca-rES/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml b/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml
index 2aa2949dc04..c31d8c8403a 100644
--- a/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml
+++ b/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml
@@ -3,6 +3,15 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">Integrace pumpy pro Omnipod Dash (nový model s funkcí Bluetooth a modrým krytem).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Historie Podu</string>
+    <string name="omnipod_dash_history_item_description">Popis</string>
+    <string name="omnipod_dash_history_item_source">Zdroj</string>
+    <string name="omnipod_dash_history_item_date">Datum</string>
+    <string name="omnipod_dash_history_type">Typ:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f U, Sach=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Rychlost: %1$.2f U, doba trvání: %2$d minut</string>
     <!-- Omnipod Dash - Overview -->
     <string name="omnipod_dash_overview_bluetooth_status">Stav Bluetooth</string>
     <string name="omnipod_dash_overview_bluetooth_address">Adresa Bluetooth</string>
@@ -18,4 +27,11 @@
     <string name="omnipod_dash_found_too_many_pods">Nalezeno příliš mnoho Podů k aktivaci</string>
     <string name="omnipod_dash_scan_failed">Nelze najít dostupný Pod k aktivaci</string>
     <string name="omnipod_dash_generic_error">Obecná chyba: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Nezdařilo se odeslat příkaz</string>
+    <string name="omnipod_dash_command_not_sent">Příkaz nebyl odeslán</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Příkaz nebyl přijat podem</string>
+    <string name="omnipod_dash_unknown">Neznámý stav příkazu</string>
+    <string name="omnipod_common_history_tbr_value">Rychlost: %1$.2f U, doba trvání: %2$d minut</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f U</string>
+    <string name="dash_bolusdelivering">Podávání %1$.2f U</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-da-rDK/strings.xml b/omnipod-dash/src/main/res/values-da-rDK/strings.xml
index 0d893756030..942b365512b 100644
--- a/omnipod-dash/src/main/res/values-da-rDK/strings.xml
+++ b/omnipod-dash/src/main/res/values-da-rDK/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-de-rDE/strings.xml b/omnipod-dash/src/main/res/values-de-rDE/strings.xml
index 7778e692ff8..1eaa7a2eff9 100644
--- a/omnipod-dash/src/main/res/values-de-rDE/strings.xml
+++ b/omnipod-dash/src/main/res/values-de-rDE/strings.xml
@@ -3,6 +3,15 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">Pumpen-Integration für Omnipod Dash (das neue, bluetooth-fähige Modell mit blauer Nadelkappe).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Pod Historie</string>
+    <string name="omnipod_dash_history_item_description">Beschreibung</string>
+    <string name="omnipod_dash_history_item_source">Quelle</string>
+    <string name="omnipod_dash_history_item_date">Datum</string>
+    <string name="omnipod_dash_history_type">Typ:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f IE</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f IE, CH=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Rate: %1$.2f IE, Dauer: %2$d min.</string>
     <!-- Omnipod Dash - Overview -->
     <string name="omnipod_dash_overview_bluetooth_status">Bluetooth-Status</string>
     <string name="omnipod_dash_overview_bluetooth_address">Bluetooth-Adresse</string>
@@ -18,4 +27,10 @@
     <string name="omnipod_dash_found_too_many_pods">Zu viele Pods für die Aktivierung gefunden</string>
     <string name="omnipod_dash_scan_failed">Konnte keinen verfügbaren Pod für die Aktivierung finden</string>
     <string name="omnipod_dash_generic_error">Allgemeiner Fehler: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Fehler beim Senden des Befehls</string>
+    <string name="omnipod_dash_command_not_sent">Befehl nicht gesendet</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Befehl nicht vom Pod empfangen</string>
+    <string name="omnipod_dash_unknown">Unbekannter Status für den Befehl</string>
+    <string name="omnipod_common_history_tbr_value">Rate: %1$.2f IE, Dauer: %2$d min.</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f IE</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-el-rGR/strings.xml b/omnipod-dash/src/main/res/values-el-rGR/strings.xml
index 0d893756030..942b365512b 100644
--- a/omnipod-dash/src/main/res/values-el-rGR/strings.xml
+++ b/omnipod-dash/src/main/res/values-el-rGR/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-es-rES/strings.xml b/omnipod-dash/src/main/res/values-es-rES/strings.xml
index 0d893756030..a946cd2d3b5 100644
--- a/omnipod-dash/src/main/res/values-es-rES/strings.xml
+++ b/omnipod-dash/src/main/res/values-es-rES/strings.xml
@@ -1,8 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Dash - Description -->
+    <string name="omnipod_dash_pump_description">Integración de bombas de insulina Omnipod Dash (el nuevo modelo, con bluetooth habilitado con tapa azul).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Historial del POD</string>
+    <string name="omnipod_dash_history_item_description">Descripción</string>
+    <string name="omnipod_dash_history_item_source">Origen</string>
+    <string name="omnipod_dash_history_item_date">Fecha</string>
+    <string name="omnipod_dash_history_type">Tipo:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f U, CH=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Tasa: %1$.2f U, duración: %2$d minutos</string>
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Estado de Bluetooth</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Dirección Bluetooth</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Calidad de la conexión</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-fr-rFR/strings.xml b/omnipod-dash/src/main/res/values-fr-rFR/strings.xml
index a178c01d4f9..adeb8a297ad 100644
--- a/omnipod-dash/src/main/res/values-fr-rFR/strings.xml
+++ b/omnipod-dash/src/main/res/values-fr-rFR/strings.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Dash - Description -->
-    <string name="omnipod_dash_pump_description">Intégration de la pompe Omnipod Dash (le nouveau modèle Bluetooth, avec un bouchon d\'aiguille bleue).</string>
+    <string name="omnipod_dash_pump_description">Intégration de la pompe Omnipod Dash (le nouveau modèle Bluetooth, avec un bouchon d\'aiguille bleu).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Historique du Pod</string>
+    <string name="omnipod_dash_history_item_description">Description</string>
+    <string name="omnipod_dash_history_item_source">Source</string>
+    <string name="omnipod_dash_history_item_date">Date</string>
+    <string name="omnipod_dash_history_type">Type :</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f U, Gluc=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Débit : %1$.2f U, durée : %2$d minutes</string>
     <!-- Omnipod Dash - Overview -->
     <string name="omnipod_dash_overview_bluetooth_status">État Bluetooth</string>
     <string name="omnipod_dash_overview_bluetooth_address">Adresse Bluetooth</string>
@@ -11,11 +20,17 @@
     <string name="omnipod_dash_overview_delivery_status">État de l\'injection</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Remplissez avec suffisamment d\'insuline pour 3 jours.\n\nVous devez entendre deux bips lors du remplissage du Pod. Ils indiquent que la quantité minimale de 85u a été ajouté. Assurez-vous de vider complètement la seringue de remplissage après avoir entendu les deux bips.\n\nAprès le remplissage du Pod, vous pouvez presser<b>Suivant</b>\n\n<b>Remarque :</b>N\'enlever pas la protection  de l\'aiguille du Pod à cette étape.</string>
-    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Tentative d\'appairage de d\'amorçage du nouveau Pod.\n\nUne fois le processus d\'initialisation terminé avec succès, vous pouvez appuyer sur <b>Suivant</b>.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Tentative d\'appairage et d\'amorçage du nouveau Pod.\n\nUne fois le processus d\'initialisation terminé avec succès, vous pouvez appuyer sur <b>Suivant</b>.</string>
     <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Son activé en cas de notification de pause d\'injection</string>
     <!-- Exceptions -->
     <string name="omnipod_dash_failed_to_connect">Echec de connexion au pod</string>
     <string name="omnipod_dash_found_too_many_pods">Trop de pods trouvés pour l\'activation</string>
     <string name="omnipod_dash_scan_failed">Impossible de trouver un pod disponible pour l\'activation</string>
     <string name="omnipod_dash_generic_error">Erreur générique : %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Échec d\'envoi de la commande</string>
+    <string name="omnipod_dash_command_not_sent">Commande non envoyée</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Commande non reçue par le pod</string>
+    <string name="omnipod_dash_unknown">État inconnu pour la commande</string>
+    <string name="omnipod_common_history_tbr_value">Débit : %1$.2f U, durée : %2$d minutes</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f U</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-ga-rIE/strings.xml b/omnipod-dash/src/main/res/values-ga-rIE/strings.xml
index 0d893756030..942b365512b 100644
--- a/omnipod-dash/src/main/res/values-ga-rIE/strings.xml
+++ b/omnipod-dash/src/main/res/values-ga-rIE/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-hr-rHR/strings.xml b/omnipod-dash/src/main/res/values-hr-rHR/strings.xml
index 0d893756030..942b365512b 100644
--- a/omnipod-dash/src/main/res/values-hr-rHR/strings.xml
+++ b/omnipod-dash/src/main/res/values-hr-rHR/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-hu-rHU/strings.xml b/omnipod-dash/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..942b365512b
--- /dev/null
+++ b/omnipod-dash/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Omnipod Dash - Description -->
+    <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
+</resources>
diff --git a/omnipod-dash/src/main/res/values-it-rIT/strings.xml b/omnipod-dash/src/main/res/values-it-rIT/strings.xml
index d2863c37b3d..b6ce74a9d84 100644
--- a/omnipod-dash/src/main/res/values-it-rIT/strings.xml
+++ b/omnipod-dash/src/main/res/values-it-rIT/strings.xml
@@ -3,6 +3,15 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">Integrazione del microinfusore Omnipod Dash (il nuovo modello, abilitato al Bluetooth e con la protezione ago di colore blu).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Storico pod</string>
+    <string name="omnipod_dash_history_item_description">Descrizione</string>
+    <string name="omnipod_dash_history_item_source">Origine</string>
+    <string name="omnipod_dash_history_item_date">Data</string>
+    <string name="omnipod_dash_history_type">Tipo:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f U, CHO=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Tasso: %1$.2f U, durata: %2$d minuti</string>
     <!-- Omnipod Dash - Overview -->
     <string name="omnipod_dash_overview_bluetooth_status">Stato bluetooth</string>
     <string name="omnipod_dash_overview_bluetooth_address">Indirizzo bluetooth</string>
@@ -10,9 +19,18 @@
     <string name="omnipod_dash_overview_bluetooth_connection_quality">Qualità connessione</string>
     <string name="omnipod_dash_overview_delivery_status">Stato erogazione</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Riempi il nuovo pod con abbastanza insulina per 3 giorni.\n\nResta in ascolto di due bip dal pod durante il processo di riempimento. Questi indicano che è stata inserita la quantità minima di 80U. Assicurati di svuotare completamente la siringa di riempimento, anche dopo aver sentito i due segnali acustici.\n\nDopo il riempimento del pod, premi <b>Avanti</b>.\n\n<b>Nota:</b> non rimuovere la protezione dell\'ago del pod in questo momento.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Tentativo di associazione nuovo pod e caricamento.\n\nQuando il processo di inizializzazione è stato completato con successo, puoi premere <b>Avanti</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Suono notifica sospensione erogazione abilitato</string>
     <!-- Exceptions -->
     <string name="omnipod_dash_failed_to_connect">Impossibile connettersi al pod</string>
     <string name="omnipod_dash_found_too_many_pods">Trovati troppi pod per l\'attivazione</string>
     <string name="omnipod_dash_scan_failed">Nessun pod disponibile per l\'attivazione</string>
     <string name="omnipod_dash_generic_error">Errore generico: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Impossibile inviare il comando</string>
+    <string name="omnipod_dash_command_not_sent">Comando non inviato</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Comando non ricevuto dal pod</string>
+    <string name="omnipod_dash_unknown">Stato sconosciuto per il comando</string>
+    <string name="omnipod_common_history_tbr_value">Tasso: %1$.2f U, durata: %2$d minuti</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f U</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-iw-rIL/strings.xml b/omnipod-dash/src/main/res/values-iw-rIL/strings.xml
index 2fb153f0c61..61e25aea1e4 100644
--- a/omnipod-dash/src/main/res/values-iw-rIL/strings.xml
+++ b/omnipod-dash/src/main/res/values-iw-rIL/strings.xml
@@ -3,6 +3,15 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">חיבור משאבת Omnipod Dash (הדגם החדש, התומך בבלוטות\' ובעל מכסה מחט כחול).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">היסטוריית הפוד</string>
+    <string name="omnipod_dash_history_item_description">תיאור</string>
+    <string name="omnipod_dash_history_item_source">מקור</string>
+    <string name="omnipod_dash_history_item_date">תאריך</string>
+    <string name="omnipod_dash_history_type">סוג:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f יח\'</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f יח\', פחמ\'= %2$.1f גר\'</string>
+    <string name="omnipod_dash_history_tbr_value">מינון: %1$.2f יח\', משך: %2$d דק\'</string>
     <!-- Omnipod Dash - Overview -->
     <string name="omnipod_dash_overview_bluetooth_status">מצב בלוטות\'</string>
     <string name="omnipod_dash_overview_bluetooth_address">כתובת בלוטות\'</string>
@@ -10,12 +19,18 @@
     <string name="omnipod_dash_overview_bluetooth_connection_quality">איכות החיבור</string>
     <string name="omnipod_dash_overview_delivery_status">סטטוס הזרקה</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
-    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">מלאו פוד חדש עם מספיק אינסולין לשלושה ימים.\n\nהקשיבו לשני צפצופים מהפוד במהלך המילוי. הם מציינים שהכמות המינימלית של 80 יחידות הוכנסה. הקפידו לרוקן לחלוטין את מזרק המילוי, גם לאחר שמיעת שני הצפצופים.\n\nלאחר מילוי הפוד, יש ללחוץ <b>הבא</b>.\n\n<b>הערה:</b> נא לא להסיר עדיין את מכסה המחט.</string>
-    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">מנסה לצמד את הפוד החדש ולתחל אותו.\n\nכאשר תהליך התחול יסתיים בהצלחה, תוכלו ללחוץ על <b>הבא</b>.</string>
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">מלאו פוד חדש עם מספיק אינסולין לשלושה ימים.\n\nהקשיבו לשני צפצופים מהפוד במהלך המילוי. הם מציינים שהכמות המינימלית של 80 יחידות הוכנסה. הקפידו לרוקן לחלוטין את מזרק המילוי לתוך הפוד, גם לאחר שמיעת שני הצפצופים.\n\nלאחר מילוי הפוד, יש ללחוץ <b>הבא</b>.\n\n<b>הערה:</b> נא לא להסיר עדיין את מכסה המחט.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">מנסה לצמד את הפוד החדש ולתחל אותו.\n\nכאשר תהליך התיחול יסתיים בהצלחה, תוכלו ללחוץ על <b>הבא</b>.</string>
     <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">השמע כשהתראת הפסקת ההזרקה מאופשרת</string>
     <!-- Exceptions -->
     <string name="omnipod_dash_failed_to_connect">הקישור לפוד נכשל</string>
     <string name="omnipod_dash_found_too_many_pods">נמצאו יותר מדי פודים להפעלה</string>
     <string name="omnipod_dash_scan_failed">לא נמצא פוד זמין להפעלה</string>
     <string name="omnipod_dash_generic_error">שגיאה גנרית: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">שליחת הפקודה נכשלה</string>
+    <string name="omnipod_dash_command_not_sent">הפקודה לא נשלחה</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">הפקודה לא התקבלה ע\"י הפוד</string>
+    <string name="omnipod_dash_unknown">מצב הפקודה לא ידוע</string>
+    <string name="omnipod_common_history_tbr_value">מינון: %1$.2f יח\', משך: %2$d דק\'</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f יח\'</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-ko-rKR/strings.xml b/omnipod-dash/src/main/res/values-ko-rKR/strings.xml
index f01c43835ce..91fdf1f9e3a 100644
--- a/omnipod-dash/src/main/res/values-ko-rKR/strings.xml
+++ b/omnipod-dash/src/main/res/values-ko-rKR/strings.xml
@@ -3,6 +3,7 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">옴니파드 대쉬(파란색 바늘 캡이 달린 새로운 블루투스 연결 모델)를 위한 펌프 통합</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-lt-rLT/strings.xml b/omnipod-dash/src/main/res/values-lt-rLT/strings.xml
index a73633ba7b7..390923037ef 100644
--- a/omnipod-dash/src/main/res/values-lt-rLT/strings.xml
+++ b/omnipod-dash/src/main/res/values-lt-rLT/strings.xml
@@ -3,7 +3,20 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">Pompos integracija Omnipod Dash (naujas, Bluetooth palaikantis modelis su mėlynu adatos dangteliu).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Bluetooth būklė</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Bluetooth adresas</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Programinė įranga %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Ryšio kokybė</string>
+    <string name="omnipod_dash_overview_delivery_status">Leidimo būklė</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Užpildykite naują Pod        insulinu, kurio pakaktų 3 dienas.\n\nTaip pat atkreipkite dėmesį į du pyptelėjimus iš Pod, kai pildote. Tai rodo, kad rezervuaras buvo užpildytas mažiausiai 80vv. Visiškai ištuštinkite švirkštą, net jei girdėjote du pyptelėjimus.\n\nUžpildę Pod, spustelėkite <b>Kitas</b>.\n\n<b>Pastaba:</b> vykdant šiuos veiksmus, nenuimkite Pod adatos apsauginio dangtelio.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Pabandykite suporuoti naują Pod ir jį užpildyti.\n\nSėkmingai užbaigę inicijavimo procesą, galite spustelėti <b>Kitas</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Įjungtas pranešimų apie pristabdytą leidimą garsas</string>
     <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Nepavyko prisijungti prie Pod</string>
+    <string name="omnipod_dash_found_too_many_pods">Nustatyta, kad suaktyvinama per daug Pod įrenginių</string>
+    <string name="omnipod_dash_scan_failed">Nepavyksta rasti aktyvinamo Pod</string>
+    <string name="omnipod_dash_generic_error">Bendroji klaida: %1$s</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-nl-rNL/strings.xml b/omnipod-dash/src/main/res/values-nl-rNL/strings.xml
index 1cc58e3cd8b..971c0068b1c 100644
--- a/omnipod-dash/src/main/res/values-nl-rNL/strings.xml
+++ b/omnipod-dash/src/main/res/values-nl-rNL/strings.xml
@@ -3,7 +3,34 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">Pomp integratie voor Omnipod Dash (het nieuwe, Bluetooth-enabled model met een blauwe naalddop).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Pod Historie</string>
+    <string name="omnipod_dash_history_item_description">Beschrijving</string>
+    <string name="omnipod_dash_history_item_source">Bron</string>
+    <string name="omnipod_dash_history_item_date">Datum</string>
+    <string name="omnipod_dash_history_type">Type:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f E</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f E, KH=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Basaal: %1$.2f E, duur: %2$d minuten</string>
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Bluetooth status</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Bluetooth adres</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Verbindingskwaliteit</string>
+    <string name="omnipod_dash_overview_delivery_status">Leveringsstatus</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Vul de nieuwe Pod met voldoende insuline voor 3 dagen.\n\nLuister of je twee piepjes hoort tijdens het vullen. Deze geven aan dat de minimum hoeveelheid van 80E is bereikt. Ook als je de twee piepjes hebt gehoord ga je verder met vullen totdat de vulspuit volledig leeg is.\n\nNa het vullen van de Pod druk je op <b>Volgende</b>.\n\n<b>Opmerking:</b> verwijder de beschermkap van de Pod naald nog niet.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Poging tot koppelen en voorvullen van de Pod.\n\nWanneer het initialisatieproces succesvol is voltooid, kunt u op <b>Volgende</b> drukken.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Geluid voor levering onderbroken notificatie ingeschakeld</string>
     <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Verbinding maken met de pod mislukt</string>
+    <string name="omnipod_dash_found_too_many_pods">Te veel pods gevonden voor activering</string>
+    <string name="omnipod_dash_scan_failed">Kan geen beschikbare pod vinden voor activering</string>
+    <string name="omnipod_dash_generic_error">Algemene fout: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Fout bij verzenden van de opdracht</string>
+    <string name="omnipod_dash_command_not_sent">Opdracht niet verzonden</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Opdracht niet ontvangen door de pod</string>
+    <string name="omnipod_dash_unknown">Onbekende status voor de opdracht</string>
+    <string name="omnipod_common_history_tbr_value">Basaal: %1$.2f E, Duur: %2$d min</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f E</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-no-rNO/strings.xml b/omnipod-dash/src/main/res/values-no-rNO/strings.xml
index a8731fa9619..8e125b2f38f 100644
--- a/omnipod-dash/src/main/res/values-no-rNO/strings.xml
+++ b/omnipod-dash/src/main/res/values-no-rNO/strings.xml
@@ -3,7 +3,35 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">Pumpeintegrering for Omnipod Dash (den nye, Bluetooth-aktiverte modellen med en blå kanylehette).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Pod historikk</string>
+    <string name="omnipod_dash_history_item_description">Beskrivelse</string>
+    <string name="omnipod_dash_history_item_source">Kilde</string>
+    <string name="omnipod_dash_history_item_date">Dato</string>
+    <string name="omnipod_dash_history_type">Type:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f E</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f E, KH=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Dosering: %1$.2f E, varighet: %2$d min</string>
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Bluetooth status</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Bluetooth adresse</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Tilkoblingskvalitet Bluetooth</string>
+    <string name="omnipod_dash_overview_delivery_status">Leveringsstatus</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Fyll en ny Pod med nok insulin for 3 dager.\n\nLytt etter to lydsignaler fra Pod under fyllingen. De indikerer at minimums volum på 80E er fylt opp. Vær nøye med å tømme fyllingssprøyten helt, selv etter at du har hørt de to lydsignalene.\n\nEtter fylling av Pod, vennligst trykk <b>Neste</b>.\n\n<b>Merk:</b> vent med å fjerne kanylebeskyttelsen til Pod.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Prøver å parre med den nye Pod og prime den.\n\nNår oppstartsprosessen er ferdig, kan du trykke <b>Neste</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Lydvarsel aktivert hvis insulinlevering blir stanset</string>
     <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Klarte ikke å koble seg til pod</string>
+    <string name="omnipod_dash_found_too_many_pods">Fant for mange podder for aktivering</string>
+    <string name="omnipod_dash_scan_failed">Fant ingen pod tilgjengelig for aktivering</string>
+    <string name="omnipod_dash_generic_error">Generell feil: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Feilet i å sende kommandoen</string>
+    <string name="omnipod_dash_command_not_sent">Kommando ikke sendt</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Kommandoen ikke mottatt av podden</string>
+    <string name="omnipod_dash_unknown">Ukjent tilstand for kommandoen</string>
+    <string name="omnipod_common_history_tbr_value">Dosering: %1$.2f E, varighet: %2$d min</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f E</string>
+    <string name="dash_bolusdelivering">Leverer %1$.2f E</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-pl-rPL/strings.xml b/omnipod-dash/src/main/res/values-pl-rPL/strings.xml
index 0d893756030..7486950f6f1 100644
--- a/omnipod-dash/src/main/res/values-pl-rPL/strings.xml
+++ b/omnipod-dash/src/main/res/values-pl-rPL/strings.xml
@@ -1,8 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Dash - Description -->
+    <string name="omnipod_dash_pump_description">Integracja dla pompy Omnipod Dash (nowy, posiadając Bluetooth model z niebieską osłonką na igłę).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Historia Poda</string>
+    <string name="omnipod_dash_history_item_description">Opis</string>
+    <string name="omnipod_dash_history_item_source">Źródło</string>
+    <string name="omnipod_dash_history_item_date">Data</string>
+    <string name="omnipod_dash_history_type">Typ:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f U, Węgl.=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Dawka: %1$.2f U, Czas trwania: %2$d min</string>
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Status Bluetooth</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Adres Bluetooth</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Jakość połączenia</string>
+    <string name="omnipod_dash_overview_delivery_status">Status podania</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Napełnij nowego Poda ilością insuliny przewidzianą na 3 dni.\n\nNasłuchuj dwóch sygnałów dźwiękowych z Poda podczas procesu napełniania. Wskazują one, że minimalna ilość 80U została napełniona. Upewnij się, że ampułkostrzykawka jest całkowicie pusta, nawet po odsłuchaniu dwóch sygnałów dźwiękowych.\n\nPo napełnieniu Poda, proszę naciśnij <b>Dalej</b>.\n\n<b>Uwaga:</b> nie usuwaj w tym czasie osłonki igły Poda.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Próba sparowania z nowym Pod i wpełnienia go.\n\nPo pomyślnym zakończeniu procesu inicjalizacji, naciśnij przycisk <b>Dalej</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Dźwięk gdy włączono powiadomienie o zawieszeniu podawania</string>
     <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Nie udało się połączyć z podem</string>
+    <string name="omnipod_dash_found_too_many_pods">Znaleziono zbyt wiele podów do aktywacji</string>
+    <string name="omnipod_dash_scan_failed">Nie można znaleźć poda dostępnego do aktywacji</string>
+    <string name="omnipod_dash_generic_error">Ogólny błąd: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Nie udało się wysłać polecenia</string>
+    <string name="omnipod_dash_command_not_sent">Polecenie nie wysłane</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Polecenie nie odebrane przez poda</string>
+    <string name="omnipod_dash_unknown">Nieznany stan polecenia</string>
+    <string name="omnipod_common_history_tbr_value">Dawka: %1$.2f U, Czas trwania: %2$d min</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f U</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-pt-rBR/strings.xml b/omnipod-dash/src/main/res/values-pt-rBR/strings.xml
index 0d893756030..942b365512b 100644
--- a/omnipod-dash/src/main/res/values-pt-rBR/strings.xml
+++ b/omnipod-dash/src/main/res/values-pt-rBR/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-pt-rPT/strings.xml b/omnipod-dash/src/main/res/values-pt-rPT/strings.xml
index d01a3acdfe9..6cf06aa4697 100644
--- a/omnipod-dash/src/main/res/values-pt-rPT/strings.xml
+++ b/omnipod-dash/src/main/res/values-pt-rPT/strings.xml
@@ -3,6 +3,7 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">Integração para a Omnipod Dash (o novo modelo, habilitado para o Bluetooth com uma proteção de agulha azul).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-ro-rRO/strings.xml b/omnipod-dash/src/main/res/values-ro-rRO/strings.xml
index 003e6934227..fa0ac1d4f61 100644
--- a/omnipod-dash/src/main/res/values-ro-rRO/strings.xml
+++ b/omnipod-dash/src/main/res/values-ro-rRO/strings.xml
@@ -3,7 +3,35 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">Integrarea pompei pentru Omnipod Dash (modelul nou, cu Bluetooth, cu un capac de ac albastru).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Istoric Pod</string>
+    <string name="omnipod_dash_history_item_description">Descriere</string>
+    <string name="omnipod_dash_history_item_source">Sursă</string>
+    <string name="omnipod_dash_history_item_date">Data</string>
+    <string name="omnipod_dash_history_type">Tip:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f U, CH=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Rata: %1$.2f U, durata: %2$d minute</string>
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Stare Bluetooth</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Adresă Bluetooth</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Calitatea conexiunii</string>
+    <string name="omnipod_dash_overview_delivery_status">Stare livrare</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Umpleți un nou Pod
+        cu suficienta insulina pentru 3 zile.\n\nAscultati 2 beep-uri de la Pod in timpul umplerii. Acestea indica ca cantitatea minima de 80u a fost încărcata. Asigurați-va ca ati golit complet seringa de umplere, chiar și după ce ati auzit 2 beep-uri.\n\nDupa ce ati umplut Pod-ul, va rog sa apăsați <b>Următor</b>.\n\n<b>Nota:</b> nu scoate capacul acului in acest model.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Se încearcă împerecherea și amorsarea unui nou pod.\n\nCand procesul de inițializare a fost finalizat cu succes, puteți apasa pe <b>Urmator</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Sunet când notificarea de livrare suspendata este activa</string>
     <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Nu s-a putut realiza conexiunea cu Pod-ul</string>
+    <string name="omnipod_dash_found_too_many_pods">S-au găsit prea multe Pod-uri de activat</string>
+    <string name="omnipod_dash_scan_failed">Nu s-a putut găsi un Pod pentru activare</string>
+    <string name="omnipod_dash_generic_error">Eroare generică: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Nu s-a reușit trimiterea comenzii</string>
+    <string name="omnipod_dash_command_not_sent">Comanda nu a fost trimisă</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Comanda nu a fost primită de Pod</string>
+    <string name="omnipod_dash_unknown">Stare necunoscută pentru comandă</string>
+    <string name="omnipod_common_history_tbr_value">Rata: %1$.2f U, durata: %2$d minute</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f U</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-ru-rRU/strings.xml b/omnipod-dash/src/main/res/values-ru-rRU/strings.xml
index 14a4ba1b3b4..51e31a2ee1b 100644
--- a/omnipod-dash/src/main/res/values-ru-rRU/strings.xml
+++ b/omnipod-dash/src/main/res/values-ru-rRU/strings.xml
@@ -3,7 +3,34 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">Интеграция с помпой Omnipod Dash (новая модель с поддержкой Bluetooth, с синим колпачком на игле).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Журнал помпы</string>
+    <string name="omnipod_dash_history_item_description">Описание</string>
+    <string name="omnipod_dash_history_item_source">Источник</string>
+    <string name="omnipod_dash_history_item_date">Дата</string>
+    <string name="omnipod_dash_history_type">Тип:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f ед</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f ед %2$.1f ГУ</string>
+    <string name="omnipod_dash_history_tbr_value">Баз Скорость: %1$.2f ед, Продолжительность: %2$d мин</string>
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Состояние Bluetooth</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Адрес Bluetooth</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Прошивка %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Качество соединения</string>
+    <string name="omnipod_dash_overview_delivery_status">Статус подачи</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Заполните новый Pod запасом инсулина на 3 дня.\n\nПоступят два звуковых сигнала от помпы во время заправки. Это означает, что минимальное количество 80 ед. заправлено. Не забудьте опустошить заправочный шприц даже после того, как услышите два звуковых сигнала.\n\nПосле заполнения Pod нажмите <b>Next</b>.\n\n<b>Примечание:</b> Пока что не снимайте с помпы колпачок с иглой.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Попытка соединиться с новым подом и активировать его.\n\nКогда процесс инициализации успешно завершен, нажмите &lt;b&gt;Next/b&gt;.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Звук на приостановку подачи включен</string>
     <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Не удалось присоединиться к pod </string>
+    <string name="omnipod_dash_found_too_many_pods">Cлишком много pod\'ов для активации</string>
+    <string name="omnipod_dash_scan_failed"> Pod для активации не найден</string>
+    <string name="omnipod_dash_generic_error">Общая ошибка: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Не удалось отправить команду</string>
+    <string name="omnipod_dash_command_not_sent">Команда не отправлена</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Команда не получена помпой</string>
+    <string name="omnipod_dash_unknown">Состояние команды неясно</string>
+    <string name="omnipod_common_history_tbr_value">Баз Скорость: %1$.2f ед, Продолжительность: %2$d мин</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f ед</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-sk-rSK/strings.xml b/omnipod-dash/src/main/res/values-sk-rSK/strings.xml
index bb75fed0a65..b18f89303b3 100644
--- a/omnipod-dash/src/main/res/values-sk-rSK/strings.xml
+++ b/omnipod-dash/src/main/res/values-sk-rSK/strings.xml
@@ -3,6 +3,15 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">Integrácia pumpy pre Omnipod Dash (nový model s funkciou Bluetooth a modrým krytom).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">História Podu</string>
+    <string name="omnipod_dash_history_item_description">Popis</string>
+    <string name="omnipod_dash_history_item_source">Zdroj</string>
+    <string name="omnipod_dash_history_item_date">Dátum</string>
+    <string name="omnipod_dash_history_type">Typ:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f JI</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f JI, Sach=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Rýchlosť: %1$.2f JI, Doba trvania: %2$d minút</string>
     <!-- Omnipod Dash - Overview -->
     <string name="omnipod_dash_overview_bluetooth_status">Stav Bluetooth</string>
     <string name="omnipod_dash_overview_bluetooth_address">Adresa Bluetooth</string>
@@ -18,4 +27,11 @@
     <string name="omnipod_dash_found_too_many_pods">Našlo sa príliš veľa Podov na aktiváciu</string>
     <string name="omnipod_dash_scan_failed">Nemôžem nájsť dostupný Pod na aktiváciu</string>
     <string name="omnipod_dash_generic_error">Všeobecná chyba: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Nepodarilo sa odoslať príkaz</string>
+    <string name="omnipod_dash_command_not_sent">Príkaz nebol odoslaný</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Príkaz nebol prijatý Podom</string>
+    <string name="omnipod_dash_unknown">Neznámy stav príkazu</string>
+    <string name="omnipod_common_history_tbr_value">Rýchlosť: %1$.2f JI, Doba trvania: %2$d minút</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f JI</string>
+    <string name="dash_bolusdelivering">Podávanie %1$.2f JI</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-sl-rSI/strings.xml b/omnipod-dash/src/main/res/values-sl-rSI/strings.xml
index 0d893756030..942b365512b 100644
--- a/omnipod-dash/src/main/res/values-sl-rSI/strings.xml
+++ b/omnipod-dash/src/main/res/values-sl-rSI/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-sv-rSE/strings.xml b/omnipod-dash/src/main/res/values-sv-rSE/strings.xml
index 3c7c463c408..867f67dbf36 100644
--- a/omnipod-dash/src/main/res/values-sv-rSE/strings.xml
+++ b/omnipod-dash/src/main/res/values-sv-rSE/strings.xml
@@ -3,7 +3,34 @@
     <!-- Omnipod Dash - Description -->
     <string name="omnipod_dash_pump_description">Pumpintegration för Omnipod Dash (den nya, Bluetooth-aktiverade modellen med blå nålskydd).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Pod-historik</string>
+    <string name="omnipod_dash_history_item_description">Beskrivning</string>
+    <string name="omnipod_dash_history_item_source">Källa</string>
+    <string name="omnipod_dash_history_item_date">Datum</string>
+    <string name="omnipod_dash_history_type">Typ:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2fU</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f U, KH=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Dos: %1$.2f U, Duration: %2$d min</string>
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Bluetooth-status</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Bluetooth-adress</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Anslutningskvalitet</string>
+    <string name="omnipod_dash_overview_delivery_status">Leveransstatus</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Fyll den nya podden med tillräckligt med insulin för 3 dagar.\n\nLyssna efter två pip under påfyllningsprocessen. Dessa anger att minimimängden 85U har nåtts. Var noga med att helt tömma påfyllningssprutan, även efter att ha hört de två pipen.\n\nNär påfyllningen är klar, tryck <b>Nästa</b>.\n\n<b>Notera:</b> Ta inte bort nålskyddet ännu.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Försöker para ihop med den nya podden och förfylla den.\n\nNär initieringsprocessen har slutförts kan du trycka på <b>Nästa</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Ljud när leverans avstängd</string>
     <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Det gick inte att ansluta till %s</string>
+    <string name="omnipod_dash_found_too_many_pods">Hittade för många poddar för aktivering</string>
+    <string name="omnipod_dash_scan_failed">Kunde inte hitta en tillgänglig pod för aktivering</string>
+    <string name="omnipod_dash_generic_error">Allmänt fel: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Det gick inte att skicka kommandot</string>
+    <string name="omnipod_dash_command_not_sent">Kommandot har inte skickats</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Kommando ej mottaget av poden</string>
+    <string name="omnipod_dash_unknown">Okänt tillstånd för kommandot</string>
+    <string name="omnipod_common_history_tbr_value">Dos: %1$.2f U, Duration: %2$d min</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2fU</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-ta-rIN/strings.xml b/omnipod-dash/src/main/res/values-ta-rIN/strings.xml
index 0d893756030..942b365512b 100644
--- a/omnipod-dash/src/main/res/values-ta-rIN/strings.xml
+++ b/omnipod-dash/src/main/res/values-ta-rIN/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values-tr-rTR/strings.xml b/omnipod-dash/src/main/res/values-tr-rTR/strings.xml
index 0d893756030..0d4c4f3354f 100644
--- a/omnipod-dash/src/main/res/values-tr-rTR/strings.xml
+++ b/omnipod-dash/src/main/res/values-tr-rTR/strings.xml
@@ -1,8 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Dash - Description -->
+    <string name="omnipod_dash_pump_description">Omnipod Dash için pompa entegrasyonu (mavi iğne başlıklı, Bluetooth özellikli model).</string>
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Pod Geçmişi</string>
+    <string name="omnipod_dash_history_item_description">Açıklama</string>
+    <string name="omnipod_dash_history_item_source">Kaynak</string>
+    <string name="omnipod_dash_history_item_date">Tarih</string>
+    <string name="omnipod_dash_history_type">Tip:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f Ü</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f Ü, CH=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Oran: %1$.2f Ü, süre: %2$d dakika</string>
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Bluetooth Durumu</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Bluetooth Adresi</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Bağlantı kalitesi</string>
+    <string name="omnipod_dash_overview_delivery_status">İletim Durumu</string>
     <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Yeni bir Pod doldurun
+         3 gün boyunca yeterli insülinle.\n\nDoldurma işlemi sırasında Pod\'tan iki bip sesi dinleyin. Bu ses, minimum 80Ü eklendiğini gösterir. İki bip sesini duyduktan sonra bile doldurma şırıngasını tamamen boşalttığınızdan emin olun.\n\nPod\'u doldurduktan sonra lütfen <b>İleri</b>\'ye basın.\n\n<b>Not:</b> bu sırada Pod\'un iğne kapağını çıkarmayın.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Yeni Pod ile eşleşmeye ve kullanıma hazırlanmaya çalışılıyor.\n\nBaşlatma işlemi başarıyla tamamlandığında, <b>İleri</b>\'ye basabilirsiniz.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">İletimin askıya alındığı bildirimi etkinleştirildiğinde sesle uyar</string>
     <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Pod bağlantı hatası</string>
+    <string name="omnipod_dash_found_too_many_pods">Aktivasyon için çok fazla Pod bulundu</string>
+    <string name="omnipod_dash_scan_failed">Etkinleştirme için uygun bir Pod bulunamadı</string>
+    <string name="omnipod_dash_generic_error">Genel hata: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Komut gönderilirken hata</string>
+    <string name="omnipod_dash_command_not_sent">Komut gönderilmedi</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Pod\'dan komut alınmadı</string>
+    <string name="omnipod_dash_unknown">Bilinmeyen komut durumu</string>
+    <string name="omnipod_common_history_tbr_value">Oran: %1$.2f Ü, süre: %2$d dakika</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f Ü</string>
+    <string name="dash_bolusdelivering">%1$.2f Ü gönderiliyor</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-zh-rCN/strings.xml b/omnipod-dash/src/main/res/values-zh-rCN/strings.xml
index 0d893756030..942b365512b 100644
--- a/omnipod-dash/src/main/res/values-zh-rCN/strings.xml
+++ b/omnipod-dash/src/main/res/values-zh-rCN/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
+    <!-- Omnipod Dash - History -->
     <!-- Omnipod Dash - Overview -->
     <!-- Omnipod Dash - Pod Activation Wizard -->
     <!-- Exceptions -->
diff --git a/omnipod-dash/src/main/res/values/strings.xml b/omnipod-dash/src/main/res/values/strings.xml
index 78482e02e76..607f6ebdc55 100644
--- a/omnipod-dash/src/main/res/values/strings.xml
+++ b/omnipod-dash/src/main/res/values/strings.xml
@@ -8,6 +8,16 @@
     <!-- Omnipod Dash - Keys -->
     <string name="key_omnipod_dash_pod_state" translatable="false">AAPS.OmnipodDash.pod_state</string>
 
+    <!-- Omnipod Dash - History -->
+    <string name="omnipod_dash_history_title">Pod History</string>
+    <string name="omnipod_dash_history_item_description">Description</string>
+    <string name="omnipod_dash_history_item_source">Source</string>
+    <string name="omnipod_dash_history_item_date">Date</string>
+    <string name="omnipod_dash_history_type">Type:</string>
+    <string name="omnipod_dash_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_dash_history_bolus_value_with_carbs">%1$.2f U, CH=%2$.1f g</string>
+    <string name="omnipod_dash_history_tbr_value">Rate: %1$.2f U, duration: %2$d minutes</string>
+
     <!-- Omnipod Dash - Overview -->
     <string name="omnipod_dash_overview_bluetooth_status">Bluetooth Status</string>
     <string name="omnipod_dash_overview_bluetooth_address">Bluetooth Address</string>
@@ -30,4 +40,11 @@
     <string name="omnipod_dash_found_too_many_pods">Found too many pods for activation</string>
     <string name="omnipod_dash_scan_failed">Could not find an available pod for activation</string>
     <string name="omnipod_dash_generic_error">Generic error: %1$s</string>
+    <string name="omnipod_dash_failed_to_send">Failed to send the command</string>
+    <string name="omnipod_dash_command_not_sent">Command not sent</string>
+    <string name="omnipod_dash_command_not_received_by_the_pod">Command not received by the pod</string>
+    <string name="omnipod_dash_unknown">Unknown state for the command</string>
+    <string name="omnipod_common_history_tbr_value">Rate: %1$.2f U, duration: %2$d minutes</string>
+    <string name="omnipod_common_history_bolus_value">%1$.2f U</string>
+    <string name="dash_bolusdelivering">Delivering %1$.2f U</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml b/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
index a5aca72daba..0e812a97095 100644
--- a/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
+++ b/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
@@ -109,12 +109,11 @@
             android:defaultValue="false"
             android:key="@string/key_omnipod_common_suspend_delivery_button_enabled"
             android:title="@string/omnipod_common_preferences_suspend_delivery_button_enabled" />
-<!--
+
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/key_omnipod_common_time_change_event_enabled"
             android:title="@string/omnipod_common_preferences_time_change_enabled" />
--->
     </PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/omnipod-eros/build.gradle b/omnipod-eros/build.gradle
index 4cf2467f9f9..5fc0d2628d9 100644
--- a/omnipod-eros/build.gradle
+++ b/omnipod-eros/build.gradle
@@ -14,4 +14,16 @@ dependencies {
     implementation project(':pump-common')
     implementation project(':omnipod-common')
     implementation project(':rileylink')
+
+
+    implementation "androidx.room:room-runtime:$room_version"
+    annotationProcessor("androidx.room:room-compiler:$room_version")
+    // To use Kotlin annotation processing tool (kapt)
+    kapt("androidx.room:room-compiler:$room_version")
+    // optional - Kotlin Extensions and Coroutines support for Room
+    implementation("androidx.room:room-ktx:$room_version")
+    // optional - RxJava2 support for Room
+    implementation "androidx.room:room-rxjava2:$room_version"
+    // optional - Test helpers
+    testImplementation("androidx.room:room-testing:$room_version")
 }
diff --git a/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt b/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt
new file mode 100644
index 00000000000..b441accbc1b
--- /dev/null
+++ b/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.eros.history
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.PodHistoryEntryType
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryDatabase
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryRecordDao
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryRecordEntity
+import org.junit.After
+import org.junit.Assert.assertNotNull
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ErosHistoryTest {
+
+    private lateinit var dao: ErosHistoryRecordDao
+    private lateinit var database: ErosHistoryDatabase
+    private lateinit var erosHistory: ErosHistory
+
+    @Before
+    fun setUp() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        database = Room.inMemoryDatabaseBuilder(
+            context,
+            ErosHistoryDatabase::class.java
+        ).build()
+        dao = database.historyRecordDao()
+        erosHistory = ErosHistory(dao)
+    }
+
+    @Test
+    fun testInsertionAndRetrieval() {
+        var history = erosHistory.getAllErosHistoryRecordsFromTimestamp(0L);
+        assert(history.isEmpty())
+
+        val type = PodHistoryEntryType.SET_BOLUS.code.toLong()
+        val entity = ErosHistoryRecordEntity(1000L, type)
+        erosHistory.create(entity)
+        erosHistory.create(ErosHistoryRecordEntity(3000L, PodHistoryEntryType.CANCEL_BOLUS.code.toLong()))
+
+        history = erosHistory.getAllErosHistoryRecordsFromTimestamp(0L);
+        assert(history.size == 2)
+        assert(type.equals(history.first().podEntryTypeCode))
+
+        val returnedEntity = erosHistory.findErosHistoryRecordByPumpId(entity.pumpId)
+        assertNotNull(returnedEntity)
+        assert(type.equals(returnedEntity.podEntryTypeCode))
+    }
+
+    @After
+    fun tearDown() {
+        database.close()
+    }
+}
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java
index 35ef3f08350..7cd7b8f1996 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java
@@ -5,8 +5,8 @@
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.IBinder;
-import android.os.Looper;
 import android.os.SystemClock;
 import android.text.TextUtils;
 
@@ -15,10 +15,12 @@
 
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
+import org.joda.time.Instant;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Supplier;
@@ -35,7 +37,7 @@
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.CommandQueue;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.Profile;
@@ -46,7 +48,7 @@
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
@@ -62,11 +64,11 @@
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandSilenceAlerts;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandDeactivatePod;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandHandleTimeChange;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandPlayTestBeep;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandResumeDelivery;
+import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandSilenceAlerts;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandSuspendDelivery;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandUpdateAlertConfiguration;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.data.RLHistoryItemOmnipod;
@@ -85,6 +87,7 @@
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosPumpValuesChanged;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosTbrChanged;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosUncertainTbrRecovered;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.ErosHistory;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandGetPodStatus;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandReadPulseLog;
@@ -125,17 +128,18 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
     private final ErosPodStateManager podStateManager;
     private final RileyLinkServiceData rileyLinkServiceData;
     private final AapsOmnipodErosManager aapsOmnipodErosManager;
+    private final ErosHistory erosHistory;
     private final AapsOmnipodUtil aapsOmnipodUtil;
     private final RileyLinkUtil rileyLinkUtil;
     private final OmnipodAlertUtil omnipodAlertUtil;
     private final ProfileFunction profileFunction;
     private final AAPSLogger aapsLogger;
     private final AapsSchedulers aapsSchedulers;
-    private final RxBusWrapper rxBus;
+    private final RxBus rxBus;
     private final ActivePlugin activePlugin;
     private final Context context;
     private final FabricPrivacy fabricPrivacy;
-    private final ResourceHelper resourceHelper;
+    private final ResourceHelper rh;
     private final SP sp;
     private final DateUtil dateUtil;
     private final PumpDescription pumpDescription;
@@ -148,13 +152,15 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
     // variables for handling statuses and history
     private boolean firstRun = true;
     private boolean hasTimeDateOrTimeZoneChanged = false;
+    private Instant lastTimeDateOrTimeZoneUpdate = Instant.ofEpochSecond(0L);
     private final boolean displayConnectionMessages = false;
     private RileyLinkOmnipodService rileyLinkOmnipodService;
     private boolean busy = false;
     private int timeChangeRetries;
     private long nextPodWarningCheck;
     private long lastConnectionTimeMillis;
-    private final Handler loopHandler = new Handler(Looper.getMainLooper());
+    private HandlerThread handlerThread;
+    private Handler loopHandler;
 
     private final Runnable statusChecker;
 
@@ -163,14 +169,15 @@ public OmnipodErosPumpPlugin(
             HasAndroidInjector injector,
             AAPSLogger aapsLogger,
             AapsSchedulers aapsSchedulers,
-            RxBusWrapper rxBus,
+            RxBus rxBus,
             Context context,
-            ResourceHelper resourceHelper,
+            ResourceHelper rh,
             ActivePlugin activePlugin,
             SP sp,
             ErosPodStateManager podStateManager,
+            ErosHistory erosHistory,
             AapsOmnipodErosManager aapsOmnipodErosManager,
-            CommandQueueProvider commandQueue,
+            CommandQueue commandQueue,
             FabricPrivacy fabricPrivacy,
             RileyLinkServiceData rileyLinkServiceData,
             DateUtil dateUtil,
@@ -188,19 +195,20 @@ public OmnipodErosPumpPlugin(
                         .shortName(R.string.omnipod_eros_name_short) //
                         .preferencesId(R.xml.omnipod_eros_preferences) //
                         .description(R.string.omnipod_eros_pump_description), //
-                injector, aapsLogger, resourceHelper, commandQueue);
+                injector, aapsLogger, rh, commandQueue);
         this.aapsLogger = aapsLogger;
         this.aapsSchedulers = aapsSchedulers;
         this.rxBus = rxBus;
         this.activePlugin = activePlugin;
         this.context = context;
         this.fabricPrivacy = fabricPrivacy;
-        this.resourceHelper = resourceHelper;
+        this.rh = rh;
         this.sp = sp;
         this.dateUtil = dateUtil;
         this.podStateManager = podStateManager;
         this.rileyLinkServiceData = rileyLinkServiceData;
         this.aapsOmnipodErosManager = aapsOmnipodErosManager;
+        this.erosHistory = erosHistory;
         this.aapsOmnipodUtil = aapsOmnipodUtil;
         this.rileyLinkUtil = rileyLinkUtil;
         this.omnipodAlertUtil = omnipodAlertUtil;
@@ -272,6 +280,12 @@ public void onServiceDisconnected(ComponentName name) {
     protected void onStart() {
         super.onStart();
 
+        if (handlerThread == null) {
+            handlerThread = new HandlerThread(OmnipodErosPumpPlugin.class.getSimpleName());
+            handlerThread.start();
+            loopHandler = new Handler(handlerThread.getLooper());
+        }
+
         loopHandler.postDelayed(statusChecker, STATUS_CHECK_INTERVAL_MILLIS);
 
         // We can't do this in PodStateManager itself, because JodaTimeAndroid.init() hasn't been called yet
@@ -313,25 +327,25 @@ protected void onStart() {
                 .toObservable(EventPreferenceChange.class)
                 .observeOn(aapsSchedulers.getIo())
                 .subscribe(event -> {
-                    if (event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.BASAL_BEEPS_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.BOLUS_BEEPS_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.TBR_BEEPS_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.SMB_BEEPS_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.SUSPEND_DELIVERY_BUTTON_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.PULSE_LOG_BUTTON_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.RILEY_LINK_STATS_BUTTON_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.SHOW_RILEY_LINK_BATTERY_LEVEL) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.BATTERY_CHANGE_LOGGING_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.TIME_CHANGE_EVENT_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_TBR_SOUND_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_SMB_SOUND_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_BOLUS_SOUND_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.AUTOMATICALLY_ACKNOWLEDGE_ALERTS_ENABLED)) {
+                    if (event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.BASAL_BEEPS_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.BOLUS_BEEPS_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.TBR_BEEPS_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.SMB_BEEPS_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.SUSPEND_DELIVERY_BUTTON_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.PULSE_LOG_BUTTON_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.RILEY_LINK_STATS_BUTTON_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.SHOW_RILEY_LINK_BATTERY_LEVEL) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.BATTERY_CHANGE_LOGGING_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.TIME_CHANGE_EVENT_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_TBR_SOUND_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_SMB_SOUND_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_BOLUS_SOUND_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.AUTOMATICALLY_ACKNOWLEDGE_ALERTS_ENABLED)) {
                         aapsOmnipodErosManager.reloadSettings();
-                    } else if (event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.EXPIRATION_REMINDER_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.EXPIRATION_REMINDER_HOURS_BEFORE_SHUTDOWN) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.LOW_RESERVOIR_ALERT_ENABLED) ||
-                            event.isChanged(getResourceHelper(), OmnipodErosStorageKeys.Preferences.LOW_RESERVOIR_ALERT_UNITS)) {
+                    } else if (event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.EXPIRATION_REMINDER_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.EXPIRATION_REMINDER_HOURS_BEFORE_SHUTDOWN) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.LOW_RESERVOIR_ALERT_ENABLED) ||
+                            event.isChanged(getRh(), OmnipodErosStorageKeys.Preferences.LOW_RESERVOIR_ALERT_UNITS)) {
                         if (!verifyPodAlertConfiguration()) {
                             getCommandQueue().customCommand(new CommandUpdateAlertConfiguration(), null);
                         }
@@ -393,7 +407,7 @@ private void handleUncertainTbrRecovery() {
             } else {
                 // Not sure what's going on. Notify the user
                 aapsLogger.error(LTag.PUMP, "Unknown TBR in both Pod state and AAPS");
-                rxBus.send(new EventNewNotification(new Notification(Notification.OMNIPOD_UNKNOWN_TBR, resourceHelper.gs(R.string.omnipod_eros_error_tbr_running_but_aaps_not_aware), Notification.NORMAL).sound(R.raw.boluserror)));
+                rxBus.send(new EventNewNotification(new Notification(Notification.OMNIPOD_UNKNOWN_TBR, rh.gs(R.string.omnipod_eros_error_tbr_running_but_aaps_not_aware), Notification.NORMAL).sound(R.raw.boluserror)));
             }
         } else if (!podStateManager.isTempBasalRunning() && tempBasal != null) {
             aapsLogger.warn(LTag.PUMP, "Removing AAPS TBR that actually hadn't succeeded");
@@ -408,7 +422,7 @@ private void handleActivePodAlerts() {
             AlertSet activeAlerts = podStateManager.getActiveAlerts();
             if (activeAlerts.size() > 0) {
                 String alerts = TextUtils.join(", ", aapsOmnipodUtil.getTranslatedActiveAlerts(podStateManager));
-                String notificationText = resourceHelper.gq(R.plurals.omnipod_common_pod_alerts, activeAlerts.size(), alerts);
+                String notificationText = rh.gq(R.plurals.omnipod_common_pod_alerts, activeAlerts.size(), alerts);
                 Notification notification = new Notification(Notification.OMNIPOD_POD_ALERTS, notificationText, Notification.URGENT);
                 rxBus.send(new EventNewNotification(notification));
                 pumpSync.insertAnnouncement(notificationText, null, PumpType.OMNIPOD_EROS, serialNumber());
@@ -422,7 +436,7 @@ private void handleActivePodAlerts() {
 
     private void handlePodFaultEvent() {
         if (podStateManager.isPodFaulted()) {
-            String notificationText = resourceHelper.gs(R.string.omnipod_common_pod_status_pod_fault_description, podStateManager.getFaultEventCode().getValue(), podStateManager.getFaultEventCode().name());
+            String notificationText = rh.gs(R.string.omnipod_common_pod_status_pod_fault_description, podStateManager.getFaultEventCode().getValue(), podStateManager.getFaultEventCode().name());
             pumpSync.insertAnnouncement(notificationText, null, PumpType.OMNIPOD_EROS, serialNumber());
         }
     }
@@ -452,19 +466,19 @@ private void queueAcknowledgeAlertsCommand() {
     private void updatePodWarningNotifications() {
         if (System.currentTimeMillis() > this.nextPodWarningCheck) {
             if (!podStateManager.isPodRunning()) {
-                Notification notification = new Notification(Notification.OMNIPOD_POD_NOT_ATTACHED, resourceHelper.gs(R.string.omnipod_common_error_pod_not_attached), Notification.NORMAL);
+                Notification notification = new Notification(Notification.OMNIPOD_POD_NOT_ATTACHED, rh.gs(R.string.omnipod_common_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_common_error_pod_suspended), Notification.NORMAL);
+                    Notification notification = new Notification(Notification.OMNIPOD_POD_SUSPENDED, rh.gs(R.string.omnipod_common_error_pod_suspended), Notification.NORMAL);
                     rxBus.send(new EventNewNotification(notification));
                 } else {
                     rxBus.send(new EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED));
 
                     if (podStateManager.timeDeviatesMoreThan(OmnipodConstants.TIME_DEVIATION_THRESHOLD)) {
-                        Notification notification = new Notification(Notification.OMNIPOD_TIME_OUT_OF_SYNC, resourceHelper.gs(R.string.omnipod_common_error_time_out_of_sync), Notification.NORMAL);
+                        Notification notification = new Notification(Notification.OMNIPOD_TIME_OUT_OF_SYNC, rh.gs(R.string.omnipod_common_error_time_out_of_sync), Notification.NORMAL);
                         rxBus.send(new EventNewNotification(notification));
                     } else {
                         rxBus.send(new EventDismissNotification(Notification.OMNIPOD_TIME_OUT_OF_SYNC));
@@ -525,7 +539,7 @@ public RileyLinkOmnipodService getRileyLinkService() {
     }
 
     @Override public RileyLinkPumpInfo getPumpInfo() {
-        String frequency = resourceHelper.gs(R.string.omnipod_eros_frequency);
+        String frequency = rh.gs(R.string.omnipod_eros_frequency);
         String connectedModel = "Eros";
         String serialNumber = podStateManager.isPodInitialized() ? String.valueOf(podStateManager.getAddress()) : "-";
         return new RileyLinkPumpInfo(frequency, connectedModel, serialNumber);
@@ -648,12 +662,19 @@ public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
             return deliverBolus(detailedBolusInfo);
         } else {
             // no bolus required, carb only treatment
-//            activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, true);
-
-//            return new PumpEnactResult(getInjector()).success(true).enacted(true).bolusDelivered(0d)
-//                    .carbsDelivered(detailedBolusInfo.carbs);
-// Needs refactor
-            throw new IllegalStateException("Not implemented");
+            boolean result = pumpSync.syncCarbsWithTimestamp(
+                    detailedBolusInfo.timestamp,
+                    detailedBolusInfo.carbs,
+                    null,
+                    model(),
+                    serialNumber());
+
+            aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "syncCarbsWithTimestamp " +
+                            "[date=%d, carbs=%.2f, pumpSerial=%s] - Result: %b",
+                    detailedBolusInfo.timestamp, detailedBolusInfo.carbs, serialNumber(), result));
+
+            return new PumpEnactResult(getInjector()).success(true).enacted(true).bolusDelivered(0d)
+                    .carbsDelivered(detailedBolusInfo.carbs);
         }
     }
 
@@ -670,7 +691,7 @@ public PumpEnactResult setTempBasalAbsolute(double absoluteRate, int durationInM
         aapsLogger.info(LTag.PUMP, "setTempBasalAbsolute: rate: {}, duration={}", absoluteRate, durationInMinutes);
 
         if (durationInMinutes <= 0 || durationInMinutes % BASAL_STEP_DURATION.getStandardMinutes() != 0) {
-            return new PumpEnactResult(getInjector()).success(false).comment(resourceHelper.gs(R.string.omnipod_eros_error_set_temp_basal_failed_validation, BASAL_STEP_DURATION.getStandardMinutes()));
+            return new PumpEnactResult(getInjector()).success(false).comment(rh.gs(R.string.omnipod_eros_error_set_temp_basal_failed_validation, BASAL_STEP_DURATION.getStandardMinutes()));
         }
 
         // read current TBR
@@ -796,28 +817,28 @@ public String serialNumber() {
     @NonNull @Override
     public String shortStatus(boolean veryShort) {
         if (!podStateManager.isPodActivationCompleted()) {
-            return resourceHelper.gs(R.string.omnipod_common_short_status_no_active_pod);
+            return rh.gs(R.string.omnipod_common_short_status_no_active_pod);
         }
         String ret = "";
         if (lastConnectionTimeMillis != 0) {
             long agoMsec = System.currentTimeMillis() - lastConnectionTimeMillis;
             int agoMin = (int) (agoMsec / 60d / 1000d);
-            ret += resourceHelper.gs(R.string.omnipod_common_short_status_last_connection, agoMin) + "\n";
+            ret += rh.gs(R.string.omnipod_common_short_status_last_connection, agoMin) + "\n";
         }
         if (podStateManager.getLastBolusStartTime() != null) {
-            ret += resourceHelper.gs(R.string.omnipod_common_short_status_last_bolus, DecimalFormatter.INSTANCE.to2Decimal(podStateManager.getLastBolusAmount()),
+            ret += rh.gs(R.string.omnipod_common_short_status_last_bolus, DecimalFormatter.INSTANCE.to2Decimal(podStateManager.getLastBolusAmount()),
                     android.text.format.DateFormat.format("HH:mm", podStateManager.getLastBolusStartTime().toDate())) + "\n";
         }
         PumpSync.PumpState pumpState = pumpSync.expectedPumpState();
         if (pumpState.getTemporaryBasal() != null && pumpState.getProfile() != null) {
-            ret += resourceHelper.gs(R.string.omnipod_common_short_status_temp_basal, toStringFull(pumpState.getTemporaryBasal(), dateUtil) + "\n");
+            ret += rh.gs(R.string.omnipod_common_short_status_temp_basal, toStringFull(pumpState.getTemporaryBasal(), dateUtil) + "\n");
         }
         if (pumpState.getExtendedBolus() != null) {
-            ret += resourceHelper.gs(R.string.omnipod_common_short_status_extended_bolus, toStringFull(pumpState.getExtendedBolus(), dateUtil) + "\n");
+            ret += rh.gs(R.string.omnipod_common_short_status_extended_bolus, toStringFull(pumpState.getExtendedBolus(), dateUtil) + "\n");
         }
-        ret += resourceHelper.gs(R.string.omnipod_common_short_status_reservoir, (getReservoirLevel() > OmnipodConstants.MAX_RESERVOIR_READING ? "50+" : DecimalFormatter.INSTANCE.to0Decimal(getReservoirLevel()))) + "\n";
+        ret += rh.gs(R.string.omnipod_common_short_status_reservoir, (getReservoirLevel() > OmnipodConstants.MAX_RESERVOIR_READING ? "50+" : DecimalFormatter.INSTANCE.to0Decimal(getReservoirLevel()))) + "\n";
         if (isUseRileyLinkBatteryLevel()) {
-            ret += resourceHelper.gs(R.string.omnipod_eros_short_status_riley_link_battery, getBatteryLevel()) + "\n";
+            ret += rh.gs(R.string.omnipod_eros_short_status_riley_link_battery, getBatteryLevel()) + "\n";
         }
         return ret.trim();
     }
@@ -858,7 +879,7 @@ public PumpEnactResult executeCustomCommand(@NonNull CustomCommand command) {
         }
 
         aapsLogger.warn(LTag.PUMP, "Unsupported custom command: " + command.getClass().getName());
-        return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(resourceHelper.gs(R.string.omnipod_common_error_unsupported_custom_command, command.getClass().getName()));
+        return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(rh.gs(R.string.omnipod_common_error_unsupported_custom_command, command.getClass().getName()));
     }
 
     private PumpEnactResult retrievePulseLog() {
@@ -871,8 +892,8 @@ private PumpEnactResult retrievePulseLog() {
 
         Intent i = new Intent(context, ErrorHelperActivity.class);
         i.putExtra(ErrorHelperActivity.SOUND_ID, 0);
-        i.putExtra(ErrorHelperActivity.STATUS, resourceHelper.gs(R.string.omnipod_eros_pod_management_pulse_log_value) + ":\n" + result.toString());
-        i.putExtra(ErrorHelperActivity.TITLE, resourceHelper.gs(R.string.omnipod_eros_pod_management_pulse_log));
+        i.putExtra(ErrorHelperActivity.STATUS, rh.gs(R.string.omnipod_eros_pod_management_pulse_log_value) + ":\n" + result.toString());
+        i.putExtra(ErrorHelperActivity.TITLE, rh.gs(R.string.omnipod_eros_pod_management_pulse_log));
         i.putExtra("clipboardContent", result.toString());
         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(i);
@@ -899,7 +920,7 @@ private PumpEnactResult retrievePulseLog() {
 
             Notification notification = new Notification(
                     Notification.OMNIPOD_POD_ALERTS_UPDATED,
-                    resourceHelper.gs(R.string.omnipod_common_confirmation_expiration_alerts_updated),
+                    rh.gs(R.string.omnipod_common_confirmation_expiration_alerts_updated),
                     Notification.INFO, 60);
             rxBus.send(new EventNewNotification(notification));
         } else {
@@ -928,7 +949,7 @@ private PumpEnactResult retrievePulseLog() {
             if (!requestedByUser && aapsOmnipodErosManager.isTimeChangeEventEnabled()) {
                 Notification notification = new Notification(
                         Notification.TIME_OR_TIMEZONE_CHANGE,
-                        resourceHelper.gs(R.string.omnipod_common_confirmation_time_on_pod_updated),
+                        rh.gs(R.string.omnipod_common_confirmation_time_on_pod_updated),
                         Notification.INFO, 60);
                 rxBus.send(new EventNewNotification(notification));
             }
@@ -941,7 +962,7 @@ private PumpEnactResult retrievePulseLog() {
                     if (aapsOmnipodErosManager.isTimeChangeEventEnabled()) {
                         Notification notification = new Notification(
                                 Notification.TIME_OR_TIMEZONE_CHANGE,
-                                resourceHelper.gs(R.string.omnipod_eros_error_automatic_time_or_timezone_change_failed),
+                                rh.gs(R.string.omnipod_eros_error_automatic_time_or_timezone_change_failed),
                                 Notification.INFO, 60);
                         rxBus.send(new EventNewNotification(notification));
                     }
@@ -958,15 +979,18 @@ private PumpEnactResult retrievePulseLog() {
     public void timezoneOrDSTChanged(TimeChangeType timeChangeType) {
         aapsLogger.info(LTag.PUMP, "Time, Date and/or TimeZone changed. [changeType=" + timeChangeType.name() + ", eventHandlingEnabled=" + aapsOmnipodErosManager.isTimeChangeEventEnabled() + "]");
 
-        if (timeChangeType == TimeChangeType.TimeChanged) {
-            aapsLogger.info(LTag.PUMP, "Ignoring time change because it is not a DST or TZ change");
+        Instant now = Instant.now();
+        if (timeChangeType == TimeChangeType.TimeChanged && now.isBefore(lastTimeDateOrTimeZoneUpdate.plus(Duration.standardDays(1L)))){
+            aapsLogger.info(LTag.PUMP, "Ignoring time change because not a TZ or DST time change and the last one happened less than 24 hours ago.");
             return;
-        } else if (!podStateManager.isPodRunning()) {
+        }
+        if (!podStateManager.isPodRunning()) {
             aapsLogger.info(LTag.PUMP, "Ignoring time change because no Pod is active");
             return;
         }
 
         aapsLogger.info(LTag.PUMP, "DST and/or TimeZone changed event will be consumed by driver");
+        lastTimeDateOrTimeZoneUpdate = now;
         hasTimeDateOrTimeZoneChanged = true;
     }
 
@@ -1076,7 +1100,7 @@ private void initializeAfterRileyLinkConnection() {
             }
             if (!success) {
                 aapsLogger.warn(LTag.PUMP, "Failed to retrieve Pod status on startup");
-                rxBus.send(new EventNewNotification(new Notification(Notification.OMNIPOD_STARTUP_STATUS_REFRESH_FAILED, resourceHelper.gs(R.string.omnipod_common_error_failed_to_refresh_status_on_startup), Notification.NORMAL)));
+                rxBus.send(new EventNewNotification(new Notification(Notification.OMNIPOD_STARTUP_STATUS_REFRESH_FAILED, rh.gs(R.string.omnipod_common_error_failed_to_refresh_status_on_startup), Notification.NORMAL)));
             }
         } else {
             aapsLogger.debug(LTag.PUMP, "Not retrieving Pod status on startup: no Pod running");
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosHistoryModule.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosHistoryModule.kt
new file mode 100644
index 00000000000..ca0b0267311
--- /dev/null
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosHistoryModule.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.ErosHistory
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryDatabase
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryRecordDao
+import javax.inject.Singleton
+
+@Module
+class OmnipodErosHistoryModule {
+
+    @Provides
+    @Singleton
+    internal fun provideDatabase(context: Context): ErosHistoryDatabase = ErosHistoryDatabase.build(context)
+
+    @Provides
+    @Singleton
+    internal fun provideHistoryRecordDao(erosHistoryDatabase: ErosHistoryDatabase): ErosHistoryRecordDao =
+        erosHistoryDatabase.historyRecordDao()
+
+    @Provides
+    @Singleton
+    internal fun provideErosHistory(dao: ErosHistoryRecordDao) =
+        ErosHistory(dao)
+
+}
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt
index 341779fbec7..ead789180a1 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt
@@ -16,7 +16,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.OmnipodErosOvervi
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.ErosPodActivationWizardActivity
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.ErosPodDeactivationWizardActivity
 
-@Module
+@Module(includes = [OmnipodErosHistoryModule::class])
 @Suppress("unused")
 abstract class OmnipodErosModule {
 
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java
index 7b804829878..9ef37672057 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java
@@ -12,7 +12,7 @@
 
 public class RLHistoryItemOmnipod extends RLHistoryItem {
 
-    @Inject ResourceHelper resourceHelper;
+    @Inject ResourceHelper rh;
     private final OmnipodCommandType omnipodCommandType;
 
     public RLHistoryItemOmnipod(HasAndroidInjector injector, OmnipodCommandType omnipodCommandType) {
@@ -22,11 +22,11 @@ public RLHistoryItemOmnipod(HasAndroidInjector injector, OmnipodCommandType omni
     }
 
     @Override
-    public String getDescription(ResourceHelper resourceHelper) {
+    public String getDescription(ResourceHelper rh) {
         if (RLHistoryItemSource.OmnipodCommand.equals(source)) {
-            return resourceHelper.gs(omnipodCommandType.getResourceId());
+            return rh.gs(omnipodCommandType.getResourceId());
         }
-        return super.getDescription(resourceHelper);
+        return super.getDescription(rh);
     }
 
 }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java
index e066f5e1a9c..1394c2f8b43 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java
@@ -50,7 +50,7 @@ protected ErosPodStateManager(AAPSLogger aapsLogger) {
     }
 
     public final void discardState() {
-        this.podState = null;
+        this.podState = new PodState(this.podState.address);
         storePodState();
     }
 
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistory.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistory.kt
new file mode 100644
index 00000000000..6d331b1e4d4
--- /dev/null
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistory.kt
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.eros.history
+
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryRecordDao
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryRecordEntity
+import io.reactivex.Maybe
+import io.reactivex.Single
+import io.reactivex.schedulers.Schedulers
+
+class ErosHistory(private val dao: ErosHistoryRecordDao) {
+
+    fun getAllErosHistoryRecordsFromTimestamp(timeInMillis: Long): List<ErosHistoryRecordEntity> {
+        return dao.allSinceAsc(timeInMillis)
+            .subscribeOn(Schedulers.io())
+            .blockingGet()
+    }
+
+    fun findErosHistoryRecordByPumpId(pumpId: Long): ErosHistoryRecordEntity? {
+        val record = dao.byId(pumpId)
+            .subscribeOn(Schedulers.io())
+            .toWrappedSingle()
+            .blockingGet()
+        return if (record is ValueWrapper.Existing) record.value else null
+    }
+
+    fun create(historyRecord: ErosHistoryRecordEntity?): Long =
+        Single.fromCallable { dao.insert(historyRecord!!) }
+            .subscribeOn(Schedulers.io())
+            .blockingGet()
+}
+
+@Suppress("USELESS_CAST")
+inline fun <reified T : Any> Maybe<T>.toWrappedSingle(): Single<ValueWrapper<T>> =
+    this.map { ValueWrapper.Existing(it) as ValueWrapper<T> }
+        .switchIfEmpty(Maybe.just(ValueWrapper.Absent()))
+        .toSingle()
+
+sealed class ValueWrapper<T> {
+    data class Existing<T>(val value: T) : ValueWrapper<T>()
+    class Absent<T> : ValueWrapper<T>()
+}
\ No newline at end of file
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryDatabase.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryDatabase.kt
new file mode 100644
index 00000000000..2ee8b16f765
--- /dev/null
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryDatabase.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+
+@Database(
+    entities = [ErosHistoryRecordEntity::class],
+    exportSchema = false,
+    version = ErosHistoryDatabase.VERSION
+)
+abstract class ErosHistoryDatabase : RoomDatabase() {
+
+    abstract fun historyRecordDao(): ErosHistoryRecordDao
+
+    companion object {
+
+        const val VERSION = 1
+
+        fun build(context: Context) =
+            Room.databaseBuilder(
+                context.applicationContext,
+                ErosHistoryDatabase::class.java,
+                "omnipod_eros_history_database.db"
+            )
+                .fallbackToDestructiveMigration()
+                .build()
+    }
+}
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordDao.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordDao.kt
new file mode 100644
index 00000000000..7a21629b065
--- /dev/null
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordDao.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import io.reactivex.Maybe
+import io.reactivex.Single
+
+@Dao
+interface ErosHistoryRecordDao {
+
+    @Query("SELECT * from historyrecords WHERE date >= :since order by date asc")
+    fun allSinceAsc(since: Long): Single<List<ErosHistoryRecordEntity>>
+
+    @Query("SELECT * FROM historyrecords WHERE pumpId = :id LIMIT 1")
+    fun byId(id: Long): Maybe<ErosHistoryRecordEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insert(ErosHistoryRecordEntity: ErosHistoryRecordEntity): Long
+
+}
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordEntity.java
similarity index 76%
rename from omnipod-common/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java
rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordEntity.java
index 584f6cc1503..79e677858d5 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordEntity.java
@@ -1,47 +1,37 @@
-package info.nightscout.androidaps.db;
+package info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database;
 
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
+import androidx.room.Entity;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 
 /**
  * Created by andy on 30.11.2019.
  */
-@DatabaseTable(tableName = "PodHistory")
-public class OmnipodHistoryRecord implements Comparable<OmnipodHistoryRecord> {
+@Entity(tableName = "historyrecords", indices = {@Index("date")})
+public class ErosHistoryRecordEntity implements Comparable<ErosHistoryRecordEntity> {
 
-    @DatabaseField(id = true)
+    @PrimaryKey
+    private long pumpId;
     public long date;
-
-    @DatabaseField
     private long podEntryTypeCode;
-
-    @DatabaseField
     private String data;
-
-    @DatabaseField
     private boolean success;
-
-    @DatabaseField
-    private long pumpId;
-
-    @DatabaseField
     private String podSerial;
-
-    @DatabaseField
     private Boolean successConfirmed;
 
-    public OmnipodHistoryRecord() {
+    public ErosHistoryRecordEntity() {
         generatePumpId();
     }
 
-    public OmnipodHistoryRecord(long dateTimeInMillis, long podEntryTypeCode) {
+    public ErosHistoryRecordEntity(long dateTimeInMillis, long podEntryTypeCode) {
         this.date = dateTimeInMillis;
         this.podEntryTypeCode = podEntryTypeCode;
         generatePumpId();
     }
 
+
     public long getDate() {
         return this.date;
     }
@@ -108,7 +98,7 @@ public void setPodSerial(String podSerial) {
     }
 
     @Override
-    public int compareTo(OmnipodHistoryRecord otherOne) {
+    public int compareTo(ErosHistoryRecordEntity otherOne) {
         return (int) (otherOne.date - this.date);
     }
 }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java
index 4a170d5c35e..1b8763b313b 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java
@@ -4,7 +4,7 @@
 import javax.inject.Singleton;
 
 import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodErosStorageKeys;
@@ -18,10 +18,10 @@
 @Singleton
 public class AapsErosPodStateManager extends ErosPodStateManager {
     private final SP sp;
-    private final RxBusWrapper rxBus;
+    private final RxBus rxBus;
 
     @Inject
-    public AapsErosPodStateManager(AAPSLogger aapsLogger, SP sp, RxBusWrapper rxBus) {
+    public AapsErosPodStateManager(AAPSLogger aapsLogger, SP sp, RxBus rxBus) {
         super(aapsLogger);
         this.sp = sp;
         this.rxBus = rxBus;
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
index 2e73d081413..58bb9c8ee95 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
@@ -17,16 +17,14 @@
 import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.OmnipodHistoryRecord;
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.extensions.PumpStateExtensionKt;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
 import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 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;
@@ -72,9 +70,11 @@
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkTimeoutException;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkUnexpectedException;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkUnreachableException;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.OmnipodManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.OmnipodManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosPumpValuesChanged;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.ErosHistory;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryRecordEntity;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil;
@@ -88,10 +88,11 @@
 public class AapsOmnipodErosManager {
 
     private final ErosPodStateManager podStateManager;
+    private final ErosHistory erosHistory;
     private final AapsOmnipodUtil aapsOmnipodUtil;
     private final AAPSLogger aapsLogger;
-    private final RxBusWrapper rxBus;
-    private final ResourceHelper resourceHelper;
+    private final RxBus rxBus;
+    private final ResourceHelper rh;
     private final HasAndroidInjector injector;
     private final SP sp;
     private final OmnipodManager delegate;
@@ -117,23 +118,25 @@ public class AapsOmnipodErosManager {
     @Inject
     public AapsOmnipodErosManager(OmnipodRileyLinkCommunicationManager communicationService,
                                   ErosPodStateManager podStateManager,
+                                  ErosHistory erosHistory,
                                   AapsOmnipodUtil aapsOmnipodUtil,
                                   AAPSLogger aapsLogger,
                                   AapsSchedulers aapsSchedulers,
-                                  RxBusWrapper rxBus,
+                                  RxBus rxBus,
                                   SP sp,
-                                  ResourceHelper resourceHelper,
+                                  ResourceHelper rh,
                                   HasAndroidInjector injector,
                                   OmnipodAlertUtil omnipodAlertUtil,
                                   Context context,
                                   PumpSync pumpSync) {
 
         this.podStateManager = podStateManager;
+        this.erosHistory = erosHistory;
         this.aapsOmnipodUtil = aapsOmnipodUtil;
         this.aapsLogger = aapsLogger;
         this.rxBus = rxBus;
         this.sp = sp;
-        this.resourceHelper = resourceHelper;
+        this.rh = rh;
         this.injector = injector;
         this.omnipodAlertUtil = omnipodAlertUtil;
         this.context = context;
@@ -206,6 +209,8 @@ public PumpEnactResult insertCannula(Profile profile) {
         addToHistory(System.currentTimeMillis(), PodHistoryEntryType.INSERT_CANNULA, result.getComment(), result.getSuccess());
 
         if (result.getSuccess()) {
+            pumpSync.connectNewPump();
+
             uploadCareportalEvent(System.currentTimeMillis() - 1000, DetailedBolusInfo.EventType.INSULIN_CHANGE);
             uploadCareportalEvent(System.currentTimeMillis(), DetailedBolusInfo.EventType.CANNULA_CHANGE);
 
@@ -329,7 +334,7 @@ public PumpEnactResult setBasalProfile(Profile profile, boolean showNotification
         addSuccessToHistory(historyEntryType, profile.getBasalValues());
 
         if (showNotifications) {
-            showNotification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, null);
+            showNotification(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, null);
         }
 
         dismissNotification(Notification.FAILED_UPDATE_PROFILE);
@@ -380,7 +385,7 @@ public PumpEnactResult bolus(DetailedBolusInfo detailedBolusInfo) {
             if (detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB) {
                 showNotification(Notification.OMNIPOD_UNCERTAIN_SMB, getStringResource(R.string.omnipod_eros_error_bolus_failed_uncertain_smb, detailedBolusInfo.insulin), Notification.URGENT, isNotificationUncertainSmbSoundEnabled() ? R.raw.boluserror : null);
             } else {
-                showErrorDialog(getStringResource(R.string.omnipod_eros_error_bolus_failed_uncertain), isNotificationUncertainBolusSoundEnabled() ? R.raw.boluserror : null);
+                showErrorDialog(getStringResource(R.string.omnipod_eros_error_bolus_failed_uncertain), isNotificationUncertainBolusSoundEnabled() ? R.raw.boluserror : 0);
             }
         }
 
@@ -693,19 +698,25 @@ public void addBolusToHistory(DetailedBolusInfo originalDetailedBolusInfo) {
 
         if (detailedBolusInfo.carbs > 0 && detailedBolusInfo.getCarbsTimestamp() != null) {
             // split out a separate carbs record without a pumpId
-            DetailedBolusInfo carbInfo = new DetailedBolusInfo();
-            carbInfo.setCarbsTimestamp(detailedBolusInfo.getCarbsTimestamp());
-            carbInfo.carbs = detailedBolusInfo.carbs;
-            carbInfo.setPumpType(PumpType.USER);
-//            activePlugin.getActiveTreatments().addToHistoryTreatment(carbInfo, false);
-// Needs refactor
+            pumpSync.syncCarbsWithTimestamp(
+                    detailedBolusInfo.getCarbsTimestamp(),
+                    detailedBolusInfo.carbs,
+                    null,
+                    PumpType.USER,
+                    serialNumber());
+
             // remove carbs from bolusInfo to not trigger any unwanted code paths in
             // TreatmentsPlugin.addToHistoryTreatment() method
             detailedBolusInfo.carbs = 0;
         }
-//        activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, false);
-// Needs refactor
-        throw new IllegalStateException("Not implemented");
+        pumpSync.syncBolusWithPumpId(
+                detailedBolusInfo.timestamp,
+                detailedBolusInfo.insulin,
+                detailedBolusInfo.getBolusType(),
+                detailedBolusInfo.getBolusPumpId(),
+                detailedBolusInfo.getPumpType(),
+                serialNumber());
+
     }
 
     public synchronized void createSuspendedFakeTbrIfNotExists() {
@@ -744,9 +755,8 @@ public synchronized void cancelSuspendedFakeTbrIfExists() {
     public boolean hasSuspendedFakeTbr() {
         PumpSync.PumpState pumpState = pumpSync.expectedPumpState();
         if (pumpState.getTemporaryBasal() != null && pumpState.getTemporaryBasal().getPumpId() != null) {
-//            OmnipodHistoryRecord historyRecord = databaseHelper.findOmnipodHistoryRecordByPumpId(pumpState.getTemporaryBasal().getPumpId());
-//            return historyRecord != null && PodHistoryEntryType.getByCode(historyRecord.getPodEntryTypeCode()).equals(PodHistoryEntryType.SET_FAKE_SUSPENDED_TEMPORARY_BASAL);
-            throw new IllegalStateException("Not implemented");
+            ErosHistoryRecordEntity historyRecord = erosHistory.findErosHistoryRecordByPumpId(pumpState.getTemporaryBasal().getPumpId());
+            return historyRecord != null && PodHistoryEntryType.getByCode(historyRecord.getPodEntryTypeCode()).equals(PodHistoryEntryType.SET_FAKE_SUSPENDED_TEMPORARY_BASAL);
         }
         return false;
     }
@@ -835,22 +845,21 @@ private long addFailureToHistory(long requestTime, PodHistoryEntryType entryType
 
     private long addToHistory(long requestTime, PodHistoryEntryType entryType, Object data,
                               boolean success) {
-        OmnipodHistoryRecord omnipodHistoryRecord = new OmnipodHistoryRecord(requestTime, entryType.getCode());
+        ErosHistoryRecordEntity erosHistoryRecordEntity = new ErosHistoryRecordEntity(requestTime, entryType.getCode());
 
         if (data != null) {
             if (data instanceof String) {
-                omnipodHistoryRecord.setData((String) data);
+                erosHistoryRecordEntity.setData((String) data);
             } else {
-                omnipodHistoryRecord.setData(aapsOmnipodUtil.getGsonInstance().toJson(data));
+                erosHistoryRecordEntity.setData(aapsOmnipodUtil.getGsonInstance().toJson(data));
             }
         }
 
-        omnipodHistoryRecord.setSuccess(success);
-        omnipodHistoryRecord.setPodSerial(podStateManager.hasPodState() ? String.valueOf(podStateManager.getAddress()) : "None");
+        erosHistoryRecordEntity.setSuccess(success);
+        erosHistoryRecordEntity.setPodSerial(podStateManager.hasPodState() ? String.valueOf(podStateManager.getAddress()) : "None");
 
-//        databaseHelper.createOrUpdate(omnipodHistoryRecord);
-//        return omnipodHistoryRecord.getPumpId();
-        throw new IllegalStateException("Not implemented");
+        erosHistory.create(erosHistoryRecordEntity);
+        return erosHistoryRecordEntity.getPumpId();
     }
 
     private void executeCommand(Runnable runnable) {
@@ -945,7 +954,7 @@ private void sendEvent(Event event) {
     }
 
     private void showErrorDialog(String message, Integer sound) {
-        ErrorHelperActivity.Companion.runAlarm(context, message, resourceHelper.gs(R.string.error), sound);
+        ErrorHelperActivity.Companion.runAlarm(context, message, rh.gs(R.string.error), sound);
     }
 
     private void showPodFaultNotification(FaultEventCode faultEventCode) {
@@ -972,7 +981,7 @@ private void dismissNotification(int id) {
     }
 
     private String getStringResource(int id, Object... args) {
-        return resourceHelper.gs(id, args);
+        return rh.gs(id, args);
     }
 
     public static BasalSchedule mapProfileToBasalSchedule(Profile profile) {
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java
index 090e754eb27..c6901d30d96 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java
@@ -19,8 +19,6 @@
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.R;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil;
 
@@ -114,11 +112,11 @@ public boolean verifyConfiguration(boolean forceRileyLinkAddressRenewal) {
 
             if (StringUtils.isEmpty(rileyLinkAddress)) {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "RileyLink address invalid: no address");
-                errorDescription = resourceHelper.gs(R.string.omnipod_eros_error_riley_link_address_invalid);
+                errorDescription = rh.gs(R.string.omnipod_eros_error_riley_link_address_invalid);
                 return false;
             } else {
                 if (!rileyLinkAddress.matches(REGEX_MAC)) {
-                    errorDescription = resourceHelper.gs(R.string.omnipod_eros_error_riley_link_address_invalid);
+                    errorDescription = rh.gs(R.string.omnipod_eros_error_riley_link_address_invalid);
                     aapsLogger.debug(LTag.PUMPBTCOMM, "RileyLink address invalid: {}", rileyLinkAddress);
                 } else {
                     if (!rileyLinkAddress.equals(this.rileyLinkAddress)) {
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java
index 0f9ea02d9fb..d9bd63e49e4 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java
@@ -23,7 +23,8 @@
 import javax.inject.Inject;
 
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
-import info.nightscout.androidaps.db.OmnipodHistoryRecord;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.ErosHistory;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryRecordEntity;
 import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
@@ -40,7 +41,8 @@ public class ErosPodHistoryActivity extends NoSplashAppCompatActivity {
 
     @Inject AAPSLogger aapsLogger;
     @Inject AapsOmnipodUtil aapsOmnipodUtil;
-    @Inject ResourceHelper resourceHelper;
+    @Inject ResourceHelper rh;
+    @Inject ErosHistory erosHistory;
 
     private Spinner historyTypeSpinner;
     private TextView statusView;
@@ -48,8 +50,8 @@ public class ErosPodHistoryActivity extends NoSplashAppCompatActivity {
     private LinearLayoutManager linearLayoutManager;
 
     private static PumpHistoryEntryGroup selectedGroup = PumpHistoryEntryGroup.All;
-    private final List<OmnipodHistoryRecord> fullHistoryList = new ArrayList<>();
-    private final List<OmnipodHistoryRecord> filteredHistoryList = new ArrayList<>();
+    private final List<ErosHistoryRecordEntity> fullHistoryList = new ArrayList<>();
+    private final List<ErosHistoryRecordEntity> filteredHistoryList = new ArrayList<>();
 
     private RecyclerViewAdapter recyclerViewAdapter;
     private boolean manualChange = false;
@@ -66,9 +68,7 @@ private void prepareData() {
         GregorianCalendar gc = new GregorianCalendar();
         gc.add(Calendar.HOUR_OF_DAY, -24);
 
-//        databaseHelper.getAllOmnipodHistoryRecordsFromTimestamp(gc.getTimeInMillis(), false);
-//        fullHistoryList.addAll(databaseHelper.getAllOmnipodHistoryRecordsFromTimestamp(gc.getTimeInMillis(), true));
-        throw new IllegalStateException("Not implemented");
+        fullHistoryList.addAll(erosHistory.getAllErosHistoryRecordsFromTimestamp(gc.getTimeInMillis()));
     }
 
 
@@ -81,7 +81,7 @@ private void filterHistory(PumpHistoryEntryGroup group) {
         if (group == PumpHistoryEntryGroup.All) {
             this.filteredHistoryList.addAll(fullHistoryList);
         } else {
-            for (OmnipodHistoryRecord pumpHistoryEntry : fullHistoryList) {
+            for (ErosHistoryRecordEntity pumpHistoryEntry : fullHistoryList) {
                 if (PodHistoryEntryType.getByCode(pumpHistoryEntry.getPodEntryTypeCode()).getGroup() == group) {
                     this.filteredHistoryList.add(pumpHistoryEntry);
                 }
@@ -146,7 +146,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         statusView.setVisibility(View.GONE);
 
-        typeListFull = getTypeList(PumpHistoryEntryGroup.Companion.getTranslatedList(resourceHelper));
+        typeListFull = getTypeList(PumpHistoryEntryGroup.Companion.getTranslatedList(rh));
 
         ArrayAdapter<TypeList> spinnerAdapter = new ArrayAdapter<>(this, R.layout.spinner_centered, typeListFull);
         historyTypeSpinner.setAdapter(spinnerAdapter);
@@ -204,14 +204,14 @@ public String toString() {
 
     public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.HistoryViewHolder> {
 
-        List<OmnipodHistoryRecord> historyList;
+        List<ErosHistoryRecordEntity> historyList;
 
-        RecyclerViewAdapter(List<OmnipodHistoryRecord> historyList) {
+        RecyclerViewAdapter(List<ErosHistoryRecordEntity> historyList) {
             this.historyList = historyList;
         }
 
 
-        void setHistoryList(List<OmnipodHistoryRecord> historyList) {
+        void setHistoryList(List<ErosHistoryRecordEntity> historyList) {
             this.historyList = historyList;
             Collections.sort(this.historyList);
         }
@@ -228,7 +228,7 @@ public HistoryViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
 
         @Override
         public void onBindViewHolder(@NonNull HistoryViewHolder holder, int position) {
-            OmnipodHistoryRecord record = historyList.get(position);
+            ErosHistoryRecordEntity record = historyList.get(position);
 
             if (record != null) {
                 holder.timeView.setText(record.getDateTimeString());
@@ -238,7 +238,7 @@ public void onBindViewHolder(@NonNull HistoryViewHolder holder, int position) {
         }
 
 
-        private void setValue(OmnipodHistoryRecord historyEntry, TextView valueView) {
+        private void setValue(ErosHistoryRecordEntity historyEntry, TextView valueView) {
             //valueView.setText("");
 
             if (historyEntry.isSuccess()) {
@@ -248,7 +248,7 @@ private void setValue(OmnipodHistoryRecord historyEntry, TextView valueView) {
                     case SET_TEMPORARY_BASAL:
                     case SPLIT_TEMPORARY_BASAL: {
                         TempBasalPair tempBasalPair = aapsOmnipodUtil.getGsonInstance().fromJson(historyEntry.getData(), TempBasalPair.class);
-                        valueView.setText(resourceHelper.gs(R.string.omnipod_eros_history_tbr_value, tempBasalPair.getInsulinRate(), tempBasalPair.getDurationMinutes()));
+                        valueView.setText(rh.gs(R.string.omnipod_eros_history_tbr_value, tempBasalPair.getInsulinRate(), tempBasalPair.getDurationMinutes()));
                     }
                     break;
 
@@ -263,9 +263,9 @@ private void setValue(OmnipodHistoryRecord historyEntry, TextView valueView) {
                     case SET_BOLUS: {
                         if (historyEntry.getData().contains(";")) {
                             String[] splitVal = historyEntry.getData().split(";");
-                            valueView.setText(resourceHelper.gs(R.string.omnipod_eros_history_bolus_value_with_carbs, Double.valueOf(splitVal[0]), Double.valueOf(splitVal[1])));
+                            valueView.setText(rh.gs(R.string.omnipod_eros_history_bolus_value_with_carbs, Double.valueOf(splitVal[0]), Double.valueOf(splitVal[1])));
                         } else {
-                            valueView.setText(resourceHelper.gs(R.string.omnipod_eros_history_bolus_value, Double.valueOf(historyEntry.getData())));
+                            valueView.setText(rh.gs(R.string.omnipod_eros_history_bolus_value, Double.valueOf(historyEntry.getData())));
                         }
                     }
                     break;
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
index 5020b99c2a4..abf0f103188 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.os.Handler
+import android.os.HandlerThread
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.interfaces.CommandQueue
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
@@ -41,9 +43,9 @@ import javax.inject.Inject
  */
 class ErosPodManagementActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var podStateManager: ErosPodStateManager
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var rileyLinkServiceData: RileyLinkServiceData
@@ -54,6 +56,7 @@ class ErosPodManagementActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var aapsSchedulers: AapsSchedulers
 
     private var disposables: CompositeDisposable = CompositeDisposable()
+    private val loopHandler = Handler(HandlerThread(this::class.simpleName + "Handler").also { it.start() }.looper)
 
     private lateinit var binding: OmnipodErosPodManagementBinding
 
@@ -82,7 +85,7 @@ class ErosPodManagementActivity : NoSplashAppCompatActivity() {
 
         binding.buttonDiscardPod.setOnClickListener {
             OKDialog.showConfirmation(this,
-                resourceHelper.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation), Thread {
+                rh.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation), Thread {
                 aapsOmnipodManager.discardPodState()
             })
         }
@@ -97,7 +100,7 @@ class ErosPodManagementActivity : NoSplashAppCompatActivity() {
 
         binding.buttonResetRileylinkConfig.setOnClickListener {
             // TODO improvement: properly disable button until task is finished
-            serviceTaskExecutor.startTask(ResetRileyLinkConfigurationTask(injector))
+            loopHandler.post { serviceTaskExecutor.startTask(ResetRileyLinkConfigurationTask(injector)) }
         }
 
         binding.buttonPlayTestBeep.setOnClickListener {
@@ -107,7 +110,7 @@ class ErosPodManagementActivity : NoSplashAppCompatActivity() {
             commandQueue.customCommand(CommandPlayTestBeep(), object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        displayErrorDialog(resourceHelper.gs(R.string.omnipod_common_warning), resourceHelper.gs(R.string.omnipod_common_two_strings_concatenated_by_colon, resourceHelper.gs(R.string.omnipod_common_error_failed_to_play_test_beep), result.comment), false)
+                        displayErrorDialog(rh.gs(R.string.omnipod_common_warning), rh.gs(R.string.omnipod_common_two_strings_concatenated_by_colon, rh.gs(R.string.omnipod_common_error_failed_to_play_test_beep), result.comment), false)
                     }
                 }
             })
@@ -120,7 +123,7 @@ class ErosPodManagementActivity : NoSplashAppCompatActivity() {
             commandQueue.customCommand(CommandReadPulseLog(), object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        displayErrorDialog(resourceHelper.gs(R.string.omnipod_common_warning), resourceHelper.gs(R.string.omnipod_common_two_strings_concatenated_by_colon, resourceHelper.gs(R.string.omnipod_eros_error_failed_to_read_pulse_log), result.comment), false)
+                        displayErrorDialog(rh.gs(R.string.omnipod_common_warning), rh.gs(R.string.omnipod_common_two_strings_concatenated_by_colon, rh.gs(R.string.omnipod_eros_error_failed_to_read_pulse_log), result.comment), false)
                     }
                 }
             })
@@ -226,8 +229,8 @@ class ErosPodManagementActivity : NoSplashAppCompatActivity() {
     private fun displayNotConfiguredDialog() {
         context.let {
             UIRunnable {
-                OKDialog.show(it, resourceHelper.gs(R.string.omnipod_common_warning),
-                    resourceHelper.gs(R.string.omnipod_eros_error_operation_not_possible_no_configuration), null)
+                OKDialog.show(it, rh.gs(R.string.omnipod_common_warning),
+                    rh.gs(R.string.omnipod_eros_error_operation_not_possible_no_configuration), null)
             }.run()
         }
     }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
index a46f7eaa926..0ec9b83777d 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
@@ -4,7 +4,7 @@ import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
-import android.os.Looper
+import android.os.HandlerThread
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
@@ -14,8 +14,8 @@ import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.interfaces.CommandQueue
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
@@ -69,9 +69,9 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
     }
 
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var rh: ResourceHelper
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var omnipodErosPumpPlugin: OmnipodErosPumpPlugin
     @Inject lateinit var podStateManager: ErosPodStateManager
@@ -86,7 +86,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
 
     private var disposables: CompositeDisposable = CompositeDisposable()
 
-    private val loopHandler = Handler(Looper.getMainLooper())
+    private val loopHandler = Handler(HandlerThread(this::class.simpleName + "Handler").also { it.start() }.looper)
     private lateinit var refreshLoop: Runnable
 
     init {
@@ -137,36 +137,36 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
         buttonBinding.buttonResumeDelivery.setOnClickListener {
             disablePodActionButtons()
             commandQueue.customCommand(CommandResumeDelivery(),
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_resume_delivery), true).messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_delivery_resumed)))
+                DisplayResultDialogCallback(rh.gs(R.string.omnipod_common_error_failed_to_resume_delivery), true).messageOnSuccess(rh.gs(R.string.omnipod_common_confirmation_delivery_resumed)))
         }
 
         buttonBinding.buttonRefreshStatus.setOnClickListener {
             disablePodActionButtons()
             commandQueue.customCommand(CommandGetPodStatus(),
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_refresh_status), false))
+                DisplayResultDialogCallback(rh.gs(R.string.omnipod_common_error_failed_to_refresh_status), false))
         }
 
         buttonBinding.buttonSilenceAlerts.setOnClickListener {
             disablePodActionButtons()
             commandQueue.customCommand(
                 CommandSilenceAlerts(),
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_silence_alerts), false)
-                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_silenced_alerts))
+                DisplayResultDialogCallback(rh.gs(R.string.omnipod_common_error_failed_to_silence_alerts), false)
+                    .messageOnSuccess(rh.gs(R.string.omnipod_common_confirmation_silenced_alerts))
                     .actionOnSuccess { rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_ALERTS)) })
         }
 
         buttonBinding.buttonSuspendDelivery.setOnClickListener {
             disablePodActionButtons()
             commandQueue.customCommand(CommandSuspendDelivery(),
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_suspend_delivery), true)
-                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_suspended_delivery)))
+                DisplayResultDialogCallback(rh.gs(R.string.omnipod_common_error_failed_to_suspend_delivery), true)
+                    .messageOnSuccess(rh.gs(R.string.omnipod_common_confirmation_suspended_delivery)))
         }
 
         buttonBinding.buttonSetTime.setOnClickListener {
             disablePodActionButtons()
             commandQueue.customCommand(CommandHandleTimeChange(true),
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_set_time), true)
-                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_time_on_pod_updated)))
+                DisplayResultDialogCallback(rh.gs(R.string.omnipod_common_error_failed_to_set_time), true)
+                    .messageOnSuccess(rh.gs(R.string.omnipod_common_confirmation_time_on_pod_updated)))
         }
     }
 
@@ -231,11 +231,11 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
 
         rileyLinkStatusBinding.rileyLinkStatus.text =
             when {
-                rileyLinkServiceState == RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
-                rileyLinkServiceState.isConnecting                        -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
-                rileyLinkServiceState.isError && rileyLinkError == null   -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
-                rileyLinkServiceState.isError && rileyLinkError != null   -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.Omnipod))
-                else                                                      -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+                rileyLinkServiceState == RileyLinkServiceState.NotStarted -> rh.gs(resourceId)
+                rileyLinkServiceState.isConnecting                        -> "{fa-bluetooth-b spin}   " + rh.gs(resourceId)
+                rileyLinkServiceState.isError && rileyLinkError == null   -> "{fa-bluetooth-b}   " + rh.gs(resourceId)
+                rileyLinkServiceState.isError && rileyLinkError != null   -> "{fa-bluetooth-b}   " + rh.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.Omnipod))
+                else                                                      -> "{fa-bluetooth-b}   " + rh.gs(resourceId)
             }
         rileyLinkStatusBinding.rileyLinkStatus.setTextColor(if (rileyLinkServiceState.isError || rileyLinkError != null) Color.RED else Color.WHITE)
     }
@@ -275,7 +275,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
             podInfoBinding.uniqueId.text = podStateManager.address.toString()
             podInfoBinding.podLot.text = podStateManager.lot.toString()
             podInfoBinding.podSequenceNumber.text = podStateManager.tid.toString()
-            podInfoBinding.firmwareVersion.text = resourceHelper.gs(R.string.omnipod_eros_overview_firmware_version_value, podStateManager.pmVersion.toString(), podStateManager.piVersion.toString())
+            podInfoBinding.firmwareVersion.text = rh.gs(R.string.omnipod_eros_overview_firmware_version_value, podStateManager.pmVersion.toString(), podStateManager.piVersion.toString())
 
             podInfoBinding.timeOnPod.text = readableZonedTime(podStateManager.time)
             podInfoBinding.timeOnPod.setTextColor(if (podStateManager.timeDeviatesMoreThan(OmnipodConstants.TIME_DEVIATION_THRESHOLD)) {
@@ -298,32 +298,32 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
 
             if (podStateManager.isPodFaulted) {
                 val faultEventCode = podStateManager.faultEventCode
-                errors.add(resourceHelper.gs(R.string.omnipod_common_pod_status_pod_fault_description, faultEventCode.value, faultEventCode.name))
+                errors.add(rh.gs(R.string.omnipod_common_pod_status_pod_fault_description, faultEventCode.value, faultEventCode.name))
             }
 
             // base basal rate
             podInfoBinding.baseBasalRate.text = if (podStateManager.isPodActivationCompleted) {
-                resourceHelper.gs(R.string.pump_basebasalrate, omnipodErosPumpPlugin.model().determineCorrectBasalSize(podStateManager.basalSchedule.rateAt(TimeUtil.toDuration(DateTime.now()))))
+                rh.gs(R.string.pump_basebasalrate, omnipodErosPumpPlugin.model().determineCorrectBasalSize(podStateManager.basalSchedule.rateAt(TimeUtil.toDuration(DateTime.now()))))
             } else {
                 PLACEHOLDER
             }
 
             // total delivered
             podInfoBinding.totalDelivered.text = if (podStateManager.isPodActivationCompleted && podStateManager.totalInsulinDelivered != null) {
-                resourceHelper.gs(R.string.omnipod_common_overview_total_delivered_value, podStateManager.totalInsulinDelivered - OmnipodConstants.POD_SETUP_UNITS)
+                rh.gs(R.string.omnipod_common_overview_total_delivered_value, podStateManager.totalInsulinDelivered - OmnipodConstants.POD_SETUP_UNITS)
             } else {
                 PLACEHOLDER
             }
 
             // reservoir
             if (podStateManager.reservoirLevel == null) {
-                podInfoBinding.reservoir.text = resourceHelper.gs(R.string.omnipod_common_overview_reservoir_value_over50)
+                podInfoBinding.reservoir.text = rh.gs(R.string.omnipod_common_overview_reservoir_value_over50)
                 podInfoBinding.reservoir.setTextColor(Color.WHITE)
             } else {
                 val lowReservoirThreshold = (omnipodAlertUtil.lowReservoirAlertUnits
                     ?: OmnipodConstants.DEFAULT_MAX_RESERVOIR_ALERT_THRESHOLD).toDouble()
 
-                podInfoBinding.reservoir.text = resourceHelper.gs(R.string.omnipod_common_overview_reservoir_value, podStateManager.reservoirLevel)
+                podInfoBinding.reservoir.text = rh.gs(R.string.omnipod_common_overview_reservoir_value, podStateManager.reservoirLevel)
                 podInfoBinding.reservoir.setTextColor(if (podStateManager.reservoirLevel < lowReservoirThreshold) {
                     Color.RED
                 } else {
@@ -369,34 +369,34 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
 
     private fun updatePodStatus() {
         podInfoBinding.podStatus.text = if (!podStateManager.hasPodState()) {
-            resourceHelper.gs(R.string.omnipod_common_pod_status_no_active_pod)
+            rh.gs(R.string.omnipod_common_pod_status_no_active_pod)
         } else if (!podStateManager.isPodActivationCompleted) {
             if (!podStateManager.isPodInitialized) {
-                resourceHelper.gs(R.string.omnipod_common_pod_status_waiting_for_activation)
+                rh.gs(R.string.omnipod_common_pod_status_waiting_for_activation)
             } else {
                 if (podStateManager.activationProgress.isBefore(ActivationProgress.PRIMING_COMPLETED)) {
-                    resourceHelper.gs(R.string.omnipod_common_pod_status_waiting_for_activation)
+                    rh.gs(R.string.omnipod_common_pod_status_waiting_for_activation)
                 } else {
-                    resourceHelper.gs(R.string.omnipod_common_pod_status_waiting_for_cannula_insertion)
+                    rh.gs(R.string.omnipod_common_pod_status_waiting_for_cannula_insertion)
                 }
             }
         } else {
             if (podStateManager.podProgressStatus.isRunning) {
                 var status = if (podStateManager.isSuspended) {
-                    resourceHelper.gs(R.string.omnipod_common_pod_status_suspended)
+                    rh.gs(R.string.omnipod_common_pod_status_suspended)
                 } else {
-                    resourceHelper.gs(R.string.omnipod_common_pod_status_running)
+                    rh.gs(R.string.omnipod_common_pod_status_running)
                 }
 
                 if (!podStateManager.isBasalCertain) {
-                    status += " (" + resourceHelper.gs(R.string.omnipod_eros_uncertain) + ")"
+                    status += " (" + rh.gs(R.string.omnipod_eros_uncertain) + ")"
                 }
 
                 status
             } else if (podStateManager.podProgressStatus == PodProgressStatus.FAULT_EVENT_OCCURRED) {
-                resourceHelper.gs(R.string.omnipod_common_pod_status_pod_fault)
+                rh.gs(R.string.omnipod_common_pod_status_pod_fault)
             } else if (podStateManager.podProgressStatus == PodProgressStatus.INACTIVE) {
-                resourceHelper.gs(R.string.omnipod_common_pod_status_inactive)
+                rh.gs(R.string.omnipod_common_pod_status_inactive)
             } else {
                 podStateManager.podProgressStatus.toString()
             }
@@ -412,14 +412,14 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
 
     private fun updateLastBolus() {
         if (podStateManager.isPodActivationCompleted && podStateManager.hasLastBolus()) {
-            var text = resourceHelper.gs(R.string.omnipod_common_overview_last_bolus_value, omnipodErosPumpPlugin.model().determineCorrectBolusSize(podStateManager.lastBolusAmount), resourceHelper.gs(R.string.insulin_unit_shortname), readableDuration(podStateManager.lastBolusStartTime))
+            var text = rh.gs(R.string.omnipod_common_overview_last_bolus_value, omnipodErosPumpPlugin.model().determineCorrectBolusSize(podStateManager.lastBolusAmount), rh.gs(R.string.insulin_unit_shortname), readableDuration(podStateManager.lastBolusStartTime))
             val textColor: Int
 
             if (podStateManager.isLastBolusCertain) {
                 textColor = Color.WHITE
             } else {
                 textColor = Color.RED
-                text += " (" + resourceHelper.gs(R.string.omnipod_eros_uncertain) + ")"
+                text += " (" + rh.gs(R.string.omnipod_eros_uncertain) + ")"
             }
 
             podInfoBinding.lastBolus.text = text
@@ -447,12 +447,12 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
 
                 var text: String
                 val textColor: Int
-                text = resourceHelper.gs(R.string.omnipod_common_overview_temp_basal_value, amount, dateUtil.timeString(startTime.millis), minutesRunning, duration.standardMinutes)
+                text = rh.gs(R.string.omnipod_common_overview_temp_basal_value, amount, dateUtil.timeString(startTime.millis), minutesRunning, duration.standardMinutes)
                 if (podStateManager.isTempBasalCertain) {
                     textColor = Color.WHITE
                 } else {
                     textColor = Color.RED
-                    text += " (" + resourceHelper.gs(R.string.omnipod_eros_uncertain) + ")"
+                    text += " (" + rh.gs(R.string.omnipod_eros_uncertain) + ")"
                 }
 
                 podInfoBinding.tempBasal.text = text
@@ -466,7 +466,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
                 textColor = Color.WHITE
             } else {
                 textColor = Color.RED
-                text += " (" + resourceHelper.gs(R.string.omnipod_eros_uncertain) + ")"
+                text += " (" + rh.gs(R.string.omnipod_eros_uncertain) + ")"
             }
 
             podInfoBinding.tempBasal.text = text
@@ -545,8 +545,8 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
     private fun displayNotConfiguredDialog() {
         context?.let {
             UIRunnable {
-                OKDialog.show(it, resourceHelper.gs(R.string.omnipod_common_warning),
-                    resourceHelper.gs(R.string.omnipod_eros_error_operation_not_possible_no_configuration), null)
+                OKDialog.show(it, rh.gs(R.string.omnipod_common_warning),
+                    rh.gs(R.string.omnipod_eros_error_operation_not_possible_no_configuration), null)
             }.run()
         }
     }
@@ -575,7 +575,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
         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_common_time_with_timezone, dateUtil.dateAndTimeString(timeAsJavaData.time), timeZoneDisplayName)
+        return rh.gs(R.string.omnipod_common_time_with_timezone, dateUtil.dateAndTimeString(timeAsJavaData.time), timeZoneDisplayName)
     }
 
     private fun readableDuration(dateTime: DateTime): String {
@@ -585,32 +585,32 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
         val seconds = duration.standardSeconds.toInt()
         when {
             seconds < 10           -> {
-                return resourceHelper.gs(R.string.omnipod_common_moments_ago)
+                return rh.gs(R.string.omnipod_common_moments_ago)
             }
 
             seconds < 60           -> {
-                return resourceHelper.gs(R.string.omnipod_common_less_than_a_minute_ago)
+                return rh.gs(R.string.omnipod_common_less_than_a_minute_ago)
             }
 
             seconds < 60 * 60      -> { // < 1 hour
-                return resourceHelper.gs(R.string.omnipod_common_time_ago, resourceHelper.gq(R.plurals.omnipod_common_minutes, minutes, minutes))
+                return rh.gs(R.string.omnipod_common_time_ago, rh.gq(R.plurals.omnipod_common_minutes, minutes, minutes))
             }
 
             seconds < 24 * 60 * 60 -> { // < 1 day
                 val minutesLeft = minutes % 60
                 if (minutesLeft > 0)
-                    return resourceHelper.gs(R.string.omnipod_common_time_ago,
-                        resourceHelper.gs(R.string.omnipod_common_composite_time, resourceHelper.gq(R.plurals.omnipod_common_hours, hours, hours), resourceHelper.gq(R.plurals.omnipod_common_minutes, minutesLeft, minutesLeft)))
-                return resourceHelper.gs(R.string.omnipod_common_time_ago, resourceHelper.gq(R.plurals.omnipod_common_hours, hours, hours))
+                    return rh.gs(R.string.omnipod_common_time_ago,
+                        rh.gs(R.string.omnipod_common_composite_time, rh.gq(R.plurals.omnipod_common_hours, hours, hours), rh.gq(R.plurals.omnipod_common_minutes, minutesLeft, minutesLeft)))
+                return rh.gs(R.string.omnipod_common_time_ago, rh.gq(R.plurals.omnipod_common_hours, hours, hours))
             }
 
             else                   -> {
                 val days = hours / 24
                 val hoursLeft = hours % 24
                 if (hoursLeft > 0)
-                    return resourceHelper.gs(R.string.omnipod_common_time_ago,
-                        resourceHelper.gs(R.string.omnipod_common_composite_time, resourceHelper.gq(R.plurals.omnipod_common_days, days, days), resourceHelper.gq(R.plurals.omnipod_common_hours, hoursLeft, hoursLeft)))
-                return resourceHelper.gs(R.string.omnipod_common_time_ago, resourceHelper.gq(R.plurals.omnipod_common_days, days, days))
+                    return rh.gs(R.string.omnipod_common_time_ago,
+                        rh.gs(R.string.omnipod_common_composite_time, rh.gq(R.plurals.omnipod_common_days, days, days), rh.gq(R.plurals.omnipod_common_hours, hoursLeft, hoursLeft)))
+                return rh.gs(R.string.omnipod_common_time_ago, rh.gq(R.plurals.omnipod_common_days, days, days))
             }
         }
     }
@@ -633,11 +633,11 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
             if (result.success) {
                 val messageOnSuccess = this.messageOnSuccess
                 if (messageOnSuccess != null) {
-                    displayOkDialog(resourceHelper.gs(R.string.omnipod_common_confirmation), messageOnSuccess)
+                    displayOkDialog(rh.gs(R.string.omnipod_common_confirmation), messageOnSuccess)
                 }
                 actionOnSuccess?.run()
             } else {
-                displayErrorDialog(resourceHelper.gs(R.string.omnipod_common_warning), resourceHelper.gs(R.string.omnipod_common_two_strings_concatenated_by_colon, errorMessagePrefix, result.comment), withSoundOnError)
+                displayErrorDialog(rh.gs(R.string.omnipod_common_warning), rh.gs(R.string.omnipod_common_two_strings_concatenated_by_colon, errorMessagePrefix, result.comment), withSoundOnError)
             }
         }
 
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt
index e7cfd81ed5f..b2a76ed05e5 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt
@@ -9,6 +9,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.R
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.Single
 import javax.inject.Inject
 
@@ -16,8 +17,9 @@ class ErosInitializePodViewModel @Inject constructor(
     private val aapsOmnipodManager: AapsOmnipodErosManager,
     private val podStateManager: AapsErosPodStateManager,
     injector: HasAndroidInjector,
-    logger: AAPSLogger
-) : InitializePodViewModel(injector, logger) {
+    logger: AAPSLogger,
+    aapsSchedulers: AapsSchedulers
+) : InitializePodViewModel(injector, logger, aapsSchedulers) {
 
     override fun isPodInAlarm(): Boolean = podStateManager.isPodFaulted
 
@@ -25,7 +27,7 @@ class ErosInitializePodViewModel @Inject constructor(
 
     override fun isPodDeactivatable(): Boolean = podStateManager.activationProgress.isAtLeast(ActivationProgress.PAIRING_COMPLETED)
 
-    override fun doExecuteAction(): Single<PumpEnactResult> = Single.just(aapsOmnipodManager.initializePod())
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.fromCallable { aapsOmnipodManager.initializePod() }
 
     @StringRes
     override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_initialize_pod_title
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt
index f28b6d1e9bc..9c556a7fe83 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.R
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.Single
 import javax.inject.Inject
 
@@ -18,8 +19,9 @@ class ErosInsertCannulaViewModel @Inject constructor(
     private val podStateManager: AapsErosPodStateManager,
     private val profileFunction: ProfileFunction,
     injector: HasAndroidInjector,
-    logger: AAPSLogger
-) : InsertCannulaViewModel(injector, logger) {
+    logger: AAPSLogger,
+    aapsSchedulers: AapsSchedulers
+) : InsertCannulaViewModel(injector, logger, aapsSchedulers) {
 
     override fun isPodInAlarm(): Boolean = podStateManager.isPodFaulted
 
@@ -27,7 +29,7 @@ class ErosInsertCannulaViewModel @Inject constructor(
 
     override fun isPodDeactivatable(): Boolean = podStateManager.activationProgress.isAtLeast(ActivationProgress.PAIRING_COMPLETED)
 
-    override fun doExecuteAction(): Single<PumpEnactResult> = Single.just(aapsOmnipodManager.insertCannula(profileFunction.getProfile()))
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.fromCallable { aapsOmnipodManager.insertCannula(profileFunction.getProfile()) }
 
     @StringRes
     override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_insert_cannula_title
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt
index 2546e6426c9..20d16a59358 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt
@@ -3,26 +3,28 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivat
 import androidx.annotation.StringRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandDeactivatePod
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action.DeactivatePodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
 import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.Single
 import javax.inject.Inject
 
 class ErosDeactivatePodViewModel @Inject constructor(
     private val aapsOmnipodManager: AapsOmnipodErosManager,
-    private val commandQueueProvider: CommandQueueProvider,
+    private val commandQueue: CommandQueue,
     injector: HasAndroidInjector,
-    logger: AAPSLogger
-) : DeactivatePodViewModel(injector, logger) {
+    logger: AAPSLogger,
+    aapsSchedulers: AapsSchedulers
+) : DeactivatePodViewModel(injector, logger, aapsSchedulers) {
 
     override fun doExecuteAction(): Single<PumpEnactResult> =
         Single.create { source ->
-            commandQueueProvider.customCommand(CommandDeactivatePod(), object : Callback() {
+            commandQueue.customCommand(CommandDeactivatePod(), object : Callback() {
                 override fun run() {
                     source.onSuccess(result)
                 }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java
index 2ac8d0cdf2e..28aef360fa8 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java
@@ -29,13 +29,13 @@
 @Singleton
 public class AapsOmnipodUtil {
 
-    private final ResourceHelper resourceHelper;
+    private final ResourceHelper rh;
 
     private final Gson gsonInstance = createGson();
 
     @Inject
-    public AapsOmnipodUtil(ResourceHelper resourceHelper) {
-        this.resourceHelper = resourceHelper;
+    public AapsOmnipodUtil(ResourceHelper rh) {
+        this.rh = rh;
     }
 
     private Gson createGson() {
@@ -68,21 +68,21 @@ public List<String> getTranslatedActiveAlerts(ErosPodStateManager podStateManage
 
     private String translateAlertType(AlertType alertType) {
         if (alertType == null) {
-            return resourceHelper.gs(R.string.omnipod_common_alert_unknown_alert);
+            return rh.gs(R.string.omnipod_common_alert_unknown_alert);
         }
         switch (alertType) {
             case FINISH_PAIRING_REMINDER:
-                return resourceHelper.gs(R.string.omnipod_common_alert_finish_pairing_reminder);
+                return rh.gs(R.string.omnipod_common_alert_finish_pairing_reminder);
             case FINISH_SETUP_REMINDER:
-                return resourceHelper.gs(R.string.omnipod_common_alert_finish_setup_reminder_reminder);
+                return rh.gs(R.string.omnipod_common_alert_finish_setup_reminder_reminder);
             case EXPIRATION_ALERT:
-                return resourceHelper.gs(R.string.omnipod_common_alert_expiration);
+                return rh.gs(R.string.omnipod_common_alert_expiration);
             case EXPIRATION_ADVISORY_ALERT:
-                return resourceHelper.gs(R.string.omnipod_common_alert_expiration_advisory);
+                return rh.gs(R.string.omnipod_common_alert_expiration_advisory);
             case SHUTDOWN_IMMINENT_ALARM:
-                return resourceHelper.gs(R.string.omnipod_common_alert_shutdown_imminent);
+                return rh.gs(R.string.omnipod_common_alert_shutdown_imminent);
             case LOW_RESERVOIR_ALERT:
-                return resourceHelper.gs(R.string.omnipod_common_alert_low_reservoir);
+                return rh.gs(R.string.omnipod_common_alert_low_reservoir);
             default:
                 return alertType.name();
         }
diff --git a/omnipod-eros/src/main/res/values-bg-rBG/strings.xml b/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
index 5b26a40bd05..7be3613e82a 100644
--- a/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
+++ b/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
@@ -65,6 +65,7 @@
     <string name="omnipod_eros_pod_management_pulse_log">Pulse лог</string>
     <string name="omnipod_eros_pod_management_pulse_log_value">Pulse log(копиран в клипборда)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">Напълни нов Под с достатъчно инсулин за 3 дена. \n\nОслушвай се за две бипкания от Пода по време на пълненето. Те означават че минималното количество от 80 единици вече е въведено. Моля подсигурете се, че напълно сте изпразнили спринцовката, дори след като сте чули дукратното бипкане. \n\nСлед пълненето на Пода, моля натинсте <b>Следващ</b>.\n\n<b>Забележка:</b> не махайте все още капчаката на иглата на Пода.\n<b>Забележка:</b>Моля поставете RileyLink в изправена позиция и поставере Пода на няколко сантиметра от него.</string>
     <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Опитвам се да се сдвоя с Pod.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> задръжте Pod много близо до RileyLink в този момент.</string>
     <!-- Omnipod Eros - Other -->
     <string name="omnipod_eros_uncertain">неизвестно</string>
diff --git a/omnipod-eros/src/main/res/values-hu-rHU/strings.xml b/omnipod-eros/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..bc89093c834
--- /dev/null
+++ b/omnipod-eros/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Omnipod Eros - Description -->
+    <!-- Omnipod Eros - Keys -->
+    <!-- Omnipod Eros - Overview -->
+    <!-- Omnipod Eros - Preferences -->
+    <!-- Omnipod Eros - History -->
+    <!-- Omnipod Eros - Short Status -->
+    <!-- Omnipod Eros - Error -->
+    <!-- Omnipod Eros - Pod Management -->
+    <!-- Omnipod Eros - Pod Activation Wizard -->
+    <!-- Omnipod Eros - Other -->
+</resources>
diff --git a/omnipod-eros/src/main/res/values-it-rIT/strings.xml b/omnipod-eros/src/main/res/values-it-rIT/strings.xml
index 4aa838fcff0..e868194eb90 100644
--- a/omnipod-eros/src/main/res/values-it-rIT/strings.xml
+++ b/omnipod-eros/src/main/res/values-it-rIT/strings.xml
@@ -17,7 +17,7 @@
     <!-- Omnipod Eros - History -->
     <string name="omnipod_eros_history_title">Storico pod</string>
     <string name="omnipod_eros_history_item_description">Descrizione</string>
-    <string name="omnipod_eros_history_item_source">Fonte</string>
+    <string name="omnipod_eros_history_item_source">Origine</string>
     <string name="omnipod_eros_history_item_date">Data</string>
     <string name="omnipod_eros_history_type">Tipo:</string>
     <string name="omnipod_eros_history_bolus_value">%1$.2f U</string>
diff --git a/omnipod-eros/src/main/res/values-iw-rIL/strings.xml b/omnipod-eros/src/main/res/values-iw-rIL/strings.xml
index fc5c628e929..53c96db90eb 100644
--- a/omnipod-eros/src/main/res/values-iw-rIL/strings.xml
+++ b/omnipod-eros/src/main/res/values-iw-rIL/strings.xml
@@ -22,7 +22,7 @@
     <string name="omnipod_eros_history_type">סוג:</string>
     <string name="omnipod_eros_history_bolus_value">%1$.2f יח\'</string>
     <string name="omnipod_eros_history_bolus_value_with_carbs">%1$.2f יח\', פחמ\'= %2$.1f גר\'</string>
-    <string name="omnipod_eros_history_tbr_value">קצב: %1$.2f יח\', משך: %2$d דק\'</string>
+    <string name="omnipod_eros_history_tbr_value">מינון: %1$.2f יח\', משך: %2$d דק\'</string>
     <!-- Omnipod Eros - Short Status -->
     <string name="omnipod_eros_short_status_riley_link_battery">סול\' ריילי: %1$d</string>
     <!-- Omnipod Eros - Error -->
diff --git a/omnipod-eros/src/main/res/values-nl-rNL/strings.xml b/omnipod-eros/src/main/res/values-nl-rNL/strings.xml
index e4fe4c26e2e..43ee9a884ae 100644
--- a/omnipod-eros/src/main/res/values-nl-rNL/strings.xml
+++ b/omnipod-eros/src/main/res/values-nl-rNL/strings.xml
@@ -67,7 +67,7 @@
     <string name="omnipod_eros_pod_management_pulse_log_value">Pulse log (gekopieerd naar klembord)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
     <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">Vul een nieuw Pod in met voldoende insuline voor 3 dagen.\n\nLuister naar twee piepjes van de Pod tijdens het vulproces. Deze geven aan dat de minimale hoeveelheid van 80E is bereikt. Ga door met vullen (ook na het horen van de twee piepjes) totdat het vulspuitje volledig leeg is.\n\nNa het vullen van de Pod kun je op <b>Volgende</b>drukken.\n\n<b>Opmerking:</b> verwijder op dit moment de naaldbeschermer van de Pod.\n<b>Opmerking:</b> Zet de RileyLink rechtop en plaats de Pod ongeveer vijf centimeter ervandaan.</string>
-    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Er wordt nu geprobeerd om de Pod te koppelen en de canule te vullen.\n\nWanneer deze stap successvol is afgerond, kan er op <b>Volgende</b> worden gedrukt.\n\n<b>Opmerking:</b> zet de RileyLink rechtop en leg de Pod er ongeveer 5 centimeter vandaan.</string>
+    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Er wordt nu geprobeerd om de Pod te koppelen en de canule te vullen.\n\nWanneer deze stap succesvol is afgerond, kan er op <b>Volgende</b> worden gedrukt.\n\n<b>Opmerking:</b> zet de RileyLink rechtop en leg de Pod er ongeveer 5 centimeter vandaan.</string>
     <!-- Omnipod Eros - Other -->
     <string name="omnipod_eros_uncertain">onzeker</string>
 </resources>
diff --git a/omnipod-eros/src/main/res/values-pl-rPL/strings.xml b/omnipod-eros/src/main/res/values-pl-rPL/strings.xml
index bc89093c834..9f2d1f487e9 100644
--- a/omnipod-eros/src/main/res/values-pl-rPL/strings.xml
+++ b/omnipod-eros/src/main/res/values-pl-rPL/strings.xml
@@ -1,13 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Eros - Description -->
+    <string name="omnipod_eros_pump_description">Integracja z pompą Omnipod Eros (starszy model z przezroczystą osłonką igły). Wymaga urządzenia RileyLink z firmware w wersji przynajmniej 2.0.</string>
     <!-- Omnipod Eros - Keys -->
     <!-- Omnipod Eros - Overview -->
     <!-- Omnipod Eros - Preferences -->
+    <string name="omnipod_eros_preferences_riley_link_configuration">Konfiguracja RileyLink</string>
+    <string name="omnipod_eros_preferences_category_notifications">Powiadomienia</string>
+    <string name="omnipod_eros_preferences_pulse_log_button_enabled">Pokaż przycisk Pulse Log w menu zarządzania Podem</string>
+    <string name="omnipod_eros_preferences_riley_link_stats_button_enabled">Pokaż przycisk Statystyki RileyLink w menu zarządzania Podem</string>
+    <string name="omnipod_eros_preferences_battery_change_logging_enabled">Włącz rejestrowanie zmiany baterii w Akcjach</string>
+    <string name="omnipod_eros_preferences_category_riley_link">RileyLink</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_tbr_sound_enabled">Dźwięk dla niepewnych powiadomień TBR włączony</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_smb_sound_enabled">Dźwięk dla niepewnych powiadomień SMB włączony</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_bolus_sound_enabled">Dźwięk dla niepewnych powiadomień o bolusie włączony</string>
     <!-- Omnipod Eros - History -->
+    <string name="omnipod_eros_history_title">Historia Poda</string>
+    <string name="omnipod_eros_history_item_description">Opis</string>
+    <string name="omnipod_eros_history_item_source">Źródło</string>
+    <string name="omnipod_eros_history_item_date">Data</string>
+    <string name="omnipod_eros_history_type">Typ:</string>
+    <string name="omnipod_eros_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_eros_history_bolus_value_with_carbs">%1$.2f U, Węgl.=%2$.1f g</string>
+    <string name="omnipod_eros_history_tbr_value">Dawka: %1$.2f U, Czas: %2$d min</string>
     <!-- Omnipod Eros - Short Status -->
+    <string name="omnipod_eros_short_status_riley_link_battery">RLBat: %1$d</string>
     <!-- Omnipod Eros - Error -->
+    <string name="omnipod_eros_error_riley_link_address_invalid">Adres RileyLink niewłaściwy.</string>
+    <string name="omnipod_eros_error_crc_mismatch">Komunikacja nie powiodła się: weryfikacja integralności komunikatu nie powiodła się</string>
+    <string name="omnipod_eros_error_invalid_packet_type">Komunikacja nie powiodła się: odebrano niepoprawny pakiet (komunikat) z Poda</string>
+    <string name="omnipod_eros_error_invalid_progress_state">Komunikacja nie powiodła się: Pod jest w niewłaściwym stanie</string>
+    <string name="omnipod_eros_error_invalid_response">Komunikacja nie powiodła się: odebrano niepoprawną odpowiedź (pakiet) z Poda</string>
+    <string name="omnipod_eros_error_invalid_message_sequence_number">Komunikacja nie powiodła się: odebrano komunikat z niepoprawnym numerem kolejnym z Poda</string>
+    <string name="omnipod_eros_error_invalid_message_address">Komunikacja nie powiodła się: odebrano komunikat z niepoprawną adresacją z Poda</string>
+    <string name="omnipod_eros_error_message_decoding_failed">Komunikacja nie powiodła się: nie powiodło się dekodowanie komunikatu z Poda</string>
+    <string name="omnipod_eros_error_nonce_resync_failed">Komunikacja nie powiodła się: synchronizacja unikalnej liczby nie powiodła się</string>
+    <string name="omnipod_eros_error_nonce_out_of_sync">Komunikacja nie powiodła się: unikalna liczba nie jest zsynchronizowana</string>
+    <string name="omnipod_eros_error_not_enough_data">Komunikacja nie powiodła się: brak wystarczającej ilości danych odebranych z Poda</string>
+    <string name="omnipod_eros_error_pod_fault">Wykryto błąd Poda (%1$03d %2$s). Proszę dezaktywować Poda i aktywować nowy</string>
+    <string name="omnipod_eros_error_pod_returned_error_response">Komunikacja nie powiodła się: Pod odpowiedział komunikatem o błędzie</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_riley_link">Brak odpowiedzi od RileyLink</string>
+    <string name="omnipod_eros_error_communication_failed_riley_link_interrupted">RileyLink przerwany/wstrzymany</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_pod">Brak odpowiedzi z Poda</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_might_be_suspended">Ustawianie profilu bazowego nie powiodło się. Podawanie mogło zostać zawieszone! W razie potrzeby proszę ręcznie odświeżyć status Poda na karcie Omnipod i wznowić podawanie.</string>
+    <string name="omnipod_eros_error_set_basal_might_have_failed_delivery_might_be_suspended">Ustawianie profilu bazowego mogło się nie powieść. Podawanie mogło zostać zawieszone! W razie potrzeby proszę ręcznie odświeżyć status Poda na karcie Omnipod i wznowić podawanie.</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_suspended">Ustawianie profilu bazowego nie powiodło się. Podawanie jest zawieszone! Proszę ręcznie wznowić podawanie z karty Omnipod.</string>
+    <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">Anulowanie tymczasowej dawki bazowej mogło zostać zakończone niepowodzeniem. Proszę ręcznie odświeżyć status Poda na karcie Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Ustawianie tymczasowej dawki bazowej nie powiodło się. Jeśli dawka tymczasowa była wcześniej podawana, mogła zostać anulowana. Proszę ręcznie odświeżyć status Poda na karcie Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Ustawienie bazy tymczasowej mogło się nie powieść. Jeśli baza tymczasowa była poprzednio uruchomiona, została anulowana. Proszę odświeżyć status Poda z zakładki Omnipod ręcznie.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_validation">Czas trwania TBR musi być większy od zera i być wielokrotnością %1$s minut.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">Ustawianie czasu mogło się nie powieść. Podawanie mogło zostać zawieszone! W razie potrzeby proszę ręcznie odświeżyć status Poda na karcie Omnipod i wznowić podawanie.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_suspended">Ustawianie czasu nie powiodło się. Podawanie jest zawieszone! Proszę ręcznie wznowić podawanie z karty Omnipod.</string>
+    <string name="omnipod_eros_error_failed_to_read_pulse_log">Nie udało się odczytać Pulse Log</string>
+    <string name="omnipod_eros_error_automatic_time_or_timezone_change_failed">Nie powiodła się próba automatycznej zmiany czasu w Podzie. Należy ręcznie zsynchronizować czas na karcie Omnipod.</string>
+    <string name="omnipod_eros_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_eros_error_bolus_failed_uncertain">Nie można sprawdzić, czy podano bolus. Proszę ręcznie sprawdzić, czy Twój Pod podaje bolus, słuchając kliknięć. <b>Jeśli jesteś pewien, że bolus się nie powiódł, to należy ręcznie usunąć wpis o bolusie z okna Leczenie, nawet jeśli klikniesz \'Anuluj bolus\' teraz!</b></string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain_smb">Nie można sprawdzić, czy powiodło się podawanie bolusa SMB (%1$.2f U). <b>Jeśli jesteś pewien, że Bolus nie został podany, należy ręcznie usunąć wpis o SMB z okna Leczenie.</b></string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">Tymczasowa dawka bazowa jest uruchomiona w Podzie, ale AAPS nie posiada informacji o niej. Anuluj tymczasową dawkę bazową ręcznie.</string>
     <!-- Omnipod Eros - Pod Management -->
+    <string name="omnipod_eros_pod_management_button_riley_link_stats">Statystyki RileyLink</string>
+    <string name="omnipod_eros_pod_management_waiting_for_riley_link_connection">Oczekiwanie na połączenie RileyLink…</string>
+    <string name="omnipod_eros_pod_management_button_reset_riley_link_config">Przywróć konfigurację RileyLink</string>
+    <string name="omnipod_eros_pod_management_button_read_pulse_log">Odczytaj Pulse Log</string>
+    <string name="omnipod_eros_pod_management_button_reading_pulse_log">Odczytywanie Pulse Log…</string>
+    <string name="omnipod_eros_pod_management_pulse_log">Logi pulsów omnipod</string>
+    <string name="omnipod_eros_pod_management_pulse_log_value">Pulse Log (skopiowany do schowka)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">Napełnij nowego Poda ilością insuliny przewidzianą na 3 dni.\n\nNasłuchuj dwóch sygnałów dźwiękowych z Poda podczas procesu napełniania. Wskazują one, że minimalna ilość 80U została napełniona. Upewnij się, że ampułkostrzykawka jest całkowicie pusta, nawet po odsłuchaniu dwóch sygnałów dźwiękowych.\n\nPo napełnieniu Poda, proszę naciśnij <b>Dalej</b>.\n\n<b>Uwaga:</b> nie usuwaj w tym czasie osłonki igły Poda.\n<b>Uwaga:</b> proszę umieść RileyLink w pozycji pionowej i nie dalej niż kilkanaście centymetrów od niego.</string>
+    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Próbuję sparować z nowym Podem i wypełnić go.\n\nPo pomyślnym zakończeniu procesu inicjalizacji możesz nacisnąć <b>Dalej</b>.\n\n<b> Uwaga: </b> umieść RileyLink w pozycji pionowej i umieść Poda kilka centymetrów od niego.</string>
     <!-- Omnipod Eros - Other -->
+    <string name="omnipod_eros_uncertain">niepewne</string>
 </resources>
diff --git a/omnipod-eros/src/main/res/values-ro-rRO/strings.xml b/omnipod-eros/src/main/res/values-ro-rRO/strings.xml
index 8e4db7977c9..8bfdeb659a3 100644
--- a/omnipod-eros/src/main/res/values-ro-rRO/strings.xml
+++ b/omnipod-eros/src/main/res/values-ro-rRO/strings.xml
@@ -66,6 +66,7 @@
     <string name="omnipod_eros_pod_management_pulse_log">Jurnal Puls</string>
     <string name="omnipod_eros_pod_management_pulse_log_value">Jurnal Puls (copiat în clipboard)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">\nUmpleți noul Pod cu suficientă insulină pentru 3 zile.\n\nAr trebui sa auziți două beep-uri de la Pod în timpul procesului de umplere. Acestea indică faptul că cantitatea minimă de 80U a fost introdusă. Asigurați-vă ca ați golit complet seringa de umplere, chiar și după ce ați auzit două beep-uri.\n\nDupă umplerea Pod-ului, vă rugăm să apăsați <b>Următorul</b>.\n\n<b>Notă:</b> Nu scoateți capacul acului in acest moment.\n<b>Nota:</b>va rugam sa puneți RileyLink in poziție verticala și sa plasați Pod-ul la o distantă de câțiva centimetri de acesta.</string>
     <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Încercare de împerechere cu noul Pod și amorsare.\n\nAtunci când inițializarea s-a terminat cu succes, puteți apăsa <b>Următorul</b>.\n\n<b>Notă:</b> Vă rugăm sa puneți RileyLInk în poziție verticala și sa plasați Pod-ul la câțiva centimetri distanta.</string>
     <!-- Omnipod Eros - Other -->
     <string name="omnipod_eros_uncertain">incert</string>
diff --git a/omnipod-eros/src/main/res/values-tr-rTR/strings.xml b/omnipod-eros/src/main/res/values-tr-rTR/strings.xml
index bc89093c834..7fcf9831329 100644
--- a/omnipod-eros/src/main/res/values-tr-rTR/strings.xml
+++ b/omnipod-eros/src/main/res/values-tr-rTR/strings.xml
@@ -1,13 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Eros - Description -->
+    <string name="omnipod_eros_pump_description">Omnipod Eros için pompa entegrasyonu (şeffaf iğne kapaklı eski model). En az donanım yazılımı sürümü 2.0 olan bir RileyLink cihazı gerektirir.</string>
     <!-- Omnipod Eros - Keys -->
     <!-- Omnipod Eros - Overview -->
     <!-- Omnipod Eros - Preferences -->
+    <string name="omnipod_eros_preferences_riley_link_configuration">RileyLink Yapılandırması</string>
+    <string name="omnipod_eros_preferences_category_notifications">Bildirimler</string>
+    <string name="omnipod_eros_preferences_pulse_log_button_enabled">Pod Yönetimi menüsünde Nabız Günlüğü düğmesini göster</string>
+    <string name="omnipod_eros_preferences_riley_link_stats_button_enabled">Pod Yönetimi menüsünde RileyLink İstatistikleri düğmesini göster</string>
+    <string name="omnipod_eros_preferences_battery_change_logging_enabled">Eylemler\'de pil değişikliği günlüğünü etkinleştir</string>
+    <string name="omnipod_eros_preferences_category_riley_link">RileyLink</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_tbr_sound_enabled">Belirsiz GBO bildirimleri için ses etkinleştirildi</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_smb_sound_enabled">Belirsiz SMB bildirimleri için ses etkinleştirildi</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_bolus_sound_enabled">Belirsiz bolus bildirimleri için ses etkinleştirildi</string>
     <!-- Omnipod Eros - History -->
+    <string name="omnipod_eros_history_title">Pod Geçmişi</string>
+    <string name="omnipod_eros_history_item_description">Açıklama</string>
+    <string name="omnipod_eros_history_item_source">Kaynak</string>
+    <string name="omnipod_eros_history_item_date">Tarih</string>
+    <string name="omnipod_eros_history_type">Tip:</string>
+    <string name="omnipod_eros_history_bolus_value">%1$.2f Ü</string>
+    <string name="omnipod_eros_history_bolus_value_with_carbs">%1$.2f Ü, CH=%2$.1f g</string>
+    <string name="omnipod_eros_history_tbr_value">Oran: %1$.2f Ü, süre: %2$d dakika</string>
     <!-- Omnipod Eros - Short Status -->
+    <string name="omnipod_eros_short_status_riley_link_battery">RLPili: %1$d</string>
     <!-- Omnipod Eros - Error -->
+    <string name="omnipod_eros_error_riley_link_address_invalid">RileyLink adresi geçersiz.</string>
+    <string name="omnipod_eros_error_crc_mismatch">İletişim başarısız oldu: mesaj bütünlüğü doğrulaması başarısız oldu</string>
+    <string name="omnipod_eros_error_invalid_packet_type">İletişim başarısız oldu: Pod\'dan geçersiz bir paket alındı</string>
+    <string name="omnipod_eros_error_invalid_progress_state">İletişim başarısız oldu: Pod yanlış durumda</string>
+    <string name="omnipod_eros_error_invalid_response">İletişim başarısız oldu: Pod\'dan geçersiz bir yanıt alındı</string>
+    <string name="omnipod_eros_error_invalid_message_sequence_number">İletişim başarısız oldu: Pod\'dan geçersiz sıra numarasına sahip bir mesaj alındı</string>
+    <string name="omnipod_eros_error_invalid_message_address">İletişim başarısız oldu: Pod\'dan geçersiz adres içeren bir mesaj alındı</string>
+    <string name="omnipod_eros_error_message_decoding_failed">İletişim başarısız oldu: Pod\'dan gelen mesajın kodu çözülemedi</string>
+    <string name="omnipod_eros_error_nonce_resync_failed">İletişim başarısız oldu: Senkronizasyon başarısızlığı</string>
+    <string name="omnipod_eros_error_nonce_out_of_sync">İletişim başarısız oldu: Senkronizasyon dışı</string>
+    <string name="omnipod_eros_error_not_enough_data">İletişim başarısız oldu: Pod\'dan yeterli veri alınmadı</string>
+    <string name="omnipod_eros_error_pod_fault">Pod hatası (%1$03d %2$s) algılandı. Lütfen Pod\'unuzu devre dışı bırakın ve yeni bir tane etkinleştirin</string>
+    <string name="omnipod_eros_error_pod_returned_error_response">İletişim başarısız oldu: Pod bir hata yanıtı verdi</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_riley_link">RileyLink yanıt vermiyor</string>
+    <string name="omnipod_eros_error_communication_failed_riley_link_interrupted">RileyLink kesintiye uğradı</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_pod">Pod yanıt vermiyor</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_might_be_suspended">Bazal profil ayar hatası. İletim askıya alınabilir! Lütfen Omnipod sekmesinden Pod durumunu manuel olarak yenileyin ve gerekirse iletime devam edin.</string>
+    <string name="omnipod_eros_error_set_basal_might_have_failed_delivery_might_be_suspended">Bazal profil ayarı hatalı olabilir. İletim askıya alınabilir! Lütfen Omnipod sekmesinden Pod durumunu manuel olarak yenileyin ve gerekirse iletime devam edin.</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_suspended">Bazal profil ayar hatası. İletim askıya alındı! Lütfen insülin iletimini Omnipod sekmesinden manuel olarak devam ettirin.</string>
+    <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">Geçici bazal iptal işlemi başarısız olabilir. Lütfen Omnipod sekmesinden Pod durumunu manuel olarak yenileyin.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Geçici bazal ayar hatası. Geçici bir bazal önceden çalışıyorsa, iptal edilmiş olabilir. Lütfen Omnipod sekmesinden Pod durumunu manuel olarak yenileyin.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Geçici bazal ayarı hatalı olabilir. Geçici bir bazal daha önce çalışıyorsa, iptal edilmiştir. Lütfen Omnipod sekmesinden Pod durumunu manuel olarak yenileyin.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_validation">GBO (TBR) süresi sıfırdan büyük ve %1$s dakikanın katı olmalıdır.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">Zaman ayarı hatalı olabilir. İletim askıya alınabilir! Lütfen Omnipod sekmesinden Pod durumunu manuel olarak yenileyin ve gerekirse iletime devam edin.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_suspended">Zaman ayarı hatalı. İletim askıya alındı! Lütfen insülin iletimini Omnipod sekmesinden manuel olarak devam ettirin.</string>
+    <string name="omnipod_eros_error_failed_to_read_pulse_log">Nabız Günlüğü okunamadı</string>
+    <string name="omnipod_eros_error_automatic_time_or_timezone_change_failed">Pod\'daki saat otomatik olarak değiştirilemedi. Omnipod sekmesinde saati manuel olarak senkronize etmelisiniz.</string>
+    <string name="omnipod_eros_error_operation_not_possible_no_configuration">İşlem mümkün değil.\n\nBu işlemi kullanmadan önce Omnipod\'u yapılandırmanız gerekir.</string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain">Bolusun başarılı olup olmadığı doğrulanamıyor. Lütfen tıklamaları dinleyerek Pod\'unuzun bolus yaptığını doğrulayın. <b>Bolusun iletilmediğinden eminseniz, bolus girişini \'Bolusu iptal et\'i tıklayarak iptal etseniz bile Tedaviler\'den de silmelisiniz!</b></string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain_smb">SMB bolusunun (%1$.2f Ü) başarılı olup olmadığı doğrulanamadı. <b>Bolusun iletilmediğinden eminseniz, SMB girişini Tedaviler\'den de silmelisiniz.</b></string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">Pod\'da geçici bir bazal çalışıyor, ancak AAPS bu geçici bazaldan habersiz. Lütfen geçici bazalınızı manuel olarak iptal edin.</string>
     <!-- Omnipod Eros - Pod Management -->
+    <string name="omnipod_eros_pod_management_button_riley_link_stats">RileyLink Durumu</string>
+    <string name="omnipod_eros_pod_management_waiting_for_riley_link_connection">RileyLink bağlantısı bekleniyor…</string>
+    <string name="omnipod_eros_pod_management_button_reset_riley_link_config">RileyLink Yapılandırmasını Sıfırla</string>
+    <string name="omnipod_eros_pod_management_button_read_pulse_log">Nabız Günlüğünü Oku</string>
+    <string name="omnipod_eros_pod_management_button_reading_pulse_log">Nabız Günlüğü Okunuyor…</string>
+    <string name="omnipod_eros_pod_management_pulse_log">Nabız Günlüğü</string>
+    <string name="omnipod_eros_pod_management_pulse_log_value">Nabız Günlüğü (panoya kopyalandı)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">Yeni bir Pod\'u 3 gün yetecek kadar insülinle doldurun.\n\nDoldurma işlemi sırasında Pod\'dan iki bip sesi gelecektir. Bu ses, minimum 80Ü insülinin eklendiğini gösterir. İki bip sesini duyduktan sonra bile doldurma şırıngasını tamamen boşalttığınızdan emin olun.\n\nPod\'u doldurduktan sonra lütfen <b>İleri</b>\'ye basın.\n\n<b>Not:</b> Bu sırada Pod\'un iğne kapağını çıkarmayın.\n<b>Not:</b> lütfen RileyLink\'i dik konuma getirin ve Pod\'u ondan birkaç cm uzağa yerleştirin.</string>
+    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Yeni Pod eşleştiriliyor ve kullanıma hazırlanıyor.\n\nBaşlatma işlemi başarıyla tamamlandığında, <b>İleri</b>\'ye basabilirsiniz.\n\n<b>Not:</b> lütfen RileyLink\'i dik konuma getirin ve Pod\'u ondan birkaç cm uzağa yerleştirin.</string>
     <!-- Omnipod Eros - Other -->
+    <string name="omnipod_eros_uncertain">belirsiz</string>
 </resources>
diff --git a/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml b/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml
index c2b97d711da..67a8c9f0a32 100644
--- a/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml
+++ b/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml
@@ -15,6 +15,11 @@
             <intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEConfigActivity" />
         </Preference>
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_orange_use_scanning"
+            android:summary="@string/orange_use_scanning_level_summary"
+            android:title="@string/orange_use_scanning_level" />
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_riley_link_show_battery_level"
diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt
index 9655fe8bb74..4535d5e0132 100644
--- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt
+++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt
@@ -5,13 +5,14 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.ErosHistory
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
@@ -31,17 +32,18 @@ import java.util.*
 class OmnipodErosPumpPluginTest : TestBase() {
 
     @Mock lateinit var injector: HasAndroidInjector
-    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var rh: ResourceHelper
     @Mock(answer = Answers.RETURNS_DEEP_STUBS) lateinit var activePlugin: ActivePlugin
     @Mock lateinit var aapsOmnipodErosManager: AapsOmnipodErosManager
-    @Mock lateinit var commandQueueProvider: CommandQueueProvider
+    @Mock lateinit var erosHistory: ErosHistory
+    @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var rileyLinkUtil: RileyLinkUtil
     @Mock lateinit var pumpSync: PumpSync
 
-    var rxBusWrapper = RxBusWrapper(TestAapsSchedulers())
+    var rxBusWrapper = RxBus(TestAapsSchedulers(), aapsLogger)
 
     @Before fun prepare() {
-        `when`(resourceHelper.gs(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong()))
+        `when`(rh.gs(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong()))
             .thenReturn("")
     }
 
@@ -51,7 +53,7 @@ class OmnipodErosPumpPluginTest : TestBase() {
         // mock all the things
         val plugin = OmnipodErosPumpPlugin(
             injector, aapsLogger, TestAapsSchedulers(), rxBusWrapper, null,
-            resourceHelper, activePlugin, null, null, aapsOmnipodErosManager, commandQueueProvider,
+            rh, activePlugin, null, null, erosHistory, aapsOmnipodErosManager, commandQueue,
             null, null, null, null,
             rileyLinkUtil, null, null, pumpSync
         )
diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt
index 6d21e22ac20..21fc2a702c5 100644
--- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt
+++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.eros.manager
 
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FirmwareVersion
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus
 import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
@@ -19,7 +19,7 @@ class AapsErosPodStateManagerTest : TestBase() {
 
     @Mock lateinit var sp: SP
 
-    private val rxBus = RxBusWrapper(TestAapsSchedulers())
+    private val rxBus = RxBus(TestAapsSchedulers(), aapsLogger)
 
     @Test fun times() {
         val timeZone = DateTimeZone.UTC
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt
index 469f4aa3466..b8a8424b1a1 100644
--- a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt
@@ -24,7 +24,7 @@ import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHCounterD
 import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHStateDelegate
 import info.nightscout.androidaps.plugin.general.openhumans.ui.OHFragment
 import info.nightscout.androidaps.plugin.general.openhumans.ui.OHLoginActivity
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
@@ -47,7 +47,7 @@ import javax.inject.Singleton
 @Singleton
 class OpenHumansUploader @Inject internal constructor(
     injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     aapsLogger: AAPSLogger,
     private val sp: SP,
     private val context: Context,
@@ -56,7 +56,7 @@ class OpenHumansUploader @Inject internal constructor(
     stateDelegate: OHStateDelegate,
     counterDelegate: OHCounterDelegate,
     appIdDelegate: OHAppIDDelegate,
-    private val rxBus: RxBusWrapper
+    private val rxBus: RxBus
 ) : PluginBase(
     PluginDescription()
         .mainType(PluginType.GENERAL)
@@ -66,7 +66,7 @@ class OpenHumansUploader @Inject internal constructor(
         .description(R.string.open_humans_description)
         .preferencesId(R.xml.pref_openhumans)
         .fragmentClass(OHFragment::class.qualifiedName),
-    aapsLogger, resourceHelper, injector
+    aapsLogger, rh, injector
 ) {
 
     private var openHumansState by stateDelegate
@@ -591,14 +591,14 @@ class OpenHumansUploader @Inject internal constructor(
         notificationManagerCompat.createNotificationChannel(
             NotificationChannel(
                 NOTIFICATION_CHANNEL_WORKER,
-                resourceHelper.gs(R.string.open_humans_uploading),
+                rh.gs(R.string.open_humans_uploading),
                 NotificationManager.IMPORTANCE_MIN
             )
         )
         notificationManagerCompat.createNotificationChannel(
             NotificationChannel(
                 NOTIFICATION_CHANNEL_MESSAGES,
-                resourceHelper.gs(R.string.open_humans_notifications),
+                rh.gs(R.string.open_humans_notifications),
                 NotificationManager.IMPORTANCE_DEFAULT
             )
         )
@@ -606,8 +606,8 @@ class OpenHumansUploader @Inject internal constructor(
 
     private suspend fun handleSignOut() {
         val notification = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_MESSAGES)
-            .setContentTitle(resourceHelper.gs(R.string.you_have_been_signed_out_of_open_humans))
-            .setContentText(resourceHelper.gs(R.string.click_here_to_sign_in_again_if_this_wasnt_on_purpose))
+            .setContentTitle(rh.gs(R.string.you_have_been_signed_out_of_open_humans))
+            .setContentText(rh.gs(R.string.click_here_to_sign_in_again_if_this_wasnt_on_purpose))
             .setStyle(NotificationCompat.BigTextStyle())
             .setSmallIcon(R.drawable.open_humans_notification)
             .setAutoCancel(true)
diff --git a/openhumans/src/main/res/layout/fragment_open_humans_new.xml b/openhumans/src/main/res/layout/fragment_open_humans_new.xml
index bc317ff21e5..43d6fde613d 100644
--- a/openhumans/src/main/res/layout/fragment_open_humans_new.xml
+++ b/openhumans/src/main/res/layout/fragment_open_humans_new.xml
@@ -37,7 +37,8 @@
             android:layout_marginTop="8dp"
             android:gravity="center"
             android:text="@string/setup_completed_info"
-            android:textAppearance="?textAppearanceBody2" />
+            android:textAppearance="?textAppearanceBody2"
+            android:textColor="@color/open_humans_text" />
 
         <TextView
             android:id="@+id/member_id"
@@ -46,6 +47,7 @@
             android:layout_marginTop="16dp"
             android:gravity="center"
             android:textAppearance="?textAppearanceBody1"
+            android:textColor="@color/open_humans_text"
             tools:text="Project Member ID: 5151515" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/openhumans/src/main/res/values-bg-rBG/strings.xml b/openhumans/src/main/res/values-bg-rBG/strings.xml
index f5a10ce1ce1..80e2ef90008 100644
--- a/openhumans/src/main/res/values-bg-rBG/strings.xml
+++ b/openhumans/src/main/res/values-bg-rBG/strings.xml
@@ -2,9 +2,18 @@
 <resources>
     <string name="open_humans">Open Humans</string>
     <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans ви позволява да качите информация за вашия диабет и да я дарите с цел развитеи на науките.</string>
     <string name="logout">Изход</string>
+    <string name="setup">Настройка</string>
+    <string name="setup_completed_info">Open Humansбеше настроен. В случай че искате да спреде качването на данни, натиснете \'Изход\'.</string>
+    <string name="not_setup_info">Open Humans в момента е неактивна. За да започнете да качвате данни, моля натиснете \'Настройка\'.</string>
+    <string name="project_member_id">Project Member ID: %1$s</string>
     <string name="only_upload_if_connected_to_wifi">Качване, само при свързано WiFi</string>
     <string name="only_upload_if_charging">Качване само при зареждане</string>
+    <string name="open_humans_uploading">Качване на данни към Open Humans…</string>
+    <string name="open_humans_notifications">Open Humans нотификации</string>
+    <string name="uploading_to_open_humans">AndroidAPS в момента качва данни към Open Humans. Това може да отнеме известно време.</string>
     <string name="you_have_been_signed_out_of_open_humans">Излязохте от \"Open Humans\".</string>
     <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Натиснете тук за да влезете отново, ако това не е било нарочно.</string>
+    <string name="upload_now">Качи сега</string>
 </resources>
diff --git a/openhumans/src/main/res/values-es-rES/strings.xml b/openhumans/src/main/res/values-es-rES/strings.xml
index b3c6b52b782..f9679955aac 100644
--- a/openhumans/src/main/res/values-es-rES/strings.xml
+++ b/openhumans/src/main/res/values-es-rES/strings.xml
@@ -2,9 +2,18 @@
 <resources>
     <string name="open_humans">Open Humans</string>
     <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans te permite subir tus datos de diabetes y donarlos a proyectos científicos.</string>
     <string name="logout">Cerrar sesión</string>
+    <string name="setup">Configuración</string>
+    <string name="setup_completed_info">Open Humans ha sido configurado. En caso de que quiera dejar de subir datos, haga clic en \'Cerrar sesión\'.</string>
+    <string name="not_setup_info">Open Humans está actualmente inactivo. Para empezar a subir datos, haga clic en \'Configurar\'.</string>
+    <string name="project_member_id">ID de miembro del proyecto: %1$s</string>
     <string name="only_upload_if_connected_to_wifi">Subir datos solo si está conectado a WiFi</string>
     <string name="only_upload_if_charging">Sólo subir datos si se está cargando</string>
+    <string name="open_humans_uploading">Subiendo a Open Humans…</string>
+    <string name="open_humans_notifications">Notificaciones de Open Humans</string>
+    <string name="uploading_to_open_humans">AndroidAPS está subiendo los datos a Open Humans. Esto puede tardar un tiempo.</string>
     <string name="you_have_been_signed_out_of_open_humans">Has cerrado la sesión de Open Humans</string>
     <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Haga clic aquí para iniciar sesión de nuevo si no tenía esa intención.</string>
+    <string name="upload_now">Subir ahora</string>
 </resources>
diff --git a/openhumans/src/main/res/values-hu-rHU/strings.xml b/openhumans/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/openhumans/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/openhumans/src/main/res/values-lt-rLT/strings.xml b/openhumans/src/main/res/values-lt-rLT/strings.xml
index 25762fc2812..202491c0c37 100644
--- a/openhumans/src/main/res/values-lt-rLT/strings.xml
+++ b/openhumans/src/main/res/values-lt-rLT/strings.xml
@@ -2,9 +2,18 @@
 <resources>
     <string name="open_humans">Open Humans</string>
     <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans leidžia įkelti diabeto valdymo duomenis ir skirti juos moksliniams projektams.</string>
     <string name="logout">Atsijungti</string>
+    <string name="setup">Sąranka</string>
+    <string name="setup_completed_info">Open Humans buvo nustatytas. Jei norite sustabdyti įkėlimą, spustelėkite „Atsijungti“.</string>
+    <string name="not_setup_info">Open Humans neaktyvus. Norėdami pradėti duomenų įkėlimą, spustelėkite „Sąranka\".</string>
+    <string name="project_member_id">Projekto nario ID: %1$s</string>
     <string name="only_upload_if_connected_to_wifi">Tik įkelti, jei prijungta prie WiFi</string>
     <string name="only_upload_if_charging">Įkelti tik akumuliatoriaus įkrovimo metu</string>
+    <string name="open_humans_uploading">Įkeliama į Open Humans…</string>
+    <string name="open_humans_notifications">Open Humans Pranešimai</string>
+    <string name="uploading_to_open_humans">AndroidAPS įkelia duomenis į Open Humans. Tai gali šiek tiek užtrukti.</string>
     <string name="you_have_been_signed_out_of_open_humans">Jūs buvote atjungtas iš Open Humans</string>
     <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Spustelėkite čia, kad prisijungtumėte dar kartą, jei tai atsitiko netyčia.</string>
+    <string name="upload_now">Įkelti dabar</string>
 </resources>
diff --git a/openhumans/src/main/res/values-nl-rNL/strings.xml b/openhumans/src/main/res/values-nl-rNL/strings.xml
index 4be13a090f9..39127a1a5e9 100644
--- a/openhumans/src/main/res/values-nl-rNL/strings.xml
+++ b/openhumans/src/main/res/values-nl-rNL/strings.xml
@@ -2,9 +2,18 @@
 <resources>
     <string name="open_humans">Open Humans</string>
     <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Met Open Humans kunt u uw diabetesgegevens uploaden en doneren aan wetenschappelijke projecten.</string>
     <string name="logout">Uitloggen</string>
+    <string name="setup">Instellen</string>
+    <string name="setup_completed_info">Open Humans is ingesteld. Als u wilt stoppen met uploaden, klik dan op \'Uitloggen\'.</string>
+    <string name="not_setup_info">Open Humans is momenteel inactief. Klik op \'Instellen\' om gegevens te uploaden.</string>
+    <string name="project_member_id">Projectdeelnemer ID: %1$s</string>
     <string name="only_upload_if_connected_to_wifi">Alleen uploaden indien verbonden met WiFi</string>
     <string name="only_upload_if_charging">Alleen uploaden tijdens opladen</string>
+    <string name="open_humans_uploading">Uploaden naar Open Humans…</string>
+    <string name="open_humans_notifications">Open Humans notificaties</string>
+    <string name="uploading_to_open_humans">AndroidAPS is aan het uploaden naar Open Humans. Dit kan even duren.</string>
     <string name="you_have_been_signed_out_of_open_humans">Je bent uitgelogd van Open Humans</string>
     <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klik hier om opnieuw in te loggen als dit niet opzettelijk was.</string>
+    <string name="upload_now">Nu Uploaden</string>
 </resources>
diff --git a/openhumans/src/main/res/values-no-rNO/strings.xml b/openhumans/src/main/res/values-no-rNO/strings.xml
index 6382ea38294..b531eea5688 100644
--- a/openhumans/src/main/res/values-no-rNO/strings.xml
+++ b/openhumans/src/main/res/values-no-rNO/strings.xml
@@ -2,9 +2,18 @@
 <resources>
     <string name="open_humans">Open Humans</string>
     <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans lar deg laste opp dine diabetesdata og donere dem til vitenskapelige prosjekter.</string>
     <string name="logout">Utlogging</string>
+    <string name="setup">Oppsett</string>
+    <string name="setup_completed_info">Open Humans er konfigurert. Hvis du vil stoppe opplastinger, klikk \"Logg ut\".</string>
+    <string name="not_setup_info">Open Humans er inaktiv. For å starte opplasting av data, klikk på \"Oppsett\".</string>
+    <string name="project_member_id">Prosjektmedlems ID: %1$s</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="open_humans_uploading">Laster opp til Open Humans…</string>
+    <string name="open_humans_notifications">Open Humans notifikasjon</string>
+    <string name="uploading_to_open_humans">AndroidAPS laster opp til Open Humans. Dette kan ta en stund.</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="upload_now">Last opp nå</string>
 </resources>
diff --git a/openhumans/src/main/res/values-pl-rPL/strings.xml b/openhumans/src/main/res/values-pl-rPL/strings.xml
index dd9ff5dbbfb..0138f625ca0 100644
--- a/openhumans/src/main/res/values-pl-rPL/strings.xml
+++ b/openhumans/src/main/res/values-pl-rPL/strings.xml
@@ -2,9 +2,18 @@
 <resources>
     <string name="open_humans">Open Humans</string>
     <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Projekt Open Humans umożliwia Ci przesłanie danych dotyczących Twojej cukrzycy w celu wsparcia badań naukowych.</string>
     <string name="logout">Wyloguj się</string>
+    <string name="setup">Konfiguracja</string>
+    <string name="setup_completed_info">Skonfigurowano udział w Open Humans. Jeśli chcesz przerwać przesyłanie, kliknij \"Wyloguj\".</string>
+    <string name="not_setup_info">Udział w projekcie Open Humans nie został skonfigurowany. Aby rozpocząć przesyłanie danych, kliknij przycisk \'Konfiguracja\'.</string>
+    <string name="project_member_id">Identyfikator członka projektu: %1$s</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="open_humans_uploading">Przesyłanie do Open Humans…</string>
+    <string name="open_humans_notifications">Powiadomienia Open Humans</string>
+    <string name="uploading_to_open_humans">AndroidAPS wysyła dane do Open Humans. To może chwilę potrwać.</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="upload_now">Prześlij teraz</string>
 </resources>
diff --git a/openhumans/src/main/res/values-ro-rRO/strings.xml b/openhumans/src/main/res/values-ro-rRO/strings.xml
index ccf049edb55..0f1261b7838 100644
--- a/openhumans/src/main/res/values-ro-rRO/strings.xml
+++ b/openhumans/src/main/res/values-ro-rRO/strings.xml
@@ -2,9 +2,18 @@
 <resources>
     <string name="open_humans">Open Humans</string>
     <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Deschide Humans îți permite să încarci datele tale despre diabet și să le donezi proiectelor științifice.</string>
     <string name="logout">Deconectare</string>
+    <string name="setup">Configurare</string>
+    <string name="setup_completed_info">Open Humans a fost configurat. În cazul în care doriți să încetați încărcarea, apăsați „Deconectare”.</string>
+    <string name="not_setup_info">Open Humans este deocamdată inactiv. Pentru a începe încărcarea datelor, apasă \"Configurare\".</string>
+    <string name="project_member_id">ID Membru proiect: %1$s</string>
     <string name="only_upload_if_connected_to_wifi">Încarcă numai pe conexiune WiFi</string>
     <string name="only_upload_if_charging">Încărca numai dacă telefonul este la încărcat</string>
+    <string name="open_humans_uploading">Se încarcă în Open Humans…</string>
+    <string name="open_humans_notifications">Notificări Open Humans</string>
+    <string name="uploading_to_open_humans">AndroidAPS încarcă în Open Humans. Acest lucru poate dura ceva timp.</string>
     <string name="you_have_been_signed_out_of_open_humans">Ai fost deconectat de la Open Humans</string>
     <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Dați click aici pentru a vă conecta din nou, dacă a fost din greșeală.</string>
+    <string name="upload_now">Încarcă acum</string>
 </resources>
diff --git a/openhumans/src/main/res/values-sv-rSE/strings.xml b/openhumans/src/main/res/values-sv-rSE/strings.xml
index e874779e5a7..039bd031f84 100644
--- a/openhumans/src/main/res/values-sv-rSE/strings.xml
+++ b/openhumans/src/main/res/values-sv-rSE/strings.xml
@@ -2,9 +2,18 @@
 <resources>
     <string name="open_humans">Open Humans</string>
     <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Med Open Humans kan du ladda upp din diabetesdata och donera den till vetenskapliga projekt.</string>
     <string name="logout">Logga ut</string>
+    <string name="setup">Konfiguration</string>
+    <string name="setup_completed_info">Open Humans har konfigurerats. Om du vill sluta ladda upp, klicka på \"Logga ut\".</string>
+    <string name="not_setup_info">Open Humans-uppladdningar är för närvarande inte aktiverade. För att börja ladda upp data, klicka på \"Konfiguration\".</string>
+    <string name="project_member_id">Projektmedlems-ID: %1$s</string>
     <string name="only_upload_if_connected_to_wifi">Ladda bara upp om ansluten till WiFi</string>
     <string name="only_upload_if_charging">Ladda bara upp vid laddning</string>
+    <string name="open_humans_uploading">Laddar upp till Open Humans…</string>
+    <string name="open_humans_notifications">Aviseringar från Open Humans</string>
+    <string name="uploading_to_open_humans">AndroidAPS laddar upp till Open Humans. Det kan ta ett tag.</string>
     <string name="you_have_been_signed_out_of_open_humans">Du har loggats ut från Open Humans</string>
     <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klicka här om du vill logga in igen.</string>
+    <string name="upload_now">Ladda upp nu</string>
 </resources>
diff --git a/openhumans/src/main/res/values-tr-rTR/strings.xml b/openhumans/src/main/res/values-tr-rTR/strings.xml
index 3ea04e700df..e9ed6c77cef 100644
--- a/openhumans/src/main/res/values-tr-rTR/strings.xml
+++ b/openhumans/src/main/res/values-tr-rTR/strings.xml
@@ -1,2 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans, diyabet verilerinizi yüklemenize ve bilimsel projelere bağış yapmanıza olanak tanır.</string>
+    <string name="logout">Çıkış</string>
+    <string name="setup">Kurulum</string>
+    <string name="setup_completed_info">Open Humans kuruldu. Yüklemeyi durdurmak isterseniz, \'Çıkış\'ı tıklayın.</string>
+    <string name="not_setup_info">Open Humans şu anda etkin değil. Veri yüklemeye başlamak için \'Kurulum\'u tıklayın.</string>
+    <string name="project_member_id">Proje Üye Kimliği: %1$s</string>
+    <string name="only_upload_if_connected_to_wifi">Yalnızca WiFi\'ye bağlandığında yükle</string>
+    <string name="only_upload_if_charging">Yalnızca şarj olurken yükleyin</string>
+    <string name="open_humans_uploading">Open Humans Yükleniyor…</string>
+    <string name="open_humans_notifications">Open Humans Bildirimleri</string>
+    <string name="uploading_to_open_humans">AndroidAPS, Open Humans\'a yükleniyor. Bu biraz zaman alabilir.</string>
+    <string name="you_have_been_signed_out_of_open_humans">Open Humans\'dan çıkış yaptınız</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Bu bilerek yapılmadıysa tekrar oturum açmak için burayı tıklayın.</string>
+    <string name="upload_now">Şimdi yükle</string>
+</resources>
diff --git a/openhumans/src/main/res/values/colors.xml b/openhumans/src/main/res/values/colors.xml
index 690c43ae2ba..9d9f88ec7ad 100644
--- a/openhumans/src/main/res/values/colors.xml
+++ b/openhumans/src/main/res/values/colors.xml
@@ -4,4 +4,5 @@
     <color name="open_humans_orange_variant">#fe6315</color>
     <color name="open_humans_blue">#009fa8</color>
     <color name="open_humans_blue_variant">#036866</color>
+    <color name="open_humans_text">@android:color/white</color>
 </resources>
\ No newline at end of file
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
index 39c4f9ecd69..5960258c71a 100644
--- a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
@@ -18,7 +18,7 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.interfaces.PumpSync.TemporaryBasalType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.common.ManufacturerType
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus
@@ -43,10 +43,10 @@ abstract class PumpPluginAbstract protected constructor(
     pluginDescription: PluginDescription?,
     pumpType: PumpType,
     injector: HasAndroidInjector?,
-    resourceHelper: ResourceHelper,
+    rh: ResourceHelper,
     aapsLogger: AAPSLogger,
-    commandQueue: CommandQueueProvider,
-    var rxBus: RxBusWrapper,
+    commandQueue: CommandQueue,
+    var rxBus: RxBus,
     var activePlugin: ActivePlugin,
     var sp: SP,
     var context: Context,
@@ -55,7 +55,7 @@ abstract class PumpPluginAbstract protected constructor(
     var aapsSchedulers: AapsSchedulers,
     var pumpSync: PumpSync,
     var pumpSyncStorage: info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage
-) : PumpPluginBase(pluginDescription!!, injector!!, aapsLogger, resourceHelper, commandQueue), Pump, Constraints, info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncEntriesCreator {
+) : PumpPluginBase(pluginDescription!!, injector!!, aapsLogger, rh, commandQueue), Pump, Constraints, info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncEntriesCreator {
 
     private val disposable = CompositeDisposable()
 
@@ -323,6 +323,7 @@ abstract class PumpPluginAbstract protected constructor(
         return ret
     }
 
+    @Synchronized
     override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
         return try {
             if (detailedBolusInfo.insulin == 0.0 && detailedBolusInfo.carbs == 0.0) {
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt
index 21b95367ea8..fd621043144 100644
--- a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt
@@ -35,16 +35,16 @@ enum class PumpHistoryEntryGroup(val resourceId: Int) {
 
         private var translatedList: MutableList<PumpHistoryEntryGroup>? = null
 
-        private fun doTranslation(resourceHelper: ResourceHelper) {
+        private fun doTranslation(rh: ResourceHelper) {
             translatedList = ArrayList()
             for (pumpHistoryEntryGroup in values()) {
-                pumpHistoryEntryGroup.translated = resourceHelper.gs(pumpHistoryEntryGroup.resourceId)
+                pumpHistoryEntryGroup.translated = rh.gs(pumpHistoryEntryGroup.resourceId)
                 (translatedList as ArrayList<PumpHistoryEntryGroup>).add(pumpHistoryEntryGroup)
             }
         }
 
-        fun getTranslatedList(resourceHelper: ResourceHelper): List<PumpHistoryEntryGroup> {
-            if (translatedList == null) doTranslation(resourceHelper)
+        fun getTranslatedList(rh: ResourceHelper): List<PumpHistoryEntryGroup> {
+            if (translatedList == null) doTranslation(rh)
             return translatedList!!
         }
     }
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt
index 918fc9d3ee7..3061e9566aa 100644
--- a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt
@@ -4,45 +4,75 @@ import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 
-data class PumpDbEntry constructor(var temporaryId: Long,
-                                   var date: Long,
-                                   var pumpType: PumpType,
-                                   var serialNumber: String,
-                                   var bolusData: PumpDbEntryBolus? = null,
-                                   var tbrData: PumpDbEntryTBR? = null,
-                                   var pumpId: Long? = null) {
+// data class PumpDbEntry constructor(var temporaryId: Long,
+//                                    var date: Long,
+//                                    var pumpType: PumpType,
+//                                    var serialNumber: String,
+//                                    var bolusData: PumpDbEntryBolus? = null,
+//                                    var tbrData: PumpDbEntryTBR? = null,
+//                                    var pumpId: Long? = null) {
+//
+//     constructor(temporaryId: Long,
+//                 date: Long,
+//                 pumpType: PumpType,
+//                 serialNumber: String,
+//                 detailedBolusInfo: DetailedBolusInfo) : this(temporaryId, date, pumpType, serialNumber) {
+//         this.bolusData = PumpDbEntryBolus(
+//             detailedBolusInfo.insulin,
+//             detailedBolusInfo.carbs,
+//             detailedBolusInfo.bolusType)
+//     }
+//
+//     constructor(temporaryId: Long,
+//                 date: Long,
+//                 pumpType: PumpType,
+//                 serialNumber: String,
+//                 rate: Double,
+//                 isAbsolute: Boolean,
+//                 durationInMinutes: Int,
+//                 tbrType: PumpSync.TemporaryBasalType) : this(temporaryId, date, pumpType, serialNumber) {
+//         this.tbrData = PumpDbEntryTBR(
+//             rate,
+//             isAbsolute,
+//             durationInMinutes,
+//             tbrType)
+//     }
+//
+// }
 
-    constructor(temporaryId: Long,
-                date: Long,
-                pumpType: PumpType,
-                serialNumber: String,
-                detailedBolusInfo: DetailedBolusInfo) : this(temporaryId, date, pumpType, serialNumber) {
-        this.bolusData = PumpDbEntryBolus(
-            detailedBolusInfo.insulin,
-            detailedBolusInfo.carbs,
-            detailedBolusInfo.bolusType)
-    }
 
-    constructor(temporaryId: Long,
+interface PumpDbEntry {
+    var temporaryId: Long
+    var date: Long
+    var pumpType: PumpType
+    var serialNumber: String
+    var pumpId: Long?
+}
+
+
+
+data class PumpDbEntryBolus(override var temporaryId: Long,
+                            override var date: Long,
+                            override var pumpType: PumpType,
+                            override var serialNumber: String,
+                            override var pumpId: Long? = null,
+                            var insulin: Double,
+                            var carbs: Double,
+                            var bolusType: DetailedBolusInfo.BolusType) : PumpDbEntry {
+
+        constructor(temporaryId: Long,
                 date: Long,
                 pumpType: PumpType,
                 serialNumber: String,
-                rate: Double,
-                isAbsolute: Boolean,
-                durationInMinutes: Int,
-                tbrType: PumpSync.TemporaryBasalType) : this(temporaryId, date, pumpType, serialNumber) {
-        this.tbrData = PumpDbEntryTBR(
-            rate,
-            isAbsolute,
-            durationInMinutes,
-            tbrType)
-    }
+                detailedBolusInfo: DetailedBolusInfo) : this(temporaryId, date, pumpType, serialNumber, null,
+                                                             detailedBolusInfo.insulin,
+                                                             detailedBolusInfo.carbs,
+                                                             detailedBolusInfo.bolusType) {
 
-}
+        }
 
-data class PumpDbEntryBolus(var insulin: Double,
-                            var carbs: Double,
-                            var bolusType: DetailedBolusInfo.BolusType)
+
+}
 
 data class PumpDbEntryCarbs(var date: Long,
                             var carbs: Double,
@@ -57,7 +87,29 @@ data class PumpDbEntryCarbs(var date: Long,
         creator.serialNumber())
 }
 
-data class PumpDbEntryTBR(var rate: Double,
+data class PumpDbEntryTBR(override var temporaryId: Long,
+                          override var date: Long,
+                          override var pumpType: PumpType,
+                          override var serialNumber: String,
+                          override var pumpId: Long? = null,
+                          var rate: Double,
                           var isAbsolute: Boolean,
                           var durationInSeconds: Int,
-                          var tbrType: PumpSync.TemporaryBasalType)
\ No newline at end of file
+                          var tbrType: PumpSync.TemporaryBasalType) : PumpDbEntry {
+
+    constructor(rate: Double,
+                isAbsolute: Boolean,
+                durationInSeconds: Int,
+                tbrType: PumpSync.TemporaryBasalType) : this(0, 0, PumpType.GENERIC_AAPS, "", null,
+                                                             rate, isAbsolute, durationInSeconds, tbrType)
+
+    constructor(temporaryId: Long,
+                date: Long,
+                pumpType: PumpType,
+                serialNumber: String,
+                entry: PumpDbEntryTBR,
+                pumpId: Long?
+               ) : this(temporaryId, date, pumpType, serialNumber, pumpId,
+                        entry.rate, entry.isAbsolute, entry.durationInSeconds, entry.tbrType)
+
+}
\ No newline at end of file
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt
index ef8866d0404..a4b244dae38 100644
--- a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt
@@ -22,13 +22,13 @@ class PumpSyncStorage @Inject constructor(
 ) {
 
     companion object {
-
-        const val pumpSyncStorageKey: String = "pump_sync_storage_xstream_v2"
-        const val TBR: String = "TBR"
-        const val BOLUS: String = "BOLUS"
+        const val pumpSyncStorageBolusKey: String = "pump_sync_storage_bolus"
+        const val pumpSyncStorageTBRKey: String = "pump_sync_storage_tbr"
     }
 
-    var pumpSyncStorage: MutableMap<String, MutableList<PumpDbEntry>> = mutableMapOf()
+    var pumpSyncStorageBolus: MutableList<PumpDbEntryBolus> = mutableListOf()
+    var pumpSyncStorageTBR: MutableList<PumpDbEntryTBR> = mutableListOf()
+
     private var storageInitialized: Boolean = false
     private var xstream: XStream = XStream()
 
@@ -41,38 +41,58 @@ class PumpSyncStorage @Inject constructor(
         if (storageInitialized)
             return
 
-        var loaded = false
+        xstream.addPermission(AnyTypePermission.ANY)
 
-        if (sp.contains(pumpSyncStorageKey)) {
-            val jsonData: String = sp.getString(pumpSyncStorageKey, "")
+        if (sp.contains(pumpSyncStorageBolusKey)) {
+            val jsonData: String = sp.getString(pumpSyncStorageBolusKey, "")
 
             if (jsonData.isNotBlank()) {
-                xstream.addPermission(AnyTypePermission.ANY)
                 @Suppress("UNCHECKED_CAST")
-                pumpSyncStorage = xstream.fromXML(jsonData, MutableMap::class.java) as MutableMap<String, MutableList<PumpDbEntry>>
+                pumpSyncStorageBolus = xstream.fromXML(jsonData, MutableList::class.java) as
+                    MutableList<PumpDbEntryBolus>
+
+                aapsLogger.debug(LTag.PUMP, "Loading Pump Sync Storage Bolus: boluses=${pumpSyncStorageBolus.size}")
+                aapsLogger.debug(LTag.PUMP, "DD: PumpSyncStorageBolus=$pumpSyncStorageBolus")
+            }
+        }
+
+        if (sp.contains(pumpSyncStorageTBRKey)) {
+            val jsonData: String = sp.getString(pumpSyncStorageTBRKey, "")
 
-                aapsLogger.debug(LTag.PUMP, String.format("Loading Pump Sync Storage: boluses=%d, tbrs=%d.", pumpSyncStorage[BOLUS]!!.size, pumpSyncStorage[TBR]!!.size))
-                aapsLogger.debug(LTag.PUMP, "DD: PumpSyncStorage=$pumpSyncStorage")
+            if (jsonData.isNotBlank()) {
+                @Suppress("UNCHECKED_CAST")
+                pumpSyncStorageTBR = xstream.fromXML(jsonData, MutableList::class.java) as
+                    MutableList<PumpDbEntryTBR>
 
-                loaded = true
+                aapsLogger.debug(LTag.PUMP, "Loading Pump Sync Storage: tbrs=${pumpSyncStorageTBR.size}.")
+                aapsLogger.debug(LTag.PUMP, "DD: PumpSyncStorageTBR=$pumpSyncStorageTBR")
             }
         }
+        storageInitialized = true
+    }
 
-        if (!loaded) {
-            pumpSyncStorage[BOLUS] = mutableListOf()
-            pumpSyncStorage[TBR] = mutableListOf()
+    fun saveStorageBolus() {
+        if (!pumpSyncStorageBolus.isEmpty()) {
+            sp.putString(pumpSyncStorageBolusKey, xstream.toXML(pumpSyncStorageBolus))
+            aapsLogger.debug(LTag.PUMP,"Saving Pump Sync Storage: boluses=${pumpSyncStorageBolus.size}")
+        } else {
+            if (sp.contains(pumpSyncStorageBolusKey))
+                sp.remove(pumpSyncStorageBolusKey)
         }
     }
 
-    fun saveStorage() {
-        if (!isStorageEmpty()) {
-            sp.putString(pumpSyncStorageKey, xstream.toXML(pumpSyncStorage))
-            aapsLogger.debug(String.format("Saving Pump Sync Storage: boluses=%d, tbrs=%d.", pumpSyncStorage[BOLUS]!!.size, pumpSyncStorage[TBR]!!.size))
+    fun saveStorageTBR() {
+        if (!pumpSyncStorageTBR.isEmpty()) {
+            sp.putString(pumpSyncStorageTBRKey, xstream.toXML(pumpSyncStorageTBR))
+            aapsLogger.debug(LTag.PUMP, "Saving Pump Sync Storage: tbr=${pumpSyncStorageTBR.size}")
+        } else {
+            if (sp.contains(pumpSyncStorageTBRKey))
+                sp.remove(pumpSyncStorageTBRKey)
         }
     }
 
     private fun cleanOldStorage() {
-        val oldSpKeys = setOf("pump_sync_storage", "pump_sync_storage_xstream")
+        val oldSpKeys = setOf("pump_sync_storage", "pump_sync_storage_xstream", "pump_sync_storage_xstream_v2")
 
         for (oldSpKey in oldSpKeys) {
             if (sp.contains(oldSpKey))
@@ -80,16 +100,12 @@ class PumpSyncStorage @Inject constructor(
         }
     }
 
-    private fun isStorageEmpty(): Boolean {
-        return pumpSyncStorage[BOLUS]!!.isEmpty() && pumpSyncStorage[TBR]!!.isEmpty()
+    fun getBoluses(): MutableList<PumpDbEntryBolus> {
+        return pumpSyncStorageBolus
     }
 
-    fun getBoluses(): MutableList<PumpDbEntry> {
-        return pumpSyncStorage[BOLUS]!!
-    }
-
-    fun getTBRs(): MutableList<PumpDbEntry> {
-        return pumpSyncStorage[TBR]!!
+    fun getTBRs(): MutableList<PumpDbEntryTBR> {
+        return pumpSyncStorageTBR
     }
 
     fun addBolusWithTempId(detailedBolusInfo: DetailedBolusInfo, writeToInternalHistory: Boolean, creator: PumpSyncEntriesCreator): Boolean {
@@ -102,24 +118,25 @@ class PumpSyncStorage @Inject constructor(
             creator.model(),
             creator.serialNumber())
 
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "addBolusWithTempId [date=%d, temporaryId=%d, insulin=%.2f, type=%s, pumpSerial=%s] - Result: %b",
-            detailedBolusInfo.timestamp, temporaryId, detailedBolusInfo.insulin, detailedBolusInfo.bolusType,
-            creator.serialNumber(), result))
+        aapsLogger.debug(LTag.PUMP, "addBolusWithTempId [date=${detailedBolusInfo.timestamp}, temporaryId=$temporaryId, " +
+            "insulin=${detailedBolusInfo.insulin}, type=${detailedBolusInfo.bolusType}, pumpSerial=${creator.serialNumber()}] - " +
+            "Result: $result")
 
         if (detailedBolusInfo.carbs > 0.0) {
             addCarbs(PumpDbEntryCarbs(detailedBolusInfo, creator))
         }
 
         if (result && writeToInternalHistory) {
-            val innerList: MutableList<PumpDbEntry> = pumpSyncStorage[BOLUS]!!
-
-            val dbEntry = PumpDbEntry(temporaryId, detailedBolusInfo.timestamp, creator.model(), creator.serialNumber(), detailedBolusInfo)
+            val dbEntry = PumpDbEntryBolus(temporaryId = temporaryId,
+                                           date = detailedBolusInfo.timestamp,
+                                           pumpType = creator.model(),
+                                           serialNumber = creator.serialNumber(),
+                                           detailedBolusInfo = detailedBolusInfo)
 
-            aapsLogger.debug("PumpDbEntry: $dbEntry")
+            aapsLogger.debug("PumpDbEntryBolus: $dbEntry")
 
-            innerList.add(dbEntry)
-            pumpSyncStorage[BOLUS] = innerList
-            saveStorage()
+            pumpSyncStorageBolus.add(dbEntry)
+            saveStorageBolus()
         }
         return result
     }
@@ -132,8 +149,8 @@ class PumpSyncStorage @Inject constructor(
             carbsDto.pumpType,
             carbsDto.serialNumber)
 
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "syncCarbsWithTimestamp [date=%d, carbs=%.2f, pumpSerial=%s] - Result: %b",
-            carbsDto.date, carbsDto.carbs, carbsDto.serialNumber, result))
+        aapsLogger.debug(LTag.PUMP, "syncCarbsWithTimestamp [date=${carbsDto.date}, " +
+            "carbs=${carbsDto.carbs}, pumpSerial=${carbsDto.serialNumber}] - Result: $result")
     }
 
     fun addTemporaryBasalRateWithTempId(temporaryBasal: PumpDbEntryTBR, writeToInternalHistory: Boolean, creator: PumpSyncEntriesCreator): Boolean {
@@ -151,42 +168,52 @@ class PumpSyncStorage @Inject constructor(
             creator.serialNumber())
 
         if (response && writeToInternalHistory) {
-            val innerList: MutableList<PumpDbEntry> = pumpSyncStorage[TBR]!!
+            val dbEntry = PumpDbEntryTBR(temporaryId = temporaryId,
+                                         date = timeNow,
+                                         pumpType = creator.model(),
+                                         serialNumber = creator.serialNumber(),
+                                         entry = temporaryBasal,
+                                         pumpId=null)
 
-            innerList.add(PumpDbEntry(temporaryId, timeNow, creator.model(), creator.serialNumber(), null, temporaryBasal))
-            pumpSyncStorage[BOLUS] = innerList
-            saveStorage()
+            aapsLogger.debug("PumpDbEntryTBR: $dbEntry")
+
+            pumpSyncStorageTBR.add(dbEntry)
+            saveStorageTBR()
         }
 
         return response
     }
 
     fun removeBolusWithTemporaryId(temporaryId: Long) {
-        val bolusList = removeTemporaryId(temporaryId, pumpSyncStorage[BOLUS]!!)
-        pumpSyncStorage[BOLUS] = bolusList
-        saveStorage()
-    }
+        var dbEntry: PumpDbEntryBolus? = null
 
-    fun removeTemporaryBasalWithTemporaryId(temporaryId: Long) {
-        val tbrList = removeTemporaryId(temporaryId, pumpSyncStorage[TBR]!!)
-        pumpSyncStorage[TBR] = tbrList
-        saveStorage()
+        for (pumpDbEntry in pumpSyncStorageBolus) {
+            if (pumpDbEntry.temporaryId == temporaryId) {
+                dbEntry = pumpDbEntry
+            }
+        }
+
+        if (dbEntry != null) {
+            pumpSyncStorageBolus.remove(dbEntry)
+        }
+
+        saveStorageBolus()
     }
 
-    private fun removeTemporaryId(temporaryId: Long, list: MutableList<PumpDbEntry>): MutableList<PumpDbEntry> {
-        var dbEntry: PumpDbEntry? = null
+    fun removeTemporaryBasalWithTemporaryId(temporaryId: Long) {
+        var dbEntry: PumpDbEntryTBR? = null
 
-        for (pumpDbEntry in list) {
+        for (pumpDbEntry in pumpSyncStorageTBR) {
             if (pumpDbEntry.temporaryId == temporaryId) {
                 dbEntry = pumpDbEntry
             }
         }
 
         if (dbEntry != null) {
-            list.remove(dbEntry)
+            pumpSyncStorageTBR.remove(dbEntry)
         }
 
-        return list
+        saveStorageTBR()
     }
 
 }
\ No newline at end of file
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt
index 8997e02482b..f5100096dc5 100644
--- a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt
@@ -25,8 +25,9 @@ object ProfileUtil {
             val basalValueValue = pumpType.determineCorrectBasalSize(basalValue.value)
             val hour = basalValue.timeAsSeconds / (60 * 60)
             stringBuilder.append((if (hour < 10) "0" else "") + hour + ":00")
+            stringBuilder.append(" ")
             stringBuilder.append(String.format(Locale.ENGLISH, "%.3f", basalValueValue))
-            stringBuilder.append(", ")
+            stringBuilder.append(",\n")
         }
         return if (stringBuilder.length > 3) stringBuilder.substring(0, stringBuilder.length - 2) else stringBuilder.toString()
     }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt
index ac6f4747ce8..ffd25e97ea6 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt
@@ -9,6 +9,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.S
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetPreamble
 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.device.OrangeLinkImpl
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusGeneralFragment
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment
@@ -30,6 +31,7 @@ abstract class RileyLinkModule {
     @ContributesAndroidInjector abstract fun sendAndListenProvider(): SendAndListen
     @ContributesAndroidInjector abstract fun setPreambleProvider(): SetPreamble
     @ContributesAndroidInjector abstract fun radioPacketProvider(): RadioPacket
+    @ContributesAndroidInjector abstract fun orangeLinkDeviceProvider(): OrangeLinkImpl
 
     @ContributesAndroidInjector abstract fun contributesRileyLinkStatusGeneral(): RileyLinkStatusGeneralFragment
     @ContributesAndroidInjector abstract fun contributesRileyLinkStatusHistoryFragment(): RileyLinkStatusHistoryFragment
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.java
index 227b642d8cf..783372ffd4b 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.java
@@ -49,7 +49,7 @@ public class RileyLinkBLEConfigActivity extends NoSplashAppCompatActivity {
 
     @Inject AAPSLogger aapsLogger;
     @Inject SP sp;
-    @Inject ResourceHelper resourceHelper;
+    @Inject ResourceHelper rh;
     @Inject BlePreCheck blePrecheck;
     @Inject RileyLinkUtil rileyLinkUtil;
     @Inject ActivePlugin activePlugin;
@@ -233,7 +233,7 @@ private boolean addDevice(ScanResult result) {
         @Override
         public void onScanFailed(int errorCode) {
             Log.e("Scan Failed", "Error Code: " + errorCode);
-            Toast.makeText(RileyLinkBLEConfigActivity.this, resourceHelper.gs(R.string.riley_link_ble_config_scan_error, errorCode),
+            Toast.makeText(RileyLinkBLEConfigActivity.this, rh.gs(R.string.riley_link_ble_config_scan_error, errorCode),
                     Toast.LENGTH_LONG).show();
         }
 
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt
index 130d018f56c..d49d5c95292 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt
@@ -33,16 +33,16 @@ open class EventRileyLinkDeviceStatusChange : EventStatus {
         this.errorDescription = errorDescription
     }
 
-    override fun getStatus(resourceHelper: ResourceHelper): String {
+    override fun getStatus(rh: ResourceHelper): String {
         val rileyLinkServiceState = this.rileyLinkServiceState ?: return ""
         val resourceId = rileyLinkServiceState.resourceId
         val rileyLinkError = this.rileyLinkError
 
         if (rileyLinkServiceState.isError && rileyLinkError != null) {
             val rileyLinkTargetDevice = this.rileyLinkTargetDevice ?: return ""
-            return resourceHelper.gs(rileyLinkError.getResourceId(rileyLinkTargetDevice))
+            return rh.gs(rileyLinkError.getResourceId(rileyLinkTargetDevice))
         }
 
-        return resourceHelper.gs(resourceId)
+        return rh.gs(resourceId)
     }
 }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java
index da071355da0..e738e49b7c7 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java
@@ -32,6 +32,7 @@ public static class Prefs {
         //public static final String RileyLinkAddress = PrefPrefix + "mac_address"; // pref_rileylink_mac_address
         public static final int RileyLinkAddress = R.string.key_rileylink_mac_address;
         public static final int RileyLinkName = R.string.key_rileylink_name;
+        public static final int OrangeUseScanning = R.string.key_orange_use_scanning;
         public static final String LastGoodDeviceCommunicationTime = Prefix + "lastGoodDeviceCommunicationTime";
         public static final String LastGoodDeviceFrequency = Prefix + "LastGoodDeviceFrequency";
         public static final int Encoding = R.string.key_medtronic_encoding;
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 a360c13d23e..383bd761aa9 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
@@ -15,7 +15,7 @@
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
@@ -51,11 +51,11 @@ public class RFSpy {
     private static final int LOW_BATTERY_PERCENTAGE_THRESHOLD = 20;
 
     @Inject AAPSLogger aapsLogger;
-    @Inject ResourceHelper resourceHelper;
+    @Inject ResourceHelper rh;
     @Inject SP sp;
     @Inject RileyLinkServiceData rileyLinkServiceData;
     @Inject RileyLinkUtil rileyLinkUtil;
-    @Inject RxBusWrapper rxBus;
+    @Inject RxBus rxBus;
 
     private final HasAndroidInjector injector;
 
@@ -68,7 +68,7 @@ public class RFSpy {
     private final UUID radioDataUUID = UUID.fromString(GattAttributes.CHARA_RADIO_DATA);
     private final UUID radioVersionUUID = UUID.fromString(GattAttributes.CHARA_RADIO_VERSION);
     private final UUID batteryServiceUUID = UUID.fromString(GattAttributes.SERVICE_BATTERY);
-    private final UUID batteryLevelUUID = UUID.fromString(GattAttributes.CHARA_BATTERY_UNK);
+    private final UUID batteryLevelUUID = UUID.fromString(GattAttributes.CHARA_BATTERY_LEVEL);
     private String bleVersion; // We don't use it so no need of sofisticated logic
     private Double currentFrequencyMHz;
     private long nextBatteryCheck = 0;
@@ -81,7 +81,7 @@ public RFSpy(HasAndroidInjector injector, RileyLinkBLE rileyLinkBle) {
 
     @Inject
     public void onInit() {
-        aapsLogger.debug("RileyLinkServiceData:" + rileyLinkServiceData);
+        //aapsLogger.debug("RileyLinkServiceData:" + rileyLinkServiceData);
         reader = new RFSpyReader(aapsLogger, rileyLinkBle);
     }
 
@@ -103,6 +103,10 @@ public void initializeRileyLink() {
         String cc1110Version = getCC1110Version();
         rileyLinkServiceData.versionCC110 = cc1110Version;
         rileyLinkServiceData.firmwareVersion = getFirmwareVersion(aapsLogger, bleVersion, cc1110Version);
+
+        aapsLogger.debug(LTag.PUMPBTCOMM,
+                String.format("RileyLink - BLE Version: %s, CC1110 Version: %s, Firmware Version: %s",
+                        bleVersion, cc1110Version, rileyLinkServiceData.firmwareVersion));
     }
 
     // Call this from the "response count" notification handler.
@@ -363,7 +367,7 @@ private void setMedtronicEncoding() {
         if (rileyLinkServiceData.firmwareVersion != null &&
                 rileyLinkServiceData.firmwareVersion.isSameVersion(RileyLinkFirmwareVersion.Version2AndHigher)) {
             if (sp.getString(RileyLinkConst.Prefs.Encoding, "None")
-                    .equals(resourceHelper.gs(R.string.key_medtronic_pump_encoding_4b6b_rileylink))) {
+                    .equals(rh.gs(R.string.key_medtronic_pump_encoding_4b6b_rileylink))) {
                 encoding = RileyLinkEncodingType.FourByteSixByteRileyLink;
             }
         }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
index 3527daaa945..a8cfa31496f 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
@@ -26,6 +26,7 @@
 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.data.GattAttributes;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.device.OrangeLinkImpl;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.operations.BLECommOperation;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.operations.BLECommOperationResult;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.operations.CharacteristicReadOperation;
@@ -49,6 +50,7 @@ public class RileyLinkBLE {
     @Inject RileyLinkServiceData rileyLinkServiceData;
     @Inject RileyLinkUtil rileyLinkUtil;
     @Inject SP sp;
+    @Inject OrangeLinkImpl orangeLink;
 
     private final Context context;
     private final boolean gattDebugEnabled = true;
@@ -67,6 +69,8 @@ public RileyLinkBLE(final Context context) {
         this.context = context;
         this.bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
 
+        //orangeLink.rileyLinkBLE = this;
+
         bluetoothGattCallback = new BluetoothGattCallback() {
 
             @Override
@@ -84,6 +88,8 @@ public void onCharacteristicChanged(final BluetoothGatt gatt,
                 if (radioResponseCountNotified != null) {
                     radioResponseCountNotified.run();
                 }
+
+                orangeLink.onCharacteristicChanged(characteristic);
             }
 
 
@@ -223,6 +229,9 @@ public void onServicesDiscovered(final BluetoothGatt gatt, int status) {
                     final List<BluetoothGattService> services = gatt.getServices();
 
                     boolean rileyLinkFound = false;
+                    orangeLink.resetOrangeLinkData();
+
+                    StringBuilder stringBuilder = new StringBuilder("RileyLink Device Debug\n");
 
                     for (BluetoothGattService service : services) {
                         final UUID uuidService = service.getUuid();
@@ -232,11 +241,14 @@ public void onServicesDiscovered(final BluetoothGatt gatt, int status) {
                         }
 
                         if (gattDebugEnabled) {
-                            debugService(service, 0);
+                            debugService(service, 0, stringBuilder);
                         }
+
+                        orangeLink.checkIsOrange(uuidService);
                     }
 
                     if (gattDebugEnabled) {
+                        aapsLogger.warn(LTag.PUMPBTCOMM, stringBuilder.toString());
                         aapsLogger.warn(LTag.PUMPBTCOMM, "onServicesDiscovered " + getGattStatusMessage(status));
                     }
 
@@ -261,7 +273,8 @@ public void onServicesDiscovered(final BluetoothGatt gatt, int status) {
 
     @Inject
     public void onInit() {
-        aapsLogger.debug(LTag.PUMPBTCOMM, "BT Adapter: " + this.bluetoothAdapter);
+        //aapsLogger.debug(LTag.PUMPBTCOMM, "BT Adapter: " + this.bluetoothAdapter);
+        this.orangeLink.rileyLinkBLE = this;
     }
 
 
@@ -278,6 +291,7 @@ private boolean isAnyRileyLinkServiceFound(BluetoothGattService service) {
                 if (isAnyRileyLinkServiceFound(serviceI)) {
                     return true;
                 }
+                orangeLink.checkIsOrange(serviceI.getUuid());
             }
         }
 
@@ -290,7 +304,7 @@ public BluetoothDevice getRileyLinkDevice() {
     }
 
 
-    public void debugService(BluetoothGattService service, int indentCount) {
+    public void debugService(BluetoothGattService service, int indentCount, StringBuilder stringBuilder) {
 
         String indentString = StringUtils.repeat(' ', indentCount);
 
@@ -299,7 +313,7 @@ public void debugService(BluetoothGattService service, int indentCount) {
         if (gattDebugEnabled) {
             final String uuidServiceString = uuidService.toString();
 
-            StringBuilder stringBuilder = new StringBuilder();
+            //StringBuilder stringBuilder = new StringBuilder();
 
             stringBuilder.append(indentString);
             stringBuilder.append(GattAttributes.lookup(uuidServiceString, "Unknown service"));
@@ -316,12 +330,12 @@ public void debugService(BluetoothGattService service, int indentCount) {
 
             stringBuilder.append("\n\n");
 
-            aapsLogger.warn(LTag.PUMPBTCOMM, stringBuilder.toString());
+            //aapsLogger.warn(LTag.PUMPBTCOMM, stringBuilder.toString());
 
             List<BluetoothGattService> includedServices = service.getIncludedServices();
 
             for (BluetoothGattService serviceI : includedServices) {
-                debugService(serviceI, indentCount + 4);
+                debugService(serviceI, indentCount + 4, stringBuilder);
             }
         }
     }
@@ -361,27 +375,46 @@ public boolean enableNotifications() {
             aapsLogger.error(LTag.PUMPBTCOMM, "Error setting response count notification");
             return false;
         }
+
+        if (rileyLinkServiceData.isOrange) {
+            return orangeLink.enableNotifications();
+        }
         return true;
     }
 
 
-    public void findRileyLink(String RileyLinkAddress) {
-        aapsLogger.debug(LTag.PUMPBTCOMM, "RileyLink address: " + RileyLinkAddress);
+    public void findRileyLink(String rileyLinkAddress) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "RileyLink address: " + rileyLinkAddress);
         // Must verify that this is a valid MAC, or crash.
+        //macAddress = RileyLinkAddress;
+        boolean useScanning = sp.getBoolean(RileyLinkConst.Prefs.OrangeUseScanning, false);
+        if (useScanning) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Start scan for OrangeLink device.");
+            orangeLink.startScan();
+        } else {
+            rileyLinkDevice = bluetoothAdapter.getRemoteDevice(rileyLinkAddress);
+            // if this succeeds, we get a connection state change callback?
+            if (rileyLinkDevice != null) {
+                connectGattInternal();
+            } else {
+                aapsLogger.error(LTag.PUMPBTCOMM, "RileyLink device not found with address: " + rileyLinkAddress);
+            }
+        }
+    }
 
-        rileyLinkDevice = bluetoothAdapter.getRemoteDevice(RileyLinkAddress);
-        // if this succeeds, we get a connection state change callback?
-
-        if (rileyLinkDevice != null) {
-            connectGatt();
+    public void connectGatt() {
+        boolean useScanning = sp.getBoolean(RileyLinkConst.Prefs.OrangeUseScanning, false);
+        if (useScanning) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Start scan for OrangeLink device.");
+            orangeLink.startScan();
         } else {
-            aapsLogger.error(LTag.PUMPBTCOMM, "RileyLink device not found with address: " + RileyLinkAddress);
+            connectGattInternal();
         }
     }
 
 
     // This function must be run on UI thread.
-    public void connectGatt() {
+    public void connectGattInternal() {
         if (this.rileyLinkDevice == null) {
             aapsLogger.error(LTag.PUMPBTCOMM, "RileyLink device is null, can't do connectGatt.");
             return;
@@ -430,7 +463,7 @@ public void close() {
     }
 
 
-    private BLECommOperationResult setNotification_blocking(UUID serviceUUID, UUID charaUUID) {
+    public BLECommOperationResult setNotification_blocking(UUID serviceUUID, UUID charaUUID) {
         BLECommOperationResult rval = new BLECommOperationResult();
         if (bluetoothConnectionGatt != null) {
 
@@ -594,4 +627,12 @@ private String getGattStatusMessage(final int status) {
 
         return statusMessage;
     }
+
+    public void setRileyLinkDevice(BluetoothDevice device) {
+        this.rileyLinkDevice = device;
+    }
+
+    public BluetoothAdapter getBluetoothAdapter() {
+        return bluetoothAdapter;
+    }
 }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java
index 9021bbf50c1..cdcf8ab37c9 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java
@@ -13,13 +13,20 @@ public class GattAttributes {
 
     public static String PREFIX = "0000";
     public static String SUFFIX = "-0000-1000-8000-00805f9b34fb";
-    public static String SERVICE_GAP = PREFIX + "1800" + SUFFIX;
-    public static String CHARA_GAP_NAME = PREFIX + "2a00" + SUFFIX; // RileyLink RFSpy
-    public static String CHARA_GAP_NUM = PREFIX + "2a01" + SUFFIX; // 0000
-    public static String CHARA_GAP_UNK = PREFIX + "2a01" + SUFFIX; // a
 
+    // Generic Access
+    public static String SERVICE_GA = PREFIX + "1800" + SUFFIX;
+    public static String CHARA_GA_NAME = PREFIX + "2a00" + SUFFIX; // RileyLink RFSpy
+    public static String CHARA_GA_APPEARANCE = PREFIX + "2a01" + SUFFIX; // 0000
+    public static String CHARA_GA_PPCP = PREFIX + "2a04" + SUFFIX; // 0000
+    public static String CHARA_GA_CAR = PREFIX + "2aa6" + SUFFIX; // 0000
+
+    // Generic Attribute
+    public static String SERVICE_G_ATTR = PREFIX + "1801" + SUFFIX;
+
+    // Battery Service
     public static String SERVICE_BATTERY = PREFIX + "180f" + SUFFIX; // Battery
-    public static String CHARA_BATTERY_UNK = PREFIX + "2a19" + SUFFIX;
+    public static String CHARA_BATTERY_LEVEL = PREFIX + "2a19" + SUFFIX;
 
     // RileyLink Radio Service
     public static String SERVICE_RADIO = "0235733b-99c5-4197-b856-69219c2a3845";
@@ -30,6 +37,20 @@ public class GattAttributes {
     public static String CHARA_RADIO_VERSION = "30d99dc9-7c91-4295-a051-0a104d238cf2";
     public static String CHARA_RADIO_LED_MODE = "c6d84241-f1a7-4f9c-a25f-fce16732f14e";
 
+    // Secure DFU Service (Orange 1.5 - 3.2)
+    public static String SERVICE_DFU = "0000fe59-0000-1000-8000-00805f9b34fb";
+    public static String CHARA_BUTTONLESS_DFU = "8ec90003-f315-4f60-9fb8-838830daea50";
+
+    // Nordic UART Service (Orange 2.1 - 3.2)
+    public static String SERVICE_NORDIC_UART = "6e400001-b5a3-f393-e0a9-e50e24dcca9e";
+    public static String CHARA_NORDIC_RX = "6e400002-b5a3-f393-e0a9-e50e24dcca9e";
+    public static String CHARA_NORDIC_TX = "6e400003-b5a3-f393-e0a9-e50e24dcca9e";
+
+
+    // Orange Radio Service
+    public static String SERVICE_RADIO_ORANGE = "6e400001-b5a3-f393-e0a9-e50e24dcca9e";
+    public static String CHARA_NOTIFICATION_ORANGE = "6e400003-b5a3-f393-e0a9-e50e24dcca9e";
+
     private static final Map<String, String> attributes;
     private static final Map<String, String> attributesRileyLinkSpecific;
 
@@ -37,13 +58,18 @@ public class GattAttributes {
     static {
         attributes = new HashMap<>();
 
-        attributes.put(SERVICE_GAP, "Device Information Service");
-        attributes.put(CHARA_GAP_NAME, "Name"); //
-        attributes.put(CHARA_GAP_NUM, "Number"); //
+        attributes.put(SERVICE_GA, "Generic Access");
+        attributes.put(CHARA_GA_NAME, "Device Name"); //
+        attributes.put(CHARA_GA_APPEARANCE, "Appearance"); //
+        attributes.put(CHARA_GA_PPCP, "Peripheral Preffered Connection Parameters");
+        attributes.put(CHARA_GA_CAR, "Central Address Resolution");
+
+        attributes.put(SERVICE_G_ATTR, "Generic Attribute");
 
         attributes.put(SERVICE_BATTERY, "Battery Service");
+        attributes.put(CHARA_BATTERY_LEVEL, "Battery Level");
 
-        attributes.put(SERVICE_RADIO, "Radio Interface"); // a
+        attributes.put(SERVICE_RADIO, "Radio Interface Service");
         attributes.put(CHARA_RADIO_CUSTOM_NAME, "Custom Name");
         attributes.put(CHARA_RADIO_DATA, "Data");
         attributes.put(CHARA_RADIO_RESPONSE_COUNT, "Response Count");
@@ -51,6 +77,13 @@ public class GattAttributes {
         attributes.put(CHARA_RADIO_VERSION, "Version"); // firmwareVersion
         attributes.put(CHARA_RADIO_LED_MODE, "Led Mode");
 
+        attributes.put(SERVICE_DFU, "Secure DFU Service");
+        attributes.put(CHARA_BUTTONLESS_DFU, "Buttonless DFU");
+
+        attributes.put(SERVICE_NORDIC_UART, "Nordic UART Service");
+        attributes.put(CHARA_NORDIC_RX, "RX Characteristic");
+        attributes.put(CHARA_NORDIC_TX, "TX Characteristic");
+
         attributesRileyLinkSpecific = new HashMap<>();
 
         attributesRileyLinkSpecific.put(SERVICE_RADIO, "Radio Interface"); // a
@@ -60,6 +93,9 @@ public class GattAttributes {
         attributesRileyLinkSpecific.put(CHARA_RADIO_TIMER_TICK, "Timer Tick");
         attributesRileyLinkSpecific.put(CHARA_RADIO_VERSION, "Version"); // firmwareVersion
         attributesRileyLinkSpecific.put(CHARA_RADIO_LED_MODE, "Led Mode");
+
+        attributesRileyLinkSpecific.put(SERVICE_RADIO_ORANGE, "Orange Radio Interface");
+        attributesRileyLinkSpecific.put(CHARA_NOTIFICATION_ORANGE, "Orange Notification");
     }
 
 
@@ -84,4 +120,9 @@ public static boolean isRileyLink(UUID uuid) {
         return attributesRileyLinkSpecific.containsKey(uuid.toString());
     }
 
+
+    public static boolean isOrange(UUID uuid) {
+        return SERVICE_RADIO_ORANGE.equals(uuid.toString());
+    }
+
 }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
index 64d6950020d..8ade0413e1d 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
@@ -29,18 +29,18 @@ public enum RileyLinkEncodingType {
         this.resourceId = resourceId;
     }
 
-    private static void doTranslation(ResourceHelper resourceHelper) {
+    private static void doTranslation(ResourceHelper rh) {
         encodingTypeMap = new HashMap<>();
 
         for (RileyLinkEncodingType encType : values()) {
             if (encType.resourceId != null) {
-                encodingTypeMap.put(resourceHelper.gs(encType.resourceId), encType);
+                encodingTypeMap.put(rh.gs(encType.resourceId), encType);
             }
         }
     }
 
-    public static RileyLinkEncodingType getByDescription(String description, ResourceHelper resourceHelper) {
-        if (encodingTypeMap == null) doTranslation(resourceHelper);
+    public static RileyLinkEncodingType getByDescription(String description, ResourceHelper rh) {
+        if (encodingTypeMap == null) doTranslation(rh);
         if (encodingTypeMap.containsKey(description)) {
             return encodingTypeMap.get(description);
         }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/device/OrangeLinkImpl.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/device/OrangeLinkImpl.kt
new file mode 100644
index 00000000000..b54cfb52ba7
--- /dev/null
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/device/OrangeLinkImpl.kt
@@ -0,0 +1,195 @@
+package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.device
+
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothGattCharacteristic
+import android.bluetooth.le.BluetoothLeScanner
+import android.bluetooth.le.ScanCallback
+import android.bluetooth.le.ScanFilter
+import android.bluetooth.le.ScanResult
+import android.bluetooth.le.ScanSettings
+import android.os.Handler
+import android.os.HandlerThread
+import android.os.Message
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.operations.BLECommOperationResult
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class OrangeLinkImpl @Inject constructor(
+    var aapsLogger: AAPSLogger,
+    var rileyLinkServiceData: RileyLinkServiceData,
+    var rileyLinkUtil: RileyLinkUtil,
+    var sp: SP) {
+
+    lateinit var rileyLinkBLE: RileyLinkBLE
+
+    fun onCharacteristicChanged(characteristic: BluetoothGattCharacteristic) {
+        if (characteristic.uuid.toString() == GattAttributes.CHARA_NOTIFICATION_ORANGE) {
+            val data = characteristic.value
+            val first = 0xff and data[0].toInt()
+            aapsLogger.info(LTag.PUMPBTCOMM,
+                "OrangeLinkImpl: onCharacteristicChanged " + ByteUtil.shortHexString(characteristic.value) + "=====" + first)
+            val fv = data[3].toString() + "." + data[4]
+            val hv = data[5].toString() + "." + data[6]
+            rileyLinkServiceData.versionOrangeFirmware = fv
+            rileyLinkServiceData.versionOrangeHardware = hv
+
+            aapsLogger.info(LTag.PUMPBTCOMM, "OrangeLink: Firmware: ${fv}, Hardware: $hv")
+        }
+    }
+
+
+    fun resetOrangeLinkData() {
+        rileyLinkServiceData.isOrange = false
+        rileyLinkServiceData.versionOrangeFirmware = null
+        rileyLinkServiceData.versionOrangeHardware = null
+    }
+
+    /**
+     * We are checking if this is special Orange (with ORANGE_NOTIFICATION_SERVICE)
+     */
+    fun checkIsOrange(uuidService: UUID) {
+        if (GattAttributes.isOrange(uuidService)) {
+            rileyLinkServiceData.isOrange = true
+        }
+    }
+
+
+    fun enableNotifications(): Boolean {
+        aapsLogger.info(LTag.PUMPBTCOMM, "OrangeLinkImpl::enableNotifications")
+        val result: BLECommOperationResult = rileyLinkBLE.setNotification_blocking(
+            UUID.fromString(GattAttributes.SERVICE_RADIO_ORANGE),  //
+            UUID.fromString(GattAttributes.CHARA_NOTIFICATION_ORANGE)
+        )
+
+        if (result.resultCode != BLECommOperationResult.RESULT_SUCCESS) {
+            aapsLogger.error(LTag.PUMPBTCOMM, "Error setting response count notification")
+            return false
+        }
+        return true
+    }
+
+
+    private fun buildScanFilters(): List<ScanFilter> {
+        val scanFilterList: MutableList<ScanFilter> = mutableListOf() //ArrayList<*> = ArrayList<Any>()
+        val scanFilterBuilder = ScanFilter.Builder()
+        scanFilterBuilder.setDeviceAddress(rileyLinkServiceData.rileyLinkAddress)
+        scanFilterList.add(scanFilterBuilder.build())
+        return scanFilterList
+    }
+
+    private fun buildScanSettings(): ScanSettings? {
+        val scanSettingBuilder = ScanSettings.Builder()
+        scanSettingBuilder.setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
+        scanSettingBuilder.setMatchMode(ScanSettings.MATCH_MODE_AGGRESSIVE)
+        scanSettingBuilder.setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
+        return scanSettingBuilder.build()
+    }
+
+    fun startScan() {
+        try {
+            stopScan()
+            val bluetoothAdapter = rileyLinkBLE.bluetoothAdapter
+            aapsLogger.debug(LTag.PUMPBTCOMM, "startScan")
+            handler.sendEmptyMessageDelayed(TIME_OUT_WHAT, TIME_OUT.toLong())
+            val bluetoothLeScanner: BluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner
+            // if (bluetoothLeScanner == null) {
+            //     bluetoothAdapter.startLeScan(mLeScanCallback)
+            //     return
+            // }
+            bluetoothLeScanner.startScan(buildScanFilters(), buildScanSettings(), scanCallback)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            aapsLogger.error(LTag.PUMPBTCOMM, "Start scan: ${e.message}", e)
+        }
+    }
+
+    private val scanCallback: ScanCallback = object : ScanCallback() {
+        override fun onScanResult(callbackType: Int, result: ScanResult) {
+            super.onScanResult(callbackType, result)
+            //val name = result.device.name
+            val address = result.device.address
+            if (rileyLinkServiceData.rileyLinkAddress.equals(address)) {
+                stopScan()
+                rileyLinkBLE.rileyLinkDevice = result.device
+                rileyLinkBLE.connectGattInternal()
+            }
+        }
+
+        override fun onBatchScanResults(results: List<ScanResult>) {
+            super.onBatchScanResults(results)
+        }
+
+        override fun onScanFailed(errorCode: Int) {
+            super.onScanFailed(errorCode)
+            stopScan()
+        }
+    }
+
+/*
+    private val mLeScanCallback = LeScanCallback { device, _, _ ->
+        if (rileyLinkServiceData.rileyLinkAddress.equals(device.address)) {
+            stopScan()
+            rileyLinkBLE.rileyLinkDevice = device
+            rileyLinkBLE.connectGattInternal()
+        }
+    }
+*/
+    private val handler: Handler = object : Handler(HandlerThread(OrangeLinkImpl::class.java.simpleName + "Handler").also { it.start() }.looper) {
+        override fun handleMessage(msg: Message) {
+            super.handleMessage(msg)
+            when (msg.what) {
+                TIME_OUT_WHAT -> stopScan()
+            }
+        }
+    }
+
+    fun stopScan() {
+        handler.removeMessages(TIME_OUT_WHAT)
+
+        val bluetoothAdapter = rileyLinkBLE.bluetoothAdapter ?: return
+
+        try {
+            val bluetoothLeScanner: BluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner
+
+            if (isBluetoothAvailable()) {
+                bluetoothLeScanner.stopScan(scanCallback)
+            }
+
+            return
+
+            // if (bluetoothLeScanner == null) {
+            //     if (isBluetoothAvailable()) {
+            //         bluetoothAdapter.stopLeScan(mLeScanCallback)
+            //     }
+            //     return
+            // }
+            // if (isBluetoothAvailable()) {
+            //     bluetoothLeScanner.stopScan(scanCallback)
+            // }
+        } catch (e: Exception) {
+            aapsLogger.error(LTag.PUMPBTCOMM, "Stop scan: ${e.message}", e)
+        }
+    }
+
+    private fun isBluetoothAvailable(): Boolean {
+        val bluetoothAdapter = rileyLinkBLE.bluetoothAdapter
+        return bluetoothAdapter != null &&
+            bluetoothAdapter.isEnabled &&
+            bluetoothAdapter.state == BluetoothAdapter.STATE_ON
+    }
+
+    companion object {
+        const val TIME_OUT = 90 * 1000
+        const val TIME_OUT_WHAT = 0x12
+    }
+}
\ No newline at end of file
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java
index 50bdcf4c5b2..155021f457a 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java
@@ -57,13 +57,13 @@ public RileyLinkError getErrorCode() {
         return errorCode;
     }
 
-    public String getDescription(ResourceHelper resourceHelper) {
+    public String getDescription(ResourceHelper rh) {
         switch (this.source) {
             case RileyLink:
-                return "State: " + resourceHelper.gs(serviceState.getResourceId())
+                return "State: " + rh.gs(serviceState.getResourceId())
                         + (this.errorCode == null ? "" : ", Error Code: " + errorCode);
             case MedtronicPump:
-                return resourceHelper.gs(pumpDeviceState.getResourceId());
+                return rh.gs(pumpDeviceState.getResourceId());
             default:
                 return "Unknown Description";
         }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
index beff5bb0267..40fc09fd551 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
@@ -23,7 +23,7 @@
 
 public class RileyLinkStatusActivity extends NoSplashAppCompatActivity {
 
-    @Inject ResourceHelper resourceHelper;
+    @Inject ResourceHelper rh;
 
     private SectionsPagerAdapter sectionsPagerAdapter;
     private TabLayout tabLayout;
@@ -60,8 +60,8 @@ public void onCreate(Bundle savedInstanceState) {
     public void setupViewPager() {
         sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
 
-        sectionsPagerAdapter.addFragment(new RileyLinkStatusGeneralFragment(), resourceHelper.gs(R.string.rileylink_settings_tab1));
-        sectionsPagerAdapter.addFragment(new RileyLinkStatusHistoryFragment(), resourceHelper.gs(R.string.rileylink_settings_tab2));
+        sectionsPagerAdapter.addFragment(new RileyLinkStatusGeneralFragment(), rh.gs(R.string.rileylink_settings_tab1));
+        sectionsPagerAdapter.addFragment(new RileyLinkStatusHistoryFragment(), rh.gs(R.string.rileylink_settings_tab2));
         viewPager.setAdapter(sectionsPagerAdapter);
     }
 
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
index 7ab66259516..673be8f5267 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
@@ -36,7 +36,7 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
     private static final String PLACEHOLDER = "-";
 
     @Inject ActivePlugin activePlugin;
-    @Inject ResourceHelper resourceHelper;
+    @Inject ResourceHelper rh;
     @Inject AAPSLogger aapsLogger;
     @Inject RileyLinkServiceData rileyLinkServiceData;
     @Inject DateUtil dateUtil;
@@ -89,26 +89,31 @@ public void onResume() {
     @Override public void refreshData() {
         RileyLinkTargetDevice targetDevice = rileyLinkServiceData.targetDevice;
 
-        this.connectionStatus.setText(resourceHelper.gs(rileyLinkServiceData.rileyLinkServiceState.getResourceId()));
+        this.connectionStatus.setText(rh.gs(rileyLinkServiceData.rileyLinkServiceState.getResourceId()));
 
-        // BS FIXME rileyLinkServiceData is injected so I suppose it cannot be null?
-        if (rileyLinkServiceData != null) {
-            this.configuredRileyLinkAddress.setText(Optional.ofNullable(rileyLinkServiceData.rileyLinkAddress).orElse(PLACEHOLDER));
-            this.configuredRileyLinkName.setText(Optional.ofNullable(rileyLinkServiceData.rileyLinkName).orElse(PLACEHOLDER));
+        this.configuredRileyLinkAddress.setText(Optional.ofNullable(rileyLinkServiceData.rileyLinkAddress).orElse(PLACEHOLDER));
+        this.configuredRileyLinkName.setText(Optional.ofNullable(rileyLinkServiceData.rileyLinkName).orElse(PLACEHOLDER));
 
-            if (sp.getBoolean(resourceHelper.gs(R.string.key_riley_link_show_battery_level), false)) {
-                batteryLevelRow.setVisibility(View.VISIBLE);
-                Integer batteryLevel = rileyLinkServiceData.batteryLevel;
-                this.batteryLevel.setText(batteryLevel == null ? PLACEHOLDER : resourceHelper.gs(R.string.rileylink_battery_level_value, batteryLevel));
-            } else {
-                batteryLevelRow.setVisibility(View.GONE);
-            }
+        if (sp.getBoolean(rh.gs(R.string.key_riley_link_show_battery_level), false)) {
+            batteryLevelRow.setVisibility(View.VISIBLE);
+            Integer batteryLevel = rileyLinkServiceData.batteryLevel;
+            this.batteryLevel.setText(batteryLevel == null ? PLACEHOLDER : rh.gs(R.string.rileylink_battery_level_value, batteryLevel));
+        } else {
+            batteryLevelRow.setVisibility(View.GONE);
+        }
 
-            RileyLinkError rileyLinkError = rileyLinkServiceData.rileyLinkError;
-            this.connectionError.setText(rileyLinkError == null ? PLACEHOLDER : resourceHelper.gs(rileyLinkError.getResourceId(targetDevice)));
+        RileyLinkError rileyLinkError = rileyLinkServiceData.rileyLinkError;
+        this.connectionError.setText(rileyLinkError == null ? PLACEHOLDER : rh.gs(rileyLinkError.getResourceId(targetDevice)));
 
-            this.firmwareVersion.setText(resourceHelper.gs(R.string.rileylink_firmware_version_value,
-                    Optional.ofNullable(rileyLinkServiceData.versionBLE113).orElse(PLACEHOLDER), Optional.ofNullable(rileyLinkServiceData.versionCC110).orElse(PLACEHOLDER)));
+
+        if (rileyLinkServiceData.isOrange && rileyLinkServiceData.versionOrangeFirmware!=null) {
+            this.firmwareVersion.setText(rh.gs(R.string.rileylink_firmware_version_value_orange,
+                            rileyLinkServiceData.versionOrangeFirmware,
+                            Optional.ofNullable(rileyLinkServiceData.versionOrangeHardware).orElse(PLACEHOLDER)));
+        } else {
+            this.firmwareVersion.setText(rh.gs(R.string.rileylink_firmware_version_value,
+                    Optional.ofNullable(rileyLinkServiceData.versionBLE113).orElse(PLACEHOLDER),
+                    Optional.ofNullable(rileyLinkServiceData.versionCC110).orElse(PLACEHOLDER)));
         }
 
         RileyLinkPumpDevice rileyLinkPumpDevice = (RileyLinkPumpDevice) activePlugin.getActivePump();
@@ -125,12 +130,12 @@ public void onResume() {
         this.pumpFrequency.setText(rileyLinkPumpInfo.getPumpFrequency());
 
         if (rileyLinkServiceData.lastGoodFrequency != null) {
-            this.lastUsedFrequency.setText(resourceHelper.gs(R.string.rileylink_pump_frequency_value, rileyLinkServiceData.lastGoodFrequency));
+            this.lastUsedFrequency.setText(rh.gs(R.string.rileylink_pump_frequency_value, rileyLinkServiceData.lastGoodFrequency));
         }
 
         long lastConnectionTimeMillis = rileyLinkPumpDevice.getLastConnectionTimeMillis();
         if (lastConnectionTimeMillis == 0) {
-            this.lastDeviceContact.setText(resourceHelper.gs(R.string.riley_link_ble_config_connected_never));
+            this.lastDeviceContact.setText(rh.gs(R.string.riley_link_ble_config_connected_never));
         } else {
             this.lastDeviceContact.setText(StringUtil.toDateTimeString(dateUtil, new LocalDateTime(lastConnectionTimeMillis)));
         }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
index 7ae38c4d588..862b6b343ca 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
@@ -32,7 +32,7 @@
 public class RileyLinkStatusHistoryFragment extends DaggerFragment implements RefreshableInterface {
 
     @Inject RileyLinkUtil rileyLinkUtil;
-    @Inject ResourceHelper resourceHelper;
+    @Inject ResourceHelper rh;
     @Inject DateUtil dateUtil;
 
     RecyclerView recyclerView;
@@ -135,7 +135,7 @@ public void onBindViewHolder(RecyclerViewAdapter.HistoryViewHolder holder, int p
             if (item != null) {
                 holder.timeView.setText(dateUtil.dateAndTimeAndSecondsString(item.getDateTime().toDateTime().getMillis()));
                 holder.typeView.setText(item.getSource().getDesc());
-                holder.valueView.setText(item.getDescription(resourceHelper));
+                holder.valueView.setText(item.getDescription(rh));
             }
         }
 
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
index c1c4bebc3b3..2f45c47afea 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
@@ -15,7 +15,7 @@
 import info.nightscout.androidaps.interfaces.ActivePlugin;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 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;
@@ -38,10 +38,10 @@ public abstract class RileyLinkService extends DaggerService {
     @Inject protected AAPSLogger aapsLogger;
     @Inject protected SP sp;
     @Inject protected Context context;
-    @Inject protected RxBusWrapper rxBus;
+    @Inject protected RxBus rxBus;
     @Inject protected RileyLinkUtil rileyLinkUtil;
     @Inject protected HasAndroidInjector injector;
-    @Inject protected ResourceHelper resourceHelper;
+    @Inject protected ResourceHelper rh;
     @Inject protected RileyLinkServiceData rileyLinkServiceData;
     @Inject protected ActivePlugin activePlugin;
     @Inject protected RileyLinkBLE rileyLinkBLE; // android-bluetooth management
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.java
index 249c94d74b3..2e09c92253d 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.java
@@ -2,13 +2,14 @@
 
 import java.util.Locale;
 
+import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import info.nightscout.androidaps.interfaces.ActivePlugin;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion;
@@ -28,7 +29,7 @@ public class RileyLinkServiceData {
 
     @Inject AAPSLogger aapsLogger;
     @Inject RileyLinkUtil rileyLinkUtil;
-    @Inject RxBusWrapper rxBus;
+    @Inject RxBus rxBus;
     @Inject ActivePlugin activePlugin;
 
     boolean tuneUpDone = false;
@@ -37,8 +38,8 @@ public class RileyLinkServiceData {
     private long lastServiceStateChange = 0L;
     public RileyLinkFirmwareVersion firmwareVersion; // here we have "compatibility level" version
     public RileyLinkTargetFrequency rileyLinkTargetFrequency;
-    public String rileyLinkAddress;
-    public String rileyLinkName;
+    @Nullable public String rileyLinkAddress;
+    @Nullable public String rileyLinkName;
     public Integer batteryLevel;
     public boolean showBatteryLevel = false;
     long lastTuneUpTime = 0L;
@@ -49,6 +50,11 @@ public class RileyLinkServiceData {
     // radio version
     public String versionCC110;
 
+    // orangeLink
+    public boolean isOrange;
+    public String versionOrangeFirmware;
+    public String versionOrangeHardware;
+
     public RileyLinkTargetDevice targetDevice;
 
     // Medtronic Pump
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
index 28a56795a76..88d1c612f46 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
@@ -4,7 +4,7 @@
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.pump.common.events.EventRefreshButtonState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
@@ -15,7 +15,7 @@
 public class ResetRileyLinkConfigurationTask extends PumpTask {
 
     @Inject ActivePlugin activePlugin;
-    @Inject RxBusWrapper rxBus;
+    @Inject RxBus rxBus;
     @Inject RFSpy rfSpy;
 
     public ResetRileyLinkConfigurationTask(HasAndroidInjector injector) {
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
index cf4ace58c8f..67adcd18ebf 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
@@ -3,7 +3,7 @@
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.pump.common.events.EventRefreshButtonState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
 
@@ -13,7 +13,7 @@
 public class WakeAndTuneTask extends PumpTask {
 
     //@Inject ActivePluginProvider activePlugin;
-    @Inject RxBusWrapper rxBus;
+    @Inject RxBus rxBus;
 
     private static final String TAG = "WakeAndTuneTask";
 
diff --git a/rileylink/src/main/res/values-bg-rBG/strings.xml b/rileylink/src/main/res/values-bg-rBG/strings.xml
index a137789211a..39677d33e80 100644
--- a/rileylink/src/main/res/values-bg-rBG/strings.xml
+++ b/rileylink/src/main/res/values-bg-rBG/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Последно връзка:</string>
     <string name="rileylink_firmware_version">Firmware версия:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Сериен номер на помпа:</string>
     <string name="rileylink_pump_frequency">Честота на помпата:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -64,6 +65,7 @@
     <string name="riley_link_common_yes">Да</string>
     <string name="riley_link_common_no">Не</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Покажи нивото на батерията на OrangeLink/EmaLink/DiaLink</string>
     <string name="riley_link_show_battery_level_summary">НЕ работи с оригиналната RileyLink. Може да не работи с други RileyLink алтернативи.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d ден</item>
@@ -73,4 +75,6 @@
         <item quantity="one">%1$d часа</item>
         <item quantity="other">%1$d часа</item>
     </plurals>
+    <string name="orange_use_scanning_level">Използвай сканиране</string>
+    <string name="orange_use_scanning_level_summary">Сканирай преди да се свържеш с OrangeLink, това би трябвало да подобри връзката (също може да се използва с други RileyLink клонинги, ако е необходимо)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-cs-rCZ/strings.xml b/rileylink/src/main/res/values-cs-rCZ/strings.xml
index ca7b132918e..d5ca579b6a2 100644
--- a/rileylink/src/main/res/values-cs-rCZ/strings.xml
+++ b/rileylink/src/main/res/values-cs-rCZ/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Poslední spojení se zařízením:</string>
     <string name="rileylink_firmware_version">Verze firmwaru:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Sériové číslo pumpy:</string>
     <string name="rileylink_pump_frequency">Frekvence pumpy:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -78,4 +79,6 @@
         <item quantity="many">%1$d hodin</item>
         <item quantity="other">%1$d hodin</item>
     </plurals>
+    <string name="orange_use_scanning_level">Použít vyhledávání</string>
+    <string name="orange_use_scanning_level_summary">Vyhledat před připojením k OrangeLink. Mělo by to zlepšit spojení (může být také použito s ostatními klony RileyLink, pokud je to nutné)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-de-rDE/strings.xml b/rileylink/src/main/res/values-de-rDE/strings.xml
index 346ab98f0f4..94e6db84127 100644
--- a/rileylink/src/main/res/values-de-rDE/strings.xml
+++ b/rileylink/src/main/res/values-de-rDE/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Letzter Gerätekontakt:</string>
     <string name="rileylink_firmware_version">Firmware-Version:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Seriennummer der Pumpe:</string>
     <string name="rileylink_pump_frequency">Pumpenfrequenz:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -74,4 +75,6 @@
         <item quantity="one">%1$d Stunde</item>
         <item quantity="other">%1$d Stunden</item>
     </plurals>
+    <string name="orange_use_scanning_level">Verwende Scannen</string>
+    <string name="orange_use_scanning_level_summary">Scanne, bevor Du mit dem OrangeLink verbindest. Das sollte die Stabilität der Verbindung verbessern und kann auch mit anderen RileyLink-Nachbauten probiert werden.</string>
 </resources>
diff --git a/rileylink/src/main/res/values-es-rES/strings.xml b/rileylink/src/main/res/values-es-rES/strings.xml
index 4fb2bf73e65..16c39a7dcd0 100644
--- a/rileylink/src/main/res/values-es-rES/strings.xml
+++ b/rileylink/src/main/res/values-es-rES/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Último contacto del dispositivo:</string>
     <string name="rileylink_firmware_version">Versión de Firmware:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Número de serie de la Infusora:</string>
     <string name="rileylink_pump_frequency">Frecuencia de la infusora:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -64,6 +65,7 @@
     <string name="riley_link_common_yes">Sí</string>
     <string name="riley_link_common_no">No</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Mostar el nivel de batería notificado por OrangeLink/EmaLink/DiaLink</string>
     <string name="riley_link_show_battery_level_summary">NO funciona con el RileyLink original. Puede que no funcione con otras alternativas de RiyeyLink.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d día</item>
@@ -73,4 +75,6 @@
         <item quantity="one">%1$d hora</item>
         <item quantity="other">%1$d horas</item>
     </plurals>
+    <string name="orange_use_scanning_level">Usar escaneo</string>
+    <string name="orange_use_scanning_level_summary">Escanear antes de conectarse a OrangeLink, debería mejorar las conexiones (también se puede utilizar con otros clones de RileyLink, si es necesario)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-fr-rFR/strings.xml b/rileylink/src/main/res/values-fr-rFR/strings.xml
index a84d83db47c..2ef3cbe2bed 100644
--- a/rileylink/src/main/res/values-fr-rFR/strings.xml
+++ b/rileylink/src/main/res/values-fr-rFR/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Dernier contact appareil :</string>
     <string name="rileylink_firmware_version">Version du firmware :</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw : %1$s\nHw : %2$s</string>
     <string name="rileylink_pump_serial_number">Numéro de série de pompe :</string>
     <string name="rileylink_pump_frequency">Fréquence de pompe :</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -74,4 +75,6 @@
         <item quantity="one">%1$d heure</item>
         <item quantity="other">%1$d heures</item>
     </plurals>
+    <string name="orange_use_scanning_level">Utiliser le scan</string>
+    <string name="orange_use_scanning_level_summary">Scanner avant de se connecter à OrangeLink, cela devrait améliorer les connexions (peut également être utilisé avec d\'autres clones RileyLink, si nécessaire)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-hu-rHU/strings.xml b/rileylink/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..0a73dfc845d
--- /dev/null
+++ b/rileylink/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL keys -->
+    <!-- RL BLE Config -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RileyLink - Common -->
+    <!-- RileyLink - Preferences -->
+</resources>
diff --git a/rileylink/src/main/res/values-it-rIT/strings.xml b/rileylink/src/main/res/values-it-rIT/strings.xml
index cdce27e5aa5..d9ac4ef7b55 100644
--- a/rileylink/src/main/res/values-it-rIT/strings.xml
+++ b/rileylink/src/main/res/values-it-rIT/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Ultimo contatto dispositivo:</string>
     <string name="rileylink_firmware_version">Versione firmware:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Numero seriale micro:</string>
     <string name="rileylink_pump_frequency">Frequenza micro:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -74,4 +75,6 @@
         <item quantity="one">%1$d ora</item>
         <item quantity="other">%1$d ore</item>
     </plurals>
+    <string name="orange_use_scanning_level">Usa scansione</string>
+    <string name="orange_use_scanning_level_summary">Scansiona prima della connessione a OrangeLink, dovrebbe migliorare le connessioni (può essere usato anche con altri cloni di RileyLink, se necessario)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-iw-rIL/strings.xml b/rileylink/src/main/res/values-iw-rIL/strings.xml
index 43052404e41..13e43ca774d 100644
--- a/rileylink/src/main/res/values-iw-rIL/strings.xml
+++ b/rileylink/src/main/res/values-iw-rIL/strings.xml
@@ -32,10 +32,11 @@
     <string name="rileylink_device_type">סוג מכשיר:</string>
     <string name="rileylink_configured_device_model">דגם המכשיר המוגדר:</string>
     <string name="rileylink_connected_device_model">דגם המכשיר המחובר:</string>
-    <string name="rileylink_last_used_frequency">תדירות השימוש לאחרונה:</string>
+    <string name="rileylink_last_used_frequency">תדר בשימוש האחרון:</string>
     <string name="rileylink_last_device_contact">קשר אחרון עם המכשיר:</string>
     <string name="rileylink_firmware_version">גרסת קושחה:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">קושחה: %1$s\n חומרה: %2$s</string>
     <string name="rileylink_pump_serial_number">מספר סידורי של המשאבה:</string>
     <string name="rileylink_pump_frequency">תדר המשאבה:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -52,7 +53,7 @@
     <string name="rileylink_state_rl_ready">ריילילינק מוכן</string>
     <!-- RL Errors -->
     <string name="rileylink_error_not_rl">ההתקן אינו ריילילינק</string>
-    <string name="rileylink_error_unreachable">ריילילינק לא נגיש</string>
+    <string name="rileylink_error_unreachable">ריילילינק בלתי נגיש</string>
     <string name="rileylink_error_bt_disabled">בלוטות\' כבוי</string>
     <string name="rileylink_error_no_bt_adapter">אין מתאם בלוטות\'</string>
     <string name="rileylink_error_tuneup_failed">כוונון נכשל</string>
@@ -78,4 +79,6 @@
         <item quantity="many">%1$d שעות</item>
         <item quantity="other">%1$d שעות</item>
     </plurals>
+    <string name="orange_use_scanning_level">השתמש בסריקה</string>
+    <string name="orange_use_scanning_level_summary">סריקה לפני החיבור ל-OrangeLink, נועד לשפר את החיבורים (ניתן להשתמש בו גם עם מכשירים תואמי RileyLink אחרים, במידת הצורך)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-lt-rLT/strings.xml b/rileylink/src/main/res/values-lt-rLT/strings.xml
index c269516114c..c049b0ead2b 100644
--- a/rileylink/src/main/res/values-lt-rLT/strings.xml
+++ b/rileylink/src/main/res/values-lt-rLT/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Paskutinis įrenginio kontaktas:</string>
     <string name="rileylink_firmware_version">Programinės įrangos versija:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Pompos serijos Nr:</string>
     <string name="rileylink_pump_frequency">Pompos dažnis:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -78,4 +79,6 @@
         <item quantity="many">%1$d val.</item>
         <item quantity="other">%1$d val.</item>
     </plurals>
+    <string name="orange_use_scanning_level">Atlikti skanavimą</string>
+    <string name="orange_use_scanning_level_summary">Prieš suporuodami su OrangeLink, naudokite skanavimą, tai turėtų pagerinti ryšio kokybę (jei reikia, galite jį naudoti ir kituose RileyLink klonuose)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-nl-rNL/strings.xml b/rileylink/src/main/res/values-nl-rNL/strings.xml
index 1424eb68ece..b31c4ef0a1f 100644
--- a/rileylink/src/main/res/values-nl-rNL/strings.xml
+++ b/rileylink/src/main/res/values-nl-rNL/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Laatste contact met apparaat:</string>
     <string name="rileylink_firmware_version">Firmwareversie:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Serienummer van de pomp:</string>
     <string name="rileylink_pump_frequency">Pompfrequentie:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -74,4 +75,6 @@
         <item quantity="one">%1$d uur</item>
         <item quantity="other">%1$d uren</item>
     </plurals>
+    <string name="orange_use_scanning_level">Gebruik scannen</string>
+    <string name="orange_use_scanning_level_summary">Scan voordat u verbinding maakt met OrangeLink, het zou de verbindingen moeten verbeteren (kan ook worden gebruikt met andere RileyLink klonen, indien nodig)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-no-rNO/strings.xml b/rileylink/src/main/res/values-no-rNO/strings.xml
index a9e91e1de22..0479ad6f28d 100644
--- a/rileylink/src/main/res/values-no-rNO/strings.xml
+++ b/rileylink/src/main/res/values-no-rNO/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Siste tilkobling:</string>
     <string name="rileylink_firmware_version">Firmware versjon:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Pumpens serienummer:</string>
     <string name="rileylink_pump_frequency">Pumpens frekvens:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -74,4 +75,6 @@
         <item quantity="one">%1$d time</item>
         <item quantity="other">%1$d timer</item>
     </plurals>
+    <string name="orange_use_scanning_level">Bruk Skanning</string>
+    <string name="orange_use_scanning_level_summary">Skann før du kobler til OrangeLink, det bør forbedre tilkoblingene (kan også brukes med andre RileyLink enheter, hvis nødvendig)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-pl-rPL/strings.xml b/rileylink/src/main/res/values-pl-rPL/strings.xml
index d3f5ddc3174..8c7fc24debe 100644
--- a/rileylink/src/main/res/values-pl-rPL/strings.xml
+++ b/rileylink/src/main/res/values-pl-rPL/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Ostatnie połączenie z urządzeniem:</string>
     <string name="rileylink_firmware_version">Wersja oprogramowania:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Numer seryjny pompy:</string>
     <string name="rileylink_pump_frequency">Częstotliwość pompy:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -64,6 +65,7 @@
     <string name="riley_link_common_yes">Tak</string>
     <string name="riley_link_common_no">Nie</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Pokaż poziom baterii zgłaszany przez OrangeLink/EmaLink/DiaLink</string>
     <string name="riley_link_show_battery_level_summary">NIE działa z oryginalnym RileyLinkiem. Może nie działać z alternatywami RileyLink-a.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d dzień</item>
@@ -77,4 +79,6 @@
         <item quantity="many">%1$d godzin</item>
         <item quantity="other">%1$d godzin</item>
     </plurals>
+    <string name="orange_use_scanning_level">Użyj skanowania</string>
+    <string name="orange_use_scanning_level_summary">Skanuj przed połączeniem z OrangeLink, to powinno poprawić jakość połączeń (w razie potrzeby można używać z innymi klonami RileyLink)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-ro-rRO/strings.xml b/rileylink/src/main/res/values-ro-rRO/strings.xml
index 9d01d93db10..d1f81323757 100644
--- a/rileylink/src/main/res/values-ro-rRO/strings.xml
+++ b/rileylink/src/main/res/values-ro-rRO/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Ultima conexiune cu dispozitivul:</string>
     <string name="rileylink_firmware_version">Versiune Firmware:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Număr de serie al pompei:</string>
     <string name="rileylink_pump_frequency">Frecvență pompă:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -64,6 +65,7 @@
     <string name="riley_link_common_yes">Da</string>
     <string name="riley_link_common_no">Nu</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Afișare nivel baterie raportat de OrangeLink/EmaLink/DiaLink</string>
     <string name="riley_link_show_battery_level_summary">NU funcționează cu RileyLink original. Este posibil sa nu funcționeze nici cu versiuni alternative de RileyLink.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d zi</item>
@@ -75,4 +77,6 @@
         <item quantity="few">%1$d ore</item>
         <item quantity="other">%1$d ore</item>
     </plurals>
+    <string name="orange_use_scanning_level">Folosește Scanarea</string>
+    <string name="orange_use_scanning_level_summary">Scanează înainte de conectarea la OrangeLink, ar trebui să îmbunătăţească conexiunile (poate fi utilizat, de asemenea, cu alte clone RileyLink, dacă este necesar)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-ru-rRU/strings.xml b/rileylink/src/main/res/values-ru-rRU/strings.xml
index 02d4e250e6d..c5bd9bf9732 100644
--- a/rileylink/src/main/res/values-ru-rRU/strings.xml
+++ b/rileylink/src/main/res/values-ru-rRU/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Контакт последнего устройства:</string>
     <string name="rileylink_firmware_version">Версия прошивки:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Прошивка: %1$s\n Устройство: %2$s</string>
     <string name="rileylink_pump_serial_number">Серийный номер помы:</string>
     <string name="rileylink_pump_frequency">Частота помпы:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f МГц</string>
@@ -78,4 +79,6 @@
         <item quantity="many">%1$d ч</item>
         <item quantity="other">%1$d ч</item>
     </plurals>
+    <string name="orange_use_scanning_level">Использовать сканирование</string>
+    <string name="orange_use_scanning_level_summary">Используйте сканирование перед сопряжением с OrangeLink, это должно улучшить качество связи (при необходимости можно применять и в других клонах RileyLink)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-sk-rSK/strings.xml b/rileylink/src/main/res/values-sk-rSK/strings.xml
index 39243e12569..de1f1d61480 100644
--- a/rileylink/src/main/res/values-sk-rSK/strings.xml
+++ b/rileylink/src/main/res/values-sk-rSK/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Posledné spojenie zo zariadením:</string>
     <string name="rileylink_firmware_version">Verzia firmvéru:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Sériové číslo pumpy:</string>
     <string name="rileylink_pump_frequency">Frekvencia pumpy:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -78,4 +79,6 @@
         <item quantity="many">%1$d hodín</item>
         <item quantity="other">%1$d hodín</item>
     </plurals>
+    <string name="orange_use_scanning_level">Použi skenovanie</string>
+    <string name="orange_use_scanning_level_summary">Skenuj, predtým, ako sa pripojíš k OrangeLinku. Malo by to zlepšiť stabilitu pripojenia (môže byť použité i s inými klonmi RileyLinku, ak je to potrebné).</string>
 </resources>
diff --git a/rileylink/src/main/res/values-sv-rSE/strings.xml b/rileylink/src/main/res/values-sv-rSE/strings.xml
index 4b23d69a3d7..c084d211743 100644
--- a/rileylink/src/main/res/values-sv-rSE/strings.xml
+++ b/rileylink/src/main/res/values-sv-rSE/strings.xml
@@ -36,6 +36,7 @@
     <string name="rileylink_last_device_contact">Senaste anslutning:</string>
     <string name="rileylink_firmware_version">Firmwareversion:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Serienummer på pumpen:</string>
     <string name="rileylink_pump_frequency">Pumpfrekvens:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -74,4 +75,6 @@
         <item quantity="one">%1$d tim</item>
         <item quantity="other">%1$d tim</item>
     </plurals>
+    <string name="orange_use_scanning_level">Använd sökning</string>
+    <string name="orange_use_scanning_level_summary">Gör en sökning innan du ansluter till OrangeLink. Det bör förbättra anslutningarna (kan även användas med andra RileyLink-kloner om det behövs)</string>
 </resources>
diff --git a/rileylink/src/main/res/values-tr-rTR/strings.xml b/rileylink/src/main/res/values-tr-rTR/strings.xml
index 0a73dfc845d..9658de7a8af 100644
--- a/rileylink/src/main/res/values-tr-rTR/strings.xml
+++ b/rileylink/src/main/res/values-tr-rTR/strings.xml
@@ -2,9 +2,79 @@
 <resources>
     <!-- RL keys -->
     <!-- RL BLE Config -->
+    <string name="riley_link_ble_config_button_scan_start">Tarama</string>
+    <string name="riley_link_ble_config_scan_stop">Dur</string>
+    <string name="riley_link_ble_config_scan_selected">Seçili</string>
+    <string name="riley_link_ble_config_scan_title">RileyLink Tarama</string>
+    <string name="riley_link_ble_config_scan_scanning">Taranıyor</string>
+    <string name="riley_link_ble_config_scan_finished">Tarama tamamlandı</string>
+    <string name="riley_link_ble_config_scan_error">Tarama Hatası:%1$d</string>
+    <string name="riley_link_ble_config_connected_never">Hiçbir zaman</string>
+    <string name="riley_link_ble_config_scan_currently_selected_riley_link">Şu Anda Seçili RileyLink</string>
+    <string name="riley_link_ble_config_remove_riley_link">Kaldır</string>
+    <string name="riley_link_ble_config_remove_riley_link_confirmation">RileyLink\'inizi kaldırmak istediğinizden emin misiniz?</string>
+    <string name="riley_link_ble_config_remove_riley_link_confirmation_title">RileyLink\'i Kaldır</string>
+    <string name="riley_link_ble_config_no_riley_link_selected">RileyLink seçilmedi</string>
     <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Ayarlar</string>
+    <string name="rileylink_settings_tab2">Geçmiş</string>
+    <string name="rileylink_status">RileyLink Durumu</string>
+    <string name="medtronic_pump_status">Pompa Durumu</string>
+    <string name="title_activity_rileylink_settings">RileyLink Ayarları</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_address">Adres:</string>
+    <string name="rileylink_name">Ad:</string>
+    <string name="rileylink_battery_level">Pil seviyesi:</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
+    <string name="rileylink_connection_status">Bağlantı durumu:</string>
+    <string name="rileylink_connection_error">Bağlantı Hatası:</string>
+    <string name="rileylink_device">Cihaz</string>
+    <string name="rileylink_device_type">Cihaz Tipi:</string>
+    <string name="rileylink_configured_device_model">Yapılandırılan Cihaz Modeli:</string>
+    <string name="rileylink_connected_device_model">Bağlı Cihaz Modeli:</string>
+    <string name="rileylink_last_used_frequency">Son Kullanılan Frekans:</string>
+    <string name="rileylink_last_device_contact">Son Cihaz İletişimi:</string>
+    <string name="rileylink_firmware_version">Firmware versiyonu:</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
+    <string name="rileylink_pump_serial_number">Pompa Seri Numarası:</string>
+    <string name="rileylink_pump_frequency">Pompa Frekansı:</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
     <!-- RL State -->
+    <string name="rileylink_state_bt_init">Bluetooth Başlatılıyor…</string>
+    <string name="rileylink_state_bt_error">Bluetooth Hatası</string>
+    <string name="rileylink_state_bt_ready">Bluetooth Hazır</string>
+    <string name="rileylink_state_not_started">Başlatılmadı</string>
+    <string name="rileylink_state_rl_init">RileyLink Başlatılıyor…</string>
+    <string name="rileylink_state_rl_error">RileyLink Hatası</string>
+    <string name="rileylink_state_pc_tune_up">RileyLink ve Pompa Ayarlanıyor</string>
+    <string name="rileylink_state_pc_error">Pompaya bağlanma sorunu</string>
+    <string name="rileylink_state_connected">Bağlandı</string>
+    <string name="rileylink_state_rl_ready">RileyLink hazır</string>
     <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Cihaz RileyLink değil</string>
+    <string name="rileylink_error_unreachable">RileyLink\'e erişilemiyor</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth devre dışı</string>
+    <string name="rileylink_error_no_bt_adapter">Bluetooth Adaptörü Yok</string>
+    <string name="rileylink_error_tuneup_failed">Ayarlama Başarısız</string>
+    <string name="rileylink_error_pump_unreachable">Pompaya ulaşılamıyor</string>
+    <string name="rileylink_error_pod_unreachable">Pod\'a erişilemiyor</string>
     <!-- RileyLink - Common -->
+    <string name="rileylink_target_device_medtronic">Medtronic Pompa</string>
+    <string name="rileylink_target_device_omnipod">Omnipod (Eros)</string>
+    <string name="riley_link_common_yes">Evet</string>
+    <string name="riley_link_common_no">Hayır</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">OrangeLink/EmaLink/DiaLink tarafından bildirilen pil seviyesini göster</string>
+    <string name="riley_link_show_battery_level_summary">Orijinal RileyLink ile ÇALIŞMAZ. Diğer RileyLink alternatifleriyle de çalışmayabilir.</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d gün</item>
+        <item quantity="other">%1$d gün</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d saat</item>
+        <item quantity="other">%1$d saat</item>
+    </plurals>
+    <string name="orange_use_scanning_level">Taramayı Kullan</string>
+    <string name="orange_use_scanning_level_summary">OrangeLink\'e bağlanmadan önce tarayın, bağlantıları iyileştirebilir (gerekirse diğer RileyLink klonlarıyla da kullanılabilir)</string>
 </resources>
diff --git a/rileylink/src/main/res/values/strings.xml b/rileylink/src/main/res/values/strings.xml
index a2e2f723f13..c8ef385aa26 100644
--- a/rileylink/src/main/res/values/strings.xml
+++ b/rileylink/src/main/res/values/strings.xml
@@ -45,6 +45,7 @@
     <string name="rileylink_last_device_contact">Last Device Contact:</string>
     <string name="rileylink_firmware_version">Firmware Version:</string>
     <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
     <string name="rileylink_pump_serial_number">Pump Serial Number:</string>
     <string name="rileylink_pump_frequency">Pump Frequency:</string>
     <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
@@ -88,5 +89,7 @@
         <item quantity="one">%1$d hour</item>
         <item quantity="other">%1$d hours</item>
     </plurals>
-
+    <string name="orange_use_scanning_level">Use Scanning</string>
+    <string name="orange_use_scanning_level_summary">Scan before connecting to OrangeLink, it should improve connections (can also be used with other RileyLink clones, if needed)</string>
+    <string name="key_orange_use_scanning" translatable="false">pref_orange_use_scanning</string>
 </resources>
\ No newline at end of file
diff --git a/wear/build.gradle b/wear/build.gradle
index c92e76a22ba..8127b80663e 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -73,8 +73,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     lintOptions {
@@ -158,7 +158,7 @@ dependencies {
     testImplementation "org.skyscreamer:jsonassert:1.5.0"
     testImplementation "org.hamcrest:hamcrest-all:1.3"
     implementation "androidx.core:core-ktx:$coreVersion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 repositories {
     mavenCentral()
diff --git a/wear/src/main/res/values-bg-rBG/strings.xml b/wear/src/main/res/values-bg-rBG/strings.xml
index 14b258864bb..5b9a48ce59d 100644
--- a/wear/src/main/res/values-bg-rBG/strings.xml
+++ b/wear/src/main/res/values-bg-rBG/strings.xml
@@ -69,6 +69,7 @@
     <string name="menu_ecarb">уд. въгл.</string>
     <string name="menu_settings">Настройки</string>
     <string name="menu_status">Статус</string>
+    <string name="menu_resync">Ре-синхр.</string>
     <string name="menu_prime_fill">Пълнене на сет</string>
     <string name="menu_none">Без</string>
     <string name="menu_default">Стандартен</string>
@@ -131,4 +132,8 @@
     <string name="digitalstyle_pref_your_color">Вашият цвят:</string>
     <string name="digitalstyle_pref_your_color_saturation">Насищане на цвета:</string>
     <string name="digitalstyle_pref_your_color_opacity">Вашата цветна прозрачност:</string>
+    <string name="bolus_progress_channel_name">AAPS Прогрес на болуса</string>
+    <string name="bolus_progress_silent_channel_name">AAPS Прогрес на болуса Безшумно</string>
+    <string name="bolus_progress_channel_description">Прогрес на болуса и отказ</string>
+    <string name="bolus_progress_silent_channel_description">Прогрес на болуса и отказ с по-малко вибрации</string>
 </resources>
diff --git a/wear/src/main/res/values-es-rES/strings.xml b/wear/src/main/res/values-es-rES/strings.xml
index 5a3e0b4e263..48a6c10ce86 100644
--- a/wear/src/main/res/values-es-rES/strings.xml
+++ b/wear/src/main/res/values-es-rES/strings.xml
@@ -63,7 +63,7 @@
     <string name="pref_version">Versión:</string>
     <string name="pref_moreWatchfaceSettings">más ajustes de Watchface</string>
     <string name="pref_lookInYourWatchfaceConfiguration">Mire en la configuración de Watchface, por favor.</string>
-    <string name="menu_tempt">TempT</string>
+    <string name="menu_tempt">ObjetivoT</string>
     <string name="menu_wizard">Asistente</string>
     <string name="menu_bolus">Bolo</string>
     <string name="menu_ecarb">eCarb</string>
@@ -87,7 +87,7 @@
     <string name="action_preset_2">Predefinido 2</string>
     <string name="action_preset_3">Predefinido 3</string>
     <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Importe gratuito</string>
-    <string name="action_confirm">Confirmar</string>
+    <string name="action_confirm">CONFIRMAR</string>
     <string name="action_timeshift">intervalo de tiempo</string>
     <string name="action_bolus">bolo</string>
     <string name="bolus_progress">Progreso del bolo</string>
diff --git a/wear/src/main/res/values-hu-rHU/strings.xml b/wear/src/main/res/values-hu-rHU/strings.xml
new file mode 100644
index 00000000000..3ea04e700df
--- /dev/null
+++ b/wear/src/main/res/values-hu-rHU/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/wear/src/main/res/values-iw-rIL/strings.xml b/wear/src/main/res/values-iw-rIL/strings.xml
index 5702c3b2936..c507be2de55 100644
--- a/wear/src/main/res/values-iw-rIL/strings.xml
+++ b/wear/src/main/res/values-iw-rIL/strings.xml
@@ -26,7 +26,7 @@
     <string name="pref_show_avgdelta">הצג דלתא ממוצעת</string>
     <string name="pref_show_phone_battery">הצג את סוללת הטלפון</string>
     <string name="pref_show_rig_battery">הצג את סוללת ה-Rig</string>
-    <string name="pref_show_basal_rate">הצג קצב בזאלי</string>
+    <string name="pref_show_basal_rate">הצג מינון בזאלי</string>
     <string name="pref_show_loop_status">הצג סטטוס לולאה</string>
     <string name="pref_show_bg">הצג רמת סוכר</string>
     <string name="pref_show_direction_arrow">הצג חץ כיוון</string>
diff --git a/wear/src/main/res/values-lt-rLT/strings.xml b/wear/src/main/res/values-lt-rLT/strings.xml
index e8c4ea8e0b9..fb6814b162a 100644
--- a/wear/src/main/res/values-lt-rLT/strings.xml
+++ b/wear/src/main/res/values-lt-rLT/strings.xml
@@ -69,6 +69,7 @@
     <string name="menu_ecarb">iAV</string>
     <string name="menu_settings">Parametrai</string>
     <string name="menu_status">Būsena</string>
+    <string name="menu_resync">Suderinti dar kartą</string>
     <string name="menu_prime_fill">Užpildymas</string>
     <string name="menu_none">Nėra</string>
     <string name="menu_default">Numatytasis</string>
@@ -131,4 +132,8 @@
     <string name="digitalstyle_pref_your_color">Jūsų spalva:</string>
     <string name="digitalstyle_pref_your_color_saturation">Jūsų spalvų sodrumas:</string>
     <string name="digitalstyle_pref_your_color_opacity">Jūsų spalvų nepermatomumas:</string>
+    <string name="bolus_progress_channel_name">AAPS leidžiamas bolusas</string>
+    <string name="bolus_progress_silent_channel_name">Nutildyti AAPS boluso suleidimą</string>
+    <string name="bolus_progress_channel_description">Boluso leidimas ir atšaukimas</string>
+    <string name="bolus_progress_silent_channel_description">Boluso leidimas ir atšaukimas su mažiau vibracijų</string>
 </resources>
diff --git a/wear/src/main/res/values-pl-rPL/strings.xml b/wear/src/main/res/values-pl-rPL/strings.xml
index 571d7079db3..5e80ee62c7c 100644
--- a/wear/src/main/res/values-pl-rPL/strings.xml
+++ b/wear/src/main/res/values-pl-rPL/strings.xml
@@ -90,6 +90,9 @@
     <string name="action_confirm">POTWIERDŹ</string>
     <string name="action_timeshift">przesunięcie czasu</string>
     <string name="action_bolus">bolus</string>
+    <string name="bolus_progress">Postęp bolusa</string>
+    <string name="press_to_cancel">naciśnij aby anulować</string>
+    <string name="cancel_bolus">ANULUJ BOLUS</string>
     <string name="status_pump">Pompa</string>
     <string name="status_loop">Pętla</string>
     <string name="status_cpp">CPP</string>
@@ -129,4 +132,8 @@
     <string name="digitalstyle_pref_your_color">Kolor:</string>
     <string name="digitalstyle_pref_your_color_saturation">Nasycenie koloru:</string>
     <string name="digitalstyle_pref_your_color_opacity">Nieprzezroczystość:</string>
+    <string name="bolus_progress_channel_name">Postęp bolusa AAPS</string>
+    <string name="bolus_progress_silent_channel_name">Postęp bolusa AAPS (Cichszy)</string>
+    <string name="bolus_progress_channel_description">Informacja o postępie w podawaniu / anulowaniu bolusa</string>
+    <string name="bolus_progress_silent_channel_description">Informacja o postępie w podawaniu / anulowaniu bolusa - zmniejsza ilość wibracji</string>
 </resources>
diff --git a/wear/src/main/res/values-tr-rTR/strings.xml b/wear/src/main/res/values-tr-rTR/strings.xml
index 3ea04e700df..45b19b8a8f1 100644
--- a/wear/src/main/res/values-tr-rTR/strings.xml
+++ b/wear/src/main/res/values-tr-rTR/strings.xml
@@ -1,2 +1,139 @@
 <?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(Büyük)</string>
+    <string name="label_xdrip_big_chart">AAPS(BüyükGrafik)</string>
+    <string name="label_xdrip_no_chart">AAPS(GrafikYok)</string>
+    <string name="label_xdrip_circle">AAPS(Daire)</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_digitalstyle">AAPS(DijitalStil)</string>
+    <string name="label_warning_sync">Veri yok!</string>
+    <string name="label_warning_old">Eski veri!</string>
+    <string name="label_warning_since">%1$s den beri</string>
+    <string name="label_warning_sync_aaps">AAPS ile eşitle!</string>
+    <string name="msg_warning_sync">%1$s\' den bu yana veri alınmıyor! Telefondaki AAPS \' nin veri gönderip göndermediğini kontrol edin</string>
+    <string name="msg_warning_old">AAPS verileri %1$s eski! Sensörleri denetleyin, xDrip+, NS, AAPS yapılandırma ya da diğerleri!</string>
+    <string name="pref_vibrate_on_bolus">Bolus\'ta Titreşim</string>
+    <string name="pref_units_for_actions">Eylemler için Birimler</string>
+    <string name="pref_show_date">Tarihi Göster</string>
+    <string name="pref_show_iob">IOB\'yi göster</string>
+    <string name="pref_show_cob">COB\'u göster</string>
+    <string name="pref_show_delta">Deltayı göster</string>
+    <string name="pref_show_avgdelta">OrtDelta\'yı Göster</string>
+    <string name="pref_show_phone_battery">Telefon Pilini Göster</string>
+    <string name="pref_show_rig_battery">Teçhizat Pilini Göster</string>
+    <string name="pref_show_basal_rate">Bazal Oranı Göster</string>
+    <string name="pref_show_loop_status">Döngü Durumunu Göster</string>
+    <string name="pref_show_bg">KŞ\'ni göster</string>
+    <string name="pref_show_direction_arrow">Yön Oku Göster</string>
+    <string name="pref_show_ago">Önce Göster</string>
+    <string name="pref_dark" comment="Enables dark visual theme">Koyu</string>
+    <string name="pref_highlight_basals">Bazalları Vurgula</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Eşleşen bölücü</string>
+    <string name="pref_chart_timeframe">Grafik Zaman Çerçevesi</string>
+    <string name="pref_1_hour">1 saat</string>
+    <string name="pref_2_hours">2 saat</string>
+    <string name="pref_3_hours">3 saat</string>
+    <string name="pref_4_hours">4 saat</string>
+    <string name="pref_5_hours">5 saat</string>
+    <string name="pref_input_design">Giriş Tasarımı</string>
+    <string name="pref_default">Varsayılan</string>
+    <string name="pref_quick_righty">Hızlı Sağ</string>
+    <string name="pref_quick_lefty">Hızlı Sol</string>
+    <string name="pref_modern_sparse">Modern Seyrek</string>
+    <string name="pref_delta_granularity">Delta Tanecikliliği (Steampunk)</string>
+    <string name="pref_low">Düşük</string>
+    <string name="pref_medium">Orta</string>
+    <string name="pref_high">Yüksek</string>
+    <string name="pref_auto">Otomatik</string>
+    <string name="pref_big_numbers">Büyük Sayılar</string>
+    <string name="pref_ring_history">Zil Geçmişi</string>
+    <string name="pref_light_ring_history">Düşük zil Geçmişi</string>
+    <string name="pref_animations">Animasyonlar</string>
+    <string name="pref_wizard_in_menu">Menüdeki Sihirbaz</string>
+    <string name="pref_prime_in_menu">Menüden Başlatma</string>
+    <string name="pref_single_target">Tek hedef</string>
+    <string name="pref_wizard_percentage">Sihirbaz Yüzdesi</string>
+    <string name="pref_complication_tap_action">Komplikasyon Dokunma Eylemi</string>
+    <string name="pref_unicode_in_complications">Komplikasyonlarda Unicode</string>
+    <string name="pref_version">Versiyon:</string>
+    <string name="pref_moreWatchfaceSettings">daha çok saatarayüz ayarı</string>
+    <string name="pref_lookInYourWatchfaceConfiguration">Lütfen, Saatarayüzü yapılandırmasına bakın.</string>
+    <string name="menu_tempt">GeçiciH</string>
+    <string name="menu_wizard">Sihirbaz</string>
+    <string name="menu_bolus">Bolus</string>
+    <string name="menu_ecarb">eCarb</string>
+    <string name="menu_settings">Ayarlar</string>
+    <string name="menu_status">Durum</string>
+    <string name="menu_resync">Yen-Senkr</string>
+    <string name="menu_prime_fill">Hazırla/doldur</string>
+    <string name="menu_none">Hiçbiri</string>
+    <string name="menu_default">Varsayılan</string>
+    <string name="menu_menu">Menü</string>
+    <string name="action_duration">süre</string>
+    <string name="action_target" comment="In temp target menu, single target value">hedef</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">düşük</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">yüksek</string>
+    <string name="action_carbs">karbonhidrat</string>
+    <string name="action_percentage">yüzdesi</string>
+    <string name="action_start_min">başlat [min]</string>
+    <string name="action_duration_h">süre [h]</string>
+    <string name="action_insulin">insülin</string>
+    <string name="action_preset_1">Ön ayar 1</string>
+    <string name="action_preset_2">Ön ayar 2</string>
+    <string name="action_preset_3">Ön ayar 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Serbest miktar</string>
+    <string name="action_confirm">ONAYLA</string>
+    <string name="action_timeshift">vardiya</string>
+    <string name="action_bolus">bolus</string>
+    <string name="bolus_progress">Bolus İlerlemesi</string>
+    <string name="press_to_cancel">iptal etmek için basın</string>
+    <string name="cancel_bolus">BOLUS İPTAL ET</string>
+    <string name="status_pump">Pompa</string>
+    <string name="status_loop">Döngü</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_carb">Karb</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">durum yok</string>
+    <string name="color_name_red">kırmızı</string>
+    <string name="color_name_pink">pembe</string>
+    <string name="color_name_purple">mor</string>
+    <string name="color_name_deeppurple">koyu mor</string>
+    <string name="color_name_indigo">çivit mavi</string>
+    <string name="color_name_blue">mavi</string>
+    <string name="color_name_lightblue">açık mavi</string>
+    <string name="color_name_cyan">camgöbeği</string>
+    <string name="color_name_teal">deniz mavisi</string>
+    <string name="color_name_green">yeşil</string>
+    <string name="color_name_lightgreen">açık yeşil</string>
+    <string name="color_name_lime">misket limonu</string>
+    <string name="color_name_yellow">sarı</string>
+    <string name="color_name_amber">kehribar</string>
+    <string name="color_name_orange">turuncu</string>
+    <string name="color_name_deeporange">koyu turuncu</string>
+    <string name="color_name_brown">kahverengi</string>
+    <string name="color_name_gray">gri</string>
+    <string name="color_name_bluegray">mavi gri</string>
+    <string name="color_name_white">beyaz</string>
+    <string name="color_name_black">siyah</string>
+    <string name="color_name_multicolor">çok renkli</string>
+    <string name="pref_vibrate_hourly">Saatlik titreşim</string>
+    <string name="pref_show_weeknumber">Hafta numarasını göster</string>
+    <string name="digitalstyle_pref_your_style">Stilin:</string>
+    <string name="digitalstyle_style_none">stil yok</string>
+    <string name="digitalstyle_style_minimal">minimal stil</string>
+    <string name="digitalstyle_style_shape">şekil stili</string>
+    <string name="digitalstyle_style_full">tam stil</string>
+    <string name="digitalstyle_pref_your_color">Renginiz:</string>
+    <string name="digitalstyle_pref_your_color_saturation">Renk doygunluğunuz:</string>
+    <string name="digitalstyle_pref_your_color_opacity">Renk opaklığınız:</string>
+    <string name="bolus_progress_channel_name">AAPS Bolus İletimi</string>
+    <string name="bolus_progress_silent_channel_name">AAPS Bolus İletimi Sessiz</string>
+    <string name="bolus_progress_channel_description">Bolus iletimi ve iptali</string>
+    <string name="bolus_progress_silent_channel_description">Bolus iletimi ve daha az titreşimle iptal etme</string>
+</resources>