diff --git a/.gitignore b/.gitignore
index 4b311a1123..d9e995910d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@ app/.classpath
 app/.settings/org.eclipse.buildship.core.prefs
 wear/.classpath
 wear/.settings/org.eclipse.buildship.core.prefs
+app/nsclient/*
+app/nsclient2/*
+app/pumpcontrol/*
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a9c3d0e4d9..c76f23799b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,9 +3,12 @@
     <option name="AUTODETECT_INDENTS" value="false" />
     <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value />
+      </option>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="6" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="6" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="BLANK_LINES_AROUND_BLOCK_WHEN_BRANCHES" value="1" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
diff --git a/.idea/dictionaries/project_dictionary.xml b/.idea/dictionaries/project_dictionary.xml
index 79a1572acb..2e08ebd897 100644
--- a/.idea/dictionaries/project_dictionary.xml
+++ b/.idea/dictionaries/project_dictionary.xml
@@ -3,9 +3,11 @@
     <words>
       <w>aaps</w>
       <w>abcdef</w>
+      <w>accu</w>
       <w>acked</w>
       <w>actionstring</w>
       <w>aidex</w>
+      <w>alarmack</w>
       <w>allowednumbers</w>
       <w>androidaps</w>
       <w>autosens</w>
@@ -26,11 +28,15 @@
       <w>carbsreq</w>
       <w>careportal</w>
       <w>cellnovo</w>
+      <w>chek</w>
+      <w>clearalarm</w>
       <w>crashlytics</w>
       <w>danar</w>
       <w>danars</w>
       <w>dataset</w>
       <w>datasets</w>
+      <w>dbadd</w>
+      <w>dbupdate</w>
       <w>devicestatus</w>
       <w>devicestatuses</w>
       <w>devslope</w>
@@ -39,12 +45,14 @@
       <w>diaconn</w>
       <w>enteredby</w>
       <w>enteredinsulin</w>
+      <w>eopatch</w>
       <w>eveningoutpost</w>
       <w>eversense</w>
       <w>extendedbolus</w>
       <w>fileprovider</w>
       <w>firebase</w>
       <w>glimp</w>
+      <w>glunovo</w>
       <w>gson</w>
       <w>hmac</w>
       <w>iage</w>
@@ -79,12 +87,14 @@
       <w>pred</w>
       <w>profileswitch</w>
       <w>pumpbtcomm</w>
+      <w>pumpcontrol</w>
       <w>quickwizard</w>
       <w>readstatus</w>
       <w>realduration</w>
       <w>refresheventsfromnightscout</w>
       <w>rileylink</w>
       <w>roboelectric</w>
+      <w>rozman</w>
       <w>sgvs</w>
       <w>shortgramm</w>
       <w>sitechange</w>
@@ -108,7 +118,8 @@
       <w>tirs</w>
       <w>totp</w>
       <w>tunedays</w>
-	  <w>uart</w>
+      <w>uart</w>
+      <w>urgentalarm</w>
       <w>wizzardpage</w>
       <w>xdrip</w>
       <w>xstream</w>
diff --git a/app/build.gradle b/app/build.gradle
index 131dfce776..3b58a7abdb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -105,7 +105,7 @@ android {
     defaultConfig {
         multiDexEnabled true
         versionCode 1500
-        version "3.1.0"
+        version "3.1.0.3-dev-a"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
diff --git a/app/src/main/assets/OpenAPSSMBDynamicISF/determine-basal.js b/app/src/main/assets/OpenAPSSMBDynamicISF/determine-basal.js
index 24b8c29718..f3ff906aac 100644
--- a/app/src/main/assets/OpenAPSSMBDynamicISF/determine-basal.js
+++ b/app/src/main/assets/OpenAPSSMBDynamicISF/determine-basal.js
@@ -203,206 +203,97 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         // 80 mg/dL with low_temptarget_lowers_sensitivity would give 1.5x basal, but is limited to autosens_max (1.2x by default)
     }
 
+    //*********************************************************************************
+    //**                   Start of Dynamic ISF code for predictions                 **
+    //*********************************************************************************
 
-    var profile_sens = round(profile.sens,1)
-    var sens = profile.sens;
+    console.error("---------------------------------------------------------");
+    console.error( " Dynamic ISF version Beta 1.6.5 ");
+    console.error("---------------------------------------------------------");
 
-    var now = new Date().getHours();
-            if (now < 1){
-                now = 1;}
-            else {
-                console.error("Time now is "+now+"; ");
-            }
-        //*********************************************************************************
-        //**                   Start of Dynamic ISF code for predictions                 **
-        //*********************************************************************************
+    var variable_sens = profile.variable_sens;
+    var TDD = profile.TDD;
+    var insulinDivisor = profile.insulinDivisor;
 
-            console.error("---------------------------------------------------------");
-            console.error( " Dynamic ISF version Beta 1.6.5 ");
-            console.error("---------------------------------------------------------");
+    //*********************************************************************************
+    //**                   End of Dynamic ISF code for predictions                   **
+    //*********************************************************************************
 
 
-        if (meal_data.TDDAIMI7){
-            var tdd7 = meal_data.TDDAIMI7;
-            }
-        else{
-        var tdd7 = ((basal * 12)*100)/21;
-        }
-        console.error("7-day average TDD is: " +tdd7+ "; ");
-
-        if (meal_data.TDDLast24){
-                var tdd_24 = meal_data.TDDLast24;
-                }
-                else {
-                var tdd_24 = (( basal * 24 ) * 2.8);
-                }
-
-           if (meal_data.TDDPUMP){
-                var tdd_pump = ( (meal_data.TDDPUMP / now ) * 24);
-                }
-                else {
-                var tdd_pump = (( basal * 24 ) * 2.8);
-                }
-           console.log("Rolling TDD for last 24 hours is: "+tdd_24+"; ");
-
-            /*var tdd_pump_now = meal_data.TDDPUMP;
-            var tdd_pump = ( tdd_pump_now / (now / 24));*/
-            //var TDD = (tdd7 * 0.4) + (tdd_pump * 0.6);
-
-    var tdd1 = meal_data.TDDAIMI1;
-    var tdd_4 = meal_data.TDDLast4;
-    var tdd8to4 = meal_data.TDD4to8;
-    var tdd_last8_wt = ( ( ( 1.4 * tdd_4) + ( 0.6 * tdd8to4) ) * 3 );
-
-    console.error("Rolling 8 hours weight average: "+tdd_last8_wt+"; ");
-    console.error("1-day average TDD is: "+tdd1+"; ");
-    console.error("7-day average TDD is: " +tdd7+ "; ");
-
-    //TDD = ( tdd_last8_wt * 0.6) + ( tdd7 * 0.4 );
-
-    var TDD = ( tdd_last8_wt * 0.33 ) + ( tdd7 * 0.34 ) + (tdd1 * 0.33);
-    console.log("TDD = " +TDD+ " using average of 7-day, 1-day and weighted 8hr average");
-
-
-        //var ins_val = 75;
-        var insulin = profile.insulinType;
-        console.log("Insulin Peak = "+profile.insulinPeak+"; ");
-        //console.log("Initial insulin value for ISF: "+ins_val+"; ");
-        //console.log("Current value for insulin: "+insulin+"; ");
-
-        var ins_val;
-        if (profile.insulinPeak > 65) { // lyumjev peak: 45
-            ins_val = 55;
-        } else if (profile.insulinPeak > 50 ){ // ultra rapid peak: 55
-            ins_val = 65;
+    if ( high_temptarget_raises_sensitivity && profile.temptargetSet && target_bg > normalTarget
+        || profile.low_temptarget_lowers_sensitivity && profile.temptargetSet && target_bg < normalTarget ) {
+        // w/ target 100, temp target 110 = .89, 120 = 0.8, 140 = 0.67, 160 = .57, and 200 = .44
+        // e.g.: Sensitivity ratio set to 0.8 based on temp target of 120; Adjusting basal from 1.65 to 1.35; ISF from 58.9 to 73.6
+        //sensitivityRatio = 2/(2+(target_bg-normalTarget)/40);
+        var c = halfBasalTarget - normalTarget;
+        sensitivityRatio = c/(c+target_bg-normalTarget);
+        // limit sensitivityRatio to profile.autosens_max (1.2x by default)
+        sensitivityRatio = Math.min(sensitivityRatio, profile.autosens_max);
+        sensitivityRatio = round(sensitivityRatio,2);
+        console.log("Sensitivity ratio set to "+sensitivityRatio+" based on temp target of "+target_bg+"; ");
+    } else if (typeof autosens_data !== 'undefined' && autosens_data) {
+        sensitivityRatio = autosens_data.ratio;
+        console.log("Autosens ratio: "+sensitivityRatio+"; ");
+    }
+    if (sensitivityRatio) {
+        basal = profile.current_basal * sensitivityRatio;
+        basal = round_basal(basal, profile);
+        if (basal !== profile_current_basal) {
+            console.log("Adjusting basal from "+profile_current_basal+" to "+basal+"; ");
         } else {
-            ins_val = 75; // rapid peak: 75
+            console.log("Basal unchanged: "+basal+"; ");
         }
-        console.log("For "+profile.insulinType+" (insulin peak: "+profile.insulinPeak+") divisor is: "+ins_val+"; ");
+    }
 
-        console.log("Insulin value for ISF based on profile: "+ins_val+"; ");
-
-        var dynISFadjust = profile.DynISFAdjust;
-        dynISFadjust = ( dynISFadjust / 100 );
-        TDD = ( dynISFadjust * TDD );
-
-        var variable_sens = 1800 / ( TDD * (Math.log(( bg / ins_val ) + 1 ) ) );
-
-        variable_sens = round(variable_sens,1);
-
-
-        if (dynISFadjust > 1 ) {
-            console.log("TDD adjustment factor is: " +dynISFadjust+"; ");
-            console.log("TDD adjusted to "+TDD+" using adjustment factor of "+dynISFadjust+"; ");
-            console.log("Current sensitivity for predictions is " +variable_sens+" based on current bg");
-        }
-        else if (dynISFadjust < 1 ){
-            console.log("TDD adjustment factor is: " +dynISFadjust+"; ");
-            console.log("TDD adjusted to "+TDD+" using adjustment factor of "+dynISFadjust+"; ");
-            console.log("Current sensitivity for predictions is " +variable_sens+" based on current bg");
-        } else {
-            console.log("Current sensitivity for predictions is " +variable_sens+" based on current bg");
-        }
-        sens = variable_sens;
-
-        //*********************************************************************************
-        //**                   End of Dynamic ISF code for predictions                   **
-        //*********************************************************************************
-
-
-        if ( high_temptarget_raises_sensitivity && profile.temptargetSet && target_bg > normalTarget || profile.low_temptarget_lowers_sensitivity && profile.temptargetSet && target_bg < normalTarget ) {
-            // w/ target 100, temp target 110 = .89, 120 = 0.8, 140 = 0.67, 160 = .57, and 200 = .44
-            // e.g.: Sensitivity ratio set to 0.8 based on temp target of 120; Adjusting basal from 1.65 to 1.35; ISF from 58.9 to 73.6
-            //sensitivityRatio = 2/(2+(target_bg-normalTarget)/40);
-            var c = halfBasalTarget - normalTarget;
-            sensitivityRatio = c/(c+target_bg-normalTarget);
-            // limit sensitivityRatio to profile.autosens_max (1.2x by default)
-            sensitivityRatio = Math.min(sensitivityRatio, profile.autosens_max);
-            sensitivityRatio = round(sensitivityRatio,2);
-            console.log("Sensitivity ratio set to "+sensitivityRatio+" based on temp target of "+target_bg+"; ");
-            sens =  sens / sensitivityRatio ;
-            sens = round(sens, 1);
-            console.log("ISF from "+variable_sens+" to "+sens+ "due to temp target; ");
-            }
-            else {
-            sensitivityRatio = ( meal_data.TDD24 / tdd7 );
-            }
-            if (sensitivityRatio > 1) {
-                sensitivityRatio = Math.min(sensitivityRatio, profile.autosens_max);
-                sensitivityRatio = round(sensitivityRatio,2);
-                console.log("Sensitivity ratio: "+sensitivityRatio+"; ");
-            }
-            else if( sensitivityRatio < 1) {
-                sensitivityRatio = Math.max(sensitivityRatio, profile.autosens_min);
-                sensitivityRatio = round(sensitivityRatio,2);
-                console.log("Sensitivity ratio: "+sensitivityRatio+"; ");
-                    }
-            else {
-            console.log("Sensitivity ratio: "+sensitivityRatio+"; ");
-            }
-
-
-        if (sensitivityRatio && profile.openapsama_useautosens === true) {
-            basal = profile.current_basal * sensitivityRatio;
-            basal = round_basal(basal, profile);
-            if (basal !== profile_current_basal) {
-                console.log("Adjusting basal from "+profile_current_basal+" to "+basal+"; ");
+    // adjust min, max, and target BG for sensitivity, such that 50% increase in ISF raises target from 100 to 120
+    if (profile.temptargetSet) {
+        //console.log("Temp Target set, not adjusting with autosens; ");
+    } else if (typeof autosens_data !== 'undefined' && autosens_data) {
+        if ( profile.sensitivity_raises_target && autosens_data.ratio < 1 || profile.resistance_lowers_target && autosens_data.ratio > 1 ) {
+            // with a target of 100, default 0.7-1.2 autosens min/max range would allow a 93-117 target range
+            min_bg = round((min_bg - 60) / autosens_data.ratio) + 60;
+            max_bg = round((max_bg - 60) / autosens_data.ratio) + 60;
+            var new_target_bg = round((target_bg - 60) / autosens_data.ratio) + 60;
+            // don't allow target_bg below 80
+            new_target_bg = Math.max(80, new_target_bg);
+            if (target_bg === new_target_bg) {
+                console.log("target_bg unchanged: "+new_target_bg+"; ");
             } else {
-                console.log("Autosens disabled. Basal unchanged: "+basal+"; ");
+                console.log("target_bg from "+target_bg+" to "+new_target_bg+"; ");
             }
+            target_bg = new_target_bg;
         }
+    }
 
-        // adjust min, max, and target BG for sensitivity, such that 50% increase in ISF raises target from 100 to 120
-        if (profile.temptargetSet) {
-            //console.log("Temp Target set, not adjusting with autosens; ");
-        } else {
-            if ( profile.sensitivity_raises_target && sensitivityRatio < 1 && profile.openapsama_useautosens === true || profile.resistance_lowers_target && sensitivityRatio > 1 && profile.openapsama_useautosens === true) {
-                // with a target of 100, default 0.7-1.2 autosens min/max range would allow a 93-117 target range
-                min_bg = round((min_bg - 60) / sensitivityRatio) + 60;
-                max_bg = round((max_bg - 60) / sensitivityRatio) + 60;
-                var new_target_bg = round((target_bg - 60) / sensitivityRatio) + 60;
-                // don't allow target_bg below 80
-                new_target_bg = Math.max(80, new_target_bg);
-                if (target_bg === new_target_bg) {
-                    console.log("target_bg unchanged: "+new_target_bg+"; ");
-                } else {
-                    console.log("target_bg from "+target_bg+" to "+new_target_bg+"; ");
-                }
-                target_bg = new_target_bg;
-            }
-        }
+    if (typeof iob_data === 'undefined' ) {
+        rT.error ='Error: iob_data undefined. ';
+        return rT;
+    }
 
+    var iobArray = iob_data;
+    if (typeof(iob_data.length) && iob_data.length > 1) {
+        iob_data = iobArray[0];
+        //console.error(JSON.stringify(iob_data[0]));
+    }
 
-        if (typeof iob_data === 'undefined' ) {
-            rT.error ='Error: iob_data undefined. ';
-            return rT;
-        }
+    if (typeof iob_data.activity === 'undefined' || typeof iob_data.iob === 'undefined' ) {
+        rT.error ='Error: iob_data missing some property. ';
+        return rT;
+    }
 
-        var iobArray = iob_data;
-        if (typeof(iob_data.length) && iob_data.length > 1) {
-            iob_data = iobArray[0];
-            //console.error(JSON.stringify(iob_data[0]));
-        }
+    var tick;
 
-        if (typeof iob_data.activity === 'undefined' || typeof iob_data.iob === 'undefined' ) {
-            rT.error ='Error: iob_data missing some property. ';
-            return rT;
-        }
+    if (glucose_status.delta > -0.5) {
+        tick = "+" + round(glucose_status.delta,0);
+    } else {
+        tick = round(glucose_status.delta,0);
+    }
+    //var minDelta = Math.min(glucose_status.delta, glucose_status.short_avgdelta, glucose_status.long_avgdelta);
+    var minDelta = Math.min(glucose_status.delta, glucose_status.short_avgdelta);
+    var minAvgDelta = Math.min(glucose_status.short_avgdelta, glucose_status.long_avgdelta);
+    var maxDelta = Math.max(glucose_status.delta, glucose_status.short_avgdelta, glucose_status.long_avgdelta);
 
-        var tick;
-
-        if (glucose_status.delta > -0.5) {
-            tick = "+" + round(glucose_status.delta,0);
-        } else {
-            tick = round(glucose_status.delta,0);
-        }
-        //var minDelta = Math.min(glucose_status.delta, glucose_status.short_avgdelta, glucose_status.long_avgdelta);
-        var minDelta = Math.min(glucose_status.delta, glucose_status.short_avgdelta);
-        var minAvgDelta = Math.min(glucose_status.short_avgdelta, glucose_status.long_avgdelta);
-        var maxDelta = Math.max(glucose_status.delta, glucose_status.short_avgdelta, glucose_status.long_avgdelta);
-
-
-    console.error("; CR:",profile.carb_ratio);
+    var sens = variable_sens
 
     // compare currenttemp to iob_data.lastTemp and cancel temp if they don't match
     var lastTempAge;
@@ -413,7 +304,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     }
     //console.error("currenttemp:",currenttemp,"lastTemp:",JSON.stringify(iob_data.lastTemp),"lastTempAge:",lastTempAge,"m");
     var tempModulus = (lastTempAge + currenttemp.duration) % 30;
-    console.error("currenttemp:",currenttemp,"lastTempAge:",lastTempAge,"m","tempModulus:",tempModulus,"m");
+    console.error("currenttemp:",round(currenttemp.rate,2),"lastTempAge:",lastTempAge,"m","tempModulus:",tempModulus,"m");
     rT.temp = 'absolute';
     rT.deliverAt = deliverAt;
     if ( microBolusAllowed && currenttemp && iob_data.lastTemp && currenttemp.rate !== iob_data.lastTemp.rate && lastTempAge > 10 && currenttemp.duration ) {
@@ -822,39 +713,36 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
 
     console.error("UAM Impact:",uci,"mg/dL per 5m; UAM Duration:",UAMduration,"hours");
 
-         console.log("EventualBG is" +eventualBG+" ;");
+    console.log("EventualBG is" +eventualBG+" ;");
 
-        minIOBPredBG = Math.max(39,minIOBPredBG);
-        minCOBPredBG = Math.max(39,minCOBPredBG);
-        minUAMPredBG = Math.max(39,minUAMPredBG);
-        minPredBG = round(minIOBPredBG);
+    minIOBPredBG = Math.max(39,minIOBPredBG);
+    minCOBPredBG = Math.max(39,minCOBPredBG);
+    minUAMPredBG = Math.max(39,minUAMPredBG);
+    minPredBG = round(minIOBPredBG);
 
-        var fSensBG = Math.min(minPredBG,bg);
+    var fSensBG = Math.min(minPredBG,bg);
 
-         if (bg > target_bg && glucose_status.delta < 3 && glucose_status.delta > -3 && glucose_status.short_avgdelta > -3 && glucose_status.short_avgdelta < 3 && eventualBG > target_bg && eventualBG < bg ) {
-             var future_sens = ( 1800 / (Math.log((((fSensBG * 0.5) + (bg * 0.5))/ins_val)+1)*TDD));
-             //var future_sens_old = ( 277700 / (TDD * ((bg * 0.5) + (eventualBG * 0.5 ))));
-             console.log("Future state sensitivity is " +future_sens+" based on eventual and current bg due to flat glucose level above target");
-             rT.reason += "Dosing sensitivity: " +future_sens+" using eventual BG;";
+     if (bg > target_bg && glucose_status.delta < 3 && glucose_status.delta > -3 && glucose_status.short_avgdelta > -3 && glucose_status.short_avgdelta < 3 && eventualBG > target_bg && eventualBG < bg ) {
+         var future_sens = ( 1800 / (Math.log((((fSensBG * 0.5) + (bg * 0.5))/insulinDivisor)+1)*TDD));
+         //var future_sens_old = ( 277700 / (TDD * ((bg * 0.5) + (eventualBG * 0.5 ))));
+         console.log("Future state sensitivity is " +future_sens+" based on eventual and current bg due to flat glucose level above target");
+         rT.reason += "Dosing sensitivity: " +future_sens+" using eventual BG;";
+     }
+
+     else if( glucose_status.delta > 0 && eventualBG > target_bg || eventualBG > bg) {
+         var future_sens = ( 1800 / (Math.log((bg/insulinDivisor)+1)*TDD));
+         //var future_sens_old = ( 277700 / (TDD * bg));
+         console.log("Future state sensitivity is " +future_sens+" using current bg due to small delta or variation");
+         rT.reason += "Dosing sensitivity: " +future_sens+" using current BG;";
          }
 
-         else if( glucose_status.delta > 0 && eventualBG > target_bg || eventualBG > bg ) {
-             var future_sens = ( 1800 / (Math.log((bg/ins_val)+1)*TDD));
-             //var future_sens_old = ( 277700 / (TDD * bg));
-             console.log("Future state sensitivity is " +future_sens+" using current bg due to small delta or variation");
-             rT.reason += "Dosing sensitivity: " +future_sens+" using current BG;";
-             }
-
-         else {
-            var future_sens = ( 1800 / (Math.log((fSensBG/ins_val)+1)*TDD));
-            //var future_sens_old = ( 277700 / (TDD * eventualBG));
-            console.log("Future state sensitivity is " +future_sens+" based on eventual bg due to -ve delta");
-            rT.reason += "Dosing sensitivity: " +future_sens+" using eventual BG;";
-         }
-         future_sens = round(future_sens,1);
-
-
-
+     else {
+        var future_sens = ( 1800 / (Math.log((fSensBG/insulinDivisor)+1)*TDD));
+        //var future_sens_old = ( 277700 / (TDD * eventualBG));
+        console.log("Future state sensitivity is " +future_sens+" based on eventual bg due to -ve delta");
+        rT.reason += "Dosing sensitivity: " +future_sens+" using eventual BG;";
+     }
+     future_sens = round(future_sens,1);
 
 
     var fractionCarbsLeft = meal_data.mealCOB/meal_data.carbs;
@@ -1079,25 +967,22 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
             }
         }
 
-
-
-            // calculate 30m low-temp required to get projected BG up to target
-            // multiply by 2 to low-temp faster for increased hypo safety
-
-            var insulinReq = 2 * Math.min(0, (eventualBG - target_bg) / future_sens);
-            insulinReq = round( insulinReq , 2);
-            // calculate naiveInsulinReq based on naive_eventualBG
-            var naiveInsulinReq = Math.min(0, (naive_eventualBG - target_bg) / sens);
-            naiveInsulinReq = round( naiveInsulinReq , 2);
-            if (minDelta < 0 && minDelta > expectedDelta) {
-                // if we're barely falling, newinsulinReq should be barely negative
-                var newinsulinReq = round(( insulinReq * (minDelta / expectedDelta) ), 2);
-                //console.error("Increasing insulinReq from " + insulinReq + " to " + newinsulinReq);
-                insulinReq = newinsulinReq;
-            }
-            // rate required to deliver insulinReq less insulin over 30m:
-            var rate = basal + (2 * insulinReq);
-            rate = round_basal(rate, profile);
+        // calculate 30m low-temp required to get projected BG up to target
+        // multiply by 2 to low-temp faster for increased hypo safety
+        var insulinReq = 2 * Math.min(0, (eventualBG - target_bg) / future_sens);
+        insulinReq = round( insulinReq , 2);
+        // calculate naiveInsulinReq based on naive_eventualBG
+        var naiveInsulinReq = Math.min(0, (naive_eventualBG - target_bg) / sens);
+        naiveInsulinReq = round( naiveInsulinReq , 2);
+        if (minDelta < 0 && minDelta > expectedDelta) {
+            // if we're barely falling, newinsulinReq should be barely negative
+            var newinsulinReq = round(( insulinReq * (minDelta / expectedDelta) ), 2);
+            //console.error("Increasing insulinReq from " + insulinReq + " to " + newinsulinReq);
+            insulinReq = newinsulinReq;
+        }
+        // rate required to deliver insulinReq less insulin over 30m:
+        var rate = basal + (2 * insulinReq);
+        rate = round_basal(rate, profile);
 
         // if required temp < existing temp basal
         var insulinScheduled = currenttemp.duration * (currenttemp.rate - basal) / 60;
@@ -1185,14 +1070,14 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         }
     } else { // otherwise, calculate 30m high-temp required to get projected BG down to target
 
-            // insulinReq is the additional insulin required to get minPredBG down to target_bg
-            //console.error(minPredBG,eventualBG);
-            insulinReq = round( (Math.min(minPredBG,eventualBG) - target_bg) / future_sens, 2);
-            // if that would put us over max_iob, then reduce accordingly
-            if (insulinReq > max_iob-iob_data.iob) {
-                rT.reason += "max_iob " + max_iob + ", ";
-                insulinReq = max_iob-iob_data.iob;
-            }
+        // insulinReq is the additional insulin required to get minPredBG down to target_bg
+        //console.error(minPredBG,eventualBG);
+        insulinReq = round( (Math.min(minPredBG,eventualBG) - target_bg) / future_sens, 2);
+        // if that would put us over max_iob, then reduce accordingly
+        if (insulinReq > max_iob-iob_data.iob) {
+            rT.reason += "max_iob " + max_iob + ", ";
+            insulinReq = max_iob-iob_data.iob;
+        }
 
         // rate required to deliver insulinReq more insulin over 30m:
         rate = basal + (2 * insulinReq);
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index 241da0bed9..ca5331004a 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -295,6 +295,7 @@ class MainActivity : NoSplashAppCompatActivity() {
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        super.onCreateOptionsMenu(menu)
         menu.setGroupDividerEnabled(true)
         this.menu = menu
         menuInflater.inflate(R.menu.menu_main, menu)
@@ -306,6 +307,7 @@ class MainActivity : NoSplashAppCompatActivity() {
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        super.onOptionsItemSelected(item)
         when (item.itemId) {
             R.id.nav_preferences        -> {
                 protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, {
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
index bc201bf3c8..62468ebbd9 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
@@ -80,7 +80,7 @@ class MainApp : DaggerApplication() {
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var alarmSoundServiceHelper: AlarmSoundServiceHelper
     @Inject lateinit var notificationStore: NotificationStore
-    @Inject lateinit var processLifecycleListener: ProcessLifecycleListener
+    @Inject lateinit var processLifecycleListener: Provider<ProcessLifecycleListener>
     @Inject lateinit var profileSwitchPlugin: ThemeSwitcherPlugin
     @Inject lateinit var localAlertUtils: LocalAlertUtils
     @Inject lateinit var rh: Provider<ResourceHelper>
@@ -94,7 +94,6 @@ class MainApp : DaggerApplication() {
         RxDogTag.install()
         setRxErrorHandler()
         LocaleHelper.update(this)
-        ProcessLifecycleOwner.get().lifecycle.addObserver(processLifecycleListener)
 
         var gitRemote: String? = BuildConfig.REMOTE
         var commitHash: String? = BuildConfig.HEAD
@@ -151,6 +150,7 @@ class MainApp : DaggerApplication() {
         localAlertUtils.preSnoozeAlarms()
         doMigrations()
         uel.log(UserEntry.Action.START_AAPS, UserEntry.Sources.Aaps)
+        ProcessLifecycleOwner.get().lifecycle.addObserver(processLifecycleListener.get())
 
         //  schedule widget update
         refreshWidget = Runnable {
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 20bed45c84..73547e31c2 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
@@ -12,7 +12,7 @@ import com.google.android.material.datepicker.MaterialDatePicker
 import com.jjoe64.graphview.GraphView
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.activities.fragments.HistoryBrowserData
 import info.nightscout.androidaps.databinding.ActivityHistorybrowseBinding
 import info.nightscout.androidaps.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.events.EventCustomCalculationFinished
@@ -21,27 +21,18 @@ import info.nightscout.androidaps.events.EventScale
 import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.extensions.toVisibilityKeepSpace
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.Config
-import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
-import info.nightscout.androidaps.plugins.general.overview.OverviewData
+import info.nightscout.androidaps.interfaces.BuildHelper
 import info.nightscout.androidaps.plugins.general.overview.OverviewMenus
 import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewGraph
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
-import info.nightscout.androidaps.receivers.DataWorker
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
-import info.nightscout.androidaps.utils.Translator
-import info.nightscout.androidaps.interfaces.BuildHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.workflow.CalculationWorkflow
 import info.nightscout.shared.logging.LTag
-import info.nightscout.shared.sharedPreferences.SP
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.*
@@ -50,23 +41,16 @@ import kotlin.math.min
 
 class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
+    @Inject lateinit var historyBrowserData: HistoryBrowserData
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var sp: SP
-    @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var buildHelper: BuildHelper
-    @Inject lateinit var repository: AppRepository
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var overviewMenus: OverviewMenus
     @Inject lateinit var dateUtil: DateUtil
-    @Inject lateinit var config: Config
-    @Inject lateinit var loop: Loop
-    @Inject lateinit var nsDeviceStatus: NSDeviceStatus
-    @Inject lateinit var translator: Translator
     @Inject lateinit var context: Context
-    @Inject lateinit var dataWorker: DataWorker
     @Inject lateinit var calculationWorkflow: CalculationWorkflow
 
     private val disposable = CompositeDisposable()
@@ -78,9 +62,6 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     private var rangeToDisplay = 24 // for graph
 //    private var start: Long = 0
 
-    private lateinit var iobCobCalculator: IobCobCalculatorPlugin
-    private lateinit var overviewData: OverviewData
-
     private lateinit var binding: ActivityHistorybrowseBinding
     private var destroyed = false
 
@@ -89,42 +70,12 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         binding = ActivityHistorybrowseBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        // We don't want to use injected singletons but own instance working on top of different data
-        overviewData =
-            OverviewData(
-                aapsLogger,
-                rh,
-                dateUtil,
-                sp,
-                activePlugin,
-                defaultValueHelper,
-                profileFunction,
-                repository,
-                fabricPrivacy
-            )
-        iobCobCalculator =
-            IobCobCalculatorPlugin(
-                injector,
-                aapsLogger,
-                aapsSchedulers,
-                rxBus,
-                sp,
-                rh,
-                profileFunction,
-                activePlugin,
-                fabricPrivacy,
-                dateUtil,
-                repository,
-                overviewData,
-                calculationWorkflow
-            )
-
         binding.left.setOnClickListener {
-            adjustTimeRange(overviewData.fromTime - T.hours(rangeToDisplay.toLong()).msecs())
+            adjustTimeRange(historyBrowserData.overviewData.fromTime - T.hours(rangeToDisplay.toLong()).msecs())
             loadAll("onClickLeft")
         }
         binding.right.setOnClickListener {
-            adjustTimeRange(overviewData.fromTime + T.hours(rangeToDisplay.toLong()).msecs())
+            adjustTimeRange(historyBrowserData.overviewData.fromTime + T.hours(rangeToDisplay.toLong()).msecs())
             loadAll("onClickRight")
         }
         binding.end.setOnClickListener {
@@ -138,7 +89,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         }
         binding.zoom.setOnLongClickListener {
             Calendar.getInstance().also { calendar ->
-                calendar.timeInMillis = overviewData.fromTime
+                calendar.timeInMillis = historyBrowserData.overviewData.fromTime
                 calendar[Calendar.MILLISECOND] = 0
                 calendar[Calendar.SECOND] = 0
                 calendar[Calendar.MINUTE] = 0
@@ -151,13 +102,13 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
         binding.date.setOnClickListener {
             MaterialDatePicker.Builder.datePicker()
-                .setSelection(dateUtil.timeStampToUtcDateMillis(overviewData.fromTime))
+                .setSelection(dateUtil.timeStampToUtcDateMillis(historyBrowserData.overviewData.fromTime))
                 .setTheme(R.style.DatePicker)
                 .build()
                 .apply {
                     addOnPositiveButtonClickListener { selection ->
-                        setTime(dateUtil.mergeUtcDateToTimestamp(overviewData.fromTime, selection))
-                        binding.date.text = dateUtil.dateAndTimeString(overviewData.fromTime)
+                        setTime(dateUtil.mergeUtcDateToTimestamp(historyBrowserData.overviewData.fromTime, selection))
+                        binding.date.text = dateUtil.dateAndTimeString(historyBrowserData.overviewData.fromTime)
                         loadAll("onClickDate")
                     }
                 }
@@ -180,8 +131,8 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         prepareGraphsIfNeeded(overviewMenus.setting.size)
         savedInstanceState?.let { bundle ->
             rangeToDisplay = bundle.getInt("rangeToDisplay", 0)
-            overviewData.fromTime = bundle.getLong("start", 0)
-            overviewData.toTime = bundle.getLong("end", 0)
+            historyBrowserData.overviewData.fromTime = bundle.getLong("start", 0)
+            historyBrowserData.overviewData.toTime = bundle.getLong("end", 0)
         }
     }
 
@@ -220,11 +171,11 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             .observeOn(aapsSchedulers.main)
             .subscribe({
                            rangeToDisplay = it.hours
-                           setTime(overviewData.fromTime)
+                           setTime(historyBrowserData.overviewData.fromTime)
                            loadAll("rangeChange")
                        }, fabricPrivacy::logException)
-
-        if (overviewData.fromTime == 0L) {
+        updateCalcProgress(100)
+        if (historyBrowserData.overviewData.fromTime == 0L) {
             // set start of current day
             setTime(dateUtil.now())
             loadAll("onResume")
@@ -236,8 +187,8 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putInt("rangeToDisplay", rangeToDisplay)
-        outState.putLong("start", overviewData.fromTime)
-        outState.putLong("end", overviewData.toTime)
+        outState.putLong("start", historyBrowserData.overviewData.fromTime)
+        outState.putLong("end", historyBrowserData.overviewData.toTime)
     }
 
     private fun prepareGraphsIfNeeded(numOfGraphs: Int) {
@@ -293,18 +244,18 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     }
 
     private fun adjustTimeRange(start: Long) {
-        overviewData.fromTime = start
-        overviewData.toTime = overviewData.fromTime + T.hours(rangeToDisplay.toLong()).msecs()
-        overviewData.endTime = overviewData.toTime
+        historyBrowserData.overviewData.fromTime = start
+        historyBrowserData.overviewData.toTime = historyBrowserData.overviewData.fromTime + T.hours(rangeToDisplay.toLong()).msecs()
+        historyBrowserData.overviewData.endTime = historyBrowserData.overviewData.toTime
     }
 
     private fun runCalculation(from: String) {
         calculationWorkflow.runCalculation(
             CalculationWorkflow.HISTORY_CALCULATION,
-            iobCobCalculator,
-            overviewData,
+            historyBrowserData.iobCobCalculator,
+            historyBrowserData.overviewData,
             from,
-            overviewData.toTime,
+            historyBrowserData.overviewData.toTime,
             bgDataReload = true,
             limitDataToOldestAvailable = false,
             cause = EventCustomCalculationFinished(),
@@ -325,7 +276,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     }
 
     private fun updateDate() {
-        binding.date.text = dateUtil.dateAndTimeString(overviewData.fromTime)
+        binding.date.text = dateUtil.dateAndTimeString(historyBrowserData.overviewData.fromTime)
         binding.zoom.text = rangeToDisplay.toString()
     }
 
@@ -337,9 +288,9 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         updateDate()
 
         val pump = activePlugin.activePump
-        val graphData = GraphData(injector, binding.bgGraph, overviewData)
+        val graphData = GraphData(injector, binding.bgGraph, historyBrowserData.overviewData)
         val menuChartSettings = overviewMenus.setting
-        graphData.addInRangeArea(overviewData.fromTime, overviewData.endTime, defaultValueHelper.determineLowLine(), defaultValueHelper.determineHighLine())
+        graphData.addInRangeArea(historyBrowserData.overviewData.fromTime, historyBrowserData.overviewData.endTime, defaultValueHelper.determineLowLine(), defaultValueHelper.determineHighLine())
         graphData.addBgReadings(menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal], context)
         if (buildHelper.isDev()) graphData.addBucketedData()
         graphData.addTreatments(context)
@@ -355,7 +306,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
         // set manual x bounds to have nice steps
         graphData.setNumVerticalLabels()
-        graphData.formatAxis(overviewData.fromTime, overviewData.endTime)
+        graphData.formatAxis(historyBrowserData.overviewData.fromTime, historyBrowserData.overviewData.endTime)
 
         graphData.performUpdate()
 
@@ -365,7 +316,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
         val now = System.currentTimeMillis()
         for (g in 0 until min(secondaryGraphs.size, menuChartSettings.size + 1)) {
-            val secondGraphData = GraphData(injector, secondaryGraphs[g], overviewData)
+            val secondGraphData = GraphData(injector, secondaryGraphs[g], historyBrowserData.overviewData)
             var useABSForScale = false
             var useIobForScale = false
             var useCobForScale = false
@@ -393,7 +344,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             if (menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(useDSForScale, 1.0)
 
             // set manual x bounds to have nice steps
-            secondGraphData.formatAxis(overviewData.fromTime, overviewData.endTime)
+            secondGraphData.formatAxis(historyBrowserData.overviewData.fromTime, historyBrowserData.overviewData.endTime)
             secondGraphData.addNowLine(now)
             secondaryGraphsData.add(secondGraphData)
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/HistoryBrowserData.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/HistoryBrowserData.kt
new file mode 100644
index 0000000000..2fba78b07c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/HistoryBrowserData.kt
@@ -0,0 +1,72 @@
+package info.nightscout.androidaps.activities.fragments
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.ResourceHelper
+import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.general.overview.OverviewData
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.workflow.CalculationWorkflow
+import info.nightscout.shared.logging.AAPSLogger
+import info.nightscout.shared.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class HistoryBrowserData @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsSchedulers: AapsSchedulers,
+    rxBus: RxBus,
+    aapsLogger: AAPSLogger,
+    rh: ResourceHelper,
+    dateUtil: DateUtil,
+    sp: SP,
+    activePlugin: ActivePlugin,
+    defaultValueHelper: DefaultValueHelper,
+    profileFunction: ProfileFunction,
+    repository: AppRepository,
+    fabricPrivacy: FabricPrivacy,
+    calculationWorkflow: CalculationWorkflow
+) {
+
+    var iobCobCalculator: IobCobCalculatorPlugin
+    var overviewData: OverviewData
+
+    init {
+        // We don't want to use injected singletons but own instance working on top of different data
+        overviewData =
+            OverviewData(
+                aapsLogger,
+                rh,
+                dateUtil,
+                sp,
+                activePlugin,
+                defaultValueHelper,
+                profileFunction,
+                repository,
+                fabricPrivacy
+            )
+        iobCobCalculator =
+            IobCobCalculatorPlugin(
+                injector,
+                aapsLogger,
+                aapsSchedulers,
+                rxBus,
+                sp,
+                rh,
+                profileFunction,
+                activePlugin,
+                fabricPrivacy,
+                dateUtil,
+                repository,
+                overviewData,
+                calculationWorkflow
+            )
+    }
+}
\ No newline at end of file
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 02e4e864f0..be18c83e80 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
@@ -6,6 +6,8 @@ import android.os.Bundle
 import android.util.SparseArray
 import android.view.*
 import androidx.core.util.forEach
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
@@ -28,6 +30,7 @@ import info.nightscout.androidaps.events.EventTreatmentChange
 import info.nightscout.androidaps.extensions.iobCalc
 import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.BuildHelper
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -40,7 +43,6 @@ import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.interfaces.BuildHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
@@ -52,7 +54,7 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-class TreatmentsBolusCarbsFragment : DaggerFragment() {
+class TreatmentsBolusCarbsFragment : DaggerFragment(), MenuProvider {
 
     @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
@@ -93,11 +95,11 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
         actionHelper = ActionModeHelper(rh, activity, this)
         actionHelper.setUpdateListHandler { binding.recyclerview.adapter?.notifyDataSetChanged() }
         actionHelper.setOnRemoveHandler { removeSelected(it) }
-        setHasOptionsMenu(true)
         binding.recyclerview.setHasFixedSize(true)
         binding.recyclerview.layoutManager = LinearLayoutManager(view.context)
         binding.recyclerview.emptyView = binding.noRecordsText
         binding.recyclerview.loadingView = binding.progressBar
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
     }
 
     private fun bolusMealLinksWithInvalid(now: Long) = repository
@@ -215,7 +217,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
                 holder.binding.bolusInvalid.visibility = bolus.isValid.not().toVisibility()
                 val iob = bolus.iobCalc(activePlugin, System.currentTimeMillis(), profile.dia)
                 if (iob.iobContrib > 0.01) {
-                    holder.binding.iob.setTextColor(rh.gac(context , R.attr.activeColor))
+                    holder.binding.iob.setTextColor(rh.gac(context, R.attr.activeColor))
                     holder.binding.iob.text = rh.gs(R.string.formatinsulinunits, iob.iobContrib)
                     holder.binding.iobLabel.visibility = View.VISIBLE
                     holder.binding.iob.visibility = View.VISIBLE
@@ -225,8 +227,8 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
                     holder.binding.iobLabel.visibility = View.GONE
                     holder.binding.iob.visibility = View.GONE
                 }
-                if (bolus.timestamp > dateUtil.now()) holder.binding.date.setTextColor(rh.gac(context, R.attr.scheduledColor)) else holder.binding.date.setTextColor(holder.binding.carbs
-                                                                                                                                                                       .currentTextColor)
+                if (bolus.timestamp > dateUtil.now())
+                    holder.binding.date.setTextColor(rh.gac(context, R.attr.scheduledColor)) else holder.binding.date.setTextColor(holder.binding.carbs.currentTextColor)
                 holder.binding.mealOrCorrection.text =
                     when (ml.bolus.type) {
                         Bolus.Type.SMB     -> "SMB"
@@ -291,10 +293,14 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         this.menu = menu
         inflater.inflate(R.menu.menu_treatments_carbs_bolus, menu)
-        super.onCreateOptionsMenu(menu, inflater)
+        updateMenuVisibility()
+        val nsUploadOnly = !sp.getBoolean(R.string.key_ns_receive_insulin, false) || !sp.getBoolean(R.string.key_ns_receive_carbs, false) || !buildHelper.isEngineeringMode()
+        menu.findItem(R.id.nav_refresh_ns)?.isVisible = !nsUploadOnly
+        val hasItems = (binding.recyclerview.adapter?.itemCount ?: 0) > 0
+        menu.findItem(R.id.nav_delete_future)?.isVisible = hasItems
     }
 
     private fun updateMenuVisibility() {
@@ -302,17 +308,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
         menu?.findItem(R.id.nav_show_invalidated)?.isVisible = !showInvalidated
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        updateMenuVisibility()
-        val nsUploadOnly = !sp.getBoolean(R.string.key_ns_receive_insulin, false) || !sp.getBoolean(R.string.key_ns_receive_carbs, false) || !buildHelper.isEngineeringMode()
-        menu.findItem(R.id.nav_refresh_ns)?.isVisible = !nsUploadOnly
-        val hasItems = (binding.recyclerview.adapter?.itemCount ?: 0) > 0
-        menu.findItem(R.id.nav_delete_future)?.isVisible = hasItems
-
-        return super.onPrepareOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    override fun onMenuItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             R.id.nav_remove_items     -> actionHelper.startRemove()
 
@@ -369,7 +365,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
         }
     }
 
-    fun deleteFutureTreatments() {
+    private fun deleteFutureTreatments() {
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, rh.gs(R.string.overview_treatment_label), rh.gs(R.string.deletefuturetreatments) + "?", Runnable {
                 uel.log(Action.DELETE_FUTURE_TREATMENTS, Sources.Treatments)
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 d34301a3e6..bedac02f8d 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
@@ -4,6 +4,8 @@ import android.os.Bundle
 import android.util.SparseArray
 import android.view.*
 import androidx.core.util.forEach
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
@@ -20,13 +22,13 @@ import info.nightscout.androidaps.databinding.TreatmentsCareportalFragmentBindin
 import info.nightscout.androidaps.databinding.TreatmentsCareportalItemBinding
 import info.nightscout.androidaps.events.EventTherapyEventChange
 import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.interfaces.BuildHelper
+import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.interfaces.BuildHelper
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
@@ -38,7 +40,7 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-class TreatmentsCareportalFragment : DaggerFragment() {
+class TreatmentsCareportalFragment : DaggerFragment(), MenuProvider {
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var rxBus: RxBus
@@ -70,11 +72,11 @@ class TreatmentsCareportalFragment : DaggerFragment() {
         actionHelper = ActionModeHelper(rh, activity, this)
         actionHelper.setUpdateListHandler { binding.recyclerview.adapter?.notifyDataSetChanged() }
         actionHelper.setOnRemoveHandler { removeSelected(it) }
-        setHasOptionsMenu(true)
         binding.recyclerview.setHasFixedSize(true)
         binding.recyclerview.layoutManager = LinearLayoutManager(view.context)
         binding.recyclerview.emptyView = binding.noRecordsText
         binding.recyclerview.loadingView = binding.progressBar
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
     }
 
     private fun refreshFromNightscout() {
@@ -184,18 +186,12 @@ class TreatmentsCareportalFragment : DaggerFragment() {
 
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         this.menu = menu
         inflater.inflate(R.menu.menu_treatments_careportal, menu)
-        super.onCreateOptionsMenu(menu, inflater)
-    }
-
-    override fun onPrepareOptionsMenu(menu: Menu) {
         updateMenuVisibility()
         val nsUploadOnly = !sp.getBoolean(R.string.key_ns_receive_therapy_events, false) || !buildHelper.isEngineeringMode()
         menu.findItem(R.id.nav_refresh_ns)?.isVisible = !nsUploadOnly
-
-        return super.onPrepareOptionsMenu(menu)
     }
 
     private fun updateMenuVisibility() {
@@ -203,7 +199,7 @@ class TreatmentsCareportalFragment : DaggerFragment() {
         menu?.findItem(R.id.nav_show_invalidated)?.isVisible = !showInvalidated
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    override fun onMenuItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             R.id.nav_remove_items          -> actionHelper.startRemove()
 
@@ -265,5 +261,4 @@ class TreatmentsCareportalFragment : DaggerFragment() {
             })
         }
     }
-
 }
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 ce91e33a51..46c8bdc5f4 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
@@ -5,6 +5,8 @@ import android.os.Bundle
 import android.util.SparseArray
 import android.view.*
 import androidx.core.util.forEach
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
@@ -42,7 +44,7 @@ import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-class TreatmentsExtendedBolusesFragment : DaggerFragment() {
+class TreatmentsExtendedBolusesFragment : DaggerFragment(), MenuProvider {
 
     private val disposable = CompositeDisposable()
 
@@ -76,11 +78,11 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
         actionHelper = ActionModeHelper(rh, activity, this)
         actionHelper.setUpdateListHandler { binding.recyclerview.adapter?.notifyDataSetChanged() }
         actionHelper.setOnRemoveHandler { removeSelected(it) }
-        setHasOptionsMenu(true)
         binding.recyclerview.setHasFixedSize(true)
         binding.recyclerview.layoutManager = LinearLayoutManager(view.context)
         binding.recyclerview.emptyView = binding.noRecordsText
         binding.recyclerview.loadingView = binding.progressBar
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
     }
 
     fun swapAdapter() {
@@ -174,10 +176,10 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
 
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         this.menu = menu
         inflater.inflate(R.menu.menu_treatments_extended_bolus, menu)
-        super.onCreateOptionsMenu(menu, inflater)
+        updateMenuVisibility()
     }
 
     private fun updateMenuVisibility() {
@@ -185,12 +187,7 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
         menu?.findItem(R.id.nav_show_invalidated)?.isVisible = !showInvalidated
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        updateMenuVisibility()
-        return super.onPrepareOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    override fun onMenuItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.nav_remove_items -> actionHelper.startRemove()
 
@@ -243,5 +240,4 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
             })
         }
     }
-
 }
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 4eda0aa1e5..eb4ea10937 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
@@ -6,6 +6,8 @@ import android.os.Bundle
 import android.util.SparseArray
 import android.view.*
 import androidx.core.util.forEach
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
@@ -48,7 +50,7 @@ import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.kotlin.subscribeBy
 import javax.inject.Inject
 
-class TreatmentsProfileSwitchFragment : DaggerFragment() {
+class TreatmentsProfileSwitchFragment : DaggerFragment(), MenuProvider {
 
     @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
@@ -81,11 +83,11 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
         actionHelper = ActionModeHelper(rh, activity, this)
         actionHelper.setUpdateListHandler { binding.recyclerview.adapter?.notifyDataSetChanged() }
         actionHelper.setOnRemoveHandler { removeSelected(it) }
-        setHasOptionsMenu(true)
         binding.recyclerview.setHasFixedSize(true)
         binding.recyclerview.layoutManager = LinearLayoutManager(view.context)
         binding.recyclerview.emptyView = binding.noRecordsText
         binding.recyclerview.loadingView = binding.progressBar
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
     }
 
     private fun refreshFromNightscout() {
@@ -272,10 +274,12 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         this.menu = menu
         inflater.inflate(R.menu.menu_treatments_profile_switch, menu)
-        super.onCreateOptionsMenu(menu, inflater)
+        updateMenuVisibility()
+        val nsUploadOnly = !sp.getBoolean(R.string.key_ns_receive_profile_switch, false) || !buildHelper.isEngineeringMode()
+        menu.findItem(R.id.nav_refresh_ns)?.isVisible = !nsUploadOnly
     }
 
     private fun updateMenuVisibility() {
@@ -283,15 +287,7 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
         menu?.findItem(R.id.nav_show_invalidated)?.isVisible = !showInvalidated
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        updateMenuVisibility()
-        val nsUploadOnly = !sp.getBoolean(R.string.key_ns_receive_profile_switch, false) || !buildHelper.isEngineeringMode()
-        menu.findItem(R.id.nav_refresh_ns)?.isVisible = !nsUploadOnly
-
-        return super.onPrepareOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    override fun onMenuItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             R.id.nav_remove_items -> actionHelper.startRemove()
 
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 4876e22dc2..ffe324b869 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
@@ -5,6 +5,8 @@ import android.os.Bundle
 import android.util.SparseArray
 import android.view.*
 import androidx.core.util.forEach
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
@@ -27,6 +29,7 @@ import info.nightscout.androidaps.extensions.friendlyDescription
 import info.nightscout.androidaps.extensions.highValueToUnitsToString
 import info.nightscout.androidaps.extensions.lowValueToUnitsToString
 import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.interfaces.BuildHelper
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -35,7 +38,6 @@ import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientR
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
 import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.interfaces.BuildHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
@@ -47,7 +49,7 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-class TreatmentsTempTargetFragment : DaggerFragment() {
+class TreatmentsTempTargetFragment : DaggerFragment(), MenuProvider {
 
     @Inject lateinit var sp: SP
     @Inject lateinit var rxBus: RxBus
@@ -81,10 +83,10 @@ class TreatmentsTempTargetFragment : DaggerFragment() {
         actionHelper = ActionModeHelper(rh, activity, this)
         actionHelper.setUpdateListHandler { binding.recyclerview.adapter?.notifyDataSetChanged() }
         actionHelper.setOnRemoveHandler { removeSelected(it) }
-        setHasOptionsMenu(true)
         binding.recyclerview.layoutManager = LinearLayoutManager(view.context)
         binding.recyclerview.emptyView = binding.noRecordsText
         binding.recyclerview.loadingView = binding.progressBar
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
     }
 
     private fun refreshFromNightscout() {
@@ -203,10 +205,12 @@ class TreatmentsTempTargetFragment : DaggerFragment() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         this.menu = menu
         inflater.inflate(R.menu.menu_treatments_temp_target, menu)
-        super.onCreateOptionsMenu(menu, inflater)
+        updateMenuVisibility()
+        val nsUploadOnly = !sp.getBoolean(R.string.key_ns_receive_temp_target, false) || !buildHelper.isEngineeringMode()
+        menu.findItem(R.id.nav_refresh_ns)?.isVisible = !nsUploadOnly
     }
 
     private fun updateMenuVisibility() {
@@ -214,15 +218,7 @@ class TreatmentsTempTargetFragment : DaggerFragment() {
         menu?.findItem(R.id.nav_show_invalidated)?.isVisible = !showInvalidated
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        updateMenuVisibility()
-        val nsUploadOnly = !sp.getBoolean(R.string.key_ns_receive_temp_target, false) || !buildHelper.isEngineeringMode()
-        menu.findItem(R.id.nav_refresh_ns)?.isVisible = !nsUploadOnly
-
-        return super.onPrepareOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    override fun onMenuItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             R.id.nav_remove_items -> actionHelper.startRemove()
 
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 b55a0723a2..7da21e6cad 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
@@ -5,6 +5,8 @@ import android.os.Bundle
 import android.util.SparseArray
 import android.view.*
 import androidx.core.util.forEach
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
@@ -48,7 +50,7 @@ import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.math.abs
 
-class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
+class TreatmentsTemporaryBasalsFragment : DaggerFragment(), MenuProvider {
 
     private val disposable = CompositeDisposable()
 
@@ -81,11 +83,11 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
         actionHelper = ActionModeHelper(rh, activity, this)
         actionHelper.setUpdateListHandler { binding.recyclerview.adapter?.notifyDataSetChanged() }
         actionHelper.setOnRemoveHandler { removeSelected(it) }
-        setHasOptionsMenu(true)
         binding.recyclerview.setHasFixedSize(true)
         binding.recyclerview.layoutManager = LinearLayoutManager(view.context)
         binding.recyclerview.emptyView = binding.noRecordsText
         binding.recyclerview.loadingView = binding.progressBar
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
     }
 
     private fun tempBasalsWithInvalid(now: Long) = repository
@@ -216,10 +218,10 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
 
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         this.menu = menu
         inflater.inflate(R.menu.menu_treatments_temp_basal, menu)
-        super.onCreateOptionsMenu(menu, inflater)
+        updateMenuVisibility()
     }
 
     private fun updateMenuVisibility() {
@@ -227,13 +229,7 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
         menu?.findItem(R.id.nav_show_invalidated)?.isVisible = !showInvalidated
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        updateMenuVisibility()
-
-        return super.onPrepareOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    override fun onMenuItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             R.id.nav_remove_items -> actionHelper.startRemove()
 
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 a5c4c40110..bd7bcdc406 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
@@ -2,6 +2,8 @@ package info.nightscout.androidaps.activities.fragments
 
 import android.os.Bundle
 import android.view.*
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
@@ -16,6 +18,7 @@ import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ImportExportPrefs
 import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.DateUtil
@@ -24,14 +27,13 @@ import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.Translator
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
 
-class TreatmentsUserEntryFragment : DaggerFragment() {
+class TreatmentsUserEntryFragment : DaggerFragment(), MenuProvider {
 
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var aapsSchedulers: AapsSchedulers
@@ -60,11 +62,11 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setHasOptionsMenu(true)
         binding.recyclerview.setHasFixedSize(true)
         binding.recyclerview.layoutManager = LinearLayoutManager(view.context)
         binding.recyclerview.emptyView = binding.noRecordsText
         binding.recyclerview.loadingView = binding.progressBar
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
     }
 
     private fun exportUserEntries() {
@@ -144,10 +146,10 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
         override fun getItemCount() = entries.size
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         this.menu = menu
         inflater.inflate(R.menu.menu_treatments_user_entry, menu)
-        super.onCreateOptionsMenu(menu, inflater)
+        updateMenuVisibility()
     }
 
     private fun updateMenuVisibility() {
@@ -155,12 +157,7 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
         menu?.findItem(R.id.nav_show_loop)?.isVisible = !showLoop
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        updateMenuVisibility()
-        return super.onPrepareOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    override fun onMenuItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             R.id.nav_show_loop -> {
                 showLoop = true
@@ -185,5 +182,4 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
 
             else               -> false
         }
-
 }
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 b6bff09699..e0b0788a25 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
@@ -153,7 +153,7 @@ class LoopDialog : DaggerDialogFragment() {
         aapsLogger.debug("UpdateGUI from $from")
         val pumpDescription: PumpDescription = activePlugin.activePump.pumpDescription
         val closedLoopAllowed = constraintChecker.isClosedLoopAllowed(Constraint(true))
-        val closedLoopAllowed2 = objectivePlugin.objectives[ObjectivesPlugin.MAXIOB_OBJECTIVE].isCompleted
+        val closedLoopAllowed2 = objectivePlugin.objectives[ObjectivesPlugin.MAXIOB_OBJECTIVE].isAccomplished
         val lgsEnabled = constraintChecker.isLgsAllowed(Constraint(true))
         val apsMode = sp.getString(R.string.key_aps_mode, "open")
         val pump = activePlugin.activePump
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 1970d7c179..49345faff8 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
@@ -2,18 +2,20 @@ package info.nightscout.androidaps.plugins.aps.loop
 
 import android.os.Bundle
 import android.view.*
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.LoopFragmentBinding
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Loop
+import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui
 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
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.sharedPreferences.SP
@@ -21,7 +23,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
 
-class LoopFragment : DaggerFragment() {
+class LoopFragment : DaggerFragment(), MenuProvider {
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
@@ -32,7 +34,7 @@ class LoopFragment : DaggerFragment() {
     @Inject lateinit var loop: Loop
     @Inject lateinit var dateUtil: DateUtil
 
-    private val ID_MENU_RUN = 1
+    private val ID_MENU_RUN = 501
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -45,7 +47,7 @@ class LoopFragment : DaggerFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
         LoopFragmentBinding.inflate(inflater, container, false).also {
             _binding = it
-            setHasOptionsMenu(true)
+            requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
         }.root
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -54,22 +56,18 @@ class LoopFragment : DaggerFragment() {
         with(binding.swipeRefresh) {
             setColorSchemeColors(rh.gac(context, R.attr.colorPrimaryDark), rh.gac(context, R.attr.colorPrimary), rh.gac(context, R.attr.colorSecondary))
             setOnRefreshListener {
-                binding.lastrun.text = rh.gs(info.nightscout.androidaps.R.string.executing)
+                binding.lastrun.text = rh.gs(R.string.executing)
                 Thread { loop.invoke("Loop swiperefresh", true) }.start()
             }
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        if (isResumed) {
-            menu.removeItem(ID_MENU_RUN)
-            menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.openapsma_run)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-            menu.setGroupDividerEnabled(true)
-        }
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+        menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.openapsma_run)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+        menu.setGroupDividerEnabled(true)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    override fun onMenuItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             ID_MENU_RUN -> {
                 binding.lastrun.text = rh.gs(R.string.executing)
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 d3fa56acf1..d135ef0cd0 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
@@ -3,16 +3,18 @@ package info.nightscout.androidaps.plugins.aps.openAPSAMA
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.*
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.OpenapsamaFragmentBinding
+import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui
 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
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
@@ -22,7 +24,7 @@ import org.json.JSONArray
 import org.json.JSONException
 import javax.inject.Inject
 
-class OpenAPSAMAFragment : DaggerFragment() {
+class OpenAPSAMAFragment : DaggerFragment(), MenuProvider {
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -35,7 +37,8 @@ class OpenAPSAMAFragment : DaggerFragment() {
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var jsonFormatter: JSONFormatter
 
-    private val ID_MENU_RUN = 1
+    @Suppress("PrivatePropertyName")
+    private val ID_MENU_RUN = 502
 
     private var _binding: OpenapsamaFragmentBinding? = null
 
@@ -46,7 +49,7 @@ class OpenAPSAMAFragment : DaggerFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
         OpenapsamaFragmentBinding.inflate(inflater, container, false).also {
             _binding = it
-            setHasOptionsMenu(true)
+            requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
         }.root
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -55,23 +58,19 @@ class OpenAPSAMAFragment : DaggerFragment() {
         with(binding.swipeRefresh) {
             setColorSchemeColors(rh.gac(context, R.attr.colorPrimaryDark), rh.gac(context, R.attr.colorPrimary), rh.gac(context, R.attr.colorSecondary))
             setOnRefreshListener {
-                binding.lastrun.text = rh.gs(info.nightscout.androidaps.R.string.executing)
-                Thread { openAPSAMAPlugin.invoke("OpenAPSAMA swiperefresh", false) }.start()
+                binding.lastrun.text = rh.gs(R.string.executing)
+                Thread { openAPSAMAPlugin.invoke("OpenAPSAMA swipe refresh", false) }.start()
             }
         }
 
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        if (isResumed) {
-            menu.removeItem(ID_MENU_RUN)
-            menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.openapsma_run)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-            menu.setGroupDividerEnabled(true)
-        }
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+        menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.openapsma_run)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+        menu.setGroupDividerEnabled(true)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    override fun onMenuItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             ID_MENU_RUN -> {
                 binding.lastrun.text = rh.gs(R.string.executing)
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 db729031a0..cb863b0fc7 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
@@ -4,17 +4,19 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.*
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.OpenapsamaFragmentBinding
 import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui
 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
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
@@ -24,7 +26,7 @@ import org.json.JSONArray
 import org.json.JSONException
 import javax.inject.Inject
 
-class OpenAPSSMBFragment : DaggerFragment() {
+class OpenAPSSMBFragment : DaggerFragment(), MenuProvider {
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -36,9 +38,9 @@ class OpenAPSSMBFragment : DaggerFragment() {
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var jsonFormatter: JSONFormatter
-    private lateinit var refreshDialog: Runnable
 
-    private val ID_MENU_RUN = 1
+    @Suppress("PrivatePropertyName")
+    private val ID_MENU_RUN = 503
 
     private var _binding: OpenapsamaFragmentBinding? = null
 
@@ -49,7 +51,7 @@ class OpenAPSSMBFragment : DaggerFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
         OpenapsamaFragmentBinding.inflate(inflater, container, false).also {
             _binding = it
-            setHasOptionsMenu(true)
+            requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
         }.root
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -58,22 +60,18 @@ class OpenAPSSMBFragment : DaggerFragment() {
         with(binding.swipeRefresh) {
             setColorSchemeColors(rh.gac(context, R.attr.colorPrimaryDark), rh.gac(context, R.attr.colorPrimary), rh.gac(context, R.attr.colorSecondary))
             setOnRefreshListener {
-                binding.lastrun.text = rh.gs(info.nightscout.androidaps.R.string.executing)
-                Thread { activePlugin.activeAPS.invoke("OpenAPSSMB swiperefresh", false) }.start()
+                binding.lastrun.text = rh.gs(R.string.executing)
+                Thread { activePlugin.activeAPS.invoke("OpenAPSSMB swipe refresh", false) }.start()
             }
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        if (isResumed) {
-            menu.removeItem(ID_MENU_RUN)
-            menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.openapsma_run)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-            menu.setGroupDividerEnabled(true)
-        }
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+        menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.openapsma_run)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+        menu.setGroupDividerEnabled(true)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    override fun onMenuItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             ID_MENU_RUN -> {
                 binding.lastrun.text = rh.gs(R.string.executing)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt
index d5a33606eb..234735a214 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt
@@ -22,6 +22,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.interfaces.ResourceHelper
+import info.nightscout.androidaps.utils.Round
 import info.nightscout.androidaps.utils.stats.TddCalculator
 import info.nightscout.shared.SafeParse
 import info.nightscout.shared.logging.AAPSLogger
@@ -36,6 +37,7 @@ import java.io.IOException
 import java.lang.reflect.InvocationTargetException
 import java.nio.charset.StandardCharsets
 import javax.inject.Inject
+import kotlin.math.ln
 
 class DetermineBasalAdapterSMBDynamicISFJS internal constructor(private val scriptReader: ScriptReader, private val injector: HasAndroidInjector) : DetermineBasalAdapterInterface {
 
@@ -194,10 +196,6 @@ class DetermineBasalAdapterSMBDynamicISFJS internal constructor(private val scri
         this.profile.put("current_basal_safety_multiplier", sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0))
         this.profile.put("lgsThreshold", Profile.toMgdl(sp.getDouble(R.string.key_lgs_threshold, 65.0)))
 
-        val insulin = activePlugin.activeInsulin
-        val insulinType = insulin.friendlyName
-        val insulinPeak = insulin.peak
-
         //mProfile.put("high_temptarget_raises_sensitivity", SP.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity));
         this.profile.put("high_temptarget_raises_sensitivity", sp.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity))
         //mProfile.put("low_temptarget_lowers_sensitivity", SP.getBoolean(R.string.key_low_temptarget_lowers_sensitivity, SMBDefaults.low_temptarget_lowers_sensitivity));
@@ -227,9 +225,6 @@ class DetermineBasalAdapterSMBDynamicISFJS internal constructor(private val scri
         this.profile.put("enableSMB_after_carbs", smbEnabled && sp.getBoolean(R.string.key_enableSMB_after_carbs, false) && advancedFiltering)
         this.profile.put("maxSMBBasalMinutes", sp.getInt(R.string.key_smbmaxminutes, SMBDefaults.maxSMBBasalMinutes))
         this.profile.put("maxUAMSMBBasalMinutes", sp.getInt(R.string.key_uamsmbmaxminutes, SMBDefaults.maxUAMSMBBasalMinutes))
-        this.profile.put("DynISFAdjust", SafeParse.stringToDouble(sp.getString(R.string.key_DynISFAdjust, "100")))
-        this.profile.put("insulinType", insulinType)
-        this.profile.put("insulinPeak", insulinPeak)
         this.profile.put("maxUAMSMBBasalMinutes", sp.getInt(R.string.key_uamsmbmaxminutes, SMBDefaults.maxUAMSMBBasalMinutes))
         //set the min SMB amount to be the amount set by the pump.
         this.profile.put("bolus_increment", pumpBolusStep)
@@ -237,8 +232,7 @@ class DetermineBasalAdapterSMBDynamicISFJS internal constructor(private val scri
         this.profile.put("current_basal", basalRate)
         this.profile.put("temptargetSet", tempTargetSet)
         this.profile.put("autosens_max", SafeParse.stringToDouble(sp.getString(R.string.key_openapsama_autosens_max, "1.2")))
-        this.profile.put("autosens_min", SafeParse.stringToDouble(sp.getString(R.string.key_openapsama_autosens_min, "0.8")))
-        this.profile.put("openapsama_useautosens", sp.getBoolean(R.string.key_openapsama_useautosens, false))
+        this.profile.put("autosens_min", SafeParse.stringToDouble(sp.getString(R.string.key_openapsama_autosens_min, "0.7")))
         //set the min SMB amount to be the amount set by the pump.
         if (profileFunction.getUnits() == GlucoseUnit.MMOL) {
             this.profile.put("out_units", "mmol/L")
@@ -270,19 +264,53 @@ class DetermineBasalAdapterSMBDynamicISFJS internal constructor(private val scri
         this.mealData.put("lastBolusTime", mealData.lastBolusTime)
         this.mealData.put("lastCarbTime", mealData.lastCarbTime)
 
-        this.mealData.put("TDDAIMI1", tddCalculator.averageTDD(tddCalculator.calculate(1))?.totalAmount)
-        this.mealData.put("TDDAIMI7", tddCalculator.averageTDD(tddCalculator.calculate(7))?.totalAmount)
-        this.mealData.put("TDDLast4", tddCalculator.calculateDaily(-4, 0).totalAmount)
-        this.mealData.put("TDD4to8", tddCalculator.calculateDaily(-8, -4).totalAmount)
-        this.mealData.put("TDD24", tddCalculator.calculateDaily(-24, 0).totalAmount)
+        val tdd1D = tddCalculator.averageTDD(tddCalculator.calculate(1))?.totalAmount
+        val tdd7D = tddCalculator.averageTDD(tddCalculator.calculate(7))?.totalAmount
+        val tddLast24H = tddCalculator.calculateDaily(-24, 0).totalAmount
+        val tddLast4H = tddCalculator.calculateDaily(-4, 0).totalAmount
+        val tddLast8to4H = tddCalculator.calculateDaily(-8, -4).totalAmount
 
+        val tddWeightedFromLast8H = ((1.4 * tddLast4H) + (0.6 * tddLast8to4H)) * 3
+//        console.error("Rolling 8 hours weight average: " + tdd_last8_wt + "; ");
+//        console.error("1-day average TDD is: " + tdd1 + "; ");
+//        console.error("7-day average TDD is: " + tdd7 + "; ");
 
+        var tdd =
+            if (tdd1D != null && tdd7D != null) (tddWeightedFromLast8H * 0.33) + (tdd7D * 0.34) + (tdd1D * 0.33)
+            else tddWeightedFromLast8H
+//        console.log("TDD = " + TDD + " using average of 7-day, 1-day and weighted 8hr average");
 
-        if (constraintChecker.isAutosensModeEnabled().value()) {
-            autosensData.put("ratio", autosensDataRatio)
-        } else {
-            autosensData.put("ratio", 1.0)
+//        console.log("Insulin Peak = " + insulin.peak + "; ");
+
+        val insulin = activePlugin.activeInsulin
+        val insulinDivisor = when {
+            insulin.peak > 65 -> 55 // lyumjev peak: 45
+            insulin.peak > 50 -> 65 // ultra rapid peak: 55
+            else              -> 75 // rapid peak: 75
         }
+//        console.log("For " + insulin.friendlyName + " (insulin peak: " + insulin.peak + ") insulin divisor is: " + ins_val + "; ");
+
+        val dynISFadjust = SafeParse.stringToDouble(sp.getString(R.string.key_DynISFAdjust, "100")) / 100.0
+        tdd *= dynISFadjust
+
+        var variableSensitivity = 1800 / (tdd * (ln((glucoseStatus.glucose / insulinDivisor) + 1)))
+        variableSensitivity = Round.roundTo(variableSensitivity, 0.1)
+
+        if (dynISFadjust != 1.0) {
+//            console.log("TDD adjusted to " + TDD + " using adjustment factor of " + dynISFadjust + "; ");
+        }
+//        console.log("Current sensitivity for predictions is " + variable_sens + " based on current bg");
+
+        this.profile.put("variable_sens", variableSensitivity)
+        this.profile.put("insulinDivisor", insulinDivisor)
+        this.profile.put("TDD", tdd)
+
+
+        if (sp.getBoolean(R.string.key_adjust_sensitivity, false) && tdd7D != null)
+            autosensData.put("ratio", tddLast24H / tdd7D)
+        else
+            autosensData.put("ratio", 1.0)
+
         this.microBolusAllowed = microBolusAllowed
         smbAlwaysAllowed = advancedFiltering
         currentTime = now
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
index f3978aacf1..ea2d85eeaa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
@@ -68,6 +68,7 @@ class OpenAPSSMBDynamicISFPlugin @Inject constructor(
             .shortName(R.string.dynisf_shortname)
             .preferencesId(R.xml.pref_openapssmbdynamicisf)
             .setDefault(false)
+            .showInList(buildHelper.isEngineeringMode() && buildHelper.isDev())
     }
 
     override fun specialEnableCondition(): Boolean = buildHelper.isEngineeringMode() && buildHelper.isDev()
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 92002eab4d..ff3fc89a4a 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
@@ -312,7 +312,7 @@ class ActionsFragment : DaggerFragment() {
         for (customAction in customActions) {
             if (!customAction.isEnabled) continue
 
-            val btn = SingleClickButton(currentContext, null, android.R.attr.buttonStyle)
+            val btn = SingleClickButton(currentContext, null, R.attr.customBtnStyle)
             btn.text = rh.gs(customAction.name)
 
             val layoutParams = LinearLayout.LayoutParams(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneFragment.kt
index 0f2834c90e..6ad3b9e04e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneFragment.kt
@@ -115,6 +115,7 @@ class AutotuneFragment : DaggerFragment() {
                 }
                 autotunePlugin.selectedProfile = profileName
                 resetParam()
+                binding.tuneDays.value = autotunePlugin.lastNbDays.toDouble()
             }
             updateGui()
         }
@@ -275,6 +276,7 @@ class AutotuneFragment : DaggerFragment() {
             .observeOn(aapsSchedulers.main)
             .subscribe({ updateGui() }, fabricPrivacy::logException)
         checkNewDay()
+        binding.tuneDays.value = autotunePlugin.lastNbDays.toDouble()
         updateGui()
     }
 
@@ -287,7 +289,6 @@ class AutotuneFragment : DaggerFragment() {
     @Synchronized
     private fun updateGui() {
         _binding ?: return
-        binding.tuneDays.value = autotunePlugin.lastNbDays.toDouble()
         profileStore = activePlugin.activeProfileSource.profile ?: ProfileStore(injector, JSONObject(), dateUtil)
         profileName = if (binding.profileList.text.toString() == rh.gs(R.string.active)) "" else binding.profileList.text.toString()
         profileFunction.getProfile()?.let { currentProfile ->
@@ -387,7 +388,7 @@ class AutotuneFragment : DaggerFragment() {
                 try {
                     if (autotunePlugin.calculationRunning)
                         binding.tuneDays.value = autotunePlugin.lastNbDays.toDouble()
-                    if (binding.tuneDays.value != autotunePlugin.lastNbDays.toDouble()) {
+                    if (binding.tuneDays.text != autotunePlugin.lastNbDays) {
                         autotunePlugin.lastNbDays = binding.tuneDays.text
                         resetParam(false)
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneIob.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneIob.kt
index a634ee876c..649838a0b0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneIob.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneIob.kt
@@ -35,10 +35,8 @@ open class AutotuneIob @Inject constructor(
     private val profileFunction: ProfileFunction,
     private val sp: SP,
     private val dateUtil: DateUtil,
-    private val activePlugin: ActivePlugin,
     private val autotuneFS: AutotuneFS
 ) {
-
     private var nsTreatments = ArrayList<NsTreatment>()
     private var dia: Double = Constants.defaultDIA
     var boluses: ArrayList<Bolus> = ArrayList()
@@ -54,7 +52,11 @@ open class AutotuneIob @Inject constructor(
         startBG = from
         endBG = to
         nsTreatments.clear()
+        meals.clear()
+        boluses.clear()
         tempBasals = ArrayList<TemporaryBasal>()
+        if (profileFunction.getProfile(from - range()) == null)
+            return
         initializeBgreadings(from, to)
         initializeTreatmentData(from - range(), to)
         initializeTempBasalData(from - range(), to, tunedProfile)
@@ -91,8 +93,6 @@ open class AutotuneIob @Inject constructor(
         aapsLogger.debug(LTag.AUTOTUNE, "Check BG date: BG Size: " + glucose.size + " OldestBG: " + dateUtil.dateAndTimeAndSecondsString(oldestBgDate) + " to: " + dateUtil.dateAndTimeAndSecondsString(to))
         val tmpCarbs = repository.getCarbsDataFromTimeToTimeExpanded(from, to, false).blockingGet()
         aapsLogger.debug(LTag.AUTOTUNE, "Nb treatments after query: " + tmpCarbs.size)
-        meals.clear()
-        boluses.clear()
         var nbCarbs = 0
         for (i in tmpCarbs.indices) {
             val tp = tmpCarbs[i]
@@ -138,23 +138,17 @@ open class AutotuneIob @Inject constructor(
     //nsTreatment is used only for export data
     private fun initializeExtendedBolusData(from: Long, to: Long, tunedProfile: ATProfile) {
         val extendedBoluses = repository.getExtendedBolusDataFromTimeToTime(from, to, false).blockingGet()
-        val pumpInterface = activePlugin.activePump
-        if (pumpInterface.isFakingTempsByExtendedBoluses) {
-            for (i in extendedBoluses.indices) {
-                val eb = extendedBoluses[i]
-                if (eb.isValid)
+        for (i in extendedBoluses.indices) {
+            val eb = extendedBoluses[i]
+            if (eb.isValid)
+                if (eb.isEmulatingTempBasal) {
                     profileFunction.getProfile(eb.timestamp)?.let {
                         toSplittedTimestampTB(eb.toTemporaryBasal(it), tunedProfile)
                     }
-            }
-        } else {
-            for (i in extendedBoluses.indices) {
-                val eb = extendedBoluses[i]
-                if (eb.isValid) {
+                } else {
                     nsTreatments.add(NsTreatment(eb))
                     boluses.addAll(convertToBoluses(eb))
                 }
-            }
         }
     }
 
@@ -381,9 +375,11 @@ open class AutotuneIob @Inject constructor(
                         }
                     }
                 TherapyEvent.Type.COMBO_BOLUS      ->
-                    extendedBolus?.let {
-                        val profile = profileFunction.getProfile(it.timestamp)
-                        it.toJson(true, profile!!, dateUtil)
+                    extendedBolus?.let { ebr ->
+                        val profile = profileFunction.getProfile(ebr.timestamp)
+                        profile?.let {
+                            ebr.toJson(true, it, dateUtil)
+                        }
                     }
                 TherapyEvent.Type.CORRECTION_BOLUS -> bolusTreatment?.toJson(true, dateUtil)
                 TherapyEvent.Type.CARBS_CORRECTION -> carbsTreatment?.toJson(true, dateUtil)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt
index 6a4f3d6a94..6690cc3235 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt
@@ -61,6 +61,7 @@ class AutotunePlugin @Inject constructor(
     .pluginName(R.string.autotune)
     .shortName(R.string.autotune_shortname)
     .preferencesId(R.xml.pref_autotune)
+    .showInList(buildHelper.isEngineeringMode() && buildHelper.isDev())
     .description(R.string.autotune_description),
     aapsLogger, resourceHelper, injector
 ), Autotune {
@@ -133,6 +134,15 @@ class AutotunePlugin @Inject constructor(
             log("Tune day " + (i + 1) + " of " + daysBack)
             tunedProfile?.let { it ->
                 autotuneIob.initializeData(from, to, it)  //autotuneIob contains BG and Treatments data from history (<=> query for ns-treatments and ns-entries)
+                if (autotuneIob.boluses.size == 0) {
+                    result = rh.gs(R.string.autotune_error)
+                    log("No basal data on day ${i + 1}")
+                    autotuneFS.exportResult(result)
+                    autotuneFS.exportLogAndZip(lastRun)
+                    rxBus.send(EventAutotuneUpdateGui())
+                    calculationRunning = false
+                    return
+                }
                 autotuneFS.exportEntries(autotuneIob)               //<=> ns-entries.yyyymmdd.json files exported for results compare with oref0 autotune on virtual machine
                 autotuneFS.exportTreatments(autotuneIob)            //<=> ns-treatments.yyyymmdd.json files exported for results compare with oref0 autotune on virtual machine (include treatments ,tempBasal and extended
                 preppedGlucose = autotunePrep.categorize(it) //<=> autotune.yyyymmdd.json files exported for results compare with oref0 autotune on virtual machine
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 6e6e0ab684..25a75d17ce 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
@@ -5,6 +5,7 @@ import android.bluetooth.BluetoothManager
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.os.Build
 import android.provider.Settings
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
@@ -113,7 +114,7 @@ class ImportExportPrefsImpl @Inject constructor(
         val n1 = Settings.System.getString(context.contentResolver, "bluetooth_name")
         val n2 = Settings.Secure.getString(context.contentResolver, "bluetooth_name")
         val n3 = try {
-            if (ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) {
                 (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter?.name
             } else null
         } catch (e: Exception){
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.kt
index 63bf4a5724..888c6ff71c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.kt
@@ -1,8 +1,6 @@
 package info.nightscout.androidaps.plugins.general.maintenance
 
-import ch.qos.logback.classic.LoggerContext
 import info.nightscout.androidaps.annotations.OpenForTesting
-import org.slf4j.LoggerFactory
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -11,7 +9,9 @@ import javax.inject.Singleton
  */
 @OpenForTesting
 @Singleton
-class LoggerUtils @Inject constructor() {
+class LoggerUtils @Inject constructor(
+    val prefFileListProvider: PrefFileListProvider
+) {
 
     var suffix = ".log.zip"
 
@@ -21,9 +21,15 @@ class LoggerUtils @Inject constructor() {
      *
      * @return
      */
+/*
+    This is failing after slf4j update to 2.0.0
+    It would be better to find a way to read the value from xml
+    So far replaced by static value
     val logDirectory: String
         get() {
             val lc = LoggerFactory.getILoggerFactory() as LoggerContext
             return lc.getProperty("EXT_FILES_DIR")
         }
+*/
+    val logDirectory get() = prefFileListProvider.logsPath
 }
\ No newline at end of file
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 43061ed25f..4a1f643a73 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
@@ -3,6 +3,8 @@ package info.nightscout.androidaps.plugins.general.nsclient
 import android.os.Bundle
 import android.view.*
 import android.widget.ScrollView
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.database.entities.UserEntry.Action
@@ -22,7 +24,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
 
-class NSClientFragment : DaggerFragment() {
+class NSClientFragment : DaggerFragment(), MenuProvider {
 
     @Inject lateinit var nsClientPlugin: NSClientPlugin
     @Inject lateinit var sp: SP
@@ -35,10 +37,10 @@ class NSClientFragment : DaggerFragment() {
 
     companion object {
 
-        const val ID_MENU_CLEAR_LOG = 6
-        const val ID_MENU_RESTART = 7
-        const val ID_MENU_SEND_NOW = 8
-        const val ID_MENU_FULL_SYNC = 9
+        const val ID_MENU_CLEAR_LOG = 507
+        const val ID_MENU_RESTART = 508
+        const val ID_MENU_SEND_NOW = 509
+        const val ID_MENU_FULL_SYNC = 510
     }
 
     private val disposable = CompositeDisposable()
@@ -52,7 +54,7 @@ class NSClientFragment : DaggerFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
         NsClientFragmentBinding.inflate(inflater, container, false).also {
             _binding = it
-            setHasOptionsMenu(true)
+            requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
         }.root
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -73,18 +75,15 @@ class NSClientFragment : DaggerFragment() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        if (isResumed) {
-            menu.add(Menu.FIRST, ID_MENU_CLEAR_LOG, 0, rh.gs(R.string.clearlog)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-            menu.add(Menu.FIRST, ID_MENU_RESTART, 0, rh.gs(R.string.restart)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-            menu.add(Menu.FIRST, ID_MENU_SEND_NOW, 0, rh.gs(R.string.deliver_now)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-            menu.add(Menu.FIRST, ID_MENU_FULL_SYNC, 0, rh.gs(R.string.full_sync)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-            menu.setGroupDividerEnabled(true)
-        }
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+        menu.add(Menu.FIRST, ID_MENU_CLEAR_LOG, 0, rh.gs(R.string.clearlog)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+        menu.add(Menu.FIRST, ID_MENU_RESTART, 0, rh.gs(R.string.restart)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+        menu.add(Menu.FIRST, ID_MENU_SEND_NOW, 0, rh.gs(R.string.deliver_now)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+        menu.add(Menu.FIRST, ID_MENU_FULL_SYNC, 0, rh.gs(R.string.full_sync)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+        menu.setGroupDividerEnabled(true)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    override fun onMenuItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             ID_MENU_CLEAR_LOG -> {
                 nsClientPlugin.clearLog()
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 8ecba9d5ad..54a2bbcb40 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
@@ -120,7 +120,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     @Inject lateinit var repository: AppRepository
     @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
 
@@ -417,7 +416,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                                                                       uel.log(Action.ACCEPTS_TEMP_BASAL, Sources.Overview)
                                                                       (context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager?)?.cancel(Constants.notificationID)
                                                                       rxBus.send(EventMobileToWear(EventData.CancelNotification(dateUtil.now())))
-                                                                      Thread { loop.acceptChangeRequest() }.run()
+                                                                      Thread { loop.acceptChangeRequest() }.start()
                                                                       binding.buttonsLayout.acceptTempButton.visibility = View.GONE
                                                                   })
                                 })
@@ -582,7 +581,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 for (event in events)
                     if (event.isEnabled && event.trigger.shouldRun())
                         context?.let { context ->
-                            SingleClickButton(context).also {
+                            SingleClickButton(context, null, R.attr.customBtnStyle).also {
                                 it.setTextColor(rh.gac(context, R.attr.treatmentButton))
                                 it.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10f)
                                 it.layoutParams = LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 0.5f).also { l ->
@@ -827,7 +826,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
     }
 
-    fun updateProfile() {
+    private fun updateProfile() {
         val profile = profileFunction.getProfile()
         runOnUiThread {
             _binding ?: return@runOnUiThread
@@ -885,7 +884,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
     }
 
-    fun updateTime() {
+    private fun updateTime() {
         _binding ?: return
         binding.infoLayout.time.text = dateUtil.timeString(dateUtil.now())
         // Status lights
@@ -915,7 +914,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         )
     }
 
-    fun updateIobCob() {
+    private fun updateIobCob() {
         val iobText = overviewData.iobText(iobCobCalculator)
         val iobDialogText = overviewData.iobDialogText(iobCobCalculator)
         val displayText = overviewData.cobInfo(iobCobCalculator).displayText(rh, dateUtil, buildHelper.isEngineeringMode())
@@ -999,6 +998,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         val pump = activePlugin.activePump
         val graphData = GraphData(injector, binding.graphsLayout.bgGraph, overviewData)
         val menuChartSettings = overviewMenus.setting
+        if (menuChartSettings.isEmpty()) return
         graphData.addInRangeArea(overviewData.fromTime, overviewData.endTime, defaultValueHelper.determineLowLine(), defaultValueHelper.determineHighLine())
         graphData.addBgReadings(menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal], context)
         if (buildHelper.isDev()) graphData.addBucketedData()
@@ -1084,7 +1084,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
     private fun updateSensitivity() {
         _binding ?: return
-        if (sp.getBoolean(R.string.key_openapsama_useautosens, false) && constraintChecker.isAutosensModeEnabled().value()) {
+        if (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)
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 e388adb8bf..2431dc5f61 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
@@ -69,14 +69,16 @@ class OverviewMenus @Inject constructor(
     private var _setting: MutableList<Array<Boolean>> = ArrayList()
 
     val setting: List<Array<Boolean>>
-        get() = _setting.toMutableList() // implicitly does a list copy
+        @Synchronized get() = _setting.toMutableList() // implicitly does a list copy
 
+    @Synchronized
     private fun storeGraphConfig() {
         val sts = Gson().toJson(_setting)
         sp.putString(R.string.key_graphconfig, sts)
         aapsLogger.debug(sts)
     }
 
+    @Synchronized
     fun loadGraphConfig() {
         val sts = sp.getString(R.string.key_graphconfig, "")
         if (sts.isNotEmpty()) {
@@ -115,7 +117,7 @@ class OverviewMenus @Inject constructor(
             val used = arrayListOf<Int>()
 
             for (g in 0 until numOfGraphs) {
-                if (g != 0 && g < numOfGraphs) {
+                if (g != 0) {
                     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
@@ -134,8 +136,8 @@ class OverviewMenus @Inject constructor(
                         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(rh.gac(context, m.attrTextId)), 0, s.length, 0)
-                        s.setSpan(BackgroundColorSpan(rh.gac(context, m.attrId)), 0, s.length, 0)
+                        s.setSpan(ForegroundColorSpan(rh.gac(m.attrTextId)), 0, s.length, 0)
+                        s.setSpan(BackgroundColorSpan(rh.gac(m.attrId)), 0, s.length, 0)
                         item.title = s
                         item.isCheckable = true
                         item.isChecked = settingsCopy[g][m.ordinal]
@@ -150,36 +152,38 @@ class OverviewMenus @Inject constructor(
             }
 
             popup.setOnMenuItemClickListener {
-                try {
-                    // id < 100 graph header - divider 1, 2, 3 .....
-                    when {
-                        it.itemId == SCALE_ID                              -> {
-                            // do nothing, submenu
-                        }
+                synchronized(this) {
+                    try {
+                        // id < 100 graph header - divider 1, 2, 3 .....
+                        when {
+                            it.itemId == SCALE_ID                              -> {
+                                // do nothing, submenu
+                            }
 
-                        it.itemId > SCALE_ID && it.itemId < SCALE_ID + 100 -> {
-                            val hours = it.itemId - SCALE_ID // 6,12,....
-                            rxBus.send(EventScale(hours))
-                        }
+                            it.itemId > SCALE_ID && it.itemId < SCALE_ID + 100 -> {
+                                val hours = it.itemId - SCALE_ID // 6,12,....
+                                rxBus.send(EventScale(hours))
+                            }
 
-                        it.itemId == numOfGraphs                           -> {
-                            // add new empty
-                            _setting.add(Array(CharType.values().size) { false })
-                        }
+                            it.itemId == numOfGraphs                           -> {
+                                // add new empty
+                                _setting.add(Array(CharType.values().size) { false })
+                            }
 
-                        it.itemId < 100                                    -> {
-                            // remove graph
-                            _setting.removeAt(it.itemId)
-                        }
+                            it.itemId < 100                                    -> {
+                                // remove graph
+                                _setting.removeAt(it.itemId)
+                            }
 
-                        else                                               -> {
-                            val graphNumber = it.itemId / 100 - 1
-                            val item = it.itemId % 100
-                            _setting[graphNumber][item] = !it.isChecked
+                            else                                               -> {
+                                val graphNumber = it.itemId / 100 - 1
+                                val item = it.itemId % 100
+                                _setting[graphNumber][item] = !it.isChecked
+                            }
                         }
+                    } catch (exception: Exception) {
+                        fabricPrivacy.logException(exception)
                     }
-                } catch (exception: Exception) {
-                    fabricPrivacy.logException(exception)
                 }
                 storeGraphConfig()
                 setupChartMenu(context, chartButton)
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 04095b64a8..18c902f6a4 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
@@ -44,10 +44,11 @@ class StatusLightHandler @Inject constructor(
             handleAge(careportal_pb_age, TherapyEvent.Type.PUMP_BATTERY_CHANGE, R.string.key_statuslights_bage_warning, 216.0, R.string.key_statuslights_bage_critical, 240.0)
         }
         if (!config.NSCLIENT) {
+            val insulinUnit = rh.gs(R.string.insulin_unit_shortname)
             if (pump.model() == PumpType.OMNIPOD_EROS || pump.model() == PumpType.OMNIPOD_DASH) {
-                handleOmnipodReservoirLevel(careportal_reservoir_level, R.string.key_statuslights_res_critical, 10.0, R.string.key_statuslights_res_warning, 80.0, pump.reservoirLevel, "U")
+                handleOmnipodReservoirLevel(careportal_reservoir_level, R.string.key_statuslights_res_critical, 10.0, R.string.key_statuslights_res_warning, 80.0, pump.reservoirLevel, insulinUnit)
             } else {
-                handleLevel(careportal_reservoir_level, R.string.key_statuslights_res_critical, 10.0, R.string.key_statuslights_res_warning, 80.0, pump.reservoirLevel, "U")
+                handleLevel(careportal_reservoir_level, R.string.key_statuslights_res_critical, 10.0, R.string.key_statuslights_res_warning, 80.0, pump.reservoirLevel, insulinUnit)
             }
             if (bgSource.sensorBatteryLevel != -1)
                 handleLevel(careportal_sensor_battery_level, R.string.key_statuslights_sbat_critical, 5.0, R.string.key_statuslights_sbat_warning, 20.0, bgSource.sensorBatteryLevel.toDouble(), "%")
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 61f0558009..e705b0b8bb 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
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.general.wear
 
 import android.content.Context
-import android.content.Intent
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventAutosensCalculationFinished
@@ -10,14 +9,14 @@ import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui
 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.DataHandlerMobile
-import info.nightscout.androidaps.plugins.general.wear.wearintegration.DataLayerListenerServiceMobile
+import info.nightscout.androidaps.plugins.general.wear.wearintegration.DataLayerListenerServiceMobileHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.sharedPreferences.SP
@@ -37,7 +36,8 @@ class WearPlugin @Inject constructor(
     private val fabricPrivacy: FabricPrivacy,
     private val rxBus: RxBus,
     private val context: Context,
-    private val dataHandlerMobile: DataHandlerMobile
+    private val dataHandlerMobile: DataHandlerMobile,
+    val dataLayerListenerServiceMobileHelper: DataLayerListenerServiceMobileHelper
 
 ) : PluginBase(
     PluginDescription()
@@ -57,7 +57,7 @@ class WearPlugin @Inject constructor(
 
     override fun onStart() {
         super.onStart()
-        context.startService(Intent(context, DataLayerListenerServiceMobile::class.java))
+        dataLayerListenerServiceMobileHelper.startService(context)
         disposable += rxBus
             .toObservable(EventDismissBolusProgressIfRunning::class.java)
             .observeOn(aapsSchedulers.io)
@@ -94,6 +94,6 @@ class WearPlugin @Inject constructor(
     override fun onStop() {
         disposable.clear()
         super.onStop()
-        context.stopService(Intent(context, DataLayerListenerServiceMobile::class.java))
+        dataLayerListenerServiceMobileHelper.stopService(context)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
index 4292307c59..1a3cd7f601 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.wear.wearintegration
 
+import android.os.Binder
 import android.os.Handler
 import android.os.HandlerThread
 import com.google.android.gms.tasks.Tasks
@@ -10,14 +11,12 @@ import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.events.EventMobileToWear
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
 import info.nightscout.androidaps.plugins.general.wear.WearPlugin
 import info.nightscout.androidaps.plugins.general.wear.events.EventWearUpdateGui
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import info.nightscout.androidaps.utils.wizard.QuickWizard
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
@@ -38,9 +37,7 @@ class DataLayerListenerServiceMobile : WearableListenerService() {
     @Inject lateinit var loop: Loop
     @Inject lateinit var wearPlugin: WearPlugin
     @Inject lateinit var sp: SP
-    @Inject lateinit var quickWizard: QuickWizard
     @Inject lateinit var config: Config
-    @Inject lateinit var nsDeviceStatus: NSDeviceStatus
     @Inject lateinit var receiverStatusStore: ReceiverStatusStore
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
@@ -48,6 +45,11 @@ class DataLayerListenerServiceMobile : WearableListenerService() {
     @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsSchedulers: AapsSchedulers
 
+    inner class LocalBinder : Binder() {
+
+        fun getService(): DataLayerListenerServiceMobile = this@DataLayerListenerServiceMobile
+    }
+
     private val dataClient by lazy { Wearable.getDataClient(this) }
     private val messageClient by lazy { Wearable.getMessageClient(this) }
     private val capabilityClient by lazy { Wearable.getCapabilityClient(this) }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt
new file mode 100644
index 0000000000..941e04eb53
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobileHelper.kt
@@ -0,0 +1,62 @@
+package info.nightscout.androidaps.plugins.general.wear.wearintegration
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import info.nightscout.androidaps.interfaces.NotificationHolder
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/*
+    This code replaces  following
+    val alarm = Intent(context, DataLayerListenerServiceMobile::class.java)
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) context.startForegroundService(alarm) else context.startService(alarm)
+
+    it fails randomly with error
+    Context.startForegroundService() did not then call Service.startForeground(): ServiceRecord{e317f7e u0 info.nightscout.nsclient/info.nightscout.androidaps.services.DataLayerListenerServiceMobile}
+
+ */
+@Singleton
+class DataLayerListenerServiceMobileHelper @Inject constructor(
+    private val notificationHolder: NotificationHolder
+) {
+
+    fun startService(context: Context) {
+        val connection = object : ServiceConnection {
+            override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
+                // The binder of the service that returns the instance that is created.
+                val binder: DataLayerListenerServiceMobile.LocalBinder = service as DataLayerListenerServiceMobile.LocalBinder
+
+                val dataLayerListenerServiceMobile: DataLayerListenerServiceMobile = binder.getService()
+
+                context.startForegroundService(Intent(context, DataLayerListenerServiceMobile::class.java))
+
+                // This is the key: Without waiting Android Framework to call this method
+                // inside Service.onCreate(), immediately call here to post the notification.
+                dataLayerListenerServiceMobile.startForeground(notificationHolder.notificationID, notificationHolder.notification)
+
+                // Release the connection to prevent leaks.
+                context.unbindService(this)
+            }
+
+            override fun onServiceDisconnected(name: ComponentName?) {
+            }
+        }
+
+        try {
+            context.bindService(Intent(context, DataLayerListenerServiceMobile::class.java), connection, Context.BIND_AUTO_CREATE)
+        } catch (ignored: RuntimeException) {
+            // This is probably a broadcast receiver context even though we are calling getApplicationContext().
+            // Just call startForegroundService instead since we cannot bind a service to a
+            // broadcast receiver context. The service also have to call startForeground in
+            // this case.
+            context.startForegroundService(Intent(context, DataLayerListenerServiceMobile::class.java))
+        }
+    }
+
+    fun stopService(context: Context) {
+        context.stopService(Intent(context, DataLayerListenerServiceMobile::class.java))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt
index 4d157a874a..12f240b1e3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt
@@ -97,11 +97,11 @@ class IobCobOref1Worker(
             val bucketedData = ads.bucketedData
             val autosensDataTable = ads.autosensDataTable
             if (bucketedData == null || bucketedData.size < 3) {
-                aapsLogger.debug(LTag.AUTOSENS, "Aborting calculation thread (No bucketed data available): ${data.from}")
+                aapsLogger.debug(LTag.AUTOSENS,  {"Aborting calculation thread (No bucketed data available): ${data.from}"})
                 return Result.success(workDataOf("Error" to "Aborting calculation thread (No bucketed data available): ${data.from}"))
             }
             val prevDataTime = ads.roundUpTime(bucketedData[bucketedData.size - 3].timestamp)
-            aapsLogger.debug(LTag.AUTOSENS, "Prev data time: " + dateUtil.dateAndTimeString(prevDataTime))
+            aapsLogger.debug(LTag.AUTOSENS, {"Prev data time: " + dateUtil.dateAndTimeString(prevDataTime)})
             var previous = autosensDataTable[prevDataTime]
             // start from oldest to be able sub cob
             for (i in bucketedData.size - 4 downTo 0) {
@@ -156,15 +156,15 @@ class IobCobOref1Worker(
                     val hourAgoData = ads.getAutosensDataAtTime(hourAgo)
                     if (hourAgoData != null) {
                         val initialIndex = autosensDataTable.indexOfKey(hourAgoData.time)
-                        aapsLogger.debug(LTag.AUTOSENS, ">>>>> bucketed_data.size()=" + bucketedData.size + " i=" + i + " hourAgoData=" + hourAgoData.toString())
+                        aapsLogger.debug(LTag.AUTOSENS, { ">>>>> bucketed_data.size()=" + bucketedData.size + " i=" + i + " hourAgoData=" + hourAgoData.toString()})
                         var past = 1
                         try {
                             while (past < 12) {
                                 val ad = autosensDataTable.valueAt(initialIndex + past)
-                                aapsLogger.debug(LTag.AUTOSENS, ">>>>> past=" + past + " ad=" + ad?.toString())
+                                aapsLogger.debug(LTag.AUTOSENS, {">>>>> past=" + past + " ad=" + ad?.toString()})
                                 if (ad == null) {
-                                    aapsLogger.debug(LTag.AUTOSENS, autosensDataTable.toString())
-                                    aapsLogger.debug(LTag.AUTOSENS, bucketedData.toString())
+                                    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, rh.gs(R.string.sendlogfiles), Notification.LOW)
                                     rxBus.send(EventNewNotification(notification))
@@ -319,14 +319,12 @@ class IobCobOref1Worker(
                 if (bgTime < dateUtil.now()) autosensDataTable.put(bgTime, autosensData)
                 aapsLogger.debug(
                     LTag.AUTOSENS,
-                    "Running detectSensitivity from: " + dateUtil.dateAndTimeString(oldestTimeWithData) + " to: " + dateUtil.dateAndTimeString(bgTime) + " lastDataTime:" + ads.lastDataTime(
-                        dateUtil
-                    )
+                    {"Running detectSensitivity from: " + dateUtil.dateAndTimeString(oldestTimeWithData) + " to: " + dateUtil.dateAndTimeString(bgTime) + " lastDataTime:" + ads.lastDataTime(dateUtil)}
                 )
                 val sensitivity = activePlugin.activeSensitivity.detectSensitivity(ads, oldestTimeWithData, bgTime)
                 aapsLogger.debug(LTag.AUTOSENS, "Sensitivity result: $sensitivity")
                 autosensData.autosensResult = sensitivity
-                aapsLogger.debug(LTag.AUTOSENS, autosensData.toString())
+                aapsLogger.debug(LTag.AUTOSENS, {autosensData.toString()})
             }
             data.iobCobCalculator.ads = ads
             Thread {
@@ -335,7 +333,7 @@ class IobCobOref1Worker(
             }.start()
         } finally {
             rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.IOB_COB_OREF, 100, data.cause))
-            aapsLogger.debug(LTag.AUTOSENS, "AUTOSENSDATA thread ended: ${data.from}")
+            aapsLogger.debug(LTag.AUTOSENS, {"AUTOSENSDATA thread ended: ${data.from}"})
             profiler.log(LTag.AUTOSENS, "IobCobOref1Thread", start)
         }
         return Result.success()
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 a3fd240570..9da1348c48 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
@@ -4,6 +4,8 @@ import android.os.Bundle
 import android.util.SparseArray
 import android.view.*
 import androidx.core.util.forEach
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
@@ -39,7 +41,7 @@ import io.reactivex.rxjava3.kotlin.plusAssign
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-class BGSourceFragment : DaggerFragment() {
+class BGSourceFragment : DaggerFragment(), MenuProvider {
 
     @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
@@ -66,7 +68,7 @@ class BGSourceFragment : DaggerFragment() {
             actionHelper = ActionModeHelper(rh, activity, this)
             actionHelper.setUpdateListHandler { binding.recyclerview.adapter?.notifyDataSetChanged() }
             actionHelper.setOnRemoveHandler { handler -> removeSelected(handler) }
-            setHasOptionsMenu(true)
+            requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
         }.root
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -104,13 +106,8 @@ class BGSourceFragment : DaggerFragment() {
         super.onPause()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         actionHelper.onCreateOptionsMenu(menu, inflater)
-    }
-
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        super.onPrepareOptionsMenu(menu)
         actionHelper.onPrepareOptionsMenu(menu)
     }
 
@@ -121,7 +118,7 @@ class BGSourceFragment : DaggerFragment() {
         _binding = null
     }
 
-    override fun onOptionsItemSelected(item: MenuItem) =
+    override fun onMenuItemSelected(item: MenuItem) =
         actionHelper.onOptionsItemSelected(item)
 
     inner class RecyclerViewAdapter internal constructor(private var glucoseValues: List<GlucoseValue>) : RecyclerView.Adapter<RecyclerViewAdapter.GlucoseValuesViewHolder>() {
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
index 239a317781..6a02daa322 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt
@@ -89,80 +89,84 @@ class GlunovoPlugin @Inject constructor(
     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()
+        try {
+            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)
+                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
-                }
+                    // 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 (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 (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(
+                    if (curr != 0.0)
+                        glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
                             timestamp = timestamp,
-                            value = value,
-                            glucoseUnit = TherapyEvent.GlucoseUnit.MMOL
+                            value = value * Constants.MMOLL_TO_MGDL,
+                            raw = 0.0,
+                            noise = null,
+                            trendArrow = GlucoseValue.TrendArrow.NONE,
+                            sourceSensor = GlucoseValue.SourceSensor.GLUNOVO_NATIVE
                         )
-                    )
-                sp.putLong(R.string.key_last_processed_glunovo_timestamp, timestamp)
-                cr.moveToNext()
-            }
-            cr.close()
+                    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")
+                if (glucoseValues.isNotEmpty() || calibrations.isNotEmpty())
+                    repository.runTransactionForResult(CgmSourceTransaction(glucoseValues, calibrations, null))
+                        .doOnError {
+                            aapsLogger.error(LTag.DATABASE, "Error while saving values from Glunovo App", it)
                         }
-                        savedValues.calibrationsInserted.forEach {  calibration ->
-                            calibration.glucose?.let { glucosevalue ->
-                                uel.log(
-                                    UserEntry.Action.CALIBRATION,
-                                    UserEntry.Sources.Dexcom,
-                                    ValueWithUnit.Timestamp(calibration.timestamp),
-                                    ValueWithUnit.TherapyEventType(calibration.type),
-                                    ValueWithUnit.fromGlucoseUnit(glucosevalue, calibration.glucoseUnit.toString)
-                                )
+                        .blockingGet()
+                        .also { savedValues ->
+                            savedValues.inserted.forEach {
+                                xDripBroadcast.send(it)
+                                aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
+                            }
+                            savedValues.calibrationsInserted.forEach { calibration ->
+                                calibration.glucose?.let { glucosevalue ->
+                                    uel.log(
+                                        UserEntry.Action.CALIBRATION,
+                                        UserEntry.Sources.Dexcom,
+                                        ValueWithUnit.Timestamp(calibration.timestamp),
+                                        ValueWithUnit.TherapyEventType(calibration.type),
+                                        ValueWithUnit.fromGlucoseUnit(glucosevalue, calibration.glucoseUnit.toString)
+                                    )
+                                }
+                                aapsLogger.debug(LTag.DATABASE, "Inserted calibration $calibration")
                             }
-                            aapsLogger.debug(LTag.DATABASE, "Inserted calibration $calibration")
                         }
-                    }
+            }
+        } catch (e: SecurityException) {
+            aapsLogger.error(LTag.CORE, "Exception", e)
         }
     }
 
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 6262e552bc..cea1f8bb35 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.utils
 
 import android.Manifest
 import android.annotation.SuppressLint
-import android.annotation.TargetApi
 import android.bluetooth.BluetoothAdapter
 import android.content.ActivityNotFoundException
 import android.content.Context
@@ -51,12 +50,20 @@ class AndroidPermission @Inject constructor(
         }
         if (test) {
             if (activity is DaggerAppCompatActivityWithResult)
-                activity.requestMultiplePermissions.launch(permissions)
+                try {
+                    activity.requestMultiplePermissions.launch(permissions)
+                } catch (ignored: IllegalStateException) {
+                    ToastUtils.errorToast(activity, rh.gs(R.string.error_asking_for_permissions))
+                }
         }
         if (testBattery) {
             try {
                 if (activity is DaggerAppCompatActivityWithResult)
-                    activity.callForBatteryOptimization.launch(null)
+                    try {
+                        activity.callForBatteryOptimization.launch(null)
+                    } catch (ignored: IllegalStateException) {
+                        ToastUtils.errorToast(activity, rh.gs(R.string.error_asking_for_permissions))
+                    }
             } catch (e: ActivityNotFoundException) {
                 permissionBatteryOptimizationFailed = true
                 OKDialog.show(activity, rh.gs(R.string.permission), rh.gs(R.string.alert_dialog_permission_battery_optimization_failed)) { activity.recreate() }
@@ -95,13 +102,14 @@ class AndroidPermission @Inject constructor(
         }
     }
 
+    @SuppressLint("MissingPermission")
     @Synchronized
     fun notifyForBtConnectPermission(activity: FragmentActivity) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             //  Manifest.permission.BLUETOOTH_CONNECT
-            if (permissionNotGranted(activity, "android.permission.BLUETOOTH_CONNECT") || permissionNotGranted(activity, "android.permission.BLUETOOTH_SCAN")) {
+            if (permissionNotGranted(activity, Manifest.permission.BLUETOOTH_CONNECT) || permissionNotGranted(activity, Manifest.permission.BLUETOOTH_SCAN)) {
                 val notification = NotificationWithAction(injector, Notification.PERMISSION_BT, rh.gs(R.string.needconnectpermission), Notification.URGENT)
-                notification.action(R.string.request) { askForPermission(activity, arrayOf("android.permission.BLUETOOTH_SCAN", "android.permission.BLUETOOTH_CONNECT")) }
+                notification.action(R.string.request) { askForPermission(activity, arrayOf(Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT)) }
                 rxBus.send(EventNewNotification(notification))
             } else {
                 activity.startActivity(Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE))
@@ -145,8 +153,10 @@ class AndroidPermission @Inject constructor(
                     if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
                         // Show alert dialog to the user saying a separate permission is needed
                         // Launch the settings activity if the user prefers
-                        val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-                            Uri.parse("package:" + activity.packageName))
+                        val intent = Intent(
+                            Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                            Uri.parse("package:" + activity.packageName)
+                        )
                         activity.startActivity(intent)
                     }
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/widget/Widget.kt b/app/src/main/java/info/nightscout/androidaps/widget/Widget.kt
index b4a2cbcd29..3d8c1e62cd 100644
--- a/app/src/main/java/info/nightscout/androidaps/widget/Widget.kt
+++ b/app/src/main/java/info/nightscout/androidaps/widget/Widget.kt
@@ -204,7 +204,7 @@ class Widget : AppWidgetProvider() {
         }
     }
 
-    fun updateProfile(views: RemoteViews) {
+    private fun updateProfile(views: RemoteViews) {
         val profileTextColor =
             profileFunction.getProfile()?.let {
                 if (it is ProfileSealed.EPS) {
@@ -226,7 +226,7 @@ class Widget : AppWidgetProvider() {
     }
 
     private fun updateSensitivity(views: RemoteViews) {
-        if (sp.getBoolean(R.string.key_openapsama_useautosens, false) && constraintChecker.isAutosensModeEnabled().value())
+        if (constraintChecker.isAutosensModeEnabled().value())
             views.setImageViewResource(R.id.sensitivity_icon, R.drawable.ic_swap_vert_black_48dp_green)
         else
             views.setImageViewResource(R.id.sensitivity_icon, R.drawable.ic_x_swap_vert)
@@ -256,7 +256,7 @@ class Widget : AppWidgetProvider() {
 
 internal fun updateWidget(context: Context) {
     context.sendBroadcast(Intent().also {
-        it.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, AppWidgetManager.getInstance(context).getAppWidgetIds(ComponentName(context, Widget::class.java)))
+        it.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, AppWidgetManager.getInstance(context)?.getAppWidgetIds(ComponentName(context, Widget::class.java)))
         it.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
     })
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_historybrowse.xml b/app/src/main/res/layout/activity_historybrowse.xml
index c3d0eec40a..26673e7b76 100644
--- a/app/src/main/res/layout/activity_historybrowse.xml
+++ b/app/src/main/res/layout/activity_historybrowse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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"
@@ -11,17 +11,6 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/noprofile"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/noprofileset"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="?attr/alarmColor"
-            android:textStyle="bold"
-            android:visibility="gone" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -82,8 +71,7 @@
 
             <RelativeLayout
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_weight="1">
+                android:layout_height="300dp">
 
                 <com.jjoe64.graphview.GraphView
                     android:id="@+id/bg_graph"
@@ -112,4 +100,4 @@
 
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index 809877af52..9748d50fcb 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -500,7 +500,6 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Verhoog sensitiwiteit vir tydelike doelwitte > = 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Lae tydelike doelwitte verlaag sensitiwiteit</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Laer sensitiwiteit vir tydelike doelwitte < 100]]></string>
-    <string name="careportal_removestartedevents">Skoon AndroidAPS begin</string>
     <string name="storedsettingsfound">Gestoorde instellings gevind</string>
     <string name="allow_hardware_pump_text">Aandag: As jy aktiveer en koppel aan \'n hardeware pomp, AndroidAPS sal die basale instellings uit die profiel aan die pomp kopieer, die bestaande basale koers gestoor op die pomp sal oorskryf word. Maak seker jy het die korrekte basale instelling in AndroidAPS. As jy nie seker is of nie die basale instellings wil oorskryf op jou pomp, druk Kanselleer en herhaal oorskakel na die pomp op \'n later tyd.</string>
     <string name="error_adding_treatment_title">Behandeling data onvolledig</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 0cd5f28707..68d6c733ef 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -644,7 +644,6 @@
     <string name="resistance_lowers_target_summary">Когато се установи резистентност, намалява целевата глюкоза.</string>
     <string name="sensitivity_raises_target_title">Чувствителността увеличава целта</string>
     <string name="sensitivity_raises_target_summary">Когато се установи чувствителност, повишаване на целевата глюкоза</string>
-    <string name="careportal_removestartedevents"> AndroidAPS стартира</string>
     <string name="storedsettingsfound">Открити са предишни настройки</string>
     <string name="allow_hardware_pump_text">Внимание: Ако активирате и свържете с хардуерна помпа, AndroidAPS ще копира основните настройки от профила в помпата, като презапише съществуващата базова скорост, съхранявана на помпата. Уверете се, че имате правилните основни настройки в AndroidAPS. Ако не сте сигурни или не искате да презапишете основните настройки на помпата, натиснете Cancel и повторете превключването към помпата по-късно.</string>
     <string name="error_adding_treatment_title">Данните за лечението не са пълни</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 5a9ff0129f..8336c1a0de 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">Pro oznámení vyžaduje aplikace oprávnění systémového okna</string>
     <string name="needlocationpermission">Aplikace potřebuje oprávnění k přístupu k poloze kvůli skenování BT a WiFi identifikaci</string>
     <string name="needstoragepermission">Aby bylo možné nahrávat logy a exportovat nastavení, je nutné pro aplikaci povolit oprávnění přístupu k úložišti</string>
-    <string name="needconnectpermission">Aplikace potřebuje oprávnění bluetooth</string>
     <string name="request">Požadavek</string>
     <string name="open_navigation">Otevřít menu</string>
     <string name="close_navigation">Zavřít menu</string>
@@ -666,7 +665,7 @@
     <string name="resistance_lowers_target_summary">Je-li zjištěna rezistence, sníží nastavenou cílovou glykémii</string>
     <string name="sensitivity_raises_target_title">Citlivost zvyšuje cíl</string>
     <string name="sensitivity_raises_target_summary">Je-li zjištěna vyšší citlivost, zvýší nastavenou cílovou glykémii</string>
-    <string name="careportal_removestartedevents">Vyčistit události \"AndroidAPS restartován\"</string>
+    <string name="careportal_removestartedevents">Odebrat záznamy spuštěné AAPS</string>
     <string name="show_invalidated">Zobrazit neplatné</string>
     <string name="hide_invalidated">Skrýt zneplatněné</string>
     <string name="remove_items">Odstranit položky</string>
@@ -1045,4 +1044,6 @@
     <string name="blocked_by_charging">Zablokováno možností nabíjení</string>
     <string name="blocked_by_connectivity">Zablokováno možností připojení</string>
     <string name="no_watch_connected">(Žádné hodinky nejsou připojeny)</string>
+    <string name="error_asking_for_permissions">Chyba žádosti o oprávnění</string>
+    <string name="dynisf_adjust_sensitivity">Upravit citlivost a glykémii</string>
 </resources>
diff --git a/app/src/main/res/values-da-rDK/exam.xml b/app/src/main/res/values-da-rDK/exam.xml
index 2a4276dfe3..75e3579ca8 100644
--- a/app/src/main/res/values-da-rDK/exam.xml
+++ b/app/src/main/res/values-da-rDK/exam.xml
@@ -123,6 +123,7 @@
     <string name="sensitivity_cannula">Notering af kanyleskift vil nulstille Autosens ratio tilbage til 100%.</string>
     <string name="sensitivity_time">Nogle af plugin mulighederne har konfigurerbare tidsintervaller, der kan indstilles af brugeren.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="sensitivity_hint2">https://androidaps.readthedocs.io/en/latest/Usage/Open-APS-features.html?highlight=Autosens#autosens</string>
     <string name="wrongcarbs_label">Kulhydrat indtastningsfejl</string>
     <string name="wrongcarbs_whattodo">Hvad gør du, hvis du har lavet en forkert kulhydrat indtastning?</string>
     <string name="wrongcarbs_treatmentstab">Slet den forkerte indtastning i Behandlinger og indtast korrekte nye kulhydrat værdier.</string>
@@ -135,6 +136,19 @@
     <string name="wronginsulin_compare">Sammenlign værdier i AndroidAPS og pumpehistorik (hvis pumpen understøtter dette).</string>
     <string name="wronginsulin_prime">Bolus en del af din beregnede \"glemte\" insulin med enten sprøjter / pen eller brug af en kanylefyldning.</string>
     <string name="wronginsulin_donothing">Gør ingenting og tillad AndroidAPS at rette op på højt blodsukker.</string>
+    <string name="cob_label">Kulhydrater om bord (COB)</string>
+    <string name="cob_question">Hvordan ændring af ISF værdi påvirker COB beregning?</string>
+    <string name="cob_longer">Ved øget ISF, vil kulhydrater være længere tid om at absorberes</string>
+    <string name="cob_shorter">Ved øget ISF, vil kulhydrater være kortere tid om at absorberes</string>
+    <string name="cob_no_effect">Øget ISF vil ikke påvirke absorbering af beregnet kulhydrat</string>
+    <string name="cob2_question">Hvordan ændring af IC værdi påvirker COB beregning?</string>
+    <string name="cob2_longer">Ved øget IC, vil kulhydrater være længere tid om at absorberes</string>
+    <string name="cob2_shorter">Ved øget IC, vil kulhydrater være kortere tid om at absorberes</string>
+    <string name="cob2_no_effect">Øget IC vil ikke påvirke absorbering af beregnet kulhydrat</string>
+    <string name="cob3_question">Hvordan skift af profil procent påvirker COB beregning?</string>
+    <string name="cob3_longer">Ved indstilling af profil til 150%, vil kulhydrater være længere tid om at absorberes</string>
+    <string name="cob3_shorter">Ved indstilling af profil til 150%, vil kulhydrater være kortere tid om at absorberes</string>
+    <string name="cob3_no_effect">Ved indstilling af profil til 150%, påvirkes absorbering af beregnet kulhydrat ikke</string>
     <string name="iob_label">Insulin om bord (IOB)</string>
     <string name="iob_value">IOB-værdi påvirkes af midlertidige basaler.</string>
     <string name="iob_hightemp">Høj midlertidlig basal vil ikke blive givet, når dit blodsukker er under målet.</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 0f64e595f1..24e3c26317 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -6,6 +6,7 @@
     <string name="treatmentssafety_title">Behandlings sikkerhed</string>
     <string name="treatmentssafety_maxbolus_title">Maks tilladt bolus [IE]</string>
     <string name="treatmentssafety_maxcarbs_title">Maks tilladte kulhydrater [g]</string>
+    <string name="treatmentssafety_lgsThreshold_title">BS under værdi for LGS grænse</string>
     <string name="nav_preferences_plugin">%1$s indstillinger</string>
     <string name="nav_preferences">Indstillinger</string>
     <string name="nav_refreshtreatments">Opdater behandlinger fra NS</string>
@@ -432,12 +433,15 @@
     <string name="ns_localbroadcasts_title">Aktiver lokale udsendelser.</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="openaps_smb_dynamic_isf">Dynamisk ISF</string>
+    <string name="DynISFAdjust_title" formatted="false">DynamiskISF-justeringsfaktor %</string>
+    <string name="DynISFAdjust_summary" formatted="false">Justeringsfaktor for DynamiskISF. Indstil mere end 100% for mere aggressive korrektionsdoser og mindre end 100% for mindre aggressive korrektioner.</string>
     <string name="enableuam">Aktiver UAM</string>
     <string name="enablesmb">Aktiver SMB</string>
     <string name="enablesmb_summary">Brug Super Mikro Boluser i stedet for midlertidig basal for hurtigere handling</string>
     <string name="enableuam_summary">Detektering af uanmeldte måltider</string>
     <string name="insulin_oref_peak">IOB Kurve Peak-Tid</string>
     <string name="insulin_peak_time">Spidstidspunkt [min]</string>
+    <string name="insulin_peak">Top</string>
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
@@ -589,6 +593,7 @@
     <string name="openapssmb_maxiob_summary">Denne værdi kaldes Max IOB i OpenAPS kontekst\nOpenAPS vil ikke tilføje mere insulin, hvis den aktuelle IOB er større end denne værdi</string>
     <string name="absorption_cutoff_title">Måltid max absorptionstid [h]</string>
     <string name="absorption_cutoff_summary">Tid hvor ethvert måltid betragtes som absorberet. Resterende kulhydrater vil blive afskåret.</string>
+    <string name="treatmentssafety_lgsThreshold_summary">BS værdi under hvilken insulin er suspenderet. Standard værdi bruger standard målmodel. Bruger kan indstille værdi mellem 60 mg/dl (3,3 mmol/l) og 100 mg/dl (5,5 mmol/l). Værdier under 65/3,6 resulterer i brug af standardmodel</string>
     <string name="overview_show_notes_field_in_dialogs_title">Vis notefelt i behandlingsdialoger</string>
     <string name="next_button">Næste</string>
     <string name="previous_button">Forrige</string>
@@ -601,7 +606,11 @@
     <string name="secondcarbsincrement">Anden kulhydratstigning</string>
     <string name="thirdcarbsincrement">Tredje kulhydratstigning</string>
     <string name="cgm">CGM</string>
+    <string name="ns_cellular">Brug mobilforbindelse</string>
+    <string name="ns_wifi">Brug Wi-Fi-forbindelse</string>
     <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="ns_charging">Under opladning</string>
+    <string name="ns_battery">På batteri</string>
     <string name="connectionsettings_title">Indstillinger for forbindelse</string>
     <string name="ns_wifi_allowedssids">Tilladte SSID\'er (semikolon separeret)</string>
     <string name="ns_allowroaming">Tillad forbindelse i roaming</string>
@@ -636,7 +645,6 @@
     <string name="needsystemwindowpermission">Applikationen mangler system vindues tilladelse til notifikationer</string>
     <string name="needlocationpermission">Applikationen mangler lokations tilladelse til BT scanning og WIFI identifikation</string>
     <string name="needstoragepermission">Applikationen mangler lagerstyrings tilladelse for at gemme logfiler og exporteringsindstillinger</string>
-    <string name="needconnectpermission">Applikationen kræver tilladelse til bluetooth</string>
     <string name="request">Anmod</string>
     <string name="open_navigation">Åbn navigation</string>
     <string name="close_navigation">Luk navigation</string>
@@ -657,7 +665,6 @@
     <string name="resistance_lowers_target_summary">Når der påvises resistens, sænkes målglukosen</string>
     <string name="sensitivity_raises_target_title">Følsomhed hæver midlertidige mål</string>
     <string name="sensitivity_raises_target_summary">Når der påvises følsomhed, skal målglukosen hæves</string>
-    <string name="careportal_removestartedevents">Ren AndroidAPS startet</string>
     <string name="show_invalidated">Vis ugyldige</string>
     <string name="hide_invalidated">Skjul ugyldige</string>
     <string name="remove_items">Fjern elementer</string>
@@ -676,6 +683,8 @@
     <string name="error_adding_treatment_message">En behandling (insulin: %1$.2f, kulhydrater: %2$d, kl: %3$s) kunne ikke tilføjes til behandlinger. Tjek og tilføj venligst en note manuelt efter behov.</string>
     <string name="generated_ecarbs_note">eCarbs: %1$d g (%2$d h), forsinkelse: %3$d m</string>
     <string name="openaps_noasdata">Ingen tilgængelige autosens data</string>
+    <string name="log_files">Logfiler</string>
+    <string name="miscellaneous">Diverse</string>
     <string name="nav_logsettings">Log indstillinger</string>
     <string name="resettodefaults">Nulstil til standardindstillinger</string>
     <string name="nsmalfunction">NSClient funktionsfejl. Overvej NS og NSClient genstart.</string>
@@ -768,6 +777,11 @@
     <string name="invalidpct">Ugyldig angivelse af %</string>
     <string name="average">Gennemsnit</string>
     <string name="tir">Tid i målområde</string>
+    <string name="day_tir">Dags TIR</string>
+    <string name="night_tir">Nat TIR</string>
+    <string name="detailed_14_days">Detaljerede 14 dage</string>
+    <string name="std_deviation">SD: %1$s</string>
+    <string name="hba1c">HbA1c: </string>
     <string name="activitymonitor">Aktivitetsovervågning</string>
     <string name="doyouwantresetstats">Ønsker du at nulstille aktivitetsstatistik?</string>
     <string name="statistics">Statistikker</string>
@@ -954,6 +968,7 @@
     <string name="wear_action_tempt_max_bg_error">Max-BS udenfor området!</string>
     <string name="wear_action_tempt_manual_range_message">Midlertidigt mål:\nMin: %1$s\nMax: %2$s\nVarighed: %3$s</string>
     <string name="wear_action_tempt_manual_message">Midlertigt mål:\nMål: %1$s\nVarighed: %2$s</string>
+    <string name="wear_action_tempt_preset_message">Midlertigt mål:\nGrund: %1$s\nMål: %2$s\nVarighed: %3$s</string>
     <string name="quick_wizard_message">Hurtigguide: %1$s\nInsulin: %2$.2fE\nKH: %3$dg</string>
     <string name="wizard_result">Guide:\nInsulin: %1$.2fE\nKH: %2$dg</string>
     <string name="overview_editquickwizard_show_on_device">Vis post på enhed:</string>
@@ -962,9 +977,11 @@
     <string name="wizard_no_active_profile">Ingen aktiv profil angivet!</string>
     <string name="wizard_no_cob">Ukendt COB! BG læsning mangler eller nylig app genstart?</string>
     <string name="wizard_carbs_constraint">KH begrænsninger overtrådt!</string>
+    <string name="wizard_explain_calc">Beregner (IC: %1$.1f, ISF: %2$.1f)</string>
     <string name="wizard_explain_carbs">Kulhydrater: %1$.2fE</string>
     <string name="wizard_explain_cob">COB: %1$.0fg %2$.2fE</string>
     <string name="wizard_explain_bg">BS: %1$.2fE</string>
+    <string name="wizard_explain_iob">IOB: %1$.2fE</string>
     <string name="wizard_explain_superbolus">Superbolus: %1$.2fE</string>
     <string name="wizard_explain_trend">15\' trend: %1$.2fE</string>
     <string name="wizard_explain_percent">Procent: %1$.2fE x %2$d%% ≈ %3$.2fE</string>
@@ -991,6 +1008,10 @@
     <string name="count_selected">%1$d valgt</string>
     <string name="sort_label">Sortér</string>
     <string name="dialog_canceled">Dialog annulleret</string>
+    <string name="veryLow" comment="below 3.1">Meget lav</string>
+    <string name="low" comment="3.1-3.9">Lav</string>
+    <string name="high" comment="10.0-13.9">Høj</string>
+    <string name="veryHigh" comment="above 13.9">Meget høj</string>
     <string name="below" comment="below &quot;in range&quot;">Under</string>
     <string name="in_range">Inden for området</string>
     <string name="above" comment="above &quot;in range&quot;">Over</string>
@@ -999,6 +1020,12 @@
     <string name="widget_description">AndroidAPS widget</string>
     <string name="configure">Indstil gennemsigtighed</string>
     <string name="loop_status">Loop status</string>
+    <string name="graph_scale">Graf skala</string>
+    <string name="profile1">Profil 1</string>
+    <string name="profile2">Profil 2</string>
+    <string name="login">Log ind</string>
+    <string name="remove_all">Fjern alle</string>
+    <string name="reset_start">Nulstil start</string>
     <string name="a11y_otp_qr_code">QR-kode til opsætning af engangs kodeord</string>
     <string name="a11y_open_settings">Åbn indstillinger</string>
     <string name="a11y_set_carb_timer">indstil KH alarm</string>
@@ -1008,8 +1035,12 @@
     <string name="a11y_only_on_watch">kun på ur</string>
     <string name="a11y_only_on_phone">kun på telefon</string>
     <string name="a11y_drag_and_drop_handle">træk og slip håndtering</string>
+    <string name="search">Søg</string>
     <!-- Aidex Cgms -->
     <string name="aidex">GlucoRx Aidex</string>
     <string name="aidex_short">Aidex</string>
     <string name="description_source_aidex">Modtag BG-værdier fra GlucoRx Aidex CGMS.</string>
+    <string name="blocked_by_charging">Blokeret af opladningsmuligheder</string>
+    <string name="blocked_by_connectivity">Blokeret af forbindelsesmuligheder</string>
+    <string name="no_watch_connected">(Intet ur forbundet)</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/exam.xml b/app/src/main/res/values-de-rDE/exam.xml
index 6b25674a29..224325bbe7 100644
--- a/app/src/main/res/values-de-rDE/exam.xml
+++ b/app/src/main/res/values-de-rDE/exam.xml
@@ -104,9 +104,11 @@
     <string name="troubleshooting_wheretoask">Wo kannst Du nach Hilfe für AndroidAPS suchen?</string>
     <string name="troubleshooting_fb">Du kannst in der AndroidAPS-Facebook-Gruppe um Rat bitten.</string>
     <string name="troubleshooting_wiki">Du solltest die AndroidAPS-Dokumentation lesen (und wiederholt lesen).</string>
+    <string name="troubleshooting_gitter">Im Discord Channel AndroidAPS kannst Du bei technischen Problemen oder Fragestellungen um Hilfe bitten.</string>
     <string name="troubleshooting_yourendo">Du solltest Deine Diabetesklinik / Deinen Diabetologen fragen.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Installing-AndroidAPS/Update-to-new-version.html#problembehandlung</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/loopedDE/</string>
+    <string name="troubleshooting_hint3">https://discord.gg/4fQUWHZ4Mw</string>
     <string name="insulin_label">Insulin-Plugins</string>
     <string name="insulin_ultrarapid">Welches Insulin kann mit dem Ultra-Rapid-Oref-Plugin verwendet werden?</string>
     <string name="insulin_fiasp">Fiasp®</string>
@@ -121,6 +123,7 @@
     <string name="sensitivity_cannula">Das Protokollieren eines Kanülenwechsels setzt das Autosens Verhältnis wieder auf 100% zurück.</string>
     <string name="sensitivity_time">Einige der Plugin-Optionen haben konfigurierbare Zeiträume, die vom Benutzer eingestellt werden können.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="sensitivity_hint2">https://androidaps.readthedocs.io/de/latest/Usage/Open-APS-features.html?highlight=Autosens#autosens</string>
     <string name="wrongcarbs_label">Fehler bei der KH-Eingabe</string>
     <string name="wrongcarbs_whattodo">Was sollst Du tun, wenn Du einen falschen KH-Eintrag gemacht hast?</string>
     <string name="wrongcarbs_treatmentstab">Lösche die falsche Eingabe in der Behandlung und gib den richtigen neuen Kohlehydratwert ein.</string>
@@ -133,6 +136,19 @@
     <string name="wronginsulin_compare">Vergleiche die Werte der Historie in AAPS und Deiner Pumpe (wenn die Pumpe diese Funktion bietet).</string>
     <string name="wronginsulin_prime">Gib einen Teil-Bolus des \'nicht erhaltenen\' Insulins mit Spritze / Pen oder durch Befüllen der Kanüle.</string>
     <string name="wronginsulin_donothing">Unternimm nichts und lass AndroidAPS die entstehenden hohen Glukosewerte korrigieren.</string>
+    <string name="cob_label">KH an Board (COB)</string>
+    <string name="cob_question">Wie beeinflusst das Ändern des ISF-Wertes die COB-Berechnung?</string>
+    <string name="cob_longer">Steigende ISF absorbiert Kohlenhydrate länger</string>
+    <string name="cob_shorter">Steigende ISF absorbiert Kohlenhydrate kürzer</string>
+    <string name="cob_no_effect">Steigende ISF verändert die Dauer für die Kohlenhydrataufnahme nicht</string>
+    <string name="cob2_question">Wie beeinflusst das Ändern des ISF-Wertes die COB-Berechnung?</string>
+    <string name="cob2_longer">Steigende IC absorbiert Kohlenhydrate länger</string>
+    <string name="cob2_shorter">Steigende IC absorbiert Kohlenhydrate kürzer</string>
+    <string name="cob2_no_effect">Steigende IC verändert die Zeit für die Kohlenhydrataufnahme nicht</string>
+    <string name="cob3_question">Wie beeinflusst die Änderung des Profil-Prozentsatzes die COB-Berechnung?</string>
+    <string name="cob3_longer">Die Einstellung des Profils auf 150% verlängert die Zeit für Kohlenhydrataufnahme</string>
+    <string name="cob3_shorter">Die Einstellung des Profils auf 150% verkürzt die Zeit für Kohlenhydrataufnahme</string>
+    <string name="cob3_no_effect">Die Einstellung des Profils auf 150% verändert die Zeit für die Kohlenhydrataufnahme nicht</string>
     <string name="iob_label">Aktives Insulin (IOB)</string>
     <string name="iob_value">IOB wird von den abgegebenen temporären Basalraten beeinflusst.</string>
     <string name="iob_hightemp">Eine hohe temporäre Basalrate wird nicht abgegeben, wenn der BZ unterhalb des Zielwerts liegt.</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 0ccb861169..a5a1293fa4 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -6,6 +6,7 @@
     <string name="treatmentssafety_title">Sicherheitseinstellungen der Behandlungen</string>
     <string name="treatmentssafety_maxbolus_title">Max. erlaubter Bolus [IE]</string>
     <string name="treatmentssafety_maxcarbs_title">Max. erlaubte Kohlenhydrate [g]</string>
+    <string name="treatmentssafety_lgsThreshold_title">BG-Pegel, unterhalb dessen die Aussetzung wegen niedriger Glukoseaussetzung eintritt</string>
     <string name="nav_preferences_plugin">%1$s-Einstellungen</string>
     <string name="nav_preferences">Einstellungen</string>
     <string name="nav_refreshtreatments">Behandlungen von NS aktualisieren</string>
@@ -25,6 +26,7 @@
     <string name="description_ns_client">Synchronisiert deine Daten mit Nightscout</string>
     <string name="description_ama">Stand des Algorithmus in 2017</string>
     <string name="description_smb">Der aktuellste Algorithmus für erfahrene Nutzer</string>
+    <string name="description_smb_dynamic_isf">Neuester Algorithmus für fortgeschrittene Benutzer mit dynamischer/automatischer ISF</string>
     <string name="description_overview">Zeigt den aktuellen Status deines Loops und Schaltflächen für die geläufigsten Aktionen an</string>
     <string name="description_persistent_notification">Zeigt eine fortlaufende Benachrichtigung mit einer kurzen Übersicht darüber, was dein Loop derzeit tut</string>
     <string name="description_profile_local">Definiere ein Profil, was auch offline verfügbar ist.</string>
@@ -264,6 +266,7 @@
     <string name="configbuilder_shortname">KONF</string>
     <string name="loop_shortname">LOOP</string>
     <string name="oaps_shortname">OAPS</string>
+    <string name="dynisf_shortname">DYNISF</string>
     <string name="localprofile_shortname">LP</string>
     <string name="overview_shortname">HOME</string>
     <string name="virtualpump_shortname">VP</string>
@@ -430,12 +433,15 @@
     <string name="ns_localbroadcasts_title">Aktiviere lokale Broadcasts</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="openaps_smb_dynamic_isf">Dynamischer ISF</string>
+    <string name="DynISFAdjust_title" formatted="false">DynamicISF Anpassungsfaktor %</string>
+    <string name="DynISFAdjust_summary" formatted="false">Anpassungsfaktor für DynamicISF. Stelle mehr als 100 % für aggressivere Korrekturdosen ein, und weniger als 100 % für weniger aggressive Korrekturen.</string>
     <string name="enableuam">Aktiviere UAM</string>
     <string name="enablesmb">Aktiviere SMB</string>
     <string name="enablesmb_summary">Benutze Super-Mikro-Boli anstelle von temporären Basalraten, um eine schnellere Wirkung zu erreichen.</string>
     <string name="enableuam_summary">Erkennung von unangekündigten Mahlzeiten</string>
     <string name="insulin_oref_peak">Wirkungshoch der IOB-Kurve</string>
     <string name="insulin_peak_time">Wirkungshoch [min]</string>
+    <string name="insulin_peak">Gipfel</string>
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
@@ -497,6 +503,7 @@
     <string name="negativeonly">Nur negative</string>
     <string name="overview_editquickwizard_usecob">COB Berechnung</string>
     <string name="overview_editquickwizard_usetemptarget">Temporäres Ziel Berechnung</string>
+    <string name="overview_editquickwizard_usepercentage">Prozentuale Berechnung</string>
     <string name="loopenabled">Loop aktiviert</string>
     <string name="apsselected">APS ausgewählt</string>
     <string name="nsclienthaswritepermission">Nightscout-Client hat Schreibrechte</string>
@@ -586,6 +593,7 @@
     <string name="openapssmb_maxiob_summary">Diesen Wert nennt OpenAPS MaxIOB.\nSolange dieser Wert überschritten wird, wird AndroidAPS kein Insulin abgeben.</string>
     <string name="absorption_cutoff_title">Maximale Dauer der Essens-Resorption [h]</string>
     <string name="absorption_cutoff_summary">Zeit, nach der jede Mahlzeit mit Sicherheit absorbiert ist. Verbleibende Kohlenhydrate werden danach nicht mehr berücksichtigt.</string>
+    <string name="treatmentssafety_lgsThreshold_summary">Der BG-Wert, unter dem die Insulinzuführung ausgesetzt wird. Der Standardwert verwendet das Standard-Zielmodell. Der Benutzer kann einen Wert zwischen 60mg/dl (3.3 mmol/l) und 100mg/dl (5.5mmol/l) setzen. Werte unterhalb 65/3.6 führen zur Verwendung des Standardmodells</string>
     <string name="overview_show_notes_field_in_dialogs_title">Zeige Feld für Notizen in den Behandlungsdialogen</string>
     <string name="next_button">Weiter</string>
     <string name="previous_button">Zurück</string>
@@ -598,7 +606,11 @@
     <string name="secondcarbsincrement">Zweite KH-Erhöhung</string>
     <string name="thirdcarbsincrement">Dritte KH-Erhöhung</string>
     <string name="cgm">CGM</string>
+    <string name="ns_cellular">Mobilfunkverbindung verwenden</string>
+    <string name="ns_wifi">WLAN Verbindung verwenden</string>
     <string name="ns_wifi_ssids">WLAN SSID</string>
+    <string name="ns_charging">Während des Ladevorgangs</string>
+    <string name="ns_battery">Bei Batteriebetrieb</string>
     <string name="connectionsettings_title">Verbindungs-Einstellungen</string>
     <string name="ns_wifi_allowedssids">Erlaubte SSIDs (durch Semikolon getrennt)</string>
     <string name="ns_allowroaming">Erlaube Verbindung bei Roaming</string>
@@ -633,7 +645,6 @@
     <string name="needsystemwindowpermission">Die App benötigt die Systemberechtigung für App-Benachrichtigungen</string>
     <string name="needlocationpermission">Die App benötigt die Berechtigung für den Standort, um Bluetooth und WLAN nutzen zu können</string>
     <string name="needstoragepermission">Die App benötigt Zugriffsrechte für den Speicher um Log-Dateien zu sichern und die Einstellungen zu exportieren.</string>
-    <string name="needconnectpermission">App benötigt Bluetooth-Berechtigung</string>
     <string name="request">Anfordern</string>
     <string name="open_navigation">Menü öffnen</string>
     <string name="close_navigation">Menü schließen</string>
@@ -654,8 +665,10 @@
     <string name="resistance_lowers_target_summary">Wenn Resistenz festgestellt wird, senke den Glukose-Zielwert</string>
     <string name="sensitivity_raises_target_title">Empfindlichkeit erhöht den Zielwert</string>
     <string name="sensitivity_raises_target_summary">Wenn eine höhere Empfindlichkeit festgestellt wird, wird der Glukose-Zielwert erhöht.</string>
-    <string name="careportal_removestartedevents">\"AndroidAPS gestartet\" Ereignisse löschen</string>
+    <string name="show_invalidated">Zeige Ungültige</string>
+    <string name="hide_invalidated">Verstecke Ungültige</string>
     <string name="remove_items">Objekte entfernen</string>
+    <string name="sort_items">Einträge sortieren</string>
     <string name="storedsettingsfound">Gespeicherte Einstellungen gefunden</string>
     <string name="allow_hardware_pump_text">WARNUNG: Wenn Du eine echte Pumpe aktivierst und anschließt, kopiert AndroidAPS die Basaleinstellungen vom aktiven Profil zur Pumpe (und behält sie bei). Die Einstellungen in der Pumpe werden hierbei überschrieben. Wenn Du Dir nicht sicher bist oder die Basaleinstellungen in der Pumpe nicht überschreiben möchten, drücke \"Abbrechen\" und vollziehe den Wechsel zur Pumpe später.</string>
     <string name="error_adding_treatment_title">Behandlungsdaten unvollständig</string>
@@ -670,6 +683,8 @@
     <string name="error_adding_treatment_message">Der Eintrag (Insulin: %1$.2f, Kohlenhydrate: %2$d, um: %3$s) konnte nicht als Behandlung gespeichert werden. Bitte überprüfe die aktuelle Liste und füge, falls notwendig, den Datensatz manuell hinzu.</string>
     <string name="generated_ecarbs_note">eCarbs: %1$d g (%2$d h), Verzögerung: %3$d m</string>
     <string name="openaps_noasdata">Keine Autosens-Daten verfügbar</string>
+    <string name="log_files">Log Dateien</string>
+    <string name="miscellaneous">Verschiedenes</string>
     <string name="nav_logsettings">Log-Einstellungen</string>
     <string name="resettodefaults">Auf Standardwerte zurücksetzen</string>
     <string name="nsmalfunction">NSClient Störung. Ziehe einen Neustart von NS und NSClient in Betracht.</string>
@@ -763,6 +778,11 @@ Unerwartetes Verhalten.</string>
     <string name="invalidpct">Ungültige % Eingabe</string>
     <string name="average">Durchschnitt</string>
     <string name="tir">TIR</string>
+    <string name="day_tir">Tages TIR</string>
+    <string name="night_tir">Nacht TIR</string>
+    <string name="detailed_14_days">Detaillierte 14 Tage</string>
+    <string name="std_deviation">SD: %1$s</string>
+    <string name="hba1c">HbA1c: </string>
     <string name="activitymonitor">Aktivitätsmonitor</string>
     <string name="doyouwantresetstats">Willst Du die Aktivitätsstatistik zurücksetzen?</string>
     <string name="statistics">Statistiken</string>
@@ -803,6 +823,7 @@ Unerwartetes Verhalten.</string>
     <string name="smscommunicator_otp_install_info">Installiere auf jedem Follower-Phone eine Authenticator-App, die RFC 6238 TOTP-Token unterstützt. Beliebte kostenlose Apps sind:\n Authy\n Google Authenticator\n LastPass Authenticator\n FreeOTP Authenticator</string>
     <string name="smscommunicator_otp_reset_warning">Wenn Du den Authentifikator zurücksetzt werden alle bestehenden Authentifikatoren ungültig. Du musst sie dann neu einrichten!</string>
     <string name="overview_show_predictions">Predictions (Vorhersagen)</string>
+    <string name="overview_show_treatments">Behandlungen</string>
     <string name="overview_show_deviationslope">Steigung der Abweichung</string>
     <string name="authorizationfailed">Autorisierung fehlgeschlagen</string>
     <string name="overview_show_absinsulin">Gesamtinsulin</string>
@@ -872,6 +893,8 @@ Unerwartetes Verhalten.</string>
     <string name="ns_receive_profile_switch_summary">Profilwechsel akzeptieren, die in NS oder NSClient eingegeben wurden</string>
     <string name="ns_receive_offline_event">APS Offline-Ereignisse empfangen</string>
     <string name="ns_receive_offline_event_summary">APS Offline-Ereignisse akzeptieren, die über NS oder NSClient eingegeben wurden</string>
+    <string name="ns_receive_tbr_eb">TBR und EB empfangen</string>
+    <string name="ns_receive_tbr_eb_summary">Akzeptiere TBR und EB, die von einer anderen Instanz eingegeben wurden</string>
     <string name="ns_receive_insulin">Insulin abrufen</string>
     <string name="ns_receive_insulin_summary">Insulin akzeptieren, das in NS oder NSClient eingegeben wurden</string>
     <string name="ns_receive_carbs">Kohlenhydrate abrufen</string>
@@ -890,9 +913,11 @@ Unerwartetes Verhalten.</string>
     <string name="error_in_isf_values">Fehler in ISF-Werten</string>
     <string name="run_question">%s ausführen?</string>
     <string name="invalid_profile_not_accepted">Ungültiges Profil %1$s wurde von NS nicht akzeptiert</string>
+    <string name="view">Ansicht</string>
     <string name="errors">Fehler</string>
     <string name="ns_sync_slow">Hochladen verlangsamen</string>
     <string name="data_status">Status BZ-Daten</string>
+    <string name="remove_bg_readings">BG-Werte entfernen</string>
     <string name="statuslights_cannula_age">Kanülenalter</string>
     <string name="statuslights_patch_pump_age">Alter Patchpumpe</string>
     <string name="patch_pump">Patch-Pumpe</string>
@@ -930,7 +955,46 @@ Unerwartetes Verhalten.</string>
     <string name="a11y_delete_current_profile">aktuelles Profil löschen</string>
     <string name="a11y_add_new_to_list">neu zur Liste hinzufügen</string>
     <!-- Theme switcher dark and light mode-->
+    <string name="theme_switcher_summary">Wähle das dunkle, helle oder das Systemdesign</string>
+    <string name="app_color_scheme">App Farbschema</string>
+    <string name="dark_theme">Dunkles Design</string>
+    <string name="light_theme">Helles Design</string>
+    <string name="follow_system_theme">Systemdesign verwenden</string>
     <!-- WEAR OS-->
+    <string name="wear_action_tempt_preset_error">Temp-Target unbekannte Voreinstellung: %1$s</string>
+    <string name="wear_action_tempt_cancel_message">Ausführung des Temp-Targets abbrechen?</string>
+    <string name="wear_action_tempt_unit_error">Verschiedene Einheiten werden auf Uhr und Telefon verwendet!</string>
+    <string name="wear_action_tempt_zero_message">Zero-Temp-Target - abbrechen des laufenden Temp-Targets?</string>
+    <string name="wear_action_tempt_min_bg_error">Min-BG ist außerhalb des Bereichs!</string>
+    <string name="wear_action_tempt_max_bg_error">Max-BG ist außerhalb des Bereichs!</string>
+    <string name="wear_action_tempt_manual_range_message">Temptarget:\nMin: %1$s\nMax: %2$s\nDauer: %3$s</string>
+    <string name="wear_action_tempt_manual_message">Temptarget:\nTarget: %1$s\nDauer: %2$s</string>
+    <string name="wear_action_tempt_preset_message">Temp-Target:\nGrund: %1$s\nTarget: %2$s\nDauer: %3$s</string>
+    <string name="quick_wizard_message">QuickWizard: %1$s\nInsulin: %2$.2fU\nCarbs: %3$dg</string>
+    <string name="wizard_result">Calc. Wizard:\nInsulin: %1$.2fU\nCarbs: %2$dg</string>
+    <string name="overview_editquickwizard_show_on_device">Zeige Eintrag auf dem Gerät:</string>
+    <string name="quick_wizard_not_available">Ausgewählter Quickwizard nicht mehr verfügbar, bitte aktualisiere die Kachel</string>
+    <string name="wizard_no_actual_bg">Kein aktueller BG liegt als Basis zur Berechnung vor!</string>
+    <string name="wizard_no_active_profile">Kein aktives Profil gesetzt!</string>
+    <string name="wizard_no_cob">Unbekannter COB! BG-Wert fehlt oder wurde App vor kurzem neu gestartet?</string>
+    <string name="wizard_carbs_constraint">Die Kohlenhydrateinschränkung wurde überschritten!</string>
+    <string name="wizard_explain_calc">Calc (IC: %1$.1f, ISF: %2$.1f)</string>
+    <string name="wizard_explain_carbs">Kohlenhydrate: %1$.2fU</string>
+    <string name="wizard_explain_cob">COB: %1$.0fg %2$.2fU</string>
+    <string name="wizard_explain_bg">BZ: %1$.2fU</string>
+    <string name="wizard_explain_iob">IOB: %1$.2fU</string>
+    <string name="wizard_explain_superbolus">Superbolus: %1$.2fU</string>
+    <string name="wizard_explain_trend">15\' Trend: %1$.2fU</string>
+    <string name="wizard_explain_percent">Prozent: %1$.2fU x %2$d%% ≈ %3$.2fU</string>
+    <string name="wizard_constraint_bolus_size">Verletzung der Bolusbeschränkung!\nKann %1$.2fU nicht abgeben</string>
+    <string name="wizard_explain_tt">TempT: %1$s</string>
+    <string name="wizard_explain_tt_to">%1$s zu %2$s</string>
+    <string name="wizard_pump_not_available">Keine Pumpe verfügbar!</string>
+    <string name="wear_unknown_action_string">Unbekannter Actionbefehl:</string>
+    <string name="overview_editquickwizard_percentage">Prozentsatz</string>
+    <string name="app_default">Standardwert der Anwendung</string>
+    <string name="show_invalidated_records">Zeige ungültige / gelöschte Einträge</string>
+    <string name="hide_invalidated_records">Verberge ungültige / gelöschte Einträge</string>
     <string name="select_profile">Profil zum Bearbeiten auswählen</string>
     <string name="refresh_from_nightscout">Aktualisiere von Nightscout</string>
     <string name="remove_selected_items">Ausgewähltes Objekt löschen</string>
@@ -939,8 +1003,47 @@ Unerwartetes Verhalten.</string>
     <string name="tempt_targets">Temporäre Ziele</string>
     <string name="carbs_and_bolus">Kohlenhydrate &amp; Bolus</string>
     <string name="confirm_remove_multiple_items">Sind Sie sicher, dass Sie diese(s) %1$d Element(e) löschen möchten?</string>
+    <string name="no_records_available">Keine Datensätze verfügbar</string>
+    <string name="hide_loop">Verberge Loop</string>
+    <string name="show_loop">Zeige Loop an</string>
     <string name="count_selected">%1$d ausgewählt</string>
     <string name="sort_label">Sortieren</string>
+    <string name="dialog_canceled">Dialog abgebrochen</string>
+    <string name="veryLow" comment="below 3.1">Sehr niedrig</string>
+    <string name="low" comment="3.1-3.9">Niedrig</string>
+    <string name="high" comment="10.0-13.9">Hoch</string>
+    <string name="veryHigh" comment="above 13.9">Sehr hoch</string>
+    <string name="below" comment="below &quot;in range&quot;">Unter</string>
+    <string name="in_range">Im Zielbereich</string>
+    <string name="above" comment="above &quot;in range&quot;">Über</string>
+    <string name="show_loop_records">Zeige Loop Datensätze</string>
+    <string name="show_hide_records">Verberge Loop Datensätze</string>
+    <string name="widget_description">AndroidAPS Widget</string>
+    <string name="configure">Deckkraft konfigurieren</string>
+    <string name="loop_status">Loop Status</string>
+    <string name="graph_scale">Diagrammskala</string>
+    <string name="profile1">Profil 1</string>
+    <string name="profile2">Profil 2</string>
     <string name="login">Login</string>
+    <string name="remove_all">Alle entfernen</string>
+    <string name="reset_start">Start zurücksetzen</string>
+    <string name="a11y_otp_qr_code">QR Code für einmaliges Passwort einrichten</string>
+    <string name="a11y_open_settings">Einstellungen öffnen</string>
+    <string name="a11y_set_carb_timer">setze Alarm für KH Timer</string>
+    <string name="device_all">Alle</string>
+    <string name="device_phone">Smartphone</string>
+    <string name="device_watch">Smartwatch</string>
+    <string name="a11y_only_on_watch">nur auf Uhr</string>
+    <string name="a11y_only_on_phone">nur auf Telefon</string>
+    <string name="a11y_drag_and_drop_handle">Drag and Drop Handle</string>
+    <string name="search">Suche</string>
     <!-- Aidex Cgms -->
+    <string name="aidex">GlucoRx Aidex</string>
+    <string name="aidex_short">Aidex</string>
+    <string name="description_source_aidex">Erhalte BG-Werte von GlucoRx Aidex CGMS.</string>
+    <string name="blocked_by_charging">Blockiert durch Ladeoptionen</string>
+    <string name="blocked_by_connectivity">Blockiert durch Verbindungsoptionen</string>
+    <string name="no_watch_connected">(keine Uhr verbunden)</string>
+    <string name="error_asking_for_permissions">Fehler beim Anfordern der Erlaubnis</string>
+    <string name="dynisf_adjust_sensitivity">Empfindlichkeit und BZ anpassen</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 f7514986ed..da7295dcea 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -502,7 +502,6 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Αύξηση ευαισθησίας για προσωρινό στόχο > = 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Ο χαμηλός προσωρινός στόχος μειώνει την ευαισθησία</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Χαμηλότερη ευαισθησία για προσωρινό στόχο < 100]]></string>
-    <string name="careportal_removestartedevents">Ξεκίνησε το AndroidAPS καθαρό</string>
     <string name="storedsettingsfound">Βρέθηκαν αποθηκευμένες ρυθμίσεις</string>
     <string name="allow_hardware_pump_text">Προσοχή: Εάν ενεργοποιήσετε και συνδεθείτε με μια αντλία, το AndroidAPS θα αντιγράψει τις ρυθμίσεις βασικού από το προφίλ στην αντλία, αντικαθιστώντας τον υπάρχων βασικό ρυθμό της αντλίας. Βεβαιωθείτε ότι έχετε τον σωστό βασικό ρυθμό στο AndroidAPS. Εάν δεν είστε βέβαιοι ή δεν θέλετε να αντικαταστήσετε τον βασικό ρυθμό στην αντλία σας, πατήστε Άκυρο και επαναλάβετε εναλλαγή προς την αντλία σε μεταγενέστερο χρόνο.</string>
     <string name="error_adding_treatment_title">Ελλιπή δεδομένα θεραπείας</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index d8e5d59e56..e8f55b0a79 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">La aplicación necesita permisos del sistema para poder mostrarse sobre otras aplicaciones, para las notificaciones</string>
     <string name="needlocationpermission">La aplicación necesita permiso de ubicación para poder buscar dispositivos Bluetooth y redes WiFi</string>
     <string name="needstoragepermission">La aplicación necesita permiso de almacenamiento para poder almacenar archivos de registro y valores de exportación</string>
-    <string name="needconnectpermission">La aplicación necesita permiso de bluetooth</string>
     <string name="request">Solicitar</string>
     <string name="open_navigation">Abrir navegación</string>
     <string name="close_navigation">Cerrar navegación</string>
@@ -666,7 +665,7 @@
     <string name="resistance_lowers_target_summary">Cuando se detecta resistencia a la insulina, disminuye el objetivo de glucosa</string>
     <string name="sensitivity_raises_target_title">Sensibilidad aumenta el objetivo</string>
     <string name="sensitivity_raises_target_summary">Cuando se detecta sensibilidad a la insulina, aumenta el objetivo de glucosa</string>
-    <string name="careportal_removestartedevents">Comenzar la limpieza de AndroidAPS</string>
+    <string name="careportal_removestartedevents">Eliminar registros de inicio de AAPS</string>
     <string name="show_invalidated">Mostrar invalidados</string>
     <string name="hide_invalidated">Ocultar invalidados</string>
     <string name="remove_items">Eliminar elementos</string>
@@ -1045,4 +1044,6 @@
     <string name="blocked_by_charging">Bloqueado por opciones de carga</string>
     <string name="blocked_by_connectivity">Bloqueado por opciones de conectividad</string>
     <string name="no_watch_connected">(Ningún reloj conectado)</string>
+    <string name="error_asking_for_permissions">Error al solicitar permisos</string>
+    <string name="dynisf_adjust_sensitivity">Ajustar sensibilidad y glucosa</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 5988390a0d..a166f7fd52 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -646,7 +646,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="needsystemwindowpermission">L\'application a besoin de l\'autorisation d\'accès à la fenêtre système pour les notifications</string>
     <string name="needlocationpermission">L\'application a besoin de l\'autorisation de localisation pour l\'analyse BT et l\'identification WiFi</string>
     <string name="needstoragepermission">L\'application a besoin d\'une autorisation de stockage pour pouvoir stocker les fichiers journaux et les paramètres d\'exportation</string>
-    <string name="needconnectpermission">L\'application a besoin de l\'autorisation Bluetooth</string>
     <string name="request">Demande</string>
     <string name="open_navigation">Ouvrir navigation</string>
     <string name="close_navigation">Fermer navigation</string>
@@ -667,7 +666,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="resistance_lowers_target_summary">Quand une résistance est détectée, baisse de la glycémie cible</string>
     <string name="sensitivity_raises_target_title">Sensibilité augmente la cible</string>
     <string name="sensitivity_raises_target_summary">Quand une sensibilité est détectée, augmentation de la glycémie cible</string>
-    <string name="careportal_removestartedevents">Réinitialiser AndroidAPS</string>
+    <string name="careportal_removestartedevents">Suppr. entrées \"Démarrage AAPS\"</string>
     <string name="show_invalidated">Montrer les entrées invalides</string>
     <string name="hide_invalidated">Masquer les entrées invalides</string>
     <string name="remove_items">Supprimer des entrées</string>
@@ -1045,4 +1044,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="blocked_by_charging">Bloqué par les options de recharge</string>
     <string name="blocked_by_connectivity">Bloqué par les options de connectivité</string>
     <string name="no_watch_connected">(Pas de montre connectée)</string>
+    <string name="error_asking_for_permissions">Erreur lors de la demande des autorisations</string>
+    <string name="dynisf_adjust_sensitivity">Ajuster la sensibilité et la glycémie</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 115e43452f..b73615f8f0 100644
--- a/app/src/main/res/values-ga-rIE/strings.xml
+++ b/app/src/main/res/values-ga-rIE/strings.xml
@@ -3,184 +3,6 @@
     <!--    <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="nav_preferences_plugin">%1$s Sainroghanna</string>
-    <string name="nav_preferences">Sainroghanna</string>
-    <string name="reset_db_confirm">An bhfuil tú cinnte gur mian leat an bhunachair sonraí a athshocrú?</string>
-    <string name="nav_exit">Scoir</string>
-    <string name="description_source_mm640g">Luachanna BG a fháil ón 600SeriesAndroidUploader.</string>
-    <string name="description_source_ns_client">Sonraí a íoslódáil ó Nightscout</string>
-    <string name="description_source_xdrip">Luachanna BG a fháil ó xDrip+.</string>
-    <string name="treatments_insulin_label_string">Inslin:</string>
-    <string name="treatments_carbs_label_string">Carbí:</string>
-    <string name="treatments_iob_label_string">IOB:</string>
-    <string name="sms_iob">IOB:</string>
-    <string name="treatments_iobtotal_label_string">Lomlán IOB:</string>
-    <string name="tempbasals_realduration_label_string">Fad:</string>
-    <string name="tempbasals_netratio_label_string">Cóimheas:</string>
-    <string name="tempbasals_netinsulin_label_string">Ins:</string>
-    <string name="tempbasals_iob_label_string">IOB:</string>
-    <string name="tempbasals_iobtotal_label_string">Lomlán IOB:</string>
-    <string name="treatments_wizard_bg_label">BG</string>
-    <string name="treatments_wizard_tt_label">TT</string>
-    <string name="treatments_wizard_carbs_label">Carbí</string>
-    <string name="treatments_wizard_correction_label">Cear</string>
-    <string name="openapsma_run">Reáchtáil anois</string>
-    <string name="openapsma_lastrun_label">Reáchtáil deiridh</string>
-    <string name="openapsma_glucosestatus_label">Glúcóis stádas</string>
-    <string name="openapsma_profile_label">Próifíl</string>
-    <string name="result">Toradh</string>
-    <string name="result_insulin_carbs">Toradh: %1$s %2$s</string>
-    <string name="delta">Deilte</string>
-    <string name="sms_delta">Deilte:</string>
-    <string name="treatments">Cóireálacha</string>
-    <string name="configbuilder_pump">Caidéil</string>
-    <string name="configbuilder_profile">Próifíl</string>
-    <string name="configbuilder_aps">APS</string>
-    <string name="configbuilder_general">Ginearálta</string>
-    <string name="constraints">Srianta</string>
-    <string name="configbuilder_loop">Lúb</string>
-    <string name="loop_aps_label">APS</string>
-    <string name="overview_calculator_label">Áireamhán</string>
-    <string name="sms_bolus">Bólas:</string>
-    <string name="sms_basal">Bunaidh:</string>
-    <string name="configbuilder_bgsource">Foinse BG</string>
-    <string name="xdrip">xDrip+</string>
-    <string name="apsmode_title">APS mód</string>
-    <string name="closedloop">Lúb dúnta</string>
-    <string name="openloop">Lúb oscailte</string>
-    <string name="disabledloop">Lúb díchumasaithe</string>
-    <string name="treatments_wizard_basaliob_label">Bunaidh IOB</string>
-    <string name="careportal_newnstreatment_other">Eile</string>
-    <string name="careportal_newnstreatment_sensor">Braiteoir</string>
-    <string name="careportal_newnstreatment_duration_label">Fad</string>
-    <string name="careportal_newnstreatment_glucosetype">Glúcóis cineál</string>
-    <string name="exported">Easpórtáil Socruithe</string>
-    <string name="export_to">Socruithe Easpórtáil chun</string>
-    <string name="nav_export">Socruithe Easpórtáil</string>
-    <string name="nav_import">Socruithe Iompórtáil</string>
-    <string name="check_preferences_import_btn">Iompórtáil</string>
-    <string name="save">Sábháil</string>
-    <string name="reloadprofile">Athlódáil próifíl</string>
-    <string name="smscommunicator_loophasbeendisabled">Is lúb díchumasaithe</string>
-    <string name="smscommunicator_loophasbeenenabled">Is lúb cumasaithe</string>
-    <string name="smscommunicator_loopisenabled">Is lúb cumasaithe</string>
-    <string name="smscommunicator_tempbasalcancelfailed">Cealú TBR teip</string>
-    <string name="overview_editquickwizard_carbs">Carbí:</string>
-    <string name="overview_editquickwizard_valid">Bailí:</string>
-    <string name="overview_editquickwizardlistactivity_add">Cuir</string>
-    <string name="overview_quickwizard_item_edit_button">In eagar</string>
-    <string name="correctionbous">Cear</string>
-    <string name="actions">Gníomhartha</string>
-    <string name="button1">Cnaipe 1</string>
-    <string name="button2">Cnaipe 2</string>
-    <string name="button3">Cnaipe 3</string>
-    <string name="units_colon">Aonaid:</string>
-    <string name="units">Aonaid</string>
-    <string name="dia">DIA</string>
-    <string name="sms_actualbg">BG:</string>
-    <string name="sms_lastbg">GF deiridh:</string>
-    <string name="MM640g">MM640g</string>
-    <string name="sms_minago">%1$dnóim ó shin</string>
-    <string name="openapsama">OpenAPS AMA</string>
-    <string name="actions_shortname">GNÍ</string>
-    <string name="loop_shortname">LÚB</string>
-    <string name="oaps_shortname">OAPS</string>
-    <string name="overview_shortname">BAILE</string>
-    <string name="wear_shortname">WEAR</string>
-    <string name="smscommunicator_shortname">SMS</string>
-    <string name="profile">Próifíl</string>
-    <string name="overview_calibration">Calabrú</string>
-    <string name="pumpsuspended">Caidéil ar fionraí</string>
-    <string name="executing">Feidhmiú</string>
-    <string name="nsclientinternal_url">URL:</string>
-    <string name="restart">Atosaigh</string>
-    <string name="deliver_now">Seachadadh anois</string>
-    <string name="status">Stádas:</string>
-    <string name="patientage">Othar cineál</string>
-    <string name="child">Páiste</string>
-    <string name="teenage">Déagóirí</string>
-    <string name="adult">Duine fásta</string>
-    <string name="patient_name">Ainm cineál</string>
-    <string name="Glimp">Glimp</string>
-    <string name="loopsuspended">Lúb ar fionraí</string>
-    <string name="loopsuspendedfor">Ar fionraí (%1$d nóim)</string>
-    <string name="suspendloopfor1h">Fionraí lúb do 1 u</string>
-    <string name="suspendloopfor2h">Fionraí lúb do 2 u</string>
-    <string name="suspendloopfor3h">Fionraí lúb do 3 u</string>
-    <string name="suspendloopfor10h">Fionraí lúb do 10 u</string>
-    <string name="disconnectpump">Dhícheangal Caidéil</string>
-    <string name="disconnectpumpfor15m">Dhícheangal Caidéil do 15 nóim</string>
-    <string name="disconnectpumpfor30m">Dhícheangal Caidéil do 30 nóim</string>
-    <string name="disconnectpumpfor1h">Dhícheangal Caidéil do 1 u</string>
-    <string name="disconnectpumpfor2h">Dhícheangal Caidéil do 2 u</string>
-    <string name="disconnectpumpfor3h">Dhícheangal Caidéil do 3 u</string>
-    <string name="duration15m">15 nóim</string>
-    <string name="duration30m">30 nóim</string>
-    <string name="duration1h">1 uair</string>
-    <string name="duration2h">2 uair</string>
-    <string name="duration3h">3 uair</string>
-    <string name="duration10h">10 uair</string>
-    <string name="resume">Atosú</string>
-    <string name="smscommunicator_loopsuspended">Lúb ar fionraí</string>
-    <string name="smscommunicator_loopresumed">Lúb atógáil</string>
-    <string name="treatments_wizard_cob_label">COB</string>
-    <string name="ultrafastactinginsulincomment">Fiasp</string>
-    <string name="insulin_shortname">INS</string>
-    <string name="basal_shortname">BUN</string>
-    <string name="activity_shortname">GNÍ</string>
-    <string name="nav_about">Faoi</string>
-    <string name="xdripstatus_shortname">xds</string>
-    <string name="careportal_sensor_label">Braiteoir</string>
-    <string name="careportal_insulin_label">Inslin</string>
-    <string name="careportal_pb_label">Caidéil ceallraí</string>
-    <string name="careportal_age_label">aois:</string>
-    <string name="ns_alarmoptions">Aláraim roghanna</string>
-    <string name="openaps">OpenAPS</string>
-    <string name="openaps_short">OAPS</string>
-    <string name="basal_short">BUN</string>
-    <string name="openapssmb">OpenAPS SMB</string>
-    <string name="rapid_acting_oref">Rapid-Acting Oref</string>
-    <string name="lyumjev">Lyumjev</string>
-    <string name="careportal_newnstreatment_percentage_label">Céatadán</string>
-    <string name="activity_duration">Gníomhaíocht fad</string>
-    <string name="activity_target">Gníomhaíocht sprioc</string>
-    <string name="food">Bia</string>
-    <string name="shortgramm">g</string>
-    <string name="shortkilojoul">kJ</string>
-    <string name="loopenabled">Lúb cumasaithe</string>
-    <string name="apsselected">APS  roghnaithe</string>
-    <string name="overview_insulin_label">Inslin</string>
-    <string name="overview_buttons_selection">Cnaipi</string>
-    <string name="overview_cgm">CGM</string>
-    <string name="temptargetshort">TT</string>
-    <string name="category">Catagóir</string>
-    <string name="overview_show_activity">Gníomhaíocht</string>
-    <string name="overview_show_basals">Bunaidhi</string>
-    <string name="food_short">Bia</string>
-    <string name="next_button">Ar Aghaidh</string>
-    <string name="previous_button">Roimhe seo</string>
-    <string name="cgm">CGM</string>
-    <string name="ns_wifi_ssids">WiFi SSID</string>
-    <string name="wear_general_settings">Socruithe Ginearálta</string>
-    <string name="poctech">Poctech</string>
-    <string name="treatments_wizard_total_label">Lomlán</string>
-    <string name="profile_total">== ∑  %1$s A</string>
-    <string name="tomato">Tomato (MiaoMiao)</string>
-    <string name="tomato_short">Tomato</string>
-    <string name="tidepool">Tidepool</string>
-    <string name="tidepool_shortname">TDP</string>
-    <string name="twohours">2u</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">nóim</string>
-    <string name="profile_name">Ainm Próifíle:</string>
-    <string name="unitsnosemicolon">Aonaid</string>
-    <string name="dia_short">DIA</string>
-    <string name="ic_short">IC</string>
-    <string name="isf_short">ISF</string>
-    <string name="randombg_short">BG</string>
     <!-- SMS Communicator & OTP Authenticator -->
     <!-- Theme switcher dark and light mode-->
     <!-- WEAR OS-->
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 699936420f..4b4ccb5887 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">L\'applicazione richiede l\'autorizzazione \"finestra di sistema\" per le notifiche</string>
     <string name="needlocationpermission">L\'applicazione richiede l\'accesso alla posizione per la scansione bluetooth e l\'identificazione WiFi</string>
     <string name="needstoragepermission">L\'applicazione richiede l\'accesso alla memoria per memorizzare i file di log ed esportare le impostazioni</string>
-    <string name="needconnectpermission">L\'applicazione richiede l\'autorizzazione bluetooth</string>
     <string name="request">Richiesta</string>
     <string name="open_navigation">Apri navigazione</string>
     <string name="close_navigation">Chiudi navigazione</string>
@@ -666,7 +665,6 @@
     <string name="resistance_lowers_target_summary">Quando viene rilevata resistenza, ridurre la glicemia target</string>
     <string name="sensitivity_raises_target_title">La sensibilità aumenta il target</string>
     <string name="sensitivity_raises_target_summary">Quando viene rilevata sensibilità, aumentare la glicemia target</string>
-    <string name="careportal_removestartedevents">Rimuovi gli eventi \"AndroidAPS avviato\"</string>
     <string name="show_invalidated">Mostra invalidato</string>
     <string name="hide_invalidated">Nascondi invalidato</string>
     <string name="remove_items">Rimuovi elementi</string>
@@ -1045,4 +1043,6 @@
     <string name="blocked_by_charging">Bloccato dalle opzioni di ricarica</string>
     <string name="blocked_by_connectivity">Bloccato dalle opzioni di connettività</string>
     <string name="no_watch_connected">(Nessuno smartwatch connesso)</string>
+    <string name="error_asking_for_permissions">Errore nel richiedere le autorizzazioni</string>
+    <string name="dynisf_adjust_sensitivity">Regola sensibilità e BG</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 a51a33dfee..438fa5b589 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">האפליקציה צריכה הרשאת מערכת של חלונות לצורך התראות</string>
     <string name="needlocationpermission">דרושה הרשאת מיקום עבור סריקת בלוטות\' וזיהוי WiFi</string>
     <string name="needstoragepermission">דרושה הרשאת אחסון כדי שתוכלו לאחסן קובצי יומן והגדרות יצוא.</string>
-    <string name="needconnectpermission">האפליקציה צריכה הרשאה לבלוטות\'</string>
     <string name="request">בקשה</string>
     <string name="open_navigation">פתח ניווט</string>
     <string name="close_navigation">סגור ניווט</string>
@@ -666,7 +665,8 @@
     <string name="resistance_lowers_target_summary">כשמזוהה תנגודת, הורד את ערך המטרה של הגלוקוז</string>
     <string name="sensitivity_raises_target_title">רגישות מעלה את ערך המטרה</string>
     <string name="sensitivity_raises_target_summary">כשמזוהה רגישות, הגדל את ערך המטרה של הגלוקוז</string>
-    <string name="careportal_removestartedevents">מחק אירועי \"AndroidAPS Started\"</string>
+    <string name="show_invalidated">הצג פסולים</string>
+    <string name="hide_invalidated">הסתר פסולים</string>
     <string name="remove_items">הסר פריטים</string>
     <string name="sort_items">מיין פריטים</string>
     <string name="storedsettingsfound">נמצאו הגדרות שמורות</string>
@@ -1041,4 +1041,6 @@
     <string name="blocked_by_charging">חסום ע\"י הגדרות טעינה</string>
     <string name="blocked_by_connectivity">חסום ע\"י הגדרות חיבור</string>
     <string name="no_watch_connected">(השעון לא מחובר)</string>
+    <string name="error_asking_for_permissions">שגיאה בעת בקשת הרשאות</string>
+    <string name="dynisf_adjust_sensitivity">כיוונון הרגישות והסוכר בדם</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 90652a8a7a..76e284a2c5 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -639,7 +639,6 @@
     <string name="resistance_lowers_target_summary">저항성이 감지되면, 목표 혈당을 낮춥니다.</string>
     <string name="sensitivity_raises_target_title">민감성이 목표 올리기</string>
     <string name="sensitivity_raises_target_summary">민감성이 감지되면, 목표 혈당을 높입니다.</string>
-    <string name="careportal_removestartedevents">\"AndroidAPS 시작\" 기록 삭제하기</string>
     <string name="storedsettingsfound">저장된 설정이 있습니다.</string>
     <string name="allow_hardware_pump_text">주의: 활성화하고 펌프에 연결하게되면, AndroidAPS는 프로파일의 Basal설정을 복사해서 기존에 펌프에 저장되어 있던 Basal설정을 덮어쓰게 될것입니다. AndroidAPS의 Basal설정이 올바른지 반드시 확인하세요. 만약 확실치 않거나 Basal설정을 덮어씌우길 원치않는다면, 취소버튼을 누르고 나중에 다시 연결하세요.</string>
     <string name="error_adding_treatment_title">관리 데이터가 불완전합니다</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 211286d69f..60086670bb 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -631,7 +631,6 @@
     <string name="needsystemwindowpermission">Norint gauti pranešimus, programai reikalingas sisteminio lango leidimas</string>
     <string name="needlocationpermission">Programai reikia vietos nustatymo leidimo, kad būtų galima naudoti Bluetooth ir WiFi</string>
     <string name="needstoragepermission">Aplikacijai reikia leidimo prieigai prie saugyklos, kad galėtų išsaugoti žurnalo įrašus ir eksportavimo nustatymus</string>
-    <string name="needconnectpermission">Programai reikalinga Bluetooth prieigos teisė</string>
     <string name="request">Užklausa</string>
     <string name="open_navigation">Atidaryti meniu</string>
     <string name="close_navigation">Uždaryti meniu</string>
@@ -652,7 +651,6 @@
     <string name="resistance_lowers_target_summary">Kai nustatoma rezistencija, tikslinė gliukozės vertė sumažinama</string>
     <string name="sensitivity_raises_target_title">Jautrumas didina tikslą</string>
     <string name="sensitivity_raises_target_summary">Kai aptinkamas padidėjęs jautrumas insulinui, tikslinis gliukozės lygis padidinamas</string>
-    <string name="careportal_removestartedevents">Ištrinti \"AndroidAPS paleista\" įrašus</string>
     <string name="storedsettingsfound">Rasti išsaugoti nustatymai</string>
     <string name="allow_hardware_pump_text">Dėmesio: jei aktyvuosite ir prijungsite prie aparatinės pompos, AndroidAPS nukopijuos bazės nustatymus iš profilio į pompą, pakeisdamas esančius nustatymus pompoje. Įsitikinkite, kad turimi bazės nustatymai AndroidAPS yra teisingi. Jei nesate tikri arba nenorite iš naujo keisti bazės nustatymų jūsų pompoje, paspauskite atšaukti ir pakartokite prijungimą prie pompos kitą kartą.</string>
     <string name="error_adding_treatment_title">Terapijos duomenys nepilni</string>
@@ -894,6 +892,7 @@
     <string name="not_available_full">Negalimas</string>
     <!-- Theme switcher dark and light mode-->
     <!-- WEAR OS-->
+    <string name="sort_label">Rūšiuoti</string>
     <string name="login">Prisijungti</string>
     <!-- Aidex Cgms -->
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index b1beae35b7..d87c17473e 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">Toepassing vereist systeemvenstermachtiging voor meldingen</string>
     <string name="needlocationpermission">App heeft locatie toestemming nodig voor Bluetooth scan en WiFi identificatie</string>
     <string name="needstoragepermission">Applicatie heeft toestemming nodig om log bestanden op te slaan en instellingen te exporteren</string>
-    <string name="needconnectpermission">Applicatie heeft Bluetooth toestemming nodig</string>
     <string name="request">Verzoek</string>
     <string name="open_navigation">Open navigatie</string>
     <string name="close_navigation">Sluit navigatie</string>
@@ -666,7 +665,6 @@
     <string name="resistance_lowers_target_summary">Wanneer insulineresistentie wordt gedetecteerd, wordt het BG streefdoel verlaagd</string>
     <string name="sensitivity_raises_target_title">Gevoeligheid verhoogt het doel</string>
     <string name="sensitivity_raises_target_summary">Wanneer insulinegevoeligheid wordt gedetecteerd, wordt het BG streefdoel verhoogd</string>
-    <string name="careportal_removestartedevents">Verwijder AndroidAPS start-meldingen</string>
     <string name="show_invalidated">Toon ongeldig</string>
     <string name="hide_invalidated">Verberg ongeldig</string>
     <string name="remove_items">Items verwijderen</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 21dbe2cb6a..9641693ebc 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">App trenger tillatelse til å bruke Varslinger for å vise meldinger</string>
     <string name="needlocationpermission">App trenger tilgang til Posisjon for å søke etter Bluetooth og Wifi enheter</string>
     <string name="needstoragepermission">App trenger tilgang til Lagring for lagre logg filer og eksportere innstillinger</string>
-    <string name="needconnectpermission">Appen trenger bluetooth tillatelse</string>
     <string name="request">Forespørsel</string>
     <string name="open_navigation">Åpne meny</string>
     <string name="close_navigation">Lukk meny</string>
@@ -666,7 +665,6 @@
     <string name="resistance_lowers_target_summary">Hvis resistens oppdages vil det redusere BS målverdi</string>
     <string name="sensitivity_raises_target_title">Sensitivitet øker BS målverdi</string>
     <string name="sensitivity_raises_target_summary">Når systemet oppdager økt insulinsensitivitet, vil BS målverdi økes</string>
-    <string name="careportal_removestartedevents">Basis AndroidAPS startet</string>
     <string name="show_invalidated">Vis ugyldige oppføringer</string>
     <string name="hide_invalidated">Skjul ugyldige oppføringer</string>
     <string name="remove_items">Fjern oppføringer</string>
@@ -1045,4 +1043,6 @@
     <string name="blocked_by_charging">Blokkert på grunn av ladealternativer</string>
     <string name="blocked_by_connectivity">Blokkert på grunn av tilkoblingsalternativer</string>
     <string name="no_watch_connected">(Ingen klokke tilkoblet)</string>
+    <string name="error_asking_for_permissions">Feil under spørring etter tillatelser</string>
+    <string name="dynisf_adjust_sensitivity">Juster sensitivitet og BS</string>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 716f005083..3b71aea876 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -244,6 +244,7 @@
     <string name="wear">Oprogramowanie Wear (Smartwatch)</string>
     <string name="resend_all_data">Prześlij ponownie wszystkie dane</string>
     <string name="open_settings_on_wear">Otwórz ustawienia dla Wear</string>
+    <string name="basal_rate">Dawka bazowa</string>
     <string name="basalvaluebelowminimum">Wartość bazy poniżej minimum. Nie ustawiono profilu!</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Ostatnia BG:</string>
@@ -631,7 +632,6 @@
     <string name="needsystemwindowpermission">Aplikacja wymaga uprawnienia systemowego okna dla powiadomień</string>
     <string name="needlocationpermission">Aplikacja wymaga dostępu do lokalizacji dla zarządzania bluetoothem i identyfikacją Wi-Fi</string>
     <string name="needstoragepermission">Aplikacja wymaga zgody na zapis do pamięci, aby móc przechować pliki logów i eksportować ustawienia</string>
-    <string name="needconnectpermission">Aplikacja wymaga uprawnienia Bluetooth</string>
     <string name="request">Żądanie</string>
     <string name="open_navigation">Otwórz menu</string>
     <string name="close_navigation">Zamknij menu</string>
@@ -652,7 +652,6 @@
     <string name="resistance_lowers_target_summary">Po wykryciu oporności obniża się docelowy poziom cukru</string>
     <string name="sensitivity_raises_target_title">Wrażliwość podnosi docelowy poziom glukozy</string>
     <string name="sensitivity_raises_target_summary">Po zwiększeniu wrażliwości zwiększ docelowy poziom glukozy</string>
-    <string name="careportal_removestartedevents">Wyczyść zdarzenia \"Start AndroidAPS\"</string>
     <string name="storedsettingsfound">Znaleziono zapisane ustawienia</string>
     <string name="allow_hardware_pump_text">Uwaga: Jeśli aktywujesz połączenie z pompą inną niż wirtualna, AndroidAPS skopiuje ustawienia bazy do profilu pompy, zastępując istniejące ustawienia w niej zapisane. Upewnij się, że ustawienia bazy w AndroidAPS są poprawne. Jeśli nie jesteś pewien lub nie chcesz nadpisywać podstawowych ustawień pompy, naciśnij przycisk anuluj i połącz ponownie w innym czasie.</string>
     <string name="error_adding_treatment_title">Niekompletne dane leczenie</string>
@@ -667,6 +666,7 @@
     <string name="error_adding_treatment_message">Leczenie (insulina: %1$.2f, węglowodany: %2$d, czas:%3$s) nie mogą być dodane. Sprawdź i dodaj ręcznie rekord w razie potrzeby.</string>
     <string name="generated_ecarbs_note">eWęgle: %1$d g (%2$d h), Opóźnienie: %3$d m</string>
     <string name="openaps_noasdata">Brak dostępnych danych autosens</string>
+    <string name="log_files">Log files</string>
     <string name="nav_logsettings">Ustawienia logów</string>
     <string name="resettodefaults">Przywróć ustawienia domyślne</string>
     <string name="nsmalfunction">Usterka NSClient. Spróbuj zrestartować NS i NSClient.</string>
@@ -748,6 +748,8 @@
     <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>
+    <string name="age">Czas</string>
+    <string name="weight_label">Waga</string>
     <string name="id">ID:</string>
     <string name="submit">Wyślij</string>
     <string name="mostcommonprofile">Najczęściej używany profil:</string>
@@ -797,6 +799,7 @@
     <string name="smscommunicator_otp_install_info">Na każdym telefonie śledzącym zainstalować aplikację uwierzytelniania obsługującą tokeny TOTP RFC 6238 Popularne darmowe aplikacje:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
     <string name="smscommunicator_otp_reset_warning">Resetowanie uwierzytelniania powoduje, że wszystkie już ustawione uwierzytelnienia stają się niepoprawne (przestają działać). Trzeba będzie je jeszcze raz skonfigurować!</string>
     <string name="overview_show_predictions">Prognozy poziomu</string>
+    <string name="overview_show_treatments">Zabiegi</string>
     <string name="overview_show_deviationslope">Krzywa odchylenie</string>
     <string name="authorizationfailed">Autoryzacja nie powiodła się</string>
     <string name="overview_show_absinsulin">Cała insulina</string>
@@ -896,6 +899,7 @@
     <!-- WEAR OS-->
     <string name="remove_selected_items">Usuń wybrane pozycje</string>
     <string name="confirm_remove_multiple_items">Czy na pewno chcesz usunąć %1$d pozycji</string>
+    <string name="no_records_available">Brak wpisów</string>
     <string name="count_selected">Wybrany %1$d</string>
     <string name="sort_label">Sortuj</string>
     <string name="login">Zaloguj się</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index fc2d50ec62..52d2a80004 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -552,7 +552,7 @@
     <string name="smbnotallowedinopenloopmode">SMB não permitido no modo open loop</string>
     <string name="food_short">Alimentos</string>
     <string name="reset">repor</string>
-    <string name="openapssmb_maxiob_title">Máximo total IOS OpenAPS não pode superar [U]</string>
+    <string name="openapssmb_maxiob_title">Máximo total de IOB OpenAPS não pode superar [U]</string>
     <string name="openapssmb_maxiob_summary">Este valor é chamado de Max IOB em contexto de OpenAPS\nOpenAPS não adicionará mais insulina se o IOB atual for maior que este valor</string>
     <string name="absorption_cutoff_title">Tempo máx. absorção refeição [h]</string>
     <string name="absorption_cutoff_summary">Hora em que qualquer refeição é considerada absorvida. Restantes hidratos de carbono serão cortados.</string>
@@ -616,7 +616,6 @@
     <string name="resistance_lowers_target_summary">Quando a resistência for detectada, diminui o alvo de glicose</string>
     <string name="sensitivity_raises_target_title">Sensibilidade aumenta o alvo</string>
     <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
-    <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
     <string name="sort_items">Ordenar itens</string>
     <string name="storedsettingsfound">Configurações encontradas</string>
     <string name="allow_hardware_pump_text">Atenção: Se conectar à sua bomba física e ativar o perfil, o AndroidAPS irá copiar as definições desse perfil para as definições da bomba, apagando o memorizado na bomba. Por favor verifique que o que preencheu no perfil do app tem os mesmos valores que estão na bomba. Em caso contrário pressione imediatamente cancelar e corrija antes de voltar a ligar à bomba.</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 1049c0380e..74e3f6421f 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -631,7 +631,6 @@
     <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
     <string name="needlocationpermission">Aplicação necessita de permissão de localização para pesquisa Bluetooth e identificação Wi-Fi</string>
     <string name="needstoragepermission">A aplicação precisa da permissão de armazenamento para poder armazenar ficheiros de registo e exportar definições</string>
-    <string name="needconnectpermission">Aplicação precisa de permissão Bluetooth</string>
     <string name="request">Pedido</string>
     <string name="open_navigation">Abrir a navegação</string>
     <string name="close_navigation">Fechar a navegação</string>
@@ -652,7 +651,6 @@
     <string name="resistance_lowers_target_summary">Quando a resistência for detectada, diminui o alvo de glicose</string>
     <string name="sensitivity_raises_target_title">Sensibilidade aumenta o alvo</string>
     <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
-    <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
     <string name="storedsettingsfound">Definições armazenadas encontradas</string>
     <string name="allow_hardware_pump_text">Atenção: Se conectar à sua bomba física e activar o perfil, a AndroidAPS irá copiar as definições desse perfil para as definições da bomba, apagando o perfil memorizado na bomba. Por favor verifique se o que preencheu no perfil da app tem os mesmos valores que estão na bomba. Caso contrário pressione imediatamente cancelar e corrija antes de voltar a ligar à bomba.</string>
     <string name="error_adding_treatment_title">Dados tratamento incompletos</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 2d55df640a..764d305a65 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -631,7 +631,6 @@
     <string name="needsystemwindowpermission">Aplicația are nevoie de permisiune la fereastra sistemului pentru a afișa notificări</string>
     <string name="needlocationpermission">Aplicația are nevoie sa acceseze locația pentru scanare Bluetooth și identificare WiFi</string>
     <string name="needstoragepermission">Aplicația are nevoie de permisiunea de a accesa unitatea de stocare pentru a scrie fișierele registru și pentru a exporta setările</string>
-    <string name="needconnectpermission">Aplicația are nevoie de permisiune Bluetooth</string>
     <string name="request">Cerință</string>
     <string name="open_navigation">Afișare navigație</string>
     <string name="close_navigation">Închidere navigație</string>
@@ -652,7 +651,6 @@
     <string name="resistance_lowers_target_summary">Când e detectata rezistență la insulină, coboară targetul</string>
     <string name="sensitivity_raises_target_title">Sensibilitatea la insulină crește targetul</string>
     <string name="sensitivity_raises_target_summary">Când este detectată sensibilitate la insulină, crește targetul</string>
-    <string name="careportal_removestartedevents">AndroidAPS pornit curat</string>
     <string name="storedsettingsfound">Au fost găsite setări stocate</string>
     <string name="allow_hardware_pump_text">Atenție: Dacă activați și conectați o pompă fizică, AndroidAPS va copia setările bazalelor din profilurile din aplicație în pompă, suprascriindu-le pe cele existente deja în pompă. Asigurați-vă că aveți setările corecte ale bazalelor în AndroidAPS. Dacă aveți dubii sau nu doriți suprascrierea setărilor bazalelor existente în pompă, apăsați butonul de anulare și repetați acțiunea mai târziu.</string>
     <string name="error_adding_treatment_title">Date incomplete despre tratament</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index fa3d099a67..0bf687cd4a 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">Приложению требуется разрешение системного окна для уведомлений</string>
     <string name="needlocationpermission">Приложению требуется разрешение на доступ к местоположению для сканирования BT и идентификации WiFi</string>
     <string name="needstoragepermission">Приложение требует разрешения на доступ к записи в память, чтобы хранить файлы журналов и настройки экспорта</string>
-    <string name="needconnectpermission">Приложению требуется разрешение Bluetooth</string>
     <string name="request">Запрос</string>
     <string name="open_navigation">Показать панель навигации</string>
     <string name="close_navigation">Cкрыть панель навигации</string>
@@ -666,7 +665,7 @@
     <string name="resistance_lowers_target_summary">При обнаружении сопротивляемости целевой уровень гликемии понижается</string>
     <string name="sensitivity_raises_target_title">Чувствительность поднимает цель</string>
     <string name="sensitivity_raises_target_summary">При обнаружении чувствительности целевой уровень глюкозы повышается</string>
-    <string name="careportal_removestartedevents">AndroidAPS перезапущен</string>
+    <string name="careportal_removestartedevents">Удалить начатые записи AAPS</string>
     <string name="show_invalidated">Показать недействительные</string>
     <string name="hide_invalidated">Скрыть недействительные</string>
     <string name="remove_items">Удалить элементы</string>
@@ -1044,4 +1043,6 @@
     <string name="blocked_by_charging">Заблокировано опциями зарядки</string>
     <string name="blocked_by_connectivity">Заблокировано настройками подключения</string>
     <string name="no_watch_connected">(Часы не подключены)</string>
+    <string name="error_asking_for_permissions">Ошибка при запросе разрешения</string>
+    <string name="dynisf_adjust_sensitivity">Настроить чувствительность относительно ГК</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 c77651b5d5..6fd9a964c7 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">Aplikácia vyžaduje pre oznámenia systémové oprávnenie</string>
     <string name="needlocationpermission">Aplikácia vyžaduje oprávnenie polohy, pre vyhľadávanie BT a identifikáciu WiFi</string>
     <string name="needstoragepermission">Aby bolo možné nahrávať logy a exportovať nastavenia, je nutné pre aplikáciu povoliť oprávnenie prístupu k úložisku</string>
-    <string name="needconnectpermission">Aplikácia vyžaduje povolenie bluetooth</string>
     <string name="request">Požiadavka</string>
     <string name="open_navigation">Otvoriť Menu</string>
     <string name="close_navigation">Zavrieť Menu</string>
@@ -666,7 +665,7 @@
     <string name="resistance_lowers_target_summary">Ak je zistená rezistancia, znížiť cieľovú hladinu glykémie</string>
     <string name="sensitivity_raises_target_title">Citlivosť zvyšuje cieľ</string>
     <string name="sensitivity_raises_target_summary">Ak je zistená vyššia citlivosť, zvýši cieľovú hladinu glykémie</string>
-    <string name="careportal_removestartedevents">Vymazať udalosti \"AndroidAPS reštartovaný\"</string>
+    <string name="careportal_removestartedevents">Odstrániť všetky záznamy AAPS spustený</string>
     <string name="show_invalidated">Zobraziť neplatné</string>
     <string name="hide_invalidated">Skryť zneplatnené</string>
     <string name="remove_items">Odstrániť položky</string>
@@ -1045,4 +1044,6 @@
     <string name="blocked_by_charging">Zablokované možnosti nabíjania</string>
     <string name="blocked_by_connectivity">Zablokované možnosti pripojenia</string>
     <string name="no_watch_connected">(Žiadne hodinky nie sú pripojené)</string>
+    <string name="error_asking_for_permissions">Chyba pri žiadosti o oprávnenie</string>
+    <string name="dynisf_adjust_sensitivity">Upraviť citlivosť a glykémiu</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index a85a2e4cb2..8a91b5eee2 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -636,7 +636,6 @@ Eversense-appen.</string>
     <string name="needsystemwindowpermission">Applikationen behöver förhöjd behörighet för aviseringar</string>
     <string name="needlocationpermission">Appen behöver platsåtkomst för bluetooth- och WiFi-identifiering</string>
     <string name="needstoragepermission">Applikationen behöver lagringsbehörighet för att kunna lagra loggfiler och exportinställningar</string>
-    <string name="needconnectpermission">Applikationen behöver bluetooth-behörighet</string>
     <string name="request">Begäran</string>
     <string name="open_navigation">Öppna menyn</string>
     <string name="close_navigation">Stäng menyn</string>
@@ -657,7 +656,6 @@ Eversense-appen.</string>
     <string name="resistance_lowers_target_summary">Om systemet upptäcker tillfällig insulinresistens, sänk mål-BG för att på så sätt tillåta mer insulin</string>
     <string name="sensitivity_raises_target_title">Insulinkänslighet höjer mål-BG</string>
     <string name="sensitivity_raises_target_summary">Om systemet upptäcker tillfällig insulinkänslighet, höj mål-BG för att på så sätt minska insulindoseringen</string>
-    <string name="careportal_removestartedevents">Rensa alla \"AndroidAPS startad\"</string>
     <string name="storedsettingsfound">Tidigare sparade inställningar hittade</string>
     <string name="allow_hardware_pump_text">Varning: Om du aktiverar och ansluter en pump, kommer AndroidAPS skriva över pumpens basalprofil med den aktiva profilen i AndroidAPS. Se till att ha rätt inställningar i appen innan du ansluter. Om du är osäker, tryck på Avbryt och anslut pumpen på nytt vid ett senare tillfälle.</string>
     <string name="error_adding_treatment_title">Behandlingsdata ofullständigt</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 12b3ce5b18..a75a61225e 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -646,7 +646,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <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="needconnectpermission">Uygulama bluetooth iznine ihtiyac duyuyor</string>
     <string name="request">İstek</string>
     <string name="open_navigation">Navigasyonu aç</string>
     <string name="close_navigation">Navigasyonu kapat</string>
@@ -667,7 +666,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <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="careportal_removestartedevents">AAPS tarafından başlatılmış girdileri kaldırın</string>
     <string name="show_invalidated">Geçersiz olanları göster</string>
     <string name="hide_invalidated">Geçersiz olanları gizle</string>
     <string name="remove_items">Öğeleri kaldır</string>
@@ -1046,4 +1045,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="blocked_by_charging">Şarj seçenekleri tarafından engellendi</string>
     <string name="blocked_by_connectivity">Bağlantı seçenekleri tarafından engellendi</string>
     <string name="no_watch_connected">(Saat Bağlı Değil)</string>
+    <string name="error_asking_for_permissions">İzin istenirken hata</string>
+    <string name="dynisf_adjust_sensitivity">Duyarlılığı ve KŞ\'ni ayarlayın</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 642148ddb4..ef92a77915 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -432,6 +432,7 @@
     <string name="ns_localbroadcasts_title">启用本地广播。</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="openaps_smb_dynamic_isf">动态ISF(胰岛素敏感系数)</string>
+    <string name="DynISFAdjust_summary" formatted="false">动态ISF的调整因子。设置100%以上用于更积极的校正，100%以下则不那么积极校正。</string>
     <string name="enableuam">启用 UAM</string>
     <string name="enablesmb">启用微型大剂量</string>
     <string name="enablesmb_summary">使用微型大剂量代替使用临时基础率，更快的干预</string>
@@ -636,7 +637,6 @@
     <string name="needsystemwindowpermission">应用程序需要悬浮窗权限用于发送通知。</string>
     <string name="needlocationpermission">应用程序需要定位权限，才能进行蓝牙扫描及WIFI识别。</string>
     <string name="needstoragepermission">应用程序需要文件存储权限，才能存储日志文件及导出设置。</string>
-    <string name="needconnectpermission">应用程序需要蓝牙权限。</string>
     <string name="request">请求</string>
     <string name="open_navigation">打开导航栏</string>
     <string name="close_navigation">关闭导航栏</string>
@@ -657,7 +657,6 @@
     <string name="resistance_lowers_target_summary">当检测到胰岛素抵抗时，降低血糖的目标值。</string>
     <string name="sensitivity_raises_target_title">敏感时提高目标</string>
     <string name="sensitivity_raises_target_summary">当检测到胰岛素敏感时，提高血糖的目标值。</string>
-    <string name="careportal_removestartedevents">Clean AndroidAPS 启动了</string>
     <string name="show_invalidated">显示无效项</string>
     <string name="hide_invalidated">隐藏失效项</string>
     <string name="remove_items">删除项目</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 5d784dd1f8..d01d0e0b58 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -28,6 +28,7 @@
         <item>@string/bg_lang</item>
         <item>@string/cs_lang</item>
         <item>@string/de_lang</item>
+        <item>@string/dk_lang</item>
         <item>@string/fr_lang</item>
         <item>@string/nl_lang</item>
         <item>@string/es_lang</item>
@@ -55,6 +56,7 @@
         <item>bg</item>
         <item>cs</item>
         <item>de</item>
+        <item>dk</item>
         <item>fr</item>
         <item>nl</item>
         <item>es</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7bc428a968..de4abf23c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <string name="fr_lang" translatable="false">French</string>
     <string name="de_lang" translatable="false">German</string>
+    <string name="dk_lang" translatable="false">Danish</string>
     <string name="el_lang" translatable="false">Greek</string>
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <string name="zh_lang" translatable="false">Chinese</string>
@@ -789,7 +790,6 @@
     <string name="needsystemwindowpermission">Application needs system window permission for notifications</string>
     <string name="needlocationpermission">Application needs location permission for BT scan and WiFi identification</string>
     <string name="needstoragepermission">Application needs storage permission to be able store log files and export settings</string>
-    <string name="needconnectpermission">Application needs bluetooth permission</string>
     <string name="request">Request</string>
     <string name="open_navigation">Open navigation</string>
     <string name="close_navigation">Close navigation</string>
@@ -815,7 +815,7 @@
     <string name="sensitivity_raises_target_title">Sensitivity raises target</string>
     <string name="sensitivity_raises_target_summary">When sensitivity is detected, raise the target glucose</string>
     <string name="key_keep_screen_on" translatable="false">keep_screen_on</string>
-    <string name="careportal_removestartedevents">Clean AndroidAPS started</string>
+    <string name="careportal_removestartedevents">Remove AAPS started entries</string>
     <string name="show_invalidated">Show invalidated</string>
     <string name="hide_invalidated">Hide invalidated</string>
     <string name="remove_items">Remove items</string>
@@ -1251,6 +1251,8 @@
     <string name="blocked_by_charging">Blocked by charging options</string>
     <string name="blocked_by_connectivity">Blocked by connectivity options</string>
     <string name="no_watch_connected">(No Watch Connected)</string>
-
+    <string name="error_asking_for_permissions">Error asking for permissions</string>
+    <string name="key_adjust_sensitivity" translatable="false">dynisf_adjust_sensitivity</string>
+    <string name="dynisf_adjust_sensitivity">Adjust sensitivity and BG</string>
 
 </resources>
diff --git a/app/src/main/res/xml/pref_autotune.xml b/app/src/main/res/xml/pref_autotune.xml
index aef72365a0..7cc1d6d488 100644
--- a/app/src/main/res/xml/pref_autotune.xml
+++ b/app/src/main/res/xml/pref_autotune.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
+
     <PreferenceCategory
         android:key="@string/key_autotune_plugin"
         android:title="@string/autotune_settings"
@@ -24,12 +26,19 @@
             android:summary="@string/autotune_tune_insulin_curve_summary"
             android:title="@string/autotune_tune_insulin_curve_title" />
         -->
-        <EditTextPreference
+
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="5"
-            android:inputType="number"
             android:key="@string/key_autotune_default_tune_days"
-            android:summary="@string/autotune_default_tune_days_summary"
-            android:title="@string/autotune_default_tune_days_title" />
+            android:title="@string/autotune_default_tune_days_title"
+            android:dialogMessage="@string/autotune_default_tune_days_summary"
+            android:digits="0123456789"
+            android:inputType="number"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            validate:maxNumber="30"
+            validate:minNumber="1"
+            validate:testType="numericRange" />
 
         <SwitchPreference
             android:defaultValue="false"
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index ebe3e0ec92..3bc1e985db 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -30,7 +30,7 @@
 
         <SwitchPreference
             android:defaultValue="false"
-            android:key="openapsama_useautosens"
+            android:key="@string/key_openapsama_useautosens"
             android:title="@string/openapsama_useautosens" />
 
         <SwitchPreference
diff --git a/app/src/main/res/xml/pref_openapssmbdynamicisf.xml b/app/src/main/res/xml/pref_openapssmbdynamicisf.xml
index c1267c75ef..ebb78258ea 100644
--- a/app/src/main/res/xml/pref_openapssmbdynamicisf.xml
+++ b/app/src/main/res/xml/pref_openapssmbdynamicisf.xml
@@ -51,8 +51,8 @@
 
         <SwitchPreference
             android:defaultValue="false"
-            android:key="openapsama_useautosens"
-            android:title="@string/openapsama_useautosens" />
+            android:key="@string/key_adjust_sensitivity"
+            android:title="@string/dynisf_adjust_sensitivity" />
 
         <SwitchPreference
             android:defaultValue="false"
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePrepTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePrepTest.kt
index ea797d8566..764be8bb56 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePrepTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePrepTest.kt
@@ -317,7 +317,6 @@ class AutotunePrepTest : TestBaseWithProfile() {
         profileFunction,
         sp,
         dateUtil,
-        activePlugin,
         autotuneFS
     ) {
 
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 16fadeb48d..b38aeded92 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
@@ -5,11 +5,19 @@ import android.content.Context
 import android.os.Bundle
 import android.text.method.ScrollingMovementMethod
 import android.util.SparseArray
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import androidx.core.util.forEach
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -40,7 +48,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
 
-class AutomationFragment : DaggerFragment(), OnStartDragListener {
+class AutomationFragment : DaggerFragment(), OnStartDragListener, MenuProvider {
 
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var rh: ResourceHelper
@@ -52,9 +60,9 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
 
     companion object {
 
-        const val ID_MENU_ADD = 3
-        const val ID_MENU_RUN = 4
-        const val ID_MENU_EDIT_MOVE = 5
+        const val ID_MENU_ADD = 504
+        const val ID_MENU_RUN = 505
+        const val ID_MENU_EDIT_MOVE = 506
     }
 
     private var disposable: CompositeDisposable = CompositeDisposable()
@@ -73,7 +81,6 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
         actionHelper.setUpdateListHandler { binding.eventListView.adapter?.notifyDataSetChanged() }
         actionHelper.setOnRemoveHandler { removeSelected(it) }
         actionHelper.enableSort = true
-        setHasOptionsMenu(true)
         return binding.root
     }
 
@@ -85,43 +92,38 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
         binding.logView.movementMethod = ScrollingMovementMethod()
 
         itemTouchHelper.attachToRecyclerView(binding.eventListView)
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        if (isResumed) {
-            actionHelper.onCreateOptionsMenu(menu, inflater)
-            menu.removeItem(ID_MENU_ADD)
-            menu.removeItem(ID_MENU_RUN)
-            menu.add(Menu.FIRST, ID_MENU_ADD, 0, rh.gs(R.string.add_automation)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-            menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.run_automations)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-            menu.add(Menu.FIRST, ID_MENU_EDIT_MOVE, 0, rh.gs(R.string.remove_sort)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-            menu.setGroupDividerEnabled(true)
-        }
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+        actionHelper.onCreateOptionsMenu(menu, inflater)
+        menu.add(Menu.FIRST, ID_MENU_ADD, 0, rh.gs(R.string.add_automation)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+        menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.run_automations)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+        menu.add(Menu.FIRST, ID_MENU_EDIT_MOVE, 0, rh.gs(R.string.remove_sort)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+        menu.setGroupDividerEnabled(true)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+    override fun onMenuItemSelected(item: MenuItem): Boolean =
         if (actionHelper.onOptionsItemSelected(item)) true
-        else
-            when (item.itemId) {
-                ID_MENU_RUN -> {
-                    Thread { automationPlugin.processActions() }.start()
-                    true
-                }
-
-                ID_MENU_ADD -> {
-                    add()
-                    true
-                }
-
-               ID_MENU_EDIT_MOVE -> {
-                    actionHelper.startAction()
-                    true
-                }
-
-                else        -> false
+        else when (item.itemId) {
+            ID_MENU_RUN       -> {
+                Thread { automationPlugin.processActions() }.start()
+                true
             }
 
+            ID_MENU_ADD       -> {
+                add()
+                true
+            }
+
+            ID_MENU_EDIT_MOVE -> {
+                actionHelper.startAction()
+                true
+            }
+
+            else              -> false
+        }
+
     @SuppressLint("NotifyDataSetChanged")
     @Synchronized
     override fun onResume() {
@@ -129,15 +131,11 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
         disposable += rxBus
             .toObservable(EventAutomationUpdateGui::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({
-                           updateGui()
-                       }, fabricPrivacy::logException)
+            .subscribe({ updateGui() }, fabricPrivacy::logException)
         disposable += rxBus
             .toObservable(EventAutomationDataChanged::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({
-                           eventListAdapter.notifyDataSetChanged()
-                       }, fabricPrivacy::logException)
+            .subscribe({ eventListAdapter.notifyDataSetChanged() }, fabricPrivacy::logException)
         updateGui()
     }
 
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 bb0c3848f1..81d22fecf9 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
@@ -1,8 +1,12 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers
 
+import android.Manifest
 import android.bluetooth.BluetoothManager
 import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
 import android.widget.LinearLayout
+import androidx.core.app.ActivityCompat
 import com.google.common.base.Optional
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.automation.R
@@ -13,9 +17,9 @@ import info.nightscout.androidaps.plugins.general.automation.elements.InputDropd
 import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
 import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
 import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.shared.logging.LTag
 import org.json.JSONObject
-import java.util.*
 import javax.inject.Inject
 
 class TriggerBTDevice(injector: HasAndroidInjector) : Trigger(injector) {
@@ -74,12 +78,16 @@ class TriggerBTDevice(injector: HasAndroidInjector) : Trigger(injector) {
     // Get the list of paired BT devices to use in dropdown menu
     private fun devicesPaired(): ArrayList<CharSequence> {
         val s = ArrayList<CharSequence>()
-        (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter?.bondedDevices?.forEach { s.add(it.name) }
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) {
+            (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter?.bondedDevices?.forEach { s.add(it.name) }
+        } else {
+            ToastUtils.errorToast(context, context.getString(R.string.needconnectpermission))
+        }
         return s
     }
 
     private fun eventExists(): Boolean {
-        automationPlugin.btConnects.forEach {
+        ArrayList(automationPlugin.btConnects).forEach {
             if (btDevice.value == it.deviceName) {
                 if (comparator.value == ComparatorConnect.Compare.ON_CONNECT && it.state == EventBTChange.Change.CONNECT) return true
                 if (comparator.value == ComparatorConnect.Compare.ON_DISCONNECT && it.state == EventBTChange.Change.DISCONNECT) return true
diff --git a/automation/src/main/res/values-da-rDK/strings.xml b/automation/src/main/res/values-da-rDK/strings.xml
index 9e3bf9669b..59f99c5877 100644
--- a/automation/src/main/res/values-da-rDK/strings.xml
+++ b/automation/src/main/res/values-da-rDK/strings.xml
@@ -123,4 +123,5 @@
     <string name="run_automations">Kør automatisering</string>
     <string name="add_automation">Tilføj regel</string>
     <string name="remove_sort">Fjern/sorter</string>
+    <string name="stop_processing">Stop afvikling</string>
 </resources>
diff --git a/automation/src/main/res/values-de-rDE/strings.xml b/automation/src/main/res/values-de-rDE/strings.xml
index 4fdf548bc7..c6e3b2bc69 100644
--- a/automation/src/main/res/values-de-rDE/strings.xml
+++ b/automation/src/main/res/values-de-rDE/strings.xml
@@ -113,5 +113,15 @@
     <string name="automation_event">Automatisierungs-Ereignis</string>
     <string name="reorder_label">Umsortieren</string>
     <string name="user_action">Benutzeraktion</string>
+    <string name="remove_automation">Automatisierung entfernen</string>
+    <string name="sort_automation">Automation-Regeln sortieren</string>
+    <string name="remove_selected_items">Ausgewähltes Objekt löschen</string>
+    <string name="count_selected">%1$d ausgewählt</string>
     <string name="confirm_remove_multiple_items">Sind Sie sicher, dass Sie diese(s) %1$d Element(e) löschen möchten?</string>
+    <string name="sort_label">Sortieren</string>
+    <string name="system_automation">System-Automatisierung</string>
+    <string name="run_automations">Automatisierungen ausführen</string>
+    <string name="add_automation">Regel hinzufügen</string>
+    <string name="remove_sort">Entfernen/sortieren</string>
+    <string name="stop_processing">Verarbeitung beenden</string>
 </resources>
diff --git a/automation/src/main/res/values-ga-rIE/strings.xml b/automation/src/main/res/values-ga-rIE/strings.xml
index 464cd30486..3ea04e700d 100644
--- a/automation/src/main/res/values-ga-rIE/strings.xml
+++ b/automation/src/main/res/values-ga-rIE/strings.xml
@@ -1,18 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="alarm_message">Aláram: %1$s</string>
-    <string name="suspendloopforXmin">Fionraí lúb do %1$d nóim</string>
-    <string name="iobcompared">IOB %1$s %2$.1f</string>
-    <string name="and">Agus</string>
-    <string name="or">Nó</string>
-    <string name="delta">Deilte</string>
-    <string name="locationis">%1$s %2$s</string>
-    <string name="add_short">CUIR</string>
-    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
-    <string name="deltacompared">%3$s %1$s %2$s</string>
-    <string name="glucose_u">Glúcóis [%1$s]:</string>
-    <string name="cobcompared">COB %1$s %2$.0f</string>
-    <string name="iob_u">IOB [U]:</string>
-    <string name="never">Riamh</string>
-    <string name="action">Gníomh:</string>
-</resources>
+<resources></resources>
diff --git a/automation/src/main/res/values-iw-rIL/strings.xml b/automation/src/main/res/values-iw-rIL/strings.xml
index 8dd19a3a32..48ca09ada2 100644
--- a/automation/src/main/res/values-iw-rIL/strings.xml
+++ b/automation/src/main/res/values-iw-rIL/strings.xml
@@ -123,4 +123,5 @@
     <string name="run_automations">הפעל אוטומציות</string>
     <string name="add_automation">הוספת כלל</string>
     <string name="remove_sort">הסרה\\סידור</string>
+    <string name="stop_processing">עצור עיבוד</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 acd9f4fba0..c4d36915e2 100644
--- a/automation/src/main/res/values-lt-rLT/strings.xml
+++ b/automation/src/main/res/values-lt-rLT/strings.xml
@@ -112,4 +112,5 @@
     <string name="automation_event">Automatizuotas įvykis</string>
     <string name="reorder_label">Pertvarkyti</string>
     <string name="user_action">Vartotojo veiksmas</string>
+    <string name="sort_label">Rūšiuoti</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 d91dd62b17..ec29696bf0 100644
--- a/automation/src/main/res/values-ru-rRU/strings.xml
+++ b/automation/src/main/res/values-ru-rRU/strings.xml
@@ -90,7 +90,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="target_u">Цель [%1$s]:</string>
     <string name="lastboluslabel">Предыдущий болюс</string>
     <string name="lastboluscompared">Время болюса %1$s %2$s мин назад</string>
     <string name="triggercoblabel">Активн углеводы</string>
diff --git a/automation/src/main/res/values-sk-rSK/strings.xml b/automation/src/main/res/values-sk-rSK/strings.xml
index 39a1502bc1..13e9c9d977 100644
--- a/automation/src/main/res/values-sk-rSK/strings.xml
+++ b/automation/src/main/res/values-sk-rSK/strings.xml
@@ -123,4 +123,5 @@
     <string name="run_automations">Spustiť automatizácie</string>
     <string name="add_automation">Pridať pravidlo</string>
     <string name="remove_sort">Odstrániť/zoradiť</string>
+    <string name="stop_processing">Zastaviť spracovanie</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index f7900a8fb6..cc611b52b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,14 +7,14 @@ buildscript {
         rxjava_version = '3.1.5'
         rxandroid_version = '3.0.0'
         rxkotlin_version = '3.0.1'
-        room_version = '2.4.2'
-        lifecycle_version = '2.5.0'
-        dagger_version = '2.42'
+        room_version = '2.4.3'
+        lifecycle_version = '2.5.1'
+        dagger_version = '2.43'
         coroutines_version = '1.6.4'
         activity_version = '1.4.0'
         fragmentktx_version = '1.4.1'
         ormLite_version = '4.46'
-        gson_version = '2.9.0'
+        gson_version = '2.9.1'
         nav_version = '2.4.2'
         appcompat_version = '1.4.2'
         material_version = '1.6.1'
@@ -26,7 +26,7 @@ buildscript {
         work_version = '2.7.1'
         tink_version = '1.5.0'
         json_version = '20220320'
-        joga_version = '2.10.14'
+        joda_version = '2.11.0.1'
 
         junit_version = '4.13.2'
         mockito_version = '4.4.0'
@@ -51,8 +51,8 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.google.gms:google-services:4.3.13'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -67,7 +67,7 @@ buildscript {
 
 plugins {
     id "io.gitlab.arturbosch.detekt" version "1.21.0"
-    id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
+    id "org.jlleitschuh.gradle.ktlint" version "11.0.0"
     id 'org.barfuin.gradle.jacocolog' version '2.0.0'
     id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
 }
diff --git a/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java b/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java
index ee256dac53..1ecd53ece1 100644
--- a/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java
+++ b/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java
@@ -4,6 +4,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import org.monkey.d.ruffy.ruffy.driver.display.menu.BolusType;
 import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuBlink;
 import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuDate;
@@ -39,11 +41,11 @@ public class Menu implements Parcelable{
                     MenuAttribute a = MenuAttribute.valueOf(attr);
                     Object o = null;
                     if (Integer.class.toString().equals(clas)) {
-                        o = new Integer(value);
+                        o = Integer.valueOf(value);
                     } else if (Double.class.toString().equals(clas)) {
-                        o = new Double(value);
+                        o = Double.valueOf(value);
                     } else if (Boolean.class.toString().equals(clas)) {
-                        o = new Boolean(value);
+                        o = Boolean.valueOf(value);
                     } else if (MenuDate.class.toString().equals(clas)) {
                         o = new MenuDate(value);
                     } else if (MenuTime.class.toString().equals(clas)) {
@@ -70,14 +72,9 @@ public class Menu implements Parcelable{
         }
     }
 
-    public void setAttribute(MenuAttribute key, Object value)
-    {
-        attributes.put(key,value);
-    }
-
     public List<MenuAttribute> attributes()
     {
-        return new LinkedList<MenuAttribute>(attributes.keySet());
+        return new LinkedList<>(attributes.keySet());
     }
 
     public Object getAttribute(MenuAttribute key)
@@ -104,17 +101,11 @@ public class Menu implements Parcelable{
 
                 String atr = a.toString();
                 Object o = attributes.get(a);
-                String clas = o.getClass().toString();
-                String v = o.toString();
-                if(atr != null && o != null && v != null) {
-                    dest.writeString(atr);
-                    dest.writeString(clas);
-                    dest.writeString(v);
-                }
-                else
-                {
-                    Log.e("Menu","null in write :/");
-                }
+                String clas = o != null ? o.getClass().toString() : "null";
+                String v = o != null ? o.toString() : " null";
+                dest.writeString(atr);
+                dest.writeString(clas);
+                dest.writeString(v);
             }catch(Exception e)
             {
                 Log.v("MenuOut","error in write",e);
@@ -122,7 +113,7 @@ public class Menu implements Parcelable{
         }
     }
     public static final Parcelable.Creator<Menu> CREATOR = new
-            Parcelable.Creator<Menu>() {
+            Parcelable.Creator<>() {
                 public Menu createFromParcel(Parcel in) {
                     return new Menu(in);
                 }
@@ -132,7 +123,7 @@ public class Menu implements Parcelable{
                 }
             };
 
-    @Override
+    @NonNull @Override
     public String toString() {
         return "Menu{" +
                 "type=" + type +
diff --git a/combo/src/main/res/values-de-rDE/strings.xml b/combo/src/main/res/values-de-rDE/strings.xml
index f932cf9292..32fa737274 100644
--- a/combo/src/main/res/values-de-rDE/strings.xml
+++ b/combo/src/main/res/values-de-rDE/strings.xml
@@ -51,4 +51,10 @@
     <string name="combo_tbr_count">Anzahl TBR</string>
     <string name="bolusstopped">Bolus gestoppt</string>
     <string name="bolusstopping">Bolus wird gestoppt</string>
+    <string name="pump_commerror_label">Komm. Fehleranzahl</string>
+    <string name="show_comm_error_count_title">Zeige Komm.-Fehleranzahl</string>
+    <string name="show_comm_error_count_summary">Zeigt die Fehleranzahl bei der Kommunikation mit Ruffy an. In den meisten Fällen zeigt eine Zahl höher als 0 an, dass Ruffy Kommunikationsprobleme vorliegen (ein Neustart kann erforderlich sein).</string>
+    <string name="combo_error_display_never">Nie</string>
+    <string name="combo_error_display_error">Bei Fehler</string>
+    <string name="combo_error_display_always">Immer</string>
 </resources>
diff --git a/combo/src/main/res/values-ga-rIE/strings.xml b/combo/src/main/res/values-ga-rIE/strings.xml
index 51f3d46c65..3ea04e700d 100644
--- a/combo/src/main/res/values-ga-rIE/strings.xml
+++ b/combo/src/main/res/values-ga-rIE/strings.xml
@@ -1,30 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="combo_programming_bolus">Cláir Caidéil bólas</string>
-    <string name="combo_pump_state_label">Stáit</string>
-    <string name="combo_pump_activity_label">Gníomhaíocht</string>
-    <string name="combo_no_pump_connection">Níl nasc le haghaidh %1$d nóim</string>
-    <string name="combo_tbr_remaining">%1$d%% (%2$d nóim fágtha)</string>
-    <string name="combo_pump_state_initializing">Tosaithe</string>
-    <string name="combo_pump_state_suspended_due_to_error">Ar fionraí ag earráid</string>
-    <string name="combo_pump_state_suspended_by_user">Ar fionraí ag úsáideoir</string>
-    <string name="combo_pump_state_running">Ag reáchtáil</string>
-    <string name="combo_pump_action_cancelling_tbr">Cealú BRS</string>
-    <string name="combo_pump_action_setting_tbr">Socrú BRS (%1$d%% / %2$d nóim)</string>
-    <string name="combo_pump_action_bolusing">Ag bólas (%1$.1f A)</string>
-    <string name="combo_pump_action_refreshing">Athnuaigh</string>
-    <string name="combo_pump_connected_now">Anois</string>
-    <string name="combo_activity_reading_pump_history">Léigh stair caidéil</string>
-    <string name="combo_activity_setting_basal_profile">Socrú próifíl bunaidh</string>
-    <string name="combo_pump_cartridge_low_warrning">Is leibhéal cartús íseal</string>
-    <string name="combo_pump_battery_low_warrning">Is ceallraí Caidéil íseal</string>
-    <string name="combo_reservoir_low">Íseal</string>
-    <string name="combo_reservoir_empty">Folamh</string>
-    <string name="combo_reservoir_normal">Gnáth</string>
-    <string name="combo_notification_check_time_date">Is nuashonrú gá clog Caidéil</string>
-    <string name="combo_actvity_reading_basal_profile">Léigh próifíl bunaidh</string>
-    <string name="combo_activity_checking_pump_state">Athnuaigh caidéil stáit</string>
-    <string name="combo_activity_checking_for_history_changes">Ag féachaint d\'athruithe stair</string>
-    <string name="bolusstopped">Bólas stopadh</string>
-    <string name="bolusstopping">Ag stopadh bólas</string>
-</resources>
+<resources></resources>
diff --git a/core/android_dependencies.gradle b/core/android_dependencies.gradle
index 6e06cbad5f..0997a3fcc9 100644
--- a/core/android_dependencies.gradle
+++ b/core/android_dependencies.gradle
@@ -1,5 +1,5 @@
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     defaultConfig {
         minSdkVersion 28
         targetSdkVersion 28
diff --git a/core/android_module_dependencies.gradle b/core/android_module_dependencies.gradle
index d163350b9b..0329267ab3 100644
--- a/core/android_module_dependencies.gradle
+++ b/core/android_module_dependencies.gradle
@@ -22,6 +22,18 @@ dependencies {
     annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
     kapt "com.google.dagger:dagger-android-processor:$dagger_version"
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
+
+    // This is necessary to prevent Gradle build errors like:
+    //
+    //  Duplicate class androidx.lifecycle.ViewModelLazy found in modules jetified-lifecycle-viewmodel-ktx-2.3.1-runtime (androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1) and lifecycle-viewmodel-2.5.0-runtime (androidx.lifecycle:lifecycle-viewmodel:2.5.0)
+    //
+    // By explicitly adding these dependencies, the jetifier
+    // is forced to use the correct lifecycle version instead
+    // of automatically picking 2.3.1.
+    //
+    // See: https://stackoverflow.com/a/69832319/560774
+    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 }
 
 allOpen {
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index 0f37944ddb..083c7f30cf 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -8,6 +8,8 @@
 
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+
     <application android:supportsRtl="true">
         <activity
             android:name="info.nightscout.androidaps.activities.TDDStatsActivity"
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 aee649f5e7..d77090bc2d 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt
@@ -31,17 +31,18 @@ fun ProfileSwitch.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
     JSONObject()
         .put("timeshift", timeshift)
         .put("percentage", percentage)
+        .put("duration", T.msecs(duration).mins())
         .put("profile", getCustomizedName())
         .put("originalProfileName", profileName)
-        .also { // remove customization to store original profileJson in toPureNsJson call
-            timeshift = 0
-            percentage = 100
-        }
+        .put("originalDuration", duration)
         .put("created_at", dateUtil.toISOString(timestamp))
         .put("enteredBy", "openaps://" + "AndroidAPS")
         .put("isValid", isValid)
         .put("eventType", TherapyEvent.Type.PROFILE_SWITCH.text)
-        .put("duration", T.msecs(duration).mins())
+        .also { // remove customization to store original profileJson in toPureNsJson call
+            timeshift = 0
+            percentage = 100
+        }
         .put("profileJson", ProfileSealed.PS(this).toPureNsJson(dateUtil).toString())
         .also {
             if (interfaceIDs.pumpId != null) it.put("pumpId", interfaceIDs.pumpId)
@@ -66,6 +67,7 @@ fun ProfileSwitch.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
 fun profileSwitchFromJson(jsonObject: JSONObject, dateUtil: DateUtil, activePlugin: ActivePlugin): ProfileSwitch? {
     val timestamp = JsonHelper.safeGetLongAllowNull(jsonObject, "mills", null) ?: return null
     val duration = JsonHelper.safeGetLong(jsonObject, "duration")
+    val originalDuration = JsonHelper.safeGetLongAllowNull(jsonObject, "originalDuration")
     val timeshift = JsonHelper.safeGetLong(jsonObject, "timeshift")
     val percentage = JsonHelper.safeGetInt(jsonObject, "percentage", 100)
     val isValid = JsonHelper.safeGetBoolean(jsonObject, "isValid", true)
@@ -93,10 +95,10 @@ fun profileSwitchFromJson(jsonObject: JSONObject, dateUtil: DateUtil, activePlug
         icBlocks = profileSealed.icBlocks,
         targetBlocks = profileSealed.targetBlocks,
         glucoseUnit = ProfileSwitch.GlucoseUnit.fromConstant(profileSealed.units),
-        profileName = originalProfileName?: profileName,
-        timeshift = T.hours(timeshift).msecs(),
+        profileName = originalProfileName ?: profileName,
+        timeshift = timeshift,
         percentage = percentage,
-        duration = T.mins(duration).msecs(),
+        duration = originalDuration ?: T.mins(duration).msecs(),
         insulinConfiguration = profileSealed.insulinConfiguration,
         isValid = isValid
     ).also {
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 f736a314d4..7a29c198c7 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt
@@ -96,12 +96,15 @@ interface Pump {
     fun isThisProfileSet(profile: Profile): Boolean
 
     /**
-     * @return timestamp of last connection to the pump
+     * @return timestamp of last connection to the pump in milliseconds
      */
     fun lastDataTime(): Long
 
     /**
      * Currently running base basal rate [U/h]
+     *
+     * This _must not_ be affected by current pump states
+     * (TBRs, pump suspended/running etc.)
      */
     val baseBasalRate: Double
 
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 0154bca89b..93d3c9c8a1 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
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.maintenance
 
+import android.content.Context
 import android.os.Environment
 import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.core.R
@@ -26,7 +27,8 @@ class PrefFileListProvider @Inject constructor(
     private val config: Config,
     private val encryptedPrefsFormat: EncryptedPrefsFormat,
     private val storage: Storage,
-    private val versionCheckerUtils: VersionCheckerUtils
+    private val versionCheckerUtils: VersionCheckerUtils,
+    context: Context
 ) {
     @Suppress("DEPRECATION")
     private val path = File(Environment.getExternalStorageDirectory().toString())
@@ -34,6 +36,7 @@ class PrefFileListProvider @Inject constructor(
     private val exportsPath = File(path, "AAPS" + File.separator + "exports")
     private val tempPath = File(path, "AAPS" + File.separator + "temp")
     private val extraPath = File(path, "AAPS" + File.separator + "extra")
+    val logsPath: String = File(path, "AAPS" + File.separator + "logs" + File.separator + context.packageName).absolutePath
 
     companion object {
 
@@ -85,7 +88,7 @@ class PrefFileListProvider @Inject constructor(
         return checkMetadata(encryptedPrefsFormat.loadMetadata(contents))
     }
 
-    fun legacyFile(): File {
+    @Suppress("unused") fun legacyFile(): File {
         return File(path, rh.gs(R.string.app_name) + "Preferences")
     }
 
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 5d65bae4e8..c62250c04a 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
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.iob.iobCobCalculator
 
 import androidx.collection.LongSparseArray
+import androidx.collection.size
 import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.data.InMemoryGlucoseValue
 import info.nightscout.androidaps.database.AppRepository
@@ -41,7 +42,7 @@ class AutosensDataStore {
         AutosensDataStore().also {
             synchronized(dataLock) {
                 it.bgReadings = this.bgReadings.toMutableList()
-                it.autosensDataTable = this.autosensDataTable.clone()
+                it.autosensDataTable = LongSparseArray<AutosensData>(this.autosensDataTable.size).apply { putAll(this@AutosensDataStore.autosensDataTable) }
                 it.bucketedData = this.bucketedData?.toMutableList()
             }
         }
@@ -57,7 +58,7 @@ class AutosensDataStore {
         synchronized(autosensDataTable) {
             for (index in autosensDataTable.size() - 1 downTo 0) {
                 if (autosensDataTable.keyAt(index) > time) {
-                    aapsLogger.debug(LTag.AUTOSENS, "Removing from autosensDataTable: " + dateUtil.dateAndTimeAndSecondsString(autosensDataTable.keyAt(index)))
+                    aapsLogger.debug(LTag.AUTOSENS) { "Removing from autosensDataTable: ${dateUtil.dateAndTimeAndSecondsString(autosensDataTable.keyAt(index))}" }
                     autosensDataTable.removeAt(index)
                 } else {
                     break
@@ -135,10 +136,10 @@ class AutosensDataStore {
                 return null
             }
             return if (data.time < System.currentTimeMillis() - 11 * 60 * 1000) {
-                aapsLogger.debug(LTag.AUTOSENS, "AUTOSENSDATA null: data is old (" + reason + ") size()=" + autosensDataTable.size() + " lastData=" + dateUtil.dateAndTimeAndSecondsString(data.time))
+                aapsLogger.debug(LTag.AUTOSENS) { "AUTOSENSDATA null: data is old ($reason) size()=${autosensDataTable.size()} lastData=${dateUtil.dateAndTimeAndSecondsString(data.time)}" }
                 null
             } else {
-                aapsLogger.debug(LTag.AUTOSENS, "AUTOSENSDATA ($reason) $data")
+                aapsLogger.debug(LTag.AUTOSENS) { "AUTOSENSDATA ($reason) $data" }
                 data
             }
         }
@@ -164,7 +165,7 @@ class AutosensDataStore {
                 .compatGetBgReadingsDataFromTime(start, to + T.mins(2).msecs(), false)
                 .blockingGet()
                 .filter { it.value >= 39 }
-            aapsLogger.debug(LTag.AUTOSENS, "BG data loaded. Size: " + bgReadings.size + " Start date: " + dateUtil.dateAndTimeString(start) + " End date: " + dateUtil.dateAndTimeString(to))
+            aapsLogger.debug(LTag.AUTOSENS) { "BG data loaded. Size: ${bgReadings.size} Start date: ${dateUtil.dateAndTimeString(start)} End date: ${dateUtil.dateAndTimeString(to)}" }
             createBucketedData(aapsLogger, dateUtil)
             rxBus.send(EventBucketedDataCreated())
         }
@@ -184,13 +185,13 @@ class AutosensDataStore {
                 totalDiff += diff
                 diff = abs(diff)
                 if (diff > T.secs(30).msecs()) {
-                    aapsLogger.debug(LTag.AUTOSENS, "Interval detection: values: " + bgReadings.size + " diff: " + diff / 1000 + "[s] is5minData: " + false)
+                    aapsLogger.debug(LTag.AUTOSENS, "Interval detection: values: ${bgReadings.size} diff: ${diff / 1000}[s] is5minData: false")
                     return false
                 }
             }
             val averageDiff = totalDiff / bgReadings.size / 1000
             val is5minData = averageDiff < 1
-            aapsLogger.debug(LTag.AUTOSENS, "Interval detection: values: " + bgReadings.size + " averageDiff: " + averageDiff + "[s] is5minData: " + is5minData)
+            aapsLogger.debug(LTag.AUTOSENS, "Interval detection: values: ${bgReadings.size} averageDiff: $averageDiff[s] is5minData: $is5minData")
             return is5minData
         }
     }
@@ -239,8 +240,7 @@ class AutosensDataStore {
         var currentTime = bgReadings[0].timestamp - bgReadings[0].timestamp % T.mins(5).msecs()
         val adjustedTime = adjustToReferenceTime(currentTime)
         // after adjusting time may be newer. In this case use T-5min
-        if (adjustedTime > currentTime) currentTime = adjustedTime - T.mins(5).msecs()
-        else currentTime = adjustedTime
+        currentTime = if (adjustedTime > currentTime) adjustedTime - T.mins(5).msecs() else adjustedTime
         aapsLogger.debug("Adjusted time " + dateUtil.dateAndTimeAndSecondsString(currentTime))
         //log.debug("First reading: " + new Date(currentTime).toLocaleString());
         while (true) {
@@ -270,7 +270,7 @@ class AutosensDataStore {
         }
         val bData: MutableList<InMemoryGlucoseValue> = ArrayList()
         bData.add(InMemoryGlucoseValue(bgReadings[0]))
-        aapsLogger.debug(LTag.AUTOSENS, "Adding. bgTime: " + dateUtil.toISOString(bgReadings[0].timestamp) + " lastBgTime: " + "none-first-value" + " " + bgReadings[0].toString())
+        aapsLogger.debug(LTag.AUTOSENS) { "Adding. bgTime: ${dateUtil.toISOString(bgReadings[0].timestamp)} lastBgTime: none-first-value ${bgReadings[0]}" }
         var j = 0
         for (i in 1 until bgReadings.size) {
             val bgTime = bgReadings[i].timestamp
@@ -293,7 +293,7 @@ class AutosensDataStore {
                         val newBgReading = InMemoryGlucoseValue(nextBgTime, nextBg.roundToLong().toDouble(), true)
                         //console.error("Interpolated", bData[j]);
                         bData.add(newBgReading)
-                        aapsLogger.debug(LTag.AUTOSENS, "Adding. bgTime: " + dateUtil.toISOString(bgTime) + " lastBgTime: " + dateUtil.toISOString(lastBgTime) + " " + newBgReading.toString())
+                        aapsLogger.debug(LTag.AUTOSENS) { "Adding. bgTime: ${dateUtil.toISOString(bgTime)} lastBgTime: ${dateUtil.toISOString(lastBgTime)} $newBgReading" }
                         elapsedMinutes -= 5
                         lastBg = nextBg
                         lastBgTime = nextBgTime
@@ -301,14 +301,14 @@ class AutosensDataStore {
                     j++
                     val newBgReading = InMemoryGlucoseValue(bgTime, bgReadings[i].value)
                     bData.add(newBgReading)
-                    aapsLogger.debug(LTag.AUTOSENS, "Adding. bgTime: " + dateUtil.toISOString(bgTime) + " lastBgTime: " + dateUtil.toISOString(lastBgTime) + " " + newBgReading.toString())
+                    aapsLogger.debug(LTag.AUTOSENS) { "Adding. bgTime: ${dateUtil.toISOString(bgTime)} lastBgTime: ${dateUtil.toISOString(lastBgTime)} $newBgReading" }
                 }
 
                 abs(elapsedMinutes) > 2 -> {
                     j++
                     val newBgReading = InMemoryGlucoseValue(bgTime, bgReadings[i].value)
                     bData.add(newBgReading)
-                    aapsLogger.debug(LTag.AUTOSENS, "Adding. bgTime: " + dateUtil.toISOString(bgTime) + " lastBgTime: " + dateUtil.toISOString(lastBgTime) + " " + newBgReading.toString())
+                    aapsLogger.debug(LTag.AUTOSENS) { "Adding. bgTime: ${dateUtil.toISOString(bgTime)} lastBgTime: ${dateUtil.toISOString(lastBgTime)} $newBgReading" }
                 }
 
                 else                    -> {
@@ -327,7 +327,7 @@ class AutosensDataStore {
             val previous = bData[i + 1]
             val mSecDiff = current.timestamp - previous.timestamp
             val adjusted = (mSecDiff - T.mins(5).msecs()) / 1000
-            aapsLogger.debug(LTag.AUTOSENS, "Adjusting bucketed data time. Current: " + dateUtil.dateAndTimeAndSecondsString(current.timestamp) + " to: " + dateUtil.dateAndTimeAndSecondsString(previous.timestamp + T.mins(5).msecs()) + " by " + adjusted + " sec")
+            aapsLogger.debug(LTag.AUTOSENS) { "Adjusting bucketed data time. Current: ${dateUtil.dateAndTimeAndSecondsString(current.timestamp)} to: ${dateUtil.dateAndTimeAndSecondsString(previous.timestamp + T.mins(5).msecs())} by $adjusted sec" }
             if (abs(adjusted) > 90) {
                 // too big adjustment, fallback to non 5 min data
                 aapsLogger.debug(LTag.AUTOSENS, "Fallback to non 5 min data")
@@ -354,5 +354,4 @@ class AutosensDataStore {
         }
         return if (count != 0) sum / count else 0.0
     }
-
 }
\ No newline at end of file
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 716aad98ce..3d96e24bc4 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
@@ -43,11 +43,10 @@ class BlePreCheck @Inject constructor(
             }
             // change after SDK = 31+
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                if (ContextCompat.checkSelfPermission(context, "android.permission.BLUETOOTH_CONNECT") != PackageManager.PERMISSION_GRANTED ||
-                    ContextCompat.checkSelfPermission(context, "android.permission.BLUETOOTH_SCAN") != PackageManager.PERMISSION_GRANTED
+                if (ContextCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ||
+                    ContextCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED
                 ) {
-                    //ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT), PERMISSION_REQUEST_BLUETOOTH)
-                    ActivityCompat.requestPermissions(activity, arrayOf("android.permission.BLUETOOTH_SCAN", "android.permission.BLUETOOTH_CONNECT"), PERMISSION_REQUEST_BLUETOOTH)
+                    ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT), PERMISSION_REQUEST_BLUETOOTH)
                     return false
                 }
             }
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 5fbe786c73..8b10cb6a97 100644
--- a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
+++ b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
@@ -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 = rh.openRawResourceFd(resourceId) ?: return START_STICKY
+            val afd = rh.openRawResourceFd(resourceId) ?: return START_NOT_STICKY
             player?.setDataSource(afd.fileDescriptor, afd.startOffset, afd.length)
             afd.close()
             player?.isLooping = true
@@ -94,7 +94,7 @@ class AlarmSoundService : DaggerService() {
             aapsLogger.error("Unhandled exception", e)
         }
         aapsLogger.debug(LTag.CORE, "onStartCommand End")
-        return START_STICKY
+        return START_NOT_STICKY
     }
 
     override fun onDestroy() {
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ActionModeHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/ActionModeHelper.kt
index f2e63ada0a..460cd78344 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/ActionModeHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ActionModeHelper.kt
@@ -27,15 +27,12 @@ class ActionModeHelper<T>(val rh: ResourceHelper, val activity: FragmentActivity
             return parentClass == "SingleFragmentActivity"
         }
 
-    val enableRemove: Boolean
+    private val enableRemove: Boolean
         get() = onRemove != null
 
     val isNoAction: Boolean
         get() = actionMode == null && removeActionMode == null && sortActionMode == null
 
-    val isAction: Boolean
-        get() = actionMode != null
-
     val isSorting: Boolean
         get() = sortActionMode != null
 
@@ -98,14 +95,6 @@ class ActionModeHelper<T>(val rh: ResourceHelper, val activity: FragmentActivity
         return false
     }
 
-    fun startSort(): Boolean {
-        if (sortActionMode == null) {
-            sortActionMode = activity?.startActionMode(SortActionModeCallback())
-            return true
-        }
-        return false
-    }
-
     fun isSelected(position: Int) =
         selectedItems.get(position) != null
 
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/BluetoothDevicePreference.kt b/core/src/main/java/info/nightscout/androidaps/utils/ui/BluetoothDevicePreference.kt
new file mode 100644
index 0000000000..20bbfd38a0
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ui/BluetoothDevicePreference.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.utils.ui
+
+import android.Manifest
+import kotlin.jvm.JvmOverloads
+import android.bluetooth.BluetoothManager
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import android.util.AttributeSet
+import androidx.core.app.ActivityCompat
+import androidx.preference.ListPreference
+import info.nightscout.androidaps.core.R
+import info.nightscout.androidaps.utils.ToastUtils
+import java.util.*
+
+class BluetoothDevicePreference @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ListPreference(context, attrs) {
+
+    init {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) {
+            val devices = Vector<CharSequence>()
+            (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter?.let { bta ->
+                for (dev in bta.bondedDevices)
+                    dev.name?.let { name -> devices.add(name) }
+            }
+            entries = devices.toTypedArray()
+            entryValues = devices.toTypedArray()
+        } else {
+            entries = emptyArray()
+            entryValues = emptyArray()
+            ToastUtils.errorToast(context, context.getString(R.string.needconnectpermission))
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index 183980600d..12f2e3e579 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d мин</string>
     <string name="pumpbusy">Помпата е заета</string>
     <string name="connectionerror">Грешка при връзка с помпата</string>
-    <string name="youareonallowedlimit">Достигнахте лимита</string>
     <string name="objectives">Цели</string>
     <string name="close">Затвори</string>
     <string name="please_wait">Моля изчакайте...</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">Натиснат е СТОП!</string>
     <string name="stop">Стоп</string>
     <string name="carbs">въглехидрати</string>
-    <string name="invalidprofile">Грешен профил !!!</string>
     <string name="noprofileset">НЕ Е АКТИВИРАН ПРОФИЛ</string>
     <string name="active"><![CDATA[<Активно>]]></string>
     <string name="date">Дата</string>
@@ -132,7 +130,6 @@
     <string name="passwords_dont_match">Паролите не съвпадат</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Базалните стойности не са за кръгли часове: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Базалната стойност е заместена от минимално поддържаната стойност %1$s</string>
     <string name="maximumbasalvaluereplaced">Базалната стойност е заместена от максимално поддържаната стойност %1$s</string>
     <string name="profile_per_unit">/Е</string>
     <string name="profile_ins_units_per_hour">Е/ч</string>
@@ -210,7 +207,6 @@
     <string name="waitingforpumpresult">Изчаква резултат от помпата</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$dгр допълнителни въглехидрати ще са необходими до %2$d минути</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Статистика</string>
     <string name="cumulative_tdd">Комулативна TDD</string>
@@ -222,7 +218,6 @@
     <string name="amount_days"># дни</string>
     <string name="weight">Тегло</string>
     <string name="warning_Message">Възможна неточност, ако сте използвали болус за презареждане!</string>
-    <string name="olddata_Message">Стари данни - натиснете \"ПРЕЗАРЕДИ\"</string>
     <string name="tbb">Общо базален инсулин</string>
     <string name="tbb2">ОБИ * 2</string>
     <!--    Ntp-->
@@ -289,6 +284,7 @@
     <string name="sms" comment="26 characters max for translation">SMS</string>
     <string name="basal">Базал</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Апликацията изисква разрешение за bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d дeн</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 1eb5f978ea..6cd9b7b34c 100644
--- a/core/src/main/res/values-ca-rES/strings.xml
+++ b/core/src/main/res/values-ca-rES/strings.xml
@@ -70,4 +70,5 @@
     <!-- Command Queue + readStatus reasons -->
     <string name="basal">Basal</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">L\'aplicació necessita el permís del bluethoot</string>
 </resources>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index b0570bbe77..5a8348357b 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -31,7 +31,7 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pumpa je zaneprázdněna</string>
     <string name="connectionerror">Chyba připojování pumpy</string>
-    <string name="youareonallowedlimit">Dosaženo limitu</string>
+    <string name="youareonallowedlimit">Byl dosažen povolený limit</string>
     <string name="objectives">Cíle</string>
     <string name="close">Zavřít</string>
     <string name="please_wait">Počkejte prosím…</string>
@@ -40,7 +40,7 @@
     <string name="stoppressed">STISKNUTO STOP</string>
     <string name="stop">Stop</string>
     <string name="carbs">Sacharidy</string>
-    <string name="invalidprofile">Chybný profil !!!</string>
+    <string name="invalidprofile">Neplatný profil!</string>
     <string name="noprofileset">ŽÁDNÝ PROFIL NENASTAVEN</string>
     <string name="active"><![CDATA[<Aktivní>]]></string>
     <string name="date">Datum</string>
@@ -140,7 +140,7 @@
     <string name="pin_dont_match">PIN kódy se neshodují</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Hodnoty bazálů nejsou zarovnané na celé hodiny: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Hodnota bazálu nahrazena minimální možnou: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Hodnota bazálu byla nahrazena minimální možnou: %1$s</string>
     <string name="maximumbasalvaluereplaced">Hodnota bazálu nahrazena maximální možnou: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -233,7 +233,7 @@
     <string name="amount_days">Dní</string>
     <string name="weight">Váha</string>
     <string name="warning_Message">Pravděpodobně nepřesné při používání bolusů k doplňování</string>
-    <string name="olddata_Message">Zastaralá data. Prosím načtěte je znovu</string>
+    <string name="olddata_Message">Zastaralá data. Klepněte na tlačítko „OBNOVIT“.</string>
     <string name="tbb">Celk. denní bazál</string>
     <string name="tbb2">CZB * 2</string>
     <!--    Ntp-->
@@ -397,7 +397,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>
+    <string name="nsclient_version_does_not_match">Verze NSClientu se neshoduje s verzí AndroidAPS. Aktualizujte prosím.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f U</string>
     <string name="carbs_g">SACHARIDY %1$d g</string>
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">Autotune spuštěno, a profil automaticky přepnut</string>
     <string name="autotune_run_with_error">Chyba při posledním spuštění Autotune</string>
     <string name="autotune_run_cancelled">Byla zjištěna jiná běžící úloha Autotune, spuštění zrušeno</string>
+    <string name="needconnectpermission">Aplikace potřebuje oprávnění bluetooth</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 d446162c2f..1578d41134 100644
--- a/core/src/main/res/values-da-rDK/strings.xml
+++ b/core/src/main/res/values-da-rDK/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pumpe er optaget</string>
     <string name="connectionerror">Forbindelsesfejl til pumpe</string>
-    <string name="youareonallowedlimit">Du har nået den tilladte grænse</string>
     <string name="objectives">Mål</string>
     <string name="close">Luk</string>
     <string name="please_wait">Vent venligst…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOP TRYKKET</string>
     <string name="stop">Stop</string>
     <string name="carbs">Kulhydrater</string>
-    <string name="invalidprofile">Ugyldig profil !!!</string>
     <string name="noprofileset">INGEN PROFIL SAT</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">Dato</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Varighed af insulin aktivitet</string>
     <string name="ic_long_label">Insulin til kulhydrat forhold</string>
     <string name="isf_long_label">Insulinfølsomhedsfaktor</string>
-    <string name="basal_long_label">Basal rate</string>
     <string name="target_long_label">Blodsukker mål</string>
     <string name="initializing">Initialiserer ...</string>
     <string name="serialnumber">Serienummer</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">PIN-koder ikke identiske</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basalværdier ikke angivet i hele timer: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Basal dosis erstattet af minimal understøttet dosis: %1$s</string>
     <string name="maximumbasalvaluereplaced">Basal dosis erstattet af maximal understøttet dosis: %1$s</string>
     <string name="profile_per_unit">/IE</string>
     <string name="profile_ins_units_per_hour">E/t</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">Venter på resultat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g ekstra kulhydrater krævet inden for %2$d minutter</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Akkumuleret TDD</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># Dage</string>
     <string name="weight">Vægt</string>
     <string name="warning_Message">Muligvis unøjagtig, hvis du bruger bolusser til priming/fyldning!</string>
-    <string name="olddata_Message">Gammel data. Tryk venligst På \"GENINDLÆS\"</string>
     <string name="tbb">Basis Basal I Alt</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <string name="valueoutofrange">»%1$s« er uden for absolutte grænser</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f er uden for absolutte grænser</string>
     <string name="basal_value">Basalværdi</string>
-    <string name="nsclient_version_does_not_match">NSClient version matcher ikke AndroidAPS. Opdater venligst.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f IE</string>
     <string name="carbs_g">KH %1$d g</string>
@@ -450,17 +443,23 @@
     <string name="autotune_auto_summary">Hvis aktiveret, vil Autotune automatisk opdatere og skifte til input-profil efter beregning ud fra en automatiseringsregel.</string>
     <string name="autotune_categorize_uam_as_basal_title">Kategoriser UAM som basal</string>
     <string name="autotune_categorize_uam_as_basal_summary">Aktiver kun hvis du har indtastet alle kulhydrater på pålidelig vis. Med denne indstilling vil pludselige stigninger set af Autotune, blive brugt til at anbefale ændringer af basal rate.</string>
+    <string name="autotune_tune_insulin_curve_title">Tilpas insulinkurven</string>
+    <string name="autotune_tune_insulin_curve_summary">Aktiver kun hvis du bruger egen peak værdi. Dette alternativ vil justere peak og DIA-varigheden</string>
     <string name="autotune_default_tune_days_title">Antal dage med data</string>
     <string name="autotune_circadian_ic_isf_title">Anvend gennemsnitligt resultat i døgnbaseret IC/ISF</string>
     <string name="autotune_circadian_ic_isf_summary">Autotune vil ikke justere døgnrytme variationer, denne indstilling benytter gennemsnitlige værdier til justering af IC og ISF til din døgnrytme input profil</string>
     <string name="autotune_additional_log_title">Inkludér flere logoplysninger for fejlfinding</string>
     <string name="autotune_additional_log_summary">Aktivér kun hvis udviklerne beder dig om det, for at sende flere logoplysninger til at hjælpe med at fejlfinde Autotune plugin</string>
+    <string name="autotune_default_tune_days_summary">Standard antal dage data der skal behandles af Autotune (op til 30)</string>
     <string name="autotune_tunedprofile_name">Justeret</string>
     <string name="autotune_profile">Profil :</string>
     <string name="autotune_tune_days">Justerings dage :</string>
     <string name="autotune_last_run">Sidst kørt :</string>
     <string name="autotune_warning">Advarsel :</string>
     <string name="autotune_select_profile">Vælg profil, der skal justeres</string>
+    <string name="autotune_ic_warning">Autotune fungerer med kun én IC-værdi, din profil har %1$d værdier. Gennemsnitsværdi er %2$.2fg/E</string>
+    <string name="autotune_isf_warning">Autotune virker med kun én ISF-værdi, din profil har %1$d værdier. Gennemsnitlig værdi er %2$.1f%3$s/E</string>
+    <string name="autotune_error">Fejl i inputdata, prøv at køre autotune igen eller reducer antallet af dage</string>
     <string name="autotune_warning_during_run">Automatisk beregning startet, vær venligst tålmodig</string>
     <string name="autotune_warning_after_run">Kontrollér resultaterne omhyggeligt, før du bruger dem!</string>
     <string name="autotune_partial_result">Delvis resultat dag %1$d / %2$d justeret</string>
@@ -482,6 +481,8 @@
     <string name="autotune_run_without_autoswitch">Autotune kørt uden profilskift</string>
     <string name="autotune_run_with_autoswitch">Autotune kørt, profilen er automatisk skiftet</string>
     <string name="autotune_run_with_error">Fejl under sidste Autotune kørsel</string>
+    <string name="autotune_run_cancelled">Autotune kører allerede, annulleret</string>
+    <string name="needconnectpermission">Applikationen kræver tilladelse til bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dage</item>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 5b12029067..90b2a2d451 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min.</string>
     <string name="pumpbusy">Pumpe ist beschäftigt</string>
     <string name="connectionerror">Pumpen-Verbindungsfehler</string>
-    <string name="youareonallowedlimit">Limit erreicht</string>
     <string name="objectives">Objectives (Ziele)</string>
     <string name="close">Schließen</string>
     <string name="please_wait">Bitte warten…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOPP GEDRÜCKT</string>
     <string name="stop">Stopp</string>
     <string name="carbs">Kohlenhydrate</string>
-    <string name="invalidprofile">Ungültiges oder defektes Profil!</string>
     <string name="noprofileset">KEIN PROFIL GESETZT</string>
     <string name="active"><![CDATA[<Aktiv>]]></string>
     <string name="date">Datum</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Insulinwirkdauer (duration of insulin action)</string>
     <string name="ic_long_label">Insulin-zu-KH-Faktor</string>
     <string name="isf_long_label">ISF: Insulin Sensitivitäts-Faktor (\"Korrektur-Faktor\")</string>
-    <string name="basal_long_label">Basalrate</string>
     <string name="target_long_label">BZ Ziel</string>
     <string name="initializing">Initialisierung...</string>
     <string name="serialnumber">Seriennummer</string>
@@ -135,10 +132,11 @@
     <string name="location_not_found_message">Auf neueren Geräten muss für die Bluetooth-Erkennung der Standortdienst aktiviert sein. AAPS speichert keine Standortdaten und der Dienst kann nach erfolgreichem Pairing wieder deaktiviert werden.</string>
     <!--    Protection-->
     <string name="wrongpassword">Falsches Passwort</string>
+    <string name="wrongpin">Falsche PIN</string>
     <string name="passwords_dont_match">Die Passwörter stimmen nicht überein.</string>
+    <string name="pin_dont_match">PINs stimmen nicht überein</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basalraten beginnen nicht zur vollen Stunde: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Basal-Wert wurde durch den kleinst möglichen Wert ersetzt: %1$s</string>
     <string name="maximumbasalvaluereplaced">Basal-Wert wurde durch größt möglichen Wert ersetzt: %1$s</string>
     <string name="profile_per_unit">/IE</string>
     <string name="profile_ins_units_per_hour">IE/h</string>
@@ -219,7 +217,6 @@
     <string name="waitingforpumpresult">Auf Pumpenergebnis warten</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g zusätzliche Kohlenhydrate innerhalb von %2$d Minuten erforderlich</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Kumulative TDD</string>
@@ -231,7 +228,6 @@
     <string name="amount_days"># Tage</string>
     <string name="weight">Gewichtung</string>
     <string name="warning_Message">Möglicherweise ungenau, wenn zum Befüllen ein Bolus verwendet wurde!</string>
-    <string name="olddata_Message">Veraltete Daten, bitte klicke auf \"NEU LADEN\"</string>
     <string name="tbb">Tägl. Basalmenge</string>
     <string name="tbb2">Tägl. Basalmenge * 2</string>
     <!--    Ntp-->
@@ -395,7 +391,6 @@
     <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>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f IE</string>
     <string name="carbs_g">KH %1$d g</string>
@@ -429,10 +424,65 @@
     <string name="insight_refresh_button" comment="26 characters max for translation">Insight Refresh Button</string>
     <string name="a11y_min_button_description">abnehmend %1$s mit %2$s</string>
     <string name="a11y_plus_button_description">zunehmend %1$s mit %2$s</string>
+    <string name="formatPercent">%1$.0f%%</string>
     <string name="basal">Basal</string>
+    <string name="basalpct">Basal %</string>
     <string name="count_selected">%1$d ausgewählt</string>
     <string name="sort_label">Sortieren</string>
+    <string name="remove_items">Entferne Elemente</string>
+    <string name="sort_items">Sortiere Elemente</string>
+    <string name="remove_selected_items">lösche ausgewählte Elemente</string>
+    <string name="a11y_file">Datei</string>
+    <string name="a11y_user">Nutzer</string>
     <!-- Autotune -->
+    <string name="autotune">Autotune</string>
+    <string name="autotune_description">Hilfe bei möglichen Anpassungen des Profils (ISF, IC und Basalraten)</string>
+    <string name="autotune_shortname">AT</string>
+    <string name="autotune_settings">Autotune Einstellungen</string>
+    <string name="autotune_auto_title">Automation Profilwechsel</string>
+    <string name="autotune_auto_summary">Falls aktiviert, wird Autotune nach der Berechnung in einer Automatisierungsregel automatisch das Eingangsprofil anpassen und darauf wechseln.</string>
+    <string name="autotune_categorize_uam_as_basal_title">UAM als Basal kategorisieren</string>
+    <string name="autotune_categorize_uam_as_basal_summary">Nur aktivieren, wenn Sie alle gegessen Kohlenhydrate zuverlässig eingegeben haben. Mit dieser Option werden plötzliche Steigerungen, die durch Autotune entdeckt werden, verwendet, um Änderungen an der Basalrate zu empfehlen.</string>
+    <string name="autotune_tune_insulin_curve_title">Insulinkurve anpassen</string>
+    <string name="autotune_tune_insulin_curve_summary">Nur einschalten, falls Du Free Peak verwendest. Diese Option passt sowohl den Gipfel der Wirkkurve an als auch die DIA Laufzeit</string>
+    <string name="autotune_default_tune_days_title">Anzahl der Tage an Daten</string>
+    <string name="autotune_circadian_ic_isf_title">Durchschnittsresultat im zirkadianen IC/ISF anwenden</string>
+    <string name="autotune_circadian_ic_isf_summary">Autotune wird keine zirkadianen Variationen einstellen. Diese Option wendet nur die durchschnittliche Änderung von IC und ISF auf Dein zirkadianes Eingangsprofil an</string>
+    <string name="autotune_additional_log_title">Fügen Sie weitere Log-Informationen zum Debuggen ein</string>
+    <string name="autotune_additional_log_summary">Nur einschalten, wenn von Du von den Entwicklern aufgefordert wirst, um ausführlichere Protokollinformationen zu senden, die beim Debuggen des Autotune Plugins hilfreich sind</string>
+    <string name="autotune_default_tune_days_summary">Standardanzahl der von Autotune zu verarbeitenden Daten (bis zu 30)</string>
+    <string name="autotune_tunedprofile_name">Angepasst</string>
+    <string name="autotune_profile">Profil :</string>
+    <string name="autotune_tune_days">Anpassungstage :</string>
+    <string name="autotune_last_run">Letzte Ausführung :</string>
+    <string name="autotune_warning">Warnung :</string>
+    <string name="autotune_select_profile">Wähle das Profil zum Anpassen aus</string>
+    <string name="autotune_ic_warning">Ausgewähltes Profil hat %1$d IC-Werte. Autotune wird %2$.2f g/U verwenden</string>
+    <string name="autotune_isf_warning">Ausgewähltes Profil hat %1$d ISF-Werte. Autotune wird %2$.1f %3$s/U verwenden</string>
+    <string name="autotune_error">Fehler in den Eingabedaten, versuche erneut Autotune auszuführen oder reduziere die Anzahl der Tage</string>
+    <string name="autotune_warning_during_run">Autotune Berechnung gestartet, bitte gedulde Dich einen Moment</string>
+    <string name="autotune_warning_after_run">Überprüfe die Ergebnisse sorgfältig, bevor Du sie verwendest!</string>
+    <string name="autotune_partial_result">Teilergebnistag %1$d / %2$d angepasst</string>
+    <string name="autotune_result">Ergebnis: %1$s</string>
+    <string name="autotune_param">Parameter</string>
+    <string name="autotune_percent">%</string>
+    <string name="autotune_missing">Fehlend</string>
+    <string name="autotune_profile_name">Autotune Profil %1$s</string>
+    <string name="autotune_run">Autotune ausführen</string>
+    <string name="autotune_check_input_profile_button">Eingabeprofil überprüfen</string>
+    <string name="autotune_compare_profile">Profile vergleichen</string>
+    <string name="autotune_copy_localprofile_button">In lokales Profil kopieren</string>
+    <string name="autotune_update_input_profile_button">Eingabeprofil anpassen</string>
+    <string name="autotune_revert_input_profile_button">Eingabeprofil zurücksetzen</string>
+    <string name="autotune_copy_local_profile_message">Neues lokales Profil aus diesem Autotune Profil erstellen?</string>
+    <string name="autotune_update_local_profile_message">Anpassen %1$s Profile mit dem Autotune Profile?</string>
+    <string name="autotune_revert_local_profile_message">%1$s Profil mit Eingabeprofil zurücksetzen?</string>
+    <string name="autotune_profile_invalid">Profil ungültig</string>
+    <string name="autotune_run_without_autoswitch">Autotune ohne Profilwechsel ausgeführt</string>
+    <string name="autotune_run_with_autoswitch">Autotune ausgeführt und Profil automatisch gewechselt</string>
+    <string name="autotune_run_with_error">Fehler beim letzten Autotune Lauf</string>
+    <string name="autotune_run_cancelled">Ein weiterer Lauf von Autotune wurde erkannt, Lauf abgebrochen</string>
+    <string name="needconnectpermission">App benötigt Bluetooth-Berechtigung</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 24f6b404b5..6e004b1947 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Bomba ocupada</string>
     <string name="connectionerror">Error de conexión de la bomba</string>
-    <string name="youareonallowedlimit">Límite permitido alcanzado</string>
     <string name="objectives">Objetivos</string>
     <string name="close">Cerrar</string>
     <string name="please_wait">Por favor, espere…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOP pulsado</string>
     <string name="stop">Detener</string>
     <string name="carbs">Carbohidratos [g]</string>
-    <string name="invalidprofile">Perfil inválido !!!</string>
     <string name="noprofileset">NINGÚN PERFIL ACTIVO</string>
     <string name="active"><![CDATA[<Activo>]]></string>
     <string name="date">Fecha</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Duración de la insulina activa</string>
     <string name="ic_long_label">Ratio de insulina/carbohidratos</string>
     <string name="isf_long_label">Factor de sensibilidad a la insulina</string>
-    <string name="basal_long_label">Tasa Basal</string>
     <string name="target_long_label">Objetivo de glucosa en sangre</string>
     <string name="initializing">Iniciando...</string>
     <string name="serialnumber">Número de serie</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">Los códigos PIN no coinciden</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valores basales no alineados a las horas: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valor basal reemplazado por el valor mínimo soportado: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valor basal reemplazado por el valor máximo soportado: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">Esperando resultado</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$dg Carbohidratos adicionales necesarios dentro de %2$d minutos</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Estadísticas</string>
     <string name="cumulative_tdd">TDD acumulada</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># Días</string>
     <string name="weight">Peso</string>
     <string name="warning_Message">Probablemente impreciso si se usan bolos para llenar/rellenar!</string>
-    <string name="olddata_Message">Datos caducados por favor pulsa RELOAD</string>
     <string name="tbb">Basal total</string>
     <string name="tbb2">Basal diaria *2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <string name="valueoutofrange">»%1$s« está fuera del límite estricto</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f está fuera de los límites estrictos</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>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLO %1$.2f U</string>
     <string name="carbs_g">CARBOHIDRATOS %1$d g</string>
@@ -489,6 +482,7 @@
     <string name="autotune_run_with_autoswitch">Autotune ejecutado y perfil cambiado automáticamente</string>
     <string name="autotune_run_with_error">Error durante la última ejecución de Autotune</string>
     <string name="autotune_run_cancelled">Se ha detectado otra ejecución de Autotune, ejecución cancelada</string>
+    <string name="needconnectpermission">La aplicación necesita permiso de bluetooth</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-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index cfd4038982..ac6f8ca25a 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -20,7 +20,7 @@
     <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="androidaps_start">Démarrage AndroidAPS</string>
     <string name="formatinsulinunits1">%1$.1f U</string>
     <string name="formatinsulinunits">%1$.2f U</string>
     <string name="formatsignedinsulinunits">%1$+.2f U</string>
@@ -31,7 +31,7 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pompe occupée</string>
     <string name="connectionerror">Erreur connection pompe</string>
-    <string name="youareonallowedlimit">Vous avez atteint la limite maximale</string>
+    <string name="youareonallowedlimit">Limite autorisée atteinte</string>
     <string name="objectives">Objectifs</string>
     <string name="close">Fermer</string>
     <string name="please_wait">Merci de patienter...</string>
@@ -40,7 +40,7 @@
     <string name="stoppressed">ARRÊT APPUYÉ</string>
     <string name="stop">Arrêt</string>
     <string name="carbs">Glucides</string>
-    <string name="invalidprofile">Profil incorrect !!!</string>
+    <string name="invalidprofile">Profil incorrect!</string>
     <string name="noprofileset">PAS DE PROFIL SELECTIONNÉ</string>
     <string name="active"><![CDATA[<Actif>]]></string>
     <string name="date"> Date</string>
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">Autotune exécuté et le profil automatiquement activé</string>
     <string name="autotune_run_with_error">Erreur lors de la dernière exécution d\'Autotune</string>
     <string name="autotune_run_cancelled">Une autre exécution d\'Autotune est détectée, l\'exécution est annulée</string>
+    <string name="needconnectpermission">L\'application a besoin de l\'autorisation Bluetooth</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-ga-rIE/strings.xml b/core/src/main/res/values-ga-rIE/strings.xml
index 0ab0b703fd..6f676893c7 100644
--- a/core/src/main/res/values-ga-rIE/strings.xml
+++ b/core/src/main/res/values-ga-rIE/strings.xml
@@ -2,112 +2,22 @@
 <resources>
     <!--    Keys-->
     <!--    General-->
-    <string name="error">Earráid</string>
-    <string name="save">Sábháil</string>
-    <string name="waitingforpump">Ag fanacht do caidéil</string>
-    <string name="connectingfor">Ag nascadh le %1$d s</string>
-    <string name="bolusdelivering">Ag seachadadh %1$.2f A</string>
-    <string name="connecting">Ag nascadh</string>
-    <string name="connected">Nasctha</string>
-    <string name="disconnected">Dínasctha</string>
-    <string name="disconnecting">Dícheangal</string>
-    <string name="androidaps_start">AndroidAPS thosaigh</string>
-    <string name="formatinsulinunits1">%1$.1f A</string>
-    <string name="formatinsulinunits">%1$.2f A</string>
-    <string name="formatsignedinsulinunits">%1$+.2f A</string>
-    <string name="format_carbs">%1$d g</string>
-    <string name="reservoirvalue">%1$.0f / %2$d A</string>
-    <string name="pump_basebasalrate">%1$.2f A/u</string>
-    <string name="format_hours">%1$.2f u</string>
-    <string name="format_mins">%1$d nóim</string>
-    <string name="close">Dún</string>
-    <string name="mute">Balbh</string>
-    <string name="reload">Athlódáil</string>
-    <string name="stop">Stad</string>
-    <string name="carbs">Carbí</string>
-    <string name="invalidprofile">Próifíl neamhbhailí !!!</string>
-    <string name="date">Dáta</string>
-    <string name="units_label">Aonaid</string>
-    <string name="dia_label">DIA</string>
-    <string name="ic_label">IC</string>
-    <string name="isf_label">ISF</string>
-    <string name="basal_label">Bunaidh</string>
-    <string name="target_label">Cuspóir</string>
-    <string name="initializing">Tosaithe ...</string>
-    <string name="serialnumber">Sraithuimhir</string>
-    <string name="battery_label">Ceallraí</string>
-    <string name="lastconnection_label">Nasc deiridh</string>
-    <string name="lastbolus_label">Bólas deiridh</string>
-    <string name="dailyunits">Aonaid lá</string>
-    <string name="basebasalrate_label">Bunaidh ráta bonn</string>
-    <string name="reservoir_label">Taiscumar</string>
-    <string name="pumphistory">Stair caidéil</string>
-    <string name="mgdl">mg/dL</string>
-    <string name="mmol">mmol/l</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="yes">Tá</string>
-    <string name="no">Níl</string>
-    <string name="loopdisabled">LÚB DÍCHUMASAITHE LE SRIANTA</string>
-    <string name="disableloop">Díchumasaigh lúb</string>
-    <string name="enableloop">Cumasaigh lúb</string>
-    <string name="resumeloop">Lúb Atosú</string>
-    <string name="suspendloop">Fionraí lúb</string>
-    <string name="glucose">Glúcóis</string>
-    <string name="name_short">Ainm:</string>
-    <string name="time">Am</string>
-    <string name="ns_wifi_ssids">WiFi SSID</string>
-    <string name="addnew">Cuir nua</string>
     <!--    Constraints-->
     <!--    Dialogs-->
-    <string name="confirmation">Deimhniú</string>
-    <string name="message">Teachtaireacht</string>
-    <string name="ok">Ceart go leor</string>
-    <string name="cancel">Cuir ar ceal</string>
     <!--    BlePreCheck-->
     <!--    Protection-->
     <!--    Profile-->
-    <string name="profile_per_unit">/A</string>
-    <string name="profile_ins_units_per_hour">A/u</string>
-    <string name="profile_carbs_per_unit">g/A</string>
     <!--    ProfileFunction-->
     <!--    PumpType-->
     <!--    APSResult-->
-    <string name="canceltemp">Cealú BRS</string>
-    <string name="rate">Ráta</string>
-    <string name="duration">Fad</string>
-    <string name="reason">Cúis</string>
     <!--    ProfileSwitch-->
-    <string name="zerovalueinprofile">Próifíl neamhbhailí: %1$s</string>
     <!--    Temptarget-->
-    <string name="mins">%1$d nóim</string>
     <!--    Translator-->
-    <string name="careportal_announcement">Fógra</string>
-    <string name="careportal_note">Nóta</string>
-    <string name="careportal_question">Ceist</string>
-    <string name="careportal_exercise">Cleachtadh</string>
-    <string name="careportal_insulincartridgechange">Athrú Cartús Inslin</string>
-    <string name="glucosetype_finger">Méar</string>
-    <string name="glucosetype_sensor">Braiteoir</string>
-    <string name="activity">Gníomhaíocht</string>
     <!--    Command-->
     <!--    PumpEnactResult-->
-    <string name="comment">Tuairim</string>
-    <string name="success">Rathúlacht</string>
-    <string name="percent">Faoin gcéad</string>
-    <string name="absolute">Iomlán</string>
-    <string name="configbuilder_insulin">Inslin</string>
-    <string name="insulin_unit_shortname">A</string>
-    <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
-    <string name="basalrate">Bunaidh</string>
-    <string name="bolus">Bólas</string>
-    <string name="tdd">TDD</string>
-    <string name="ratio">Cóimheas</string>
-    <string name="amount_days"># Lá</string>
-    <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
-    <string name="format_hour_minute">%1$du %2$dn</string>
     <!-- Maintenance -->
     <!-- VersionChecker -->
     <!-- Permissions -->
@@ -115,6 +25,5 @@
     <!-- User Entry -->
     <!-- HardLimits -->
     <!-- Command Queue + readStatus reasons -->
-    <string name="basal">Bunaidh</string>
     <!-- Autotune -->
 </resources>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index fa7260b877..a7f4e0fd5e 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Il micro è occupato</string>
     <string name="connectionerror">Errore connessione micro</string>
-    <string name="youareonallowedlimit">Hai raggiunto il limite consentito</string>
     <string name="objectives">Obiettivi</string>
     <string name="close">Chiudi</string>
     <string name="please_wait">Attendi…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOP PREMUTO</string>
     <string name="stop">Stop</string>
     <string name="carbs">CHO</string>
-    <string name="invalidprofile">Profilo non valido !!!</string>
     <string name="noprofileset">NESSUN PROFILO IMPOSTATO</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">Data</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Durata dell’azione dell’insulina</string>
     <string name="ic_long_label">Rapporto Insulina-Carboidrati (I:C)</string>
     <string name="isf_long_label">Fattore di sensibilità insulinica (ISF)</string>
-    <string name="basal_long_label">Velocità basale</string>
     <string name="target_long_label">Target glicemia</string>
     <string name="initializing">Inizializzazione...</string>
     <string name="serialnumber">Numero seriale</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">I PIN non coincidono</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valori basali non allineati alle ore: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valore basale sostituito dal minimo valore supportato: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valore basale sostituito dal massimo valore supportato: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">In attesa del risultato</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g di CHO aggiuntivi richiesti entro %2$d minuti</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistiche</string>
     <string name="cumulative_tdd">TDD cumulativo</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># Giorni</string>
     <string name="weight">Peso</string>
     <string name="warning_Message">Probabilmente inaccurato se per il caricamento/riempimento si usano i boli al posto dell\'apposita funzione!</string>
-    <string name="olddata_Message">Dati vecchi, premi \"RICARICA\"</string>
     <string name="tbb">Basale originale totale</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <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>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLO %1$.2f U</string>
     <string name="carbs_g">CHO %1$d g</string>
@@ -489,6 +482,7 @@
     <string name="autotune_run_with_autoswitch">Autotune eseguito e profilo cambiato automaticamente</string>
     <string name="autotune_run_with_error">Errore durante l\'ultima esecuzione di Autotune</string>
     <string name="autotune_run_cancelled">È stata rilevata un\'altra esecuzione di Autotune, esecuzione annullata</string>
+    <string name="needconnectpermission">L\'applicazione richiede l\'autorizzazione bluetooth</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 20cb735c6e..c8d3f5d271 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d דק\'</string>
     <string name="pumpbusy">המשאבה אינה פנויה</string>
     <string name="connectionerror">שגיאה בחיבור המשאבה</string>
-    <string name="youareonallowedlimit">הגעתם למגבלה המותרת</string>
     <string name="objectives">משימות</string>
     <string name="close">סגור</string>
     <string name="please_wait">נא להמתין…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">עצור נלחץ!</string>
     <string name="stop">עצור</string>
     <string name="carbs">פחמימות</string>
-    <string name="invalidprofile">פרופיל לא חוקי !!!</string>
     <string name="noprofileset">לא הוגדר פרופיל</string>
     <string name="active"><![CDATA[<פועל>]]></string>
     <string name="date">תאריך</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">משך פעילות האינסולין</string>
     <string name="ic_long_label">יחס אינסולין-פחמימות </string>
     <string name="isf_long_label">יחס התיקון (ISF)</string>
-    <string name="basal_long_label">מינון בזאלי</string>
     <string name="target_long_label">ערך מטרה</string>
     <string name="initializing">מאתחל...</string>
     <string name="serialnumber">מספר סידורי</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">קודי PIN אינם תואמים</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">ערכי הבזאלי לא מותאמים לשעות: %1$s</string>
-    <string name="minimalbasalvaluereplaced">ערכי הבזאלי הוחלפו בהערכים המינימליים שנתמכים: %1$s</string>
     <string name="maximumbasalvaluereplaced">ערכי הבזאלי הוחלפו בערכים הנתמכים המינימליים: %1$s</string>
     <string name="profile_per_unit">/יח\'</string>
     <string name="profile_ins_units_per_hour">יח\'\\שעה</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">ממתין לתוצאות</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d גר\' פחמימות דרושות ב-%2$d הדקות הקרובות</string>
     <!--    TDDStatsActivity-->
     <string name="stats">סטטיסטיקה</string>
     <string name="cumulative_tdd">מינון יומי מצטבר (TDD)</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># ימים</string>
     <string name="weight">משקל</string>
     <string name="warning_Message">שימוש בבולוס למילוי \\ תיחול עשוי לגרום לחוסר דיוק!</string>
-    <string name="olddata_Message">הנתונים ישנים. לרענון לחצו \"טען מחדש\"</string>
     <string name="tbb">סה\"כ בזאלי בסיסי</string>
     <string name="tbb2">סה\"כ בזאלי בסיסי * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <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>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">בולוס %1$.2f יח\'</string>
     <string name="carbs_g">פחמימות %1$d גרם</string>
@@ -489,6 +482,7 @@
     <string name="autotune_run_with_autoswitch">כוונון אוטומטי הופעל והפרופיל הוחלף אוטומטית</string>
     <string name="autotune_run_with_error">שגיאה במהלך הכיוונון האוטומטי האחרון</string>
     <string name="autotune_run_cancelled">נמצאה הפעלה נוספת של הכוונון האוטומטי ברקע, ההפעלה מבוטלת</string>
+    <string name="needconnectpermission">האפליקציה צריכה הרשאה לבלוטות\'</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 c04e9ec5b3..f75531ba68 100644
--- a/core/src/main/res/values-ko-rKR/strings.xml
+++ b/core/src/main/res/values-ko-rKR/strings.xml
@@ -30,7 +30,6 @@
     <string name="format_mins">%1$d 분</string>
     <string name="pumpbusy">펌프가 바쁩니다</string>
     <string name="connectionerror">펌프 연결 에러</string>
-    <string name="youareonallowedlimit">허용된 제한값에 도달하였습니다</string>
     <string name="objectives">목표</string>
     <string name="close">닫기</string>
     <string name="please_wait">잠시 기다려 주세요...</string>
@@ -39,7 +38,6 @@
     <string name="stoppressed">정지 누름</string>
     <string name="stop">정지</string>
     <string name="carbs">탄수화물</string>
-    <string name="invalidprofile">프로파일이 유효하지 않습니다!!!</string>
     <string name="noprofileset">프로파일이 설정되지 않았습니다.</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">날짜</string>
@@ -131,7 +129,6 @@
     <string name="passwords_dont_match">비밀번호가 일치하지 않습니다.</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basal값이 시간단위로 설정되지 않았습니다: %1$s</string>
-    <string name="minimalbasalvaluereplaced">지원되는 최소값으로 Basal값이 대체되었습니다:%1$s</string>
     <string name="maximumbasalvaluereplaced">지원되는 최대값으로 Basal값이 대체되었습니다:%1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -204,7 +201,6 @@
     <string name="waitingforpumpresult">결과 기다리는 중</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%2$d 분 안에 %1$d g의 추가적인 탄수화물이 요구됨</string>
     <!--    TDDStatsActivity-->
     <string name="stats">통계</string>
     <string name="cumulative_tdd">누적 일총량</string>
@@ -216,7 +212,6 @@
     <string name="amount_days">#일</string>
     <string name="weight">가중</string>
     <string name="warning_Message">교체/채움을 위해 Bolus를 사용한 경우 부정확할 수 있습니다!!</string>
-    <string name="olddata_Message">오래된 데이터입니다. \"새로고침\"을 누르세요.</string>
     <string name="tbb">총 기본 Basal</string>
     <string name="tbb2">총기초량 * 2</string>
     <!--    Ntp-->
diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
index c834cbf768..447d12baef 100644
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min.</string>
     <string name="pumpbusy">Pompa šiuo metu veikia</string>
     <string name="connectionerror">Pompos prisijungimo klaida</string>
-    <string name="youareonallowedlimit">Pasiekėte leistiną ribą</string>
     <string name="objectives">Tikslai</string>
     <string name="close">Uždaryti</string>
     <string name="please_wait">Palaukite…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">Paspausta STOP</string>
     <string name="stop">Stop</string>
     <string name="carbs">AV</string>
-    <string name="invalidprofile">Netinkamas profilis!!!</string>
     <string name="noprofileset">Nenustatytas profilis</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">Data</string>
@@ -132,7 +130,6 @@
     <string name="passwords_dont_match">Slaptažodžiai nesutampa</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Bazės reikšmės nesuderintos su valandomis: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valandinė bazė pakeista mažiausia palaikoma verte: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valandinė bazė pakeista didžiausia palaikoma verte: %1$s</string>
     <string name="profile_per_unit">/vv</string>
     <string name="profile_ins_units_per_hour">Vv/val</string>
@@ -213,7 +210,6 @@
     <string name="waitingforpumpresult">Laukiama rezultato</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">Būtina suvartoti %1$d g papildomų AV per %2$d min</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistika</string>
     <string name="cumulative_tdd">BPD viso</string>
@@ -225,7 +221,6 @@
     <string name="amount_days"># d.</string>
     <string name="weight">Svoris</string>
     <string name="warning_Message">Duomenys netikslūs, jei bolusai naudojami kateterių užpildymui!</string>
-    <string name="olddata_Message">Duomenys seni, spauskite \"ATNAUJINTI\"</string>
     <string name="tbb">Pagrindinė bazė (PB)</string>
     <string name="tbb2">PB * 2</string>
     <!--    Ntp-->
@@ -388,7 +383,6 @@
     <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>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUSAS %1$.2f vv</string>
     <string name="carbs_g">AV %1$d g</string>
@@ -422,6 +416,7 @@
     <string name="insight_refresh_button" comment="26 characters max for translation">Insight Mygtukas Naujinti</string>
     <string name="basal">Valandinė bazė</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Programai reikalinga Bluetooth prieigos teisė</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-night/styles.xml b/core/src/main/res/values-night/styles.xml
index 7e98c75fcd..dfd244db24 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -246,6 +246,16 @@
         <!---Icons in Loop area -->
         <item name="profileColor">@color/white</item>
         <item name="crossTargetColor">@color/white</item>
+        <!---Spinner style from pump common-->
+        <item name="android:spinnerItemStyle">@style/CommonSpinnerItemStyle</item>
+        <!---Custom button -->
+        <item name="customBtnStyle">@style/GrayButton</item>
+    </style>
+
+
+    <style name="CommonSpinnerItemStyle" parent="Widget.AppCompat.TextView.SpinnerItem">
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textSize">15sp</item>
     </style>
 
     <style name="Aaps_ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
index 9a314f98f1..bd825ded72 100644
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d minuten</string>
     <string name="pumpbusy">Pomp is bezig</string>
     <string name="connectionerror">Pomp verbindingsstoring</string>
-    <string name="youareonallowedlimit">Limiet bereikt</string>
     <string name="objectives">Doelen</string>
     <string name="close">Sluiten</string>
     <string name="please_wait">Even geduld a.u.b.…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOP INGEDRUKT</string>
     <string name="stop">Stop</string>
     <string name="carbs">Koolhydraten</string>
-    <string name="invalidprofile">Ongeldig profiel !!!</string>
     <string name="noprofileset">Geen profiel ingesteld</string>
     <string name="active"><![CDATA[<Huidig>]]></string>
     <string name="date">Datum</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Duur van insuline activiteit</string>
     <string name="ic_long_label">Insuline - Koolhydraat ratio</string>
     <string name="isf_long_label">Insuline gevoeligheidsfactor</string>
-    <string name="basal_long_label">Basaalstand</string>
     <string name="target_long_label">Bloedglucose doelwaarde</string>
     <string name="initializing">Initialiseren...</string>
     <string name="serialnumber">Serie nummer</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">PIN-codes komen niet overeen</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basaalstanden niet ingesteld in hele uren: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Basale waarde vervangen door minimaal ondersteunde waarde; %1$s</string>
     <string name="maximumbasalvaluereplaced">Basale waarde vervangen door maximale ondersteunde waarde: %1$s</string>
     <string name="profile_per_unit">/E</string>
     <string name="profile_ins_units_per_hour">E/u</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">Wachtend op resultaat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g extra koolhydraten nodig binnen %2$d minuten</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistieken</string>
     <string name="cumulative_tdd">Cumulatieve TDD</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># Dagen</string>
     <string name="weight">Gewicht</string>
     <string name="warning_Message">Mogelijks inaccuraat bij gebruik van bolussen om infusieset te vullen!</string>
-    <string name="olddata_Message">Oude gegevens, druk op \"VERNIEUW\"</string>
     <string name="tbb">Totaal basaal</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <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>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f E</string>
     <string name="carbs_g">KOOLHYDRATEN %1$d gr</string>
diff --git a/core/src/main/res/values-no-rNO/strings.xml b/core/src/main/res/values-no-rNO/strings.xml
index b25407ac6a..6bc8659f74 100644
--- a/core/src/main/res/values-no-rNO/strings.xml
+++ b/core/src/main/res/values-no-rNO/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pumpen er opptatt</string>
     <string name="connectionerror">Tilkoblingsfeil til pumpe</string>
-    <string name="youareonallowedlimit">Du har nådd din tillatte grense</string>
     <string name="objectives">Opplæringsmål</string>
     <string name="close">Lukk</string>
     <string name="please_wait">Vennligst vent…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOPP trykket</string>
     <string name="stop">Stopp</string>
     <string name="carbs">Karbohydrater</string>
-    <string name="invalidprofile">Ugyldig profil!!!</string>
     <string name="noprofileset">INGEN PROFIL VALGT</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">Dato</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Insulinets virkningstid (DIA)</string>
     <string name="ic_long_label">Insulin- til karbohydratfaktor</string>
     <string name="isf_long_label">Insulin sensitivitetsfaktor (ISF)</string>
-    <string name="basal_long_label">Basal rate</string>
     <string name="target_long_label">Blodsukkermål</string>
     <string name="initializing">Starter opp...</string>
     <string name="serialnumber">Serienummer</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">PIN-kodene samsvarer ikke</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basal verdier er ikke angitt på hele timer: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Basal verdi erstattet med laveste tillate verdi: %1$s</string>
     <string name="maximumbasalvaluereplaced">Basal verdi erstattet med høyeste tillate verdi: %1$s</string>
     <string name="profile_per_unit">/E</string>
     <string name="profile_ins_units_per_hour">E/t</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">Venter på resultat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g ekstra karbohydrater kreves innen %2$d minutter</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistikk</string>
     <string name="cumulative_tdd">Akkumulert TDD</string>
@@ -233,7 +228,6 @@
     <string name="amount_days">Antall dager</string>
     <string name="weight">Vekt</string>
     <string name="warning_Message">Kan vise feil hvis bolus brukes for priming/fylling!</string>
-    <string name="olddata_Message">Gamle data. Vennligst trykk \"HENT\"</string>
     <string name="tbb">Total grunnbasal</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <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>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f E</string>
     <string name="carbs_g">CARBS %1$d g</string>
@@ -489,6 +482,7 @@
     <string name="autotune_run_with_autoswitch">Autotune utført og profil automatisk skiftet ut</string>
     <string name="autotune_run_with_error">Feil oppdaget under siste Autotune kjøring</string>
     <string name="autotune_run_cancelled">Autotune kjører allerede. Kjøring avbrutt</string>
+    <string name="needconnectpermission">Appen trenger bluetooth tillatelse</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 eba2bf6385..d46768339a 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min.</string>
     <string name="pumpbusy">Pompa jest zajęta</string>
     <string name="connectionerror">Błąd połączenia z pompą</string>
-    <string name="youareonallowedlimit">Osiągnąłeś dozwolony limit</string>
     <string name="objectives">Zadania</string>
     <string name="close">Zamknij</string>
     <string name="please_wait">Proszę czekać…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">NACIŚNIĘTY STOP</string>
     <string name="stop">Stop</string>
     <string name="carbs">Węglowodany</string>
-    <string name="invalidprofile">Nieprawidłowy profil !!!</string>
     <string name="noprofileset">NIE USTAWIONO PROFILU</string>
     <string name="active"><![CDATA[<Aktywny>]]></string>
     <string name="date">Data</string>
@@ -132,7 +130,6 @@
     <string name="passwords_dont_match">Hasła się nie zgadzają</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Wartości bazy nie są ustawione w pełnych godzinach: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Wartość bazy zastąpiona minimalną obsługiwaną wartością: %1$s</string>
     <string name="maximumbasalvaluereplaced">Wartość bazy zastąpiona maksymalną obsługiwaną wartością: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -213,7 +210,6 @@
     <string name="waitingforpumpresult">Oczekiwanie na wynik</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">Zalecane podanie %1$d g węglowodanów w przeciągu %2$d minut</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statystyki</string>
     <string name="cumulative_tdd">Kumulatywna TDD (dawka dzienna)</string>
@@ -225,7 +221,6 @@
     <string name="amount_days"># Dni</string>
     <string name="weight">Waga</string>
     <string name="warning_Message">Możliwa niedokładność jeśli używasz bolusów do wypełnień!</string>
-    <string name="olddata_Message">Stare dane, naciśnij \"RELOAD\"</string>
     <string name="tbb">Suma dzienna bazy (TBB)</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -388,7 +383,6 @@
     <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>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f U</string>
     <string name="carbs_g">WĘGLOW. %1$d g</string>
@@ -424,6 +418,7 @@
     <string name="count_selected">Wybrany %1$d</string>
     <string name="sort_label">Sortuj</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Aplikacja wymaga uprawnienia Bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d dzień</item>
         <item quantity="few">%1$d dni</item>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index fa70256576..e1b07da0bd 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -22,7 +22,6 @@
     <string name="format_hours">%1$.2f h</string>
     <string name="pumpbusy">A bomba está ocupada</string>
     <string name="connectionerror">Erro de conexão com a bomba</string>
-    <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
     <string name="objectives">Objetivos</string>
     <string name="close">Fechar</string>
     <string name="please_wait">Por favor aguarde…</string>
@@ -31,7 +30,6 @@
     <string name="stoppressed">STOP PRESSIONADO</string>
     <string name="stop">Parar</string>
     <string name="carbs">Carbos</string>
-    <string name="invalidprofile">Perfil inválido !!!</string>
     <string name="noprofileset">SEM PERFIL DEFINIDO</string>
     <string name="date">Data</string>
     <string name="units_label">Unidades</string>
@@ -106,7 +104,6 @@
     <string name="passwords_dont_match">As passwords não coincidem</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valor da basal alterado para o valor máximo suportado: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -180,7 +177,6 @@
     <string name="amount_days"># Dias</string>
     <string name="weight">Peso</string>
     <string name="warning_Message">Possivelmente impreciso se o bolus for usado para purgar!</string>
-    <string name="olddata_Message">Dados antigos, pressione \"Recarregar\"</string>
     <string name="tbb">Basal Diária Total</string>
     <string name="tbb2">Basal diária * 2</string>
     <!--    Ntp-->
@@ -229,6 +225,7 @@
     <string name="autotune_tune_insulin_curve_summary">Habilitar apenas se você usar pico livre. Esta opção irá ajustar a duração do pico e da DAI</string>
     <string name="autotune_default_tune_days_summary">Número padrão de dias de dados a serem processados por Autotune (até 30)</string>
     <string name="autotune_error">Erro nos dados de entrada, tente executar novamente autotune ou reduza o número de dias</string>
+    <string name="needconnectpermission">O aplicativo precisa de permissão bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d dia</item>
         <item quantity="other">%1$d dias</item>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index 29c658270c..a5ed713284 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -30,7 +30,6 @@
     <string name="format_mins">%1$d mins</string>
     <string name="pumpbusy">A bomba está ocupada</string>
     <string name="connectionerror">Erro de ligação da bomba</string>
-    <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
     <string name="objectives">Objectivos</string>
     <string name="close">Fechar</string>
     <string name="please_wait">Por favor aguarde…</string>
@@ -39,7 +38,6 @@
     <string name="stoppressed">PARAR PRESSIONADO</string>
     <string name="stop">Parar</string>
     <string name="carbs">Hidratos</string>
-    <string name="invalidprofile">Perfil inválido !!!</string>
     <string name="noprofileset">SEM PERFIL DEFINIDO</string>
     <string name="active"><![CDATA[<Activo>]]></string>
     <string name="date">Data</string>
@@ -130,7 +128,6 @@
     <string name="passwords_dont_match">Palavras-passe não correspondem</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valor da basal alterado para o valor máximo suportado: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -199,7 +196,6 @@
     <string name="waitingforpumpresult">À espera de resultado</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g Hidratos Adicionais Necessários Dentro de %2$d Minutos</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Estatísticas</string>
     <string name="cumulative_tdd">Cumulativo TDI</string>
@@ -211,7 +207,6 @@
     <string name="amount_days"># Dias</string>
     <string name="weight">Peso</string>
     <string name="warning_Message">Possivelmente impreciso se foram usados bólus para purgar/preencher!</string>
-    <string name="olddata_Message">Dados antigos, pressione \"Recarregar\"</string>
     <string name="tbb">Basal Diária Total</string>
     <string name="tbb2">Basal diária * 2</string>
     <!--    Ntp-->
@@ -341,6 +336,7 @@
     <!-- Command Queue + readStatus reasons -->
     <string name="basal">Basal</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Aplicação precisa de permissão Bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d dia</item>
         <item quantity="other">%1$d dias</item>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index dc4b4b01f3..9754e3cd00 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pompa face altă acțiune</string>
     <string name="connectionerror">Eroare de conexiune cu pompa</string>
-    <string name="youareonallowedlimit">Ați atins limita permisă</string>
     <string name="objectives">Obiective</string>
     <string name="close">Închide</string>
     <string name="please_wait">Așteptați…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOP APĂSAT</string>
     <string name="stop">Stop</string>
     <string name="carbs">Carbohidrați</string>
-    <string name="invalidprofile">Profil invalid!!!</string>
     <string name="noprofileset">NICIUN PROFIL SETAT</string>
     <string name="active"><![CDATA[<Activ>]]></string>
     <string name="date">Data</string>
@@ -132,7 +130,6 @@
     <string name="passwords_dont_match">Parolele nu corespund</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valori bazale nesincronizate cu ora: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valoarea bazalei a fost înlocuită cu valoarea minimă posibilă: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valoarea bazalei a fost înlocuită cu valoarea maximă posibilă: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -214,7 +211,6 @@
     <string name="waitingforpumpresult">Se așteaptă rezultatul</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g carbohidrați suplimentari necesari în %2$d minute</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistici</string>
     <string name="cumulative_tdd">TDD cumulat</string>
@@ -226,7 +222,6 @@
     <string name="amount_days"># Zile</string>
     <string name="weight">Greutate</string>
     <string name="warning_Message">Posibil fără acuratețe bună dacă folosiți bolus de insulină pentru amorsare/umplere!</string>
-    <string name="olddata_Message">Date vechi, apăsați \"REÎNCĂRCARE\"</string>
     <string name="tbb">Total bazală implicită</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -389,7 +384,6 @@
     <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>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f U</string>
     <string name="carbs_g">CARB %1$d g</string>
@@ -424,6 +418,7 @@
     <string name="basal">Rate bazale</string>
     <string name="sort_label">Sortează</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Aplicația are nevoie de permisiune Bluetooth</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 473b44ee80..1d16f4c8bc 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d мин</string>
     <string name="pumpbusy">помпа занята</string>
     <string name="connectionerror">ошибка соединения</string>
-    <string name="youareonallowedlimit">разрешенный предел достигнут</string>
     <string name="objectives">Цели</string>
     <string name="close">Закрыть</string>
     <string name="please_wait">Подождите…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">нажат стоп</string>
     <string name="stop">стоп</string>
     <string name="carbs">Углеводы</string>
-    <string name="invalidprofile">Неверный профиль !!!</string>
     <string name="noprofileset">ПРОФИЛЬ НЕ ЗАДАН</string>
     <string name="active"><![CDATA[Активен]]></string>
     <string name="date">дата</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Продолжительность действия инсулина</string>
     <string name="ic_long_label">Соотношение инсулин/углеводы I: C</string>
     <string name="isf_long_label">Фактор Чувствительности к Инсулину (ISF)</string>
-    <string name="basal_long_label">Скорость базала</string>
     <string name="target_long_label">Целевая ГК</string>
     <string name="initializing">инициализация...</string>
     <string name="serialnumber">Серийный номер</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">PIN-коды не совпадают</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Базальные значения не выровнены по часам: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Значение базала заменено минимальной поддерживаемой величиной: %1$s</string>
     <string name="maximumbasalvaluereplaced">Значение базала заменено максимальной поддерживаемой величиной: %1$s</string>
     <string name="profile_per_unit">/ед</string>
     <string name="profile_ins_units_per_hour">ед/ч</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">Ожидание результата</string>
     <string name="smb_shortname">Супер микро болюс SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">Необходимо дополнительно %1$d г углеводов в течение %2$d минут</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Статистика</string>
     <string name="cumulative_tdd">накопительные TDD</string>
@@ -233,7 +228,6 @@
     <string name="amount_days">количество дней</string>
     <string name="weight">вес</string>
     <string name="warning_Message">возможны неточности если болюсы использовались для заполнения</string>
-    <string name="olddata_Message">старые данные. нажмите \"перезагрузка\"</string>
     <string name="tbb">общий базал</string>
     <string name="tbb2">общий базал*2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <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>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">БОЛЮС %1$.2f ЕД</string>
     <string name="carbs_g">УГЛ %1$d г</string>
@@ -489,6 +482,7 @@
     <string name="autotune_run_with_autoswitch">Autotune выполнен и профиль переключён автоматически</string>
     <string name="autotune_run_with_error">Ошибка во время последнего выполнения Autotune</string>
     <string name="autotune_run_cancelled">Обнаружен другой запуск Autotune, выполнение отменено</string>
+    <string name="needconnectpermission">Приложению требуется разрешение Bluetooth</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 1de2cd04aa..1b5c7a61dd 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -31,16 +31,16 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pumpa je zaneprázdnená</string>
     <string name="connectionerror">Chyba pripájania pumpy</string>
-    <string name="youareonallowedlimit">Dosiahnutý limit</string>
+    <string name="youareonallowedlimit">Dosiahnutý povolený limit</string>
     <string name="objectives">Ciele</string>
     <string name="close">Zavrieť</string>
     <string name="please_wait">Čakajte prosím...</string>
     <string name="mute">Stíšiť</string>
-    <string name="reload">Načítať</string>
+    <string name="reload">Znova načítať</string>
     <string name="stoppressed">STLAČENÝ STOP</string>
     <string name="stop">Stop</string>
     <string name="carbs">Sacharidy</string>
-    <string name="invalidprofile">Chybný profil !!!</string>
+    <string name="invalidprofile">Neplatný profil!</string>
     <string name="noprofileset">Nenastavený žiadny profil</string>
     <string name="active"><![CDATA[<Aktívny>]]></string>
     <string name="date">Dátum</string>
@@ -221,7 +221,7 @@
     <string name="waitingforpumpresult">Čakanie na výsledok</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g dodatočných sacharidov požadovaných v priebehu %2$d minút</string>
+    <string name="carbsreq">Požadovaných dodatočných %1$d g sacharidov v priebehu %2$d minút</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Štatistiky</string>
     <string name="cumulative_tdd">Kumulatívny TDD</string>
@@ -233,7 +233,7 @@
     <string name="amount_days">Dní</string>
     <string name="weight">Váha</string>
     <string name="warning_Message">Pravdepodobne nepresné, ak bol použitý bolus na plnenie!</string>
-    <string name="olddata_Message">Zastaralé dáta. Prosím načítajte ich znovu</string>
+    <string name="olddata_Message">Zastaralé dáta. Stlačte tlačítko „ZNOVA NAČÍTAŤ“</string>
     <string name="tbb">Celk. denný bazál</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">Autotune spustený a profil automaticky prepnutý</string>
     <string name="autotune_run_with_error">Chyba pri poslednom spustení Autotune</string>
     <string name="autotune_run_cancelled">Bola zistená iná spustená úloha Autotune, spustenie zrušené</string>
+    <string name="needconnectpermission">Aplikácia vyžaduje povolenie bluetooth</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 86d9f25d0c..cc95cd1e14 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pump upptagen</string>
     <string name="connectionerror">Anslutningsfel</string>
-    <string name="youareonallowedlimit">Du har nått din tillåtna gräns</string>
     <string name="objectives">Mål</string>
     <string name="close">Stäng</string>
     <string name="please_wait">Var god vänta…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">Stopp nedtryckt</string>
     <string name="stop">Stopp</string>
     <string name="carbs">Kolhydrater</string>
-    <string name="invalidprofile">Ogiltig profil!</string>
     <string name="noprofileset">INGEN PROFIL VALD</string>
     <string name="active"><![CDATA[<Aktiv>]]></string>
     <string name="date">Datum</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Insulinets verkningstid</string>
     <string name="ic_long_label">Insulin till kolhydratförhållande</string>
     <string name="isf_long_label">Insulinkänslighetsfaktor</string>
-    <string name="basal_long_label">Basaldos</string>
     <string name="target_long_label">Mål-BG</string>
     <string name="initializing">Startar...</string>
     <string name="serialnumber">Serienummer</string>
@@ -138,7 +135,6 @@
     <string name="passwords_dont_match">Lösenorden stämmer inte överens</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Profilens basaler är inte satta på hel timme: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Basalvärdet ersatt med det lägsta tillåtna: %1$s</string>
     <string name="maximumbasalvaluereplaced">Basalvärdet ersatt med det högsta tillåtna: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -219,7 +215,6 @@
     <string name="waitingforpumpresult">Väntar på resultat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$dg KH behövs inom %2$d minuter</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Kumulativ TDD</string>
@@ -231,7 +226,6 @@
     <string name="amount_days">Antal dagar</string>
     <string name="weight">Vikt</string>
     <string name="warning_Message">Kan visa fel om man använder bolus för förfyllning!</string>
-    <string name="olddata_Message">Gammalt data. Tryck på Hämta</string>
     <string name="tbb">Total grundbasal</string>
     <string name="tbb2">TDB * 2</string>
     <!--    Ntp-->
@@ -394,7 +388,6 @@
     <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>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f U</string>
     <string name="carbs_g">KH %1$d g</string>
@@ -430,6 +423,7 @@
     <string name="a11y_plus_button_description">öka %1$s med %2$s</string>
     <string name="basal">Basal</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Applikationen behöver bluetooth-behörighet</string>
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dagar</item>
diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/src/main/res/values-tr-rTR/strings.xml
index 4ecfd908e0..b3c48e0def 100644
--- a/core/src/main/res/values-tr-rTR/strings.xml
+++ b/core/src/main/res/values-tr-rTR/strings.xml
@@ -31,7 +31,7 @@
     <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="youareonallowedlimit">İzin verilen limite ulaşıldı</string>
     <string name="objectives">Görevler</string>
     <string name="close">Kapat</string>
     <string name="please_wait">Lütfen bekleyin…</string>
@@ -40,7 +40,7 @@
     <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="invalidprofile">Geçersiz profil!</string>
     <string name="noprofileset">PROFİL AYARLANMADI</string>
     <string name="active"><![CDATA[<Aktif>]]></string>
     <string name="date">Tarih</string>
@@ -140,7 +140,7 @@
     <string name="pin_dont_match">PIN\'ler 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="minimalbasalvaluereplaced">Desteklenen minimum değerle değiştirilen bazal değer: %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>
@@ -221,7 +221,7 @@
     <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>
+    <string name="carbsreq">%2$d dakika iç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>
@@ -233,7 +233,7 @@
     <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="olddata_Message">Eski veriler, lütfen \"YENİDEN YÜKLE\"ye basın</string>
     <string name="tbb">Günlük bazal miktarı</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +397,7 @@
     <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>
+    <string name="nsclient_version_does_not_match">NSClient sürümü, AndroidAPS sürümü ile eşleşmiyor. Lütfen güncelle.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f Ü</string>
     <string name="carbs_g">Karbonhidrat %1$d g</string>
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">OtoAyar çalıştırıldı ve profil otomatik olarak değiştirildi</string>
     <string name="autotune_run_with_error">Son OtoAyar çalışması sırasında hata oluştu</string>
     <string name="autotune_run_cancelled">Başka bir OtoAyar çalıştırması tespit edildi, çalıştırma iptal edildi</string>
+    <string name="needconnectpermission">Uygulama bluetooth iznine ihtiyac duyuyor</string>
     <plurals name="days">
         <item quantity="one">%1$d gün</item>
         <item quantity="other">%1$d gün</item>
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
index d64d0e7d41..d773218257 100644
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d 分钟</string>
     <string name="pumpbusy">胰岛素泵忙碌中</string>
     <string name="connectionerror">泵连接错误</string>
-    <string name="youareonallowedlimit">你达到了允许的极限</string>
     <string name="objectives">目标</string>
     <string name="close">关闭</string>
     <string name="please_wait">请稍等...</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">停止键按下了</string>
     <string name="stop">停止</string>
     <string name="carbs">碳水化合物</string>
-    <string name="invalidprofile">无效的配置文件!!!</string>
     <string name="noprofileset">没有设置配置文件</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">日期</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">胰岛素作用持续时间DIA</string>
     <string name="ic_long_label">碳水化合物系数（ICR）</string>
     <string name="isf_long_label">胰岛素敏感系数ISF</string>
-    <string name="basal_long_label">基础率</string>
     <string name="target_long_label">血糖目标</string>
     <string name="initializing">正在初始化</string>
     <string name="serialnumber">序列号</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">PIN 码不匹配。</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">基础率值与小时数不一致:%1$s</string>
-    <string name="minimalbasalvaluereplaced">基础率值被泵支持的最小值: %1$s 替换了</string>
     <string name="maximumbasalvaluereplaced">基础率值被泵支持的最大值:%1$s 替换了</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">正在等待结果</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">在 %2$d 分钟内需要 %1$d 克碳水化合物</string>
     <!--    TDDStatsActivity-->
     <string name="stats">统计信息</string>
     <string name="cumulative_tdd">累积的每日胰岛素输注的总量</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># 天</string>
     <string name="weight">权重</string>
     <string name="warning_Message">如果使用大剂量来充盈排气的话，活性胰岛素的量显示的可能不准确</string>
-    <string name="olddata_Message">旧数据请按 \"重新加载\"</string>
     <string name="tbb">基础率总量</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <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">NS客户端版本与AndroidAPS不匹配，请更新。</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">大剂量 %1$.2f U</string>
     <string name="carbs_g">碳水 %1$d 克</string>
@@ -442,6 +435,7 @@
     <string name="a11y_file">文件</string>
     <string name="a11y_user">用户</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">应用程序需要蓝牙权限。</string>
     <plurals name="days">
         <item quantity="other">%1$d　天</item>
     </plurals>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 0c9e53b9b7..5c5146e42d 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -218,4 +218,6 @@
     <!---Icons in Loop area -->
     <attr name="profileColor" format="reference|color" />
     <attr name="crossTargetColor" format="reference|color" />
+    <!---Custom button -->
+    <attr name="customBtnStyle" format="reference"/>
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 3f5832b0cd..56ed54ace4 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -105,7 +105,7 @@
     <string name="format_mins">%1$d mins</string>
     <string name="pumpbusy">Pump is busy</string>
     <string name="connectionerror">Pump connection error</string>
-    <string name="youareonallowedlimit">You reached allowed limit</string>
+    <string name="youareonallowedlimit">Allowed limit reached</string>
     <string name="objectives">Objectives</string>
     <string name="close">Close</string>
     <string name="please_wait">Please wait…</string>
@@ -114,7 +114,7 @@
     <string name="stoppressed">STOP PRESSED</string>
     <string name="stop">Stop</string>
     <string name="carbs">Carbs</string>
-    <string name="invalidprofile">Invalid profile !!!</string>
+    <string name="invalidprofile">Invalid profile!</string>
     <string name="noprofileset">NO PROFILE SET</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">Date</string>
@@ -127,7 +127,7 @@
     <string name="dia_long_label">Duration of Insulin Action</string>
     <string name="ic_long_label">Insulin to Carb ratio</string>
     <string name="isf_long_label">Insulin Sensitivity Factor</string>
-    <string name="basal_long_label">Basel rate</string>
+    <string name="basal_long_label">Basal rate</string>
     <string name="target_long_label">Blood Glucose Target</string>
     <string name="initializing">Initializing ...</string>
     <string name="serialnumber">Serial number</string>
@@ -219,7 +219,7 @@
 
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basal values not aligned to hours: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Basal value replaced by minimal supported value: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Basal value replaced by minimum supported value: %1$s</string>
     <string name="maximumbasalvaluereplaced">Basal value replaced by maximum supported value: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -309,7 +309,7 @@
     <string name="smb_shortname">SMB</string>
 
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g Additional Carbs Required Within %2$d Minutes</string>
+    <string name="carbsreq">%1$d g additional carbs required within %2$d minutes</string>
 
     <!--    TDDStatsActivity-->
     <string name="stats">Stats</string>
@@ -322,7 +322,7 @@
     <string name="amount_days"># Days</string>
     <string name="weight">Weight</string>
     <string name="warning_Message">Possibly inaccurate if using boluses for priming/filling!</string>
-    <string name="olddata_Message">Old Data Please Press "RELOAD"</string>
+    <string name="olddata_Message">Old data, please press "RELOAD"</string>
     <string name="tbb">Total Base Basal</string>
     <string name="tbb2">TBB * 2</string>
 
@@ -500,7 +500,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>
+    <string name="nsclient_version_does_not_match">NSClient version doesn\'t match AndroidAPS version. Please update.</string>
 
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f U</string>
@@ -601,6 +601,7 @@
     <string name="autotune_run_with_autoswitch">Autotune runned and profile automatically switched</string>
     <string name="autotune_run_with_error">Error during last Autotune run</string>
     <string name="autotune_run_cancelled">Another run of Autotune is detected, run cancelled</string>
+    <string name="needconnectpermission">Application needs bluetooth permission</string>
 
     <plurals name="days">
         <item quantity="one">%1$d day</item>
@@ -615,4 +616,4 @@
         <item quantity="other">%1$d minutes</item>
     </plurals>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 92c284f9b5..a471a947dc 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -247,8 +247,18 @@
         <!---Icons in Loop area -->
         <item name="profileColor">@color/black</item>
         <item name="crossTargetColor">@color/white</item>
+        <!---Spinner style from pump common-->
+        <item name="android:spinnerItemStyle">@style/CommonSpinnerItemStyle</item>
+        <!---Custom button -->
+        <item name="customBtnStyle">@style/GrayButton</item>
     </style>
 
+    <style name="CommonSpinnerItemStyle" parent="Widget.AppCompat.TextView.SpinnerItem">
+        <item name="android:textColor">@android:color/black</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+
+
     <style name="Aaps_ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
         <item name="android:titleTextStyle">@style/Theme.Aaps.ActionBar.TitleTextStyle</item>
     </style>
diff --git a/dana/src/main/res/values-ga-rIE/strings.xml b/dana/src/main/res/values-ga-rIE/strings.xml
index a4dd30318f..3ea04e700d 100644
--- a/dana/src/main/res/values-ga-rIE/strings.xml
+++ b/dana/src/main/res/values-ga-rIE/strings.xml
@@ -1,25 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="overview_bolusprogress_delivered">Seachadta</string>
-    <string name="overview_bolusprogress_stoped">Stopadh</string>
-    <string name="lowbattery">Ceallraí Íseal</string>
-    <string name="danar_history_alarm">Aláraim</string>
-    <string name="danar_history_bolus">Bólasi</string>
-    <string name="danar_history_carbohydrates">Carbaihiodráití</string>
-    <string name="danar_history_dailyinsulin">Inslin lá</string>
-    <string name="danar_history_errors">Earráidí</string>
-    <string name="danar_history_glucose">Glúcóis</string>
-    <string name="danar_history_refill">Athlán</string>
-    <string name="danar_history_syspend">Fionraí</string>
-    <string name="danar_pumpalarm">Aláram</string>
-    <string name="danar_glucoseunits">Aonaid Glúcóis</string>
-    <string name="danarpump_shortname">DANA</string>
-    <string name="danarkoreanpump">DanaR Cóiréis</string>
-    <string name="danarpump">DanaR</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="danar_bluetooth_status">Bluetooth stádas</string>
-    <string name="timeformat12h">12u</string>
-    <string name="timeformat24h">24u</string>
-    <string name="danar_bt_name_title">DanaR Bluetooth gléas</string>
-</resources>
+<resources></resources>
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/BluetoothDevicePreference.kt b/danar/src/main/java/info/nightscout/androidaps/danar/BluetoothDevicePreference.kt
deleted file mode 100644
index 41b090bc72..0000000000
--- a/danar/src/main/java/info/nightscout/androidaps/danar/BluetoothDevicePreference.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package info.nightscout.androidaps.danar
-
-import kotlin.jvm.JvmOverloads
-import android.bluetooth.BluetoothAdapter
-import android.bluetooth.BluetoothDevice
-import android.bluetooth.BluetoothManager
-import android.content.Context
-import android.util.AttributeSet
-import androidx.preference.ListPreference
-import java.util.*
-
-class BluetoothDevicePreference @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ListPreference(context, attrs) {
-    init {
-        val entries = Vector<CharSequence>()
-        (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter?.let { bta ->
-            for (dev in bta.bondedDevices)
-                dev.name?.let { name -> entries.add(name) }
-        }
-        setEntries(entries.toTypedArray())
-        entryValues = entries.toTypedArray()
-    }
-}
\ No newline at end of file
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 2e0b01350c..3425dd25ad 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
@@ -1,14 +1,19 @@
 package info.nightscout.androidaps.danar.services;
 
+import android.Manifest;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.IBinder;
 import android.os.SystemClock;
 
+import androidx.core.app.ActivityCompat;
+
 import java.io.IOException;
 import java.util.Set;
 import java.util.UUID;
@@ -41,8 +46,7 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
 import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.interfaces.PumpSync;
-import info.nightscout.shared.logging.AAPSLogger;
-import info.nightscout.shared.logging.LTag;
+import info.nightscout.androidaps.interfaces.ResourceHelper;
 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;
@@ -50,8 +54,9 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.ToastUtils;
-import info.nightscout.androidaps.interfaces.ResourceHelper;
 import info.nightscout.androidaps.utils.rx.AapsSchedulers;
+import info.nightscout.shared.logging.AAPSLogger;
+import info.nightscout.shared.logging.LTag;
 import info.nightscout.shared.sharedPreferences.SP;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
@@ -191,30 +196,32 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
 
     protected void getBTSocketForSelectedPump() {
         mDevName = sp.getString(R.string.key_danar_bt_name, "");
-        BluetoothAdapter bluetoothAdapter = ((BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) {
+            BluetoothAdapter bluetoothAdapter = ((BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
 
-        if (bluetoothAdapter != null) {
-            Set<BluetoothDevice> bondedDevices = bluetoothAdapter.getBondedDevices();
+            if (bluetoothAdapter != null) {
+                Set<BluetoothDevice> bondedDevices = bluetoothAdapter.getBondedDevices();
 
-            if (bondedDevices != null)
-                for (BluetoothDevice device : bondedDevices) {
-                    if (mDevName.equals(device.getName())) {
-                        mBTDevice = device;
-                        try {
-                            mRfcommSocket = mBTDevice.createRfcommSocketToServiceRecord(SPP_UUID);
-                        } catch (IOException e) {
-                            aapsLogger.error("Error creating socket: ", e);
+                if (bondedDevices != null)
+                    for (BluetoothDevice device : bondedDevices) {
+                        if (mDevName.equals(device.getName())) {
+                            mBTDevice = device;
+                            try {
+                                mRfcommSocket = mBTDevice.createRfcommSocketToServiceRecord(SPP_UUID);
+                            } catch (IOException e) {
+                                aapsLogger.error("Error creating socket: ", e);
+                            }
+                            break;
                         }
-                        break;
                     }
-                }
+            } else {
+                ToastUtils.INSTANCE.showToastInUiThread(context.getApplicationContext(), rh.gs(R.string.nobtadapter));
+            }
+            if (mBTDevice == null) {
+                ToastUtils.INSTANCE.showToastInUiThread(context.getApplicationContext(), rh.gs(R.string.devicenotfound));
+            }
         } else {
-            ToastUtils.INSTANCE.showToastInUiThread(context.getApplicationContext(),
-                    rh.gs(R.string.nobtadapter));
-        }
-        if (mBTDevice == null) {
-            ToastUtils.INSTANCE.showToastInUiThread(context.getApplicationContext(),
-                    rh.gs(R.string.devicenotfound));
+            ToastUtils.INSTANCE.errorToast(context, context.getString(R.string.needconnectpermission));
         }
     }
 
diff --git a/danar/src/main/res/values-da-rDK/strings.xml b/danar/src/main/res/values-da-rDK/strings.xml
index 3ea04e700d..a943e7b0de 100644
--- a/danar/src/main/res/values-da-rDK/strings.xml
+++ b/danar/src/main/res/values-da-rDK/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="unsupported_action_in_pump">Handling understøttes ikke i pumpe. Brug kun AndroidAPS-brugerflade!</string>
+</resources>
diff --git a/danar/src/main/res/values-de-rDE/strings.xml b/danar/src/main/res/values-de-rDE/strings.xml
index 3ea04e700d..2fde3f558c 100644
--- a/danar/src/main/res/values-de-rDE/strings.xml
+++ b/danar/src/main/res/values-de-rDE/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="unsupported_action_in_pump">Nicht unterstützte Aktion in Insulinpumpe. Bitte nur AndroidAPS-UI benutzen!</string>
+</resources>
diff --git a/danar/src/main/res/xml/pref_danar.xml b/danar/src/main/res/xml/pref_danar.xml
index c7d45b8f12..98b1f51b37 100644
--- a/danar/src/main/res/xml/pref_danar.xml
+++ b/danar/src/main/res/xml/pref_danar.xml
@@ -8,7 +8,7 @@
         android:title="@string/danar_pump_settings"
         app:initialExpandedChildrenCount="0">
 
-        <info.nightscout.androidaps.danar.BluetoothDevicePreference
+        <info.nightscout.androidaps.utils.ui.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
diff --git a/danar/src/main/res/xml/pref_danarkorean.xml b/danar/src/main/res/xml/pref_danarkorean.xml
index 96479baf58..5b3372e2ed 100644
--- a/danar/src/main/res/xml/pref_danarkorean.xml
+++ b/danar/src/main/res/xml/pref_danarkorean.xml
@@ -8,7 +8,7 @@
         android:title="@string/danar_pump_settings"
         app:initialExpandedChildrenCount="0">
 
-        <info.nightscout.androidaps.danar.BluetoothDevicePreference
+        <info.nightscout.androidaps.utils.ui.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
diff --git a/danar/src/main/res/xml/pref_danarv2.xml b/danar/src/main/res/xml/pref_danarv2.xml
index f18ed77e4a..f16c06afb6 100644
--- a/danar/src/main/res/xml/pref_danarv2.xml
+++ b/danar/src/main/res/xml/pref_danarv2.xml
@@ -8,7 +8,7 @@
         android:title="@string/danar_pump_settings"
         app:initialExpandedChildrenCount="0">
 
-        <info.nightscout.androidaps.danar.BluetoothDevicePreference
+        <info.nightscout.androidaps.utils.ui.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
diff --git a/danars/src/main/AndroidManifest.xml b/danars/src/main/AndroidManifest.xml
index c3ef8bc727..108cb94048 100644
--- a/danars/src/main/AndroidManifest.xml
+++ b/danars/src/main/AndroidManifest.xml
@@ -5,6 +5,8 @@
 
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+
     <application>
         <activity
             android:name="info.nightscout.androidaps.danars.activities.BLEScanActivity"
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 da57033b39..5f56ddc2b7 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
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.danars.activities
 
+import android.Manifest
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothDevice
@@ -9,6 +10,8 @@ import android.bluetooth.le.ScanCallback
 import android.bluetooth.le.ScanResult
 import android.content.Context
 import android.content.pm.ActivityInfo
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -16,14 +19,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.TextView
+import androidx.core.app.ActivityCompat
 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.RxBus
 import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck
+import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.shared.sharedPreferences.SP
-import java.util.*
 import java.util.regex.Pattern
 import javax.inject.Inject
 
@@ -58,8 +61,12 @@ class BLEScanActivity : NoSplashAppCompatActivity() {
     override fun onResume() {
         super.onResume()
 
-        if (bluetoothAdapter?.isEnabled != true) bluetoothAdapter?.enable()
-        startScan()
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) {
+            if (bluetoothAdapter?.isEnabled != true) bluetoothAdapter?.enable()
+            startScan()
+        } else {
+            ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission))
+        }
     }
 
     override fun onPause() {
@@ -68,17 +75,26 @@ class BLEScanActivity : NoSplashAppCompatActivity() {
     }
 
     private fun startScan() =
-        try {
-            bluetoothLeScanner?.startScan(mBleScanCallback)
-        } catch (e: IllegalStateException) {
-        } // ignore BT not on
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED) {
+            try {
+                bluetoothLeScanner?.startScan(mBleScanCallback)
+            } catch (ignore: IllegalStateException) {
+            } // ignore BT not on
+        } else {
+            ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission))
+        }
 
     private fun stopScan() =
-        try {
-            bluetoothLeScanner?.stopScan(mBleScanCallback)
-        } catch (e: IllegalStateException) {
-        } // ignore BT not on
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED) {
+            try {
+                bluetoothLeScanner?.stopScan(mBleScanCallback)
+            } catch (ignore: IllegalStateException) {
+            } // ignore BT not on
+        } else {
+            ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission))
+        }
 
+    @SuppressLint("MissingPermission")
     private fun addBleDevice(device: BluetoothDevice?) {
         if (device == null || device.name == null || device.name == "") {
             return
@@ -132,11 +148,16 @@ class BLEScanActivity : NoSplashAppCompatActivity() {
             override fun onClick(v: View) {
                 sp.putString(R.string.key_danars_address, item.device.address)
                 sp.putString(R.string.key_danars_name, name.text.toString())
-                item.device.createBond()
-                rxBus.send(EventDanaRSDeviceChange())
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) {
+                    item.device.createBond()
+                    rxBus.send(EventDanaRSDeviceChange())
+                } else {
+                    ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission))
+                }
                 finish()
             }
 
+            @SuppressLint("MissingPermission")
             fun setData(data: BluetoothDeviceItem) {
                 var tTitle = data.device.name
                 if (tTitle == null || tTitle == "") {
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 248583eb66..959a14aa3a 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
@@ -1,10 +1,15 @@
 package info.nightscout.androidaps.danars.services
 
+import android.Manifest
+import android.annotation.SuppressLint
 import android.bluetooth.*
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.SystemClock
 import android.util.Base64
+import androidx.core.app.ActivityCompat
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.DanaRSPlugin
@@ -21,6 +26,7 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.extensions.notify
 import info.nightscout.androidaps.extensions.waitMillis
 import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.interfaces.ResourceHelper
 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
@@ -28,7 +34,6 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
@@ -90,6 +95,13 @@ class BLEComm @Inject internal constructor(
 
     @Synchronized
     fun connect(from: String, address: String?): Boolean {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+            ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED
+        ) {
+            ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission))
+            aapsLogger.error(LTag.PUMPBTCOMM, "missing permission: $from")
+            return false
+        }
         aapsLogger.debug(LTag.PUMPBTCOMM, "Initializing BLEComm.")
         if (bluetoothAdapter == null) {
             aapsLogger.error("Unable to obtain a BluetoothAdapter.")
@@ -107,8 +119,10 @@ class BLEComm @Inject internal constructor(
             return false
         }
         if (device.bondState == BluetoothDevice.BOND_NONE) {
-            device.createBond()
-            SystemClock.sleep(10000)
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) {
+                device.createBond()
+                SystemClock.sleep(10000)
+            }
             return false
         }
         isConnected = false
@@ -131,6 +145,12 @@ class BLEComm @Inject internal constructor(
 
     @Synchronized
     fun disconnect(from: String) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+            ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED
+        ) {
+            aapsLogger.error(LTag.PUMPBTCOMM, "missing permission: $from")
+            return
+        }
         aapsLogger.debug(LTag.PUMPBTCOMM, "disconnect from: $from")
 
         if (!encryptedDataRead && encryptedCommandSent && encryption == EncryptionType.ENCRYPTION_BLE5) {
@@ -191,6 +211,7 @@ class BLEComm @Inject internal constructor(
         }
     }
 
+    @SuppressLint("MissingPermission")
     @Synchronized fun close() {
         /*
         if (!encryptedDataRead && !encryptedCommandSent) {
@@ -268,6 +289,7 @@ class BLEComm @Inject internal constructor(
         }
     }
 
+    @SuppressLint("MissingPermission")
     @Synchronized
     private fun setCharacteristicNotification(characteristic: BluetoothGattCharacteristic?, enabled: Boolean) {
         aapsLogger.debug(LTag.PUMPBTCOMM, "setCharacteristicNotification")
@@ -287,6 +309,7 @@ class BLEComm @Inject internal constructor(
         }
     }
 
+    @SuppressLint("MissingPermission")
     @Synchronized
     private fun writeCharacteristicNoResponse(characteristic: BluetoothGattCharacteristic, data: ByteArray) {
         Thread(Runnable {
@@ -346,6 +369,7 @@ class BLEComm @Inject internal constructor(
         }
     }
 
+    @SuppressLint("MissingPermission")
     @Synchronized
     private fun onConnectionStateChangeSynchronized(gatt: BluetoothGatt, newState: Int) {
         aapsLogger.debug(LTag.PUMPBTCOMM, "onConnectionStateChange")
@@ -559,7 +583,7 @@ class BLEComm @Inject internal constructor(
                 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()) {
+            if (storedPairingKey.isBlank()) {
                 removeBond()
                 disconnect("Non existing pairing key")
             }
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 fcb383fa8c..386a9e5349 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt
@@ -20,6 +20,11 @@ class DiaconnG8Pump @Inject constructor(
     private val dateUtil: DateUtil
 ) {
 
+    var isPumpLogUploadFailed: Boolean = false
+
+    //var bleResultInfo: Pair<Int?, Boolean> = Pair(null, false)
+    var bolusConfirmMessage: Byte = 0
+    var isReadyToBolus: Boolean = false
     var maxBolusePerDay: Double = 0.0
     var pumpIncarnationNum: Int = 65536
     var isPumpVersionGe2_63: Boolean = false // is pumpVersion higher then 2.63
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 52165d828d..05fbebeaf1 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
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.diaconn.activities
 
+import android.Manifest
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothDevice
@@ -11,6 +12,8 @@ import android.bluetooth.le.ScanResult
 import android.bluetooth.le.ScanSettings
 import android.content.Context
 import android.content.pm.ActivityInfo
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -19,12 +22,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.TextView
+import androidx.core.app.ActivityCompat
 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.RxBus
+import info.nightscout.androidaps.diaconn.events.EventDiaconnG8DeviceChange
 import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck
+import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.shared.sharedPreferences.SP
 import java.util.*
 import javax.inject.Inject
@@ -61,18 +65,25 @@ class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
     override fun onResume() {
         super.onResume()
 
-       bluetoothAdapter?.let { bluetoothAdapter ->
-            if (!bluetoothAdapter.isEnabled) bluetoothAdapter.enable()
-            bluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner
-            startScan()
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED) {
+            bluetoothAdapter?.let { bluetoothAdapter ->
+                if (!bluetoothAdapter.isEnabled) bluetoothAdapter.enable()
+                bluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner
+                startScan()
+            }
+        } else {
+            ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission))
         }
     }
 
     override fun onPause() {
         super.onPause()
-        stopScan()
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED) {
+            stopScan()
+        }
     }
 
+    @SuppressLint("MissingPermission")
     private fun startScan() =
         try {
             val filters: MutableList<ScanFilter> = ArrayList()
@@ -86,16 +97,23 @@ class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
                 .build()
 
             bluetoothLeScanner?.startScan(filters, settings, mBleScanCallback)
-        } catch (e: IllegalStateException) {
+        } catch (ignored: IllegalStateException) {
         } // ignore BT not on
 
+    @SuppressLint("MissingPermission")
     private fun stopScan() =
         try {
             bluetoothLeScanner?.stopScan(mBleScanCallback)
-        } catch (e: IllegalStateException) {
+        } catch (ignored: IllegalStateException) {
         } // ignore BT not on
 
     private fun addBleDevice(device: BluetoothDevice?) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+            ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED
+        ) {
+            ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission))
+            return
+        }
         if (device == null || device.name == null || device.name == "") {
             return
         }
@@ -145,6 +163,7 @@ class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
                 v.setOnClickListener(this@ViewHolder)
             }
 
+            @SuppressLint("MissingPermission")
             override fun onClick(v: View) {
                 sp.putString(R.string.key_diaconn_g8_address, item.device.address)
                 sp.putString(R.string.key_diaconn_g8_name, name.text.toString())
@@ -153,6 +172,7 @@ class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
                 finish()
             }
 
+            @SuppressLint("MissingPermission")
             fun setData(data: BluetoothDeviceItem) {
                 var tTitle = data.device.name
                 if (tTitle == null || tTitle == "") {
@@ -168,6 +188,7 @@ class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
 
     //
     inner class BluetoothDeviceItem internal constructor(val device: BluetoothDevice) {
+
         override fun equals(other: Any?): Boolean {
             if (other !is BluetoothDeviceItem) {
                 return false
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt
index 86a27374ce..49ec0d9f30 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt
@@ -77,6 +77,8 @@ abstract class DiaconnG8PacketModule {
     @ContributesAndroidInjector abstract fun contributesLanguageInquireResponsePacket(): LanguageInquireResponsePacket
     @ContributesAndroidInjector abstract fun contributesBigAPSMainInfoInquirePacket(): BigAPSMainInfoInquirePacket
     @ContributesAndroidInjector abstract fun contributesBigAPSMainInfoInquireResponsePacket(): BigAPSMainInfoInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesSerialNumInquirePacket(): SerialNumInquirePacket
+    @ContributesAndroidInjector abstract fun contributesSerialNumInquireResponsePacket(): SerialNumInquireResponsePacket
 
 
 }
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt
index d45f174bf3..9f41cfde1b 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt
@@ -35,6 +35,10 @@ class AppConfirmSettingResponsePacket(
             failed = true
             return
         }
+        //  The bolus progress diallog opens only when the confirm result is successfull
+        if(diaconnG8Pump.bolusConfirmMessage == 0x07.toByte()) {
+          diaconnG8Pump.isReadyToBolus = true
+        }
     }
 
     override fun getFriendlyName(): String {
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 fe347adbf0..a646a6baa6 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
@@ -846,6 +846,8 @@ class BigLogInquireResponsePacket(
                             }
                         }
                         override fun onFailure(call: Call<ApiResponse>, t: Throwable) {
+                            aapsLogger.error(LTag.PUMPCOMM, "api uploadPumplogs failed")
+                            diaconnG8Pump.isPumpLogUploadFailed = true
                             t.printStackTrace()
                         }
                     }
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt
index 7248d73530..e401d465a8 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt
@@ -25,7 +25,6 @@ class DiaconnG8ResponseMessageHashTable @Inject constructor(val injector: HasAnd
         put(SneckLimitInquireResponsePacket(injector))
         put(BasalLimitInquireResponsePacket(injector))
         put(TempBasalInquireResponsePacket(injector))
-        put(TimeInquirePacket(injector))
         put(TimeInquireResponsePacket(injector))
         put(TimeReportPacket(injector))
         put(LogStatusInquireResponsePacket(injector))
@@ -34,6 +33,8 @@ class DiaconnG8ResponseMessageHashTable @Inject constructor(val injector: HasAnd
         put(SoundInquireResponsePacket(injector))
         put(DisplayTimeInquireResponsePacket(injector))
         put(LanguageInquireResponsePacket(injector))
+        put(SerialNumInquireResponsePacket(injector))
+
 
         // Report Packet
         put(BasalPauseReportPacket(injector))
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquirePacket.kt
new file mode 100644
index 0000000000..0284c35029
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquirePacket.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.shared.logging.LTag
+import javax.inject.Inject
+
+/**
+
+ * SerialNumInquirePacket
+ */
+class SerialNumInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x6E
+        aapsLogger.debug(LTag.PUMPCOMM, "SeialNumInquirePacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SERIAL_NUM_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquireResponsePacket.kt
new file mode 100644
index 0000000000..76306e54fa
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquireResponsePacket.kt
@@ -0,0 +1,69 @@
+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.interfaces.ResourceHelper
+import info.nightscout.shared.logging.LTag
+import info.nightscout.shared.sharedPreferences.SP
+import javax.inject.Inject
+
+/**
+ * SerialNumInquireResponsePacket
+ */
+class SerialNumInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+    @Inject lateinit var rh: ResourceHelper
+
+
+    init {
+        msgType = 0xAE.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "SerialNumInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "SerialNumInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.country = getByteToInt(bufferData).toChar().toString().toInt() // ASCII
+        diaconnG8Pump.productType = getByteToInt(bufferData).toChar().toString().toInt() // ASCII
+        diaconnG8Pump.makeYear = getByteToInt(bufferData)
+        diaconnG8Pump.makeMonth = getByteToInt(bufferData)
+        diaconnG8Pump.makeDay = getByteToInt(bufferData)
+        diaconnG8Pump.lotNo = getByteToInt(bufferData)// LOT NO
+        diaconnG8Pump.serialNo = getShortToInt(bufferData)
+        diaconnG8Pump.majorVersion = getByteToInt(bufferData)
+        diaconnG8Pump.minorVersion = getByteToInt(bufferData)
+
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result       --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "country      --> ${diaconnG8Pump.country}")
+        aapsLogger.debug(LTag.PUMPCOMM, "productType  --> ${diaconnG8Pump.productType}")
+        aapsLogger.debug(LTag.PUMPCOMM, "makeYear     --> ${diaconnG8Pump.makeYear}")
+        aapsLogger.debug(LTag.PUMPCOMM, "makeMonth    --> ${diaconnG8Pump.makeMonth}")
+        aapsLogger.debug(LTag.PUMPCOMM, "makeDay      --> ${diaconnG8Pump.makeDay}")
+        aapsLogger.debug(LTag.PUMPCOMM, "lotNo        --> ${diaconnG8Pump.lotNo}")
+        aapsLogger.debug(LTag.PUMPCOMM, "serialNo     --> ${diaconnG8Pump.serialNo}")
+        aapsLogger.debug(LTag.PUMPCOMM, "majorVersion --> ${diaconnG8Pump.majorVersion}")
+        aapsLogger.debug(LTag.PUMPCOMM, "minorVersion --> ${diaconnG8Pump.minorVersion}")
+
+        sp.putString(rh.gs(R.string.pumpversion), diaconnG8Pump.majorVersion.toString() + "." + diaconnG8Pump.minorVersion.toString())
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SERIAL_NUM_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt
index 6b7882196c..a2f88429b5 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt
@@ -15,24 +15,30 @@ class TimeInquireResponsePacket(
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
 
     init {
-        msgType = 0x50.toByte()
+        msgType = 0x8F.toByte()
         aapsLogger.debug(LTag.PUMPCOMM, "TimeInquireResponsePacket init")
     }
 
     override fun handleMessage(data: ByteArray?) {
-        val result = defect(data)
-        if (result != 0) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "TimeInquireResponsePacket Got some Error")
             failed = true
             return
         } else failed = false
 
         val bufferData = prefixDecode(data)
-        val result2 =  getByteToInt(bufferData)
-        if(!isSuccInquireResponseResult(result2)) {
+        val result = getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result)) {
             failed = true
             return
         }
+        diaconnG8Pump.year = getByteToInt(bufferData) + 2000   // 년 (18~99)
+        diaconnG8Pump.month = getByteToInt(bufferData)  // 월 (1~12)
+        diaconnG8Pump.day = getByteToInt(bufferData)    // 일 (1~31)
+        diaconnG8Pump.hour = getByteToInt(bufferData)   // 시 (0~23)
+        diaconnG8Pump.minute = getByteToInt(bufferData) // 분 (0~59)
+        diaconnG8Pump.second = getByteToInt(bufferData) // 초 (0~59)
     }
 
     override fun getFriendlyName(): String {
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 9c9d48a0fa..44b53851e7 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
@@ -1,9 +1,13 @@
 package info.nightscout.androidaps.diaconn.service
 
+import android.Manifest
+import android.annotation.SuppressLint
 import android.bluetooth.*
 import android.content.Context
-import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.SystemClock
+import androidx.core.app.ActivityCompat
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.diaconn.DiaconnG8Pump
@@ -12,10 +16,11 @@ import info.nightscout.androidaps.diaconn.packet.*
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.extensions.notify
 import info.nightscout.androidaps.extensions.waitMillis
+import info.nightscout.androidaps.interfaces.ResourceHelper
+import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import java.util.*
 import java.util.concurrent.ScheduledFuture
 import javax.inject.Inject
@@ -31,9 +36,10 @@ class BLECommonService @Inject internal constructor(
     private val diaconnG8ResponseMessageHashTable: DiaconnG8ResponseMessageHashTable,
     private val diaconnG8SettingResponseMessageHashTable: DiaconnG8SettingResponseMessageHashTable,
     private val diaconnG8Pump: DiaconnG8Pump,
-){
+) {
 
     companion object {
+
         private const val WRITE_DELAY_MILLIS: Long = 50
         private const val INDICATION_UUID = "6e400003-b5a3-f393-e0a9-e50e24dcca9e"
         private const val WRITE_UUID = "6e400002-b5a3-f393-e0a9-e50e24dcca9e"
@@ -53,7 +59,7 @@ class BLECommonService @Inject internal constructor(
     private var uartIndicate: BluetoothGattCharacteristic? = null
     private var uartWrite: BluetoothGattCharacteristic? = null
 
-    private var mSequence : Int = 0
+    private var mSequence: Int = 0
 
     private fun getMsgSequence(): Int {
         val seq = mSequence % 255
@@ -66,6 +72,13 @@ class BLECommonService @Inject internal constructor(
 
     @Synchronized
     fun connect(from: String, address: String?): Boolean {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+            ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED
+        ) {
+            ToastUtils.errorToast(context, context.getString(info.nightscout.androidaps.core.R.string.needconnectpermission))
+            aapsLogger.error(LTag.PUMPBTCOMM, "missing permission: $from")
+            return false
+        }
         aapsLogger.debug(LTag.PUMPBTCOMM, "Initializing Bluetooth ")
         if (bluetoothAdapter == null) {
             aapsLogger.error("Unable to obtain a BluetoothAdapter.")
@@ -98,6 +111,12 @@ class BLECommonService @Inject internal constructor(
 
     @Synchronized
     fun disconnect(from: String) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+            ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED
+        ) {
+            aapsLogger.error(LTag.PUMPBTCOMM, "missing permission: $from")
+            return
+        }
         aapsLogger.debug(LTag.PUMPBTCOMM, "disconnect from: $from")
 
         // cancel previous scheduled disconnection to prevent closing upcoming connection
@@ -117,6 +136,7 @@ class BLECommonService @Inject internal constructor(
         SystemClock.sleep(2000)
     }
 
+    @SuppressLint("MissingPermission")
     @Synchronized
     fun close() {
         aapsLogger.debug(LTag.PUMPBTCOMM, "BluetoothAdapter close")
@@ -133,13 +153,16 @@ class BLECommonService @Inject internal constructor(
             aapsLogger.debug(LTag.PUMPBTCOMM, "onServicesDiscovered")
             if (status == BluetoothGatt.GATT_SUCCESS) {
                 findCharacteristic()
+                SystemClock.sleep(1600)
+                isConnected = true
+                isConnecting = false
             }
         }
 
         override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) {
             aapsLogger.debug(LTag.PUMPBTCOMM, "(응답) onCharacteristicChanged: " + DiaconnG8Packet.toHex(characteristic.value))
             // 대량로그응답 처리.
-            if(characteristic.value[1] == 0xb2.toByte()) {
+            if (characteristic.value[1] == 0xb2.toByte()) {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "(대량 로그 처리 응답) onCharacteristicChanged: " + DiaconnG8Packet.toHex(characteristic.value))
                 val message = BigLogInquireResponsePacket(injector)
                 message.handleMessage(characteristic.value)
@@ -156,6 +179,7 @@ class BLECommonService @Inject internal constructor(
         }
     }
 
+    @SuppressLint("MissingPermission")
     @Synchronized
     private fun writeCharacteristicNoResponse(characteristic: BluetoothGattCharacteristic, data: ByteArray) {
         Thread(Runnable {
@@ -194,6 +218,7 @@ class BLECommonService @Inject internal constructor(
         return bluetoothGatt?.services
     }
 
+    @SuppressLint("MissingPermission")
     @Synchronized
     private fun findCharacteristic() {
         val gattServices = getSupportedGattServices() ?: return
@@ -206,6 +231,7 @@ class BLECommonService @Inject internal constructor(
                     uartIndicate = gattCharacteristic
                     //setCharacteristicNotification(uartIndicate, true)
                     bluetoothGatt?.setCharacteristicNotification(uartIndicate, true)
+
                     // nRF Connect 참고하여 추가함
                     val descriptor: BluetoothGattDescriptor = uartIndicate!!.getDescriptor(UUID.fromString(CHARACTERISTIC_CONFIG_UUID))
                     descriptor.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
@@ -218,13 +244,12 @@ class BLECommonService @Inject internal constructor(
         }
     }
 
+    @SuppressLint("MissingPermission")
     @Synchronized
     private fun onConnectionStateChangeSynchronized(gatt: BluetoothGatt, newState: Int) {
         aapsLogger.debug(LTag.PUMPBTCOMM, "onConnectionStateChange newState : $newState")
         if (newState == BluetoothProfile.STATE_CONNECTED) {
             gatt.discoverServices()
-            isConnected = true
-            isConnecting = false
             rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
         } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
             close()
@@ -245,12 +270,17 @@ class BLECommonService @Inject internal constructor(
         val bytes = message.encode(sequence)
         processedMessageByte = bytes
 
+        if (bluetoothGatt == null) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> IGNORING (NOT CONNECTED) " + message.friendlyName )
+            return
+        }
+
         aapsLogger.debug(LTag.PUMPBTCOMM, "sendMessage() before mSendQueue.size :: ${mSendQueue.size}")
         // 펌프에 요청 보내기.
         writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
         // 요청 큐에 요청할 바이트 정보 담기.
         synchronized(mSendQueue) {
-            if(mSendQueue.size > 10) mSendQueue.clear()
+            if (mSendQueue.size > 10) mSendQueue.clear()
             mSendQueue.add(bytes)
         }
         aapsLogger.debug(LTag.PUMPBTCOMM, "sendMessage() after mSendQueue.size :: ${mSendQueue.size}")
@@ -268,6 +298,7 @@ class BLECommonService @Inject internal constructor(
     // process common packet response
     private fun processResponseMessage(data: ByteArray) {
         isConnected = true
+        isConnecting = false
 
         //요청정보
         val originalMessageSeq = processedMessage?.getSeq(processedMessageByte)
@@ -281,29 +312,29 @@ class BLECommonService @Inject internal constructor(
         aapsLogger.debug(LTag.PUMPBTCOMM, "receivedCommand :: $receivedCommand")
 
         // 응답메시지가 조회응답인지. 설정응답인지 구분해야됨.
-        var message:DiaconnG8Packet? = null
+        var message: DiaconnG8Packet? = null
         // 요청시퀀스와 응답의 시퀀스가 동일한 경우에만 처리.
         // 펌프로부터 받은 보고응답의 경우 처리
-        if(receivedType == 3) {
+        if (receivedType == 3) {
             message = diaconnG8ResponseMessageHashTable.findMessage(receivedCommand)
             // injection Blocked Report
-            if(message is InjectionBlockReportPacket ) {
+            if (message is InjectionBlockReportPacket) {
                 message.handleMessage(data)
                 diaconnG8Pump.bolusBlocked = true
-                ErrorHelperActivity.runAlarm(context, rh.gs(R.string.injectionblocked), rh.gs(R.string.injectionblocked), R.raw.boluserror )
+                ErrorHelperActivity.runAlarm(context, rh.gs(R.string.injectionblocked), rh.gs(R.string.injectionblocked), R.raw.boluserror)
                 return
             }
             // battery warning report
-            if(message is BatteryWarningReportPacket ) {
+            if (message is BatteryWarningReportPacket) {
                 message.handleMessage(data)
-                ErrorHelperActivity.runAlarm(context, rh.gs(R.string.needbatteryreplace), rh.gs(R.string.batterywarning), R.raw.boluserror )
+                ErrorHelperActivity.runAlarm(context, rh.gs(R.string.needbatteryreplace), rh.gs(R.string.batterywarning), R.raw.boluserror)
                 return
             }
 
             // insulin lack warning report
-            if(message is InsulinLackReportPacket ) {
+            if (message is InsulinLackReportPacket) {
                 message.handleMessage(data)
-                ErrorHelperActivity.runAlarm(context, rh.gs(R.string.needinsullinreplace), rh.gs(R.string.insulinlackwarning), R.raw.boluserror )
+                ErrorHelperActivity.runAlarm(context, rh.gs(R.string.needinsullinreplace), rh.gs(R.string.insulinlackwarning), R.raw.boluserror)
                 return
             }
 
@@ -312,7 +343,7 @@ class BLECommonService @Inject internal constructor(
             synchronized(mSendQueue) {
                 val sendQueueSize = mSendQueue.size
                 if (sendQueueSize > 0) {
-                    for (i in sendQueueSize-1 downTo 0 ) {
+                    for (i in sendQueueSize - 1 downTo 0) {
                         val sendQueueSeq = DiaconnG8Packet(injector).getSeq(mSendQueue[i])
                         val sendQueueType = DiaconnG8Packet(injector).getType(mSendQueue[i])
                         if (sendQueueSeq == receivedSeq) {
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 85e84d4b29..160c4f64a3 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
@@ -18,7 +18,6 @@ import info.nightscout.androidaps.diaconn.api.DiaconnApiService
 import info.nightscout.androidaps.diaconn.api.DiaconnLogUploader
 import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
 import info.nightscout.androidaps.diaconn.events.EventDiaconnG8NewStatus
-import info.nightscout.androidaps.diaconn.events.EventDiaconnG8PumpLogReset
 import info.nightscout.androidaps.diaconn.packet.*
 import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
 import info.nightscout.androidaps.dialogs.BolusProgressDialog
@@ -136,13 +135,14 @@ class DiaconnG8Service : DaggerService() {
     }
 
     private fun sendMessage(message: DiaconnG8Packet) {
-        bleCommonService.sendMessage(message, 2000)
+        bleCommonService.sendMessage(message, 5000)
     }
 
     fun readPumpStatus() {
         try {
             val pump = activePlugin.activePump
             rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingpumpsettings)))
+            sendMessage(SerialNumInquirePacket(injector))
 
             val pumpFirmwareVersion = sp.getString(rh.gs(R.string.pumpversion), "")
 
@@ -170,6 +170,7 @@ class DiaconnG8Service : DaggerService() {
 
             // 시간 설정
             rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingpumptime)))
+            sendMessage(TimeInquirePacket(injector))
             var timeDiff = (diaconnG8Pump.getPumpTime() - System.currentTimeMillis()) / 1000L
             if (diaconnG8Pump.getPumpTime() == 0L) {
                 // initial handshake was not successful
@@ -239,14 +240,12 @@ class DiaconnG8Service : DaggerService() {
     }
 
     fun loadHistory(): PumpEnactResult {
-
         if (!diaconnG8Plugin.isInitialized()) {
             val result = PumpEnactResult(injector).success(false)
             result.comment = "pump not initialized"
             return result
         }
         sendMessage(LogStatusInquirePacket(injector))
-
         // pump version check
         if (diaconnG8Pump.isPumpVersionGe2_63) {
             sendMessage(IncarnationInquirePacket(injector))
@@ -257,7 +256,7 @@ class DiaconnG8Service : DaggerService() {
         var apsWrappingCount = -1
         // get saved last loginfo
         val diaconnHistoryRecord = diaconnHistoryRecordDao.getLastRecord(diaconnG8Pump.pumpUid)
-        aapsLogger.error(LTag.PUMPCOMM, "diaconnHistoryRecord :: $diaconnHistoryRecord")
+        aapsLogger.debug(LTag.PUMPCOMM, "diaconnHistoryRecord :: $diaconnHistoryRecord")
 
         if(diaconnHistoryRecord != null) {
             apsLastLogNum = diaconnHistoryRecord.lognum
@@ -293,7 +292,7 @@ class DiaconnG8Service : DaggerService() {
 
         // pump log loop size
         val pumpLogPageSize = 11
-        val (start, end, loopSize) = getLogLoopCount(apsLastLogNum, apsWrappingCount, pumpLastNum, pumpWrappingCount, false)
+        val (start, end, loopSize) = getLogLoopCount(apsLastLogNum, apsWrappingCount, pumpLastNum, pumpWrappingCount)
         aapsLogger.debug(LTag.PUMPCOMM, "loopinfo start : $start, end : $end, loopSize : $loopSize")
         // log sync start!
         if (loopSize > 0) {
@@ -306,7 +305,6 @@ class DiaconnG8Service : DaggerService() {
             result.success(true)
             diaconnG8Pump.lastConnection = System.currentTimeMillis()
         }
-
         // upload pump log to Diaconn Cloud
         if (sp.getBoolean(R.string.key_diaconn_g8_cloudsend, true)) {
             SystemClock.sleep(1000)
@@ -327,10 +325,13 @@ class DiaconnG8Service : DaggerService() {
                     aapsLogger.debug(LTag.PUMPCOMM, "platformLogNo: $platformLogNo, platformWrappingCount: $platformWrappingCount")
 
                     // 페이지 사이즈로 처리할 때 루핑 횟수 계산
-                    val (platformStart, platformEnd, platformLoopSize) = getLogLoopCount(platformLogNo, platformWrappingCount, pumpLastNum, pumpWrappingCount, true)
+                    val (platformStart, platformEnd, platformLoopSize) = getCloudLogLoopCount(platformLastNo.toInt(), platformLogNo, platformWrappingCount, pumpLastNum, pumpWrappingCount)
                     if(platformLoopSize > 0) {
                         diaconnG8Pump.isPlatformUploadStarted = true
                         for (i in 0 until platformLoopSize) {
+                            if(diaconnG8Pump.isPumpLogUploadFailed) {
+                                break
+                            }
                             rxBus.send(EventPumpStatusChanged("클라우드동기화 진행 중 : $i / $platformLoopSize"))
                             val startLogNo: Int = platformStart + i * pumpLogPageSize
                             val endLogNo: Int = startLogNo + min(platformEnd - startLogNo, pumpLogPageSize)
@@ -339,6 +340,7 @@ class DiaconnG8Service : DaggerService() {
                         }
                         SystemClock.sleep(1000)
                         diaconnG8Pump.isPlatformUploadStarted = false
+                        diaconnG8Pump.isPumpLogUploadFailed = false
                     }
                 }
             } catch (e:Exception) {
@@ -348,22 +350,39 @@ class DiaconnG8Service : DaggerService() {
         return result
     }
 
-    private fun getLogLoopCount(lastLogNum: Int, wrappingCount: Int, pumpLastNum: Int, pumpWrappingCount: Int, isPlatform: Boolean): Triple<Int, Int, Int> {
+    private fun getLogLoopCount(lastLogNum: Int, wrappingCount: Int, pumpLastNum: Int, pumpWrappingCount: Int): Triple<Int, Int, Int> {
         val start: Int// log sync start number
         val end: Int // log sync end number1311
         aapsLogger.debug(LTag.PUMPCOMM, "lastLogNum : $lastLogNum, wrappingCount : $wrappingCount , pumpLastNum: $pumpLastNum, pumpWrappingCount : $pumpWrappingCount")
 
-        if ((pumpWrappingCount * 10000 + pumpLastNum - lastLogNum > 10000 && isPlatform)) {
-            start = pumpLastNum
-            end = 10000
-        } else if (pumpWrappingCount > wrappingCount && lastLogNum < 9999) {
+        if (pumpWrappingCount > wrappingCount && lastLogNum < 9999) {
             start = (lastLogNum + 1)
             end = 10000
-        } else if (pumpWrappingCount > wrappingCount && lastLogNum >= 9999 && isPlatform) {
+        } else {
+            start = (lastLogNum + 1)
+            end = pumpLastNum
+        }
+        val size = ceil((end - start) / 11.0).toInt()
+        //
+        return Triple(start, end, size)
+    }
+
+    private fun getCloudLogLoopCount(platformLastNo:Int, platformPumpLogNum: Int, wrappingCount: Int, pumpLastNum: Int, pumpWrappingCount: Int): Triple<Int, Int, Int> {
+        val start: Int// log sync start number
+        val end: Int // log sync end number1311
+        aapsLogger.debug(LTag.PUMPCOMM, "platformLastNo: $platformLastNo, PlatformPumpLogNum : $platformPumpLogNum, wrappingCount : $wrappingCount , pumpLastNum: $pumpLastNum, pumpWrappingCount :$pumpWrappingCount")
+
+        if ((pumpWrappingCount * 10000 + pumpLastNum - platformLastNo > 10000 )) {
+            start = pumpLastNum
+            end = 10000
+        } else if (pumpWrappingCount > wrappingCount && platformPumpLogNum < 9999) {
+            start = (platformPumpLogNum + 1)
+            end = 10000
+        } else if (pumpWrappingCount > wrappingCount && platformPumpLogNum >= 9999 ) {
             start = 0 // 처음부터 시작
             end = pumpLastNum
         } else {
-            start = (lastLogNum + 1)
+            start = (platformPumpLogNum + 1)
             end = pumpLastNum
         }
         val size = ceil((end - start) / 11.0).toInt()
@@ -399,13 +418,6 @@ class DiaconnG8Service : DaggerService() {
     fun bolus(insulin: Double, carbs: Int, carbTime: Long, t: EventOverviewBolusProgress.Treatment): Boolean {
         if (!isConnected) return false
         if (BolusProgressDialog.stopPressed) return false
-
-        // Only Carbs
-        if (carbs > 0 && insulin == 0.0) {
-            pumpSync.syncCarbsWithTimestamp(carbTime, carbs.toDouble(), null, PumpType.DIACONN_G8, diaconnG8Pump.serialNo.toString())
-            return true
-        }
-
         rxBus.send(EventPumpStatusChanged(rh.gs(R.string.startingbolus)))
 
         // bolus speed setting
@@ -435,7 +447,7 @@ class DiaconnG8Service : DaggerService() {
         val bolusStart = System.currentTimeMillis()
         if (insulin > 0) {
             if (!diaconnG8Pump.bolusStopped) {
-                sendMessage(start)
+                sendMessage(start, 100)
                 // otp process
                 if (!processConfirm(start.msgType)) return false
             } else {
@@ -460,26 +472,29 @@ class DiaconnG8Service : DaggerService() {
         }
 
         val bolusDurationInMSec = (insulin * speed * 1000).toLong()
-        val expectedEnd = bolusStart + bolusDurationInMSec + 7500L
+        val expectedEnd = bolusStart + bolusDurationInMSec + 3500L
         val totalwaitTime = (expectedEnd - System.currentTimeMillis()) / 1000
-        while (!diaconnG8Pump.bolusDone) {
-            val waitTime = (expectedEnd - System.currentTimeMillis()) / 1000
-            bolusingEvent.status = rh.gs(R.string.waitingforestimatedbolusend, if (waitTime < 0) 0 else waitTime)
-            var progressPecent = 0
-            if (totalwaitTime > waitTime) {
-                progressPecent = ((totalwaitTime - waitTime) * 100 / totalwaitTime).toInt()
+        if(diaconnG8Pump.isReadyToBolus) {
+            while (!diaconnG8Pump.bolusDone) {
+                val waitTime = (expectedEnd - System.currentTimeMillis()) / 1000
+                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()
+                }
+                bolusingEvent.percent = min(progressPecent, 100)
+                rxBus.send(bolusingEvent)
+                SystemClock.sleep(200)
             }
-            bolusingEvent.percent = min(progressPecent, 100)
-            rxBus.send(bolusingEvent)
-            SystemClock.sleep(200)
         }
+        diaconnG8Pump.isReadyToBolus = false
 
         // do not call loadHistory() directly, reconnection may be needed
         commandQueue.loadEvents(object : Callback() {
             override fun run() {
                 // reread bolus status
                 rxBus.send(EventPumpStatusChanged(rh.gs(R.string.gettingbolusstatus)))
-                sendMessage(InjectionSnackInquirePacket(injector), 1000) // last bolus
+                sendMessage(InjectionSnackInquirePacket(injector), 2000) // last bolus
                 // 볼러스 결과 보고패킷에서 처리함.
                 bolusingEvent.percent = 100
                 rxBus.send(EventPumpStatusChanged(rh.gs(R.string.disconnecting)))
@@ -492,7 +507,7 @@ class DiaconnG8Service : DaggerService() {
         val stop = InjectionCancelSettingPacket(injector, 0x07.toByte())
         diaconnG8Pump.bolusStopForced = true
         if (isConnected) {
-            sendMessage(stop)
+            sendMessage(stop, 100)
             // otp process
             if (!processConfirm(stop.msgType)) return
             while (!diaconnG8Pump.bolusStopped) {
@@ -513,7 +528,7 @@ class DiaconnG8Service : DaggerService() {
             rxBus.send(EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)))
             val msgPacket = TempBasalSettingPacket(injector, 2, diaconnG8Pump.tbTime, diaconnG8Pump.tbInjectRateRatio)
             // tempbasal stop
-            sendMessage(msgPacket)
+            sendMessage(msgPacket, 100)
             // otp process
             if (!processConfirm(msgPacket.msgType)) return false
             diaconnG8Pump.tempBasalStart = dateUtil.now()
@@ -521,7 +536,7 @@ class DiaconnG8Service : DaggerService() {
         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)
+        sendMessage(msgTBR, 100)
         // otp process
         if (!processConfirm(msgTBR.msgType)) return false
         // pump tempbasal status inquire
@@ -545,7 +560,7 @@ class DiaconnG8Service : DaggerService() {
             rxBus.send(EventPumpStatusChanged(rh.gs(R.string.stoppingtempbasal)))
             val msgPacket = TempBasalSettingPacket(injector, 2, diaconnG8Pump.tbTime, diaconnG8Pump.tbInjectRateRatio)
             // tempbasal stop
-            sendMessage(msgPacket)
+            sendMessage(msgPacket, 100)
             // otp process
             if (!processConfirm(msgPacket.msgType)) return false
             SystemClock.sleep(500)
@@ -553,7 +568,7 @@ class DiaconnG8Service : DaggerService() {
         rxBus.send(EventPumpStatusChanged(rh.gs(R.string.settingtempbasal)))
         val tbInjectRate = absoluteRate * 100 + 1000
         val msgTBR = TempBasalSettingPacket(injector, 1, 2, tbInjectRate.toInt())
-        sendMessage(msgTBR)
+        sendMessage(msgTBR, 100)
         // otp process
         if (!processConfirm(msgTBR.msgType)) return false
         sendMessage(TempBasalInquirePacket(injector))
@@ -577,7 +592,7 @@ class DiaconnG8Service : DaggerService() {
                 diaconnG8Pump.tbInjectRateRatio
             )
             // tempbasal stop
-            sendMessage(msgPacket)
+            sendMessage(msgPacket, 500)
             // otp process
             if (!processConfirm(msgPacket.msgType)) return false
             SystemClock.sleep(500)
@@ -593,7 +608,7 @@ class DiaconnG8Service : DaggerService() {
     fun extendedBolus(insulin: Double, durationInMinutes: Int): Boolean {
         if (!isConnected) return false
         rxBus.send(EventPumpStatusChanged(rh.gs(R.string.settingextendedbolus)))
-        aapsLogger.error(LTag.PUMPCOMM, "insulin: $insulin durationInMinutes: $durationInMinutes")
+        aapsLogger.debug(LTag.PUMPCOMM, "insulin: $insulin durationInMinutes: $durationInMinutes")
 
         val msgExtended = InjectionExtendedBolusSettingPacket(injector, (insulin * 100).toInt(), durationInMinutes, dateUtil.now())
         sendMessage(msgExtended)
@@ -672,6 +687,7 @@ class DiaconnG8Service : DaggerService() {
             (basalList[23] * 100).toInt()
         )
         // setting basal pattern 1,2,3,4
+        sendMessage(SerialNumInquirePacket(injector), 2000)
         sendMessage(requestReqPacket1, 500)
         sendMessage(requestReqPacket2, 500)
         sendMessage(requestReqPacket3, 500)
@@ -694,22 +710,22 @@ class DiaconnG8Service : DaggerService() {
 
     private fun processConfirm(msgType: Byte): Boolean {
         // pump confirm
+        var loopCnt = 0
+        // waiting 2 seconds for otp
+        while(loopCnt < 20) {
+            if (diaconnG8Pump.otpNumber == 0) {
+                SystemClock.sleep(100)
+                aapsLogger.error(LTag.PUMPCOMM, "OTP waiting 100ms $loopCnt / 20")
+            }
+            loopCnt++
+        }
+        // after 2 second
         if (diaconnG8Pump.otpNumber == 0) {
             aapsLogger.error(LTag.PUMPCOMM, "otp is not received yet")
-
-            // Comments are made as dialogs are exposed twice each in the event of an error.
-            // Thread {
-            //     val i = Intent(context, ErrorHelperActivity::class.java)
-            //     i.putExtra("soundid", R.raw.boluserror)
-            //     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()
-
             return false
         }
-        sendMessage(AppConfirmSettingPacket(injector, msgType, diaconnG8Pump.otpNumber))
+        diaconnG8Pump.bolusConfirmMessage = msgType
+        sendMessage(AppConfirmSettingPacket(injector, msgType, diaconnG8Pump.otpNumber), 2000)
         diaconnG8Pump.otpNumber = 0
         return true
     }
diff --git a/diaconn/src/main/res/values-de-rDE/strings.xml b/diaconn/src/main/res/values-de-rDE/strings.xml
index 696d5e84f4..50a3ac09df 100644
--- a/diaconn/src/main/res/values-de-rDE/strings.xml
+++ b/diaconn/src/main/res/values-de-rDE/strings.xml
@@ -152,4 +152,6 @@
     <string name="diaconn_g8_errorcode_34">LGS inaktiv, Befehl zum Ausschalten zurückgewiesen.</string>
     <string name="diaconn_g8_errorcode_35">TBR Start ist während einer laufenden TBR nicht möglich.</string>
     <string name="diaconn_g8_errorcode_36">TBR kann nicht gestoppt werden, da keine TBR läuft.</string>
+    <string name="diaconn_g8_cloudsend_summary">Sende Pumpenprotokolle zur Diaconn Cloud.</string>
+    <string name="diaconn_g8_cloudsend_title">Diaconn Cloud-Sync</string>
 </resources>
diff --git a/diaconn/src/main/res/values-ga-rIE/strings.xml b/diaconn/src/main/res/values-ga-rIE/strings.xml
index 52b4accfd3..3ea04e700d 100644
--- a/diaconn/src/main/res/values-ga-rIE/strings.xml
+++ b/diaconn/src/main/res/values-ga-rIE/strings.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="bolus_step">Bólas Céim</string>
-    <string name="basal_step">Bunaidh Céim</string>
-</resources>
+<resources></resources>
diff --git a/diaconn/src/main/res/values/strings.xml b/diaconn/src/main/res/values/strings.xml
index f74b46b0af..ea014d7ef3 100644
--- a/diaconn/src/main/res/values/strings.xml
+++ b/diaconn/src/main/res/values/strings.xml
@@ -169,5 +169,5 @@
     <string name="diaconn_g8_errorcode_36">Tempbasal stop is rejected  when tempbasal is not running</string>
     <string name="diaconn_g8_cloudsend_summary">Send pump logs to the Diaconn Cloud.</string>
     <string name="diaconn_g8_cloudsend_title">Diaconn Cloud Sync</string>
-    <string name="key_diaconn_g8_appuid" translatable="false">diaconn_g8_appuid</string>
+    <string name="key_diaconn_g8_appuid">diaconn_g8_appuid</string>
 </resources>
diff --git a/insight/build.gradle b/insight/build.gradle
index 623c52532a..5e69a77ba6 100644
--- a/insight/build.gradle
+++ b/insight/build.gradle
@@ -25,6 +25,7 @@ android {
 dependencies {
     implementation project(':core')
     implementation project(':shared')
+    implementation project(':pump-common')
 
     api "androidx.room:room-ktx:$room_version"
     api "androidx.room:room-runtime:$room_version"
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 517d1c7ec4..503b68e53f 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
@@ -590,7 +590,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
                 EventOverviewBolusProgress.Treatment t = new EventOverviewBolusProgress.Treatment(0, 0, detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB, detailedBolusInfo.getId());
                 final EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
                 bolusingEvent.setT(t);
-                bolusingEvent.setStatus(rh.gs(R.string.insight_delivered, 0d, insulin));
+                bolusingEvent.setStatus(rh.gs(R.string.bolus_delivered, 0d, insulin));
                 bolusingEvent.setPercent(0);
                 rxBus.send(bolusingEvent);
                 int trials = 0;
@@ -629,14 +629,14 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
                         trials = -1;
                         int percentBefore = bolusingEvent.getPercent();
                         bolusingEvent.setPercent((int) (100D / activeBolus.getInitialAmount() * (activeBolus.getInitialAmount() - activeBolus.getRemainingAmount())));
-                        bolusingEvent.setStatus(rh.gs(R.string.insight_delivered, activeBolus.getInitialAmount() - activeBolus.getRemainingAmount(), activeBolus.getInitialAmount()));
+                        bolusingEvent.setStatus(rh.gs(R.string.bolus_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(rh.gs(R.string.insight_delivered, insulin, insulin));
+                                    bolusingEvent.setStatus(rh.gs(R.string.bolus_delivered, insulin, insulin));
                                     bolusingEvent.setPercent(100);
                                     rxBus.send(bolusingEvent);
                                 }
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
index 114dbdbe62..f394dad0bd 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
@@ -1,16 +1,20 @@
 package info.nightscout.androidaps.plugins.pump.insight.connection_service;
 
+import android.Manifest;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Binder;
+import android.os.Build;
 import android.os.IBinder;
 import android.os.PowerManager;
 
 import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
 
 import org.spongycastle.crypto.InvalidCipherTextException;
 
@@ -23,8 +27,6 @@ import javax.inject.Inject;
 
 import dagger.android.DaggerService;
 import info.nightscout.androidaps.insight.R;
-import info.nightscout.shared.logging.AAPSLogger;
-import info.nightscout.shared.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.ReadParameterBlockMessage;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.CloseConfigurationWriteSessionMessage;
@@ -87,6 +89,8 @@ import info.nightscout.androidaps.plugins.pump.insight.utils.PairingDataStorage;
 import info.nightscout.androidaps.plugins.pump.insight.utils.crypto.Cryptograph;
 import info.nightscout.androidaps.plugins.pump.insight.utils.crypto.DerivedKeys;
 import info.nightscout.androidaps.plugins.pump.insight.utils.crypto.KeyPair;
+import info.nightscout.shared.logging.AAPSLogger;
+import info.nightscout.shared.logging.LTag;
 import info.nightscout.shared.sharedPreferences.SP;
 
 public class InsightConnectionService extends DaggerService implements ConnectionEstablisher.Callback, InputStreamReader.Callback, OutputStreamWriter.Callback {
@@ -108,7 +112,7 @@ public class InsightConnectionService extends DaggerService implements Connectio
     private DelayedActionThread disconnectTimer;
     private DelayedActionThread recoveryTimer;
     private DelayedActionThread timeoutTimer;
-    private BluetoothAdapter bluetoothAdapter;
+    @Nullable private BluetoothAdapter bluetoothAdapter;
     private BluetoothDevice bluetoothDevice;
     private BluetoothSocket bluetoothSocket;
     private ConnectionEstablisher connectionEstablisher;
@@ -205,7 +209,7 @@ public class InsightConnectionService extends DaggerService implements Connectio
     }
 
     public synchronized boolean isPaired() {
-        return pairingDataStorage.isPaired();
+        return pairingDataStorage != null && pairingDataStorage.isPaired();
     }
 
     public synchronized <T extends AppLayerMessage> MessageRequest<T> requestMessage(T message) {
@@ -258,7 +262,9 @@ public class InsightConnectionService extends DaggerService implements Connectio
     @Override
     public synchronized void onCreate() {
         super.onCreate();
-        bluetoothAdapter = ((BluetoothManager)getApplicationContext().getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) {
+            bluetoothAdapter = ((BluetoothManager) getApplicationContext().getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
+        }
         pairingDataStorage = new PairingDataStorage(this);
         state = pairingDataStorage.isPaired() ? InsightState.DISCONNECTED : InsightState.NOT_PAIRED;
         wakeLock = ((PowerManager) getSystemService(POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:InsightConnectionService");
@@ -426,6 +432,7 @@ public class InsightConnectionService extends DaggerService implements Connectio
     }
 
     private synchronized void connect() {
+        if (bluetoothAdapter == null) return;
         if (bluetoothDevice == null)
             bluetoothDevice = bluetoothAdapter.getRemoteDevice(pairingDataStorage.getMacAddress());
         setState(InsightState.CONNECTING);
diff --git a/insight/src/main/res/layout/bluetooth_device.xml b/insight/src/main/res/layout/bluetooth_device.xml
index 9287922b46..1e6f3e7121 100644
--- a/insight/src/main/res/layout/bluetooth_device.xml
+++ b/insight/src/main/res/layout/bluetooth_device.xml
@@ -7,6 +7,5 @@
     android:gravity="center_vertical"
     android:paddingStart="16dp"
     android:paddingEnd="0dp"
-    android:textColor="#FFFFFF"
     android:textSize="20sp"
     tools:text="Test" />
diff --git a/insight/src/main/res/layout/local_insight_status_item.xml b/insight/src/main/res/layout/local_insight_status_item.xml
index 987d71b50e..31eb51d0a6 100644
--- a/insight/src/main/res/layout/local_insight_status_item.xml
+++ b/insight/src/main/res/layout/local_insight_status_item.xml
@@ -34,7 +34,6 @@
         android:gravity="start"
         android:paddingStart="5dp"
         android:paddingEnd="0dp"
-        android:textColor="@android:color/white"
         android:textSize="14sp" />
 
 </LinearLayout>
diff --git a/insight/src/main/res/values-bg-rBG/strings.xml b/insight/src/main/res/values-bg-rBG/strings.xml
index 1cf9437089..d299c43c7b 100644
--- a/insight/src/main/res/values-bg-rBG/strings.xml
+++ b/insight/src/main/res/values-bg-rBG/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Съвпадат ли кодовете, показани на това устройство и на Вашата помпа?</string>
     <string name="insight_pairing">Insight свързване</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2fЕ / %2$.2fЕ доставени</string>
     <string name="insight_alert_formatter">%1$s:%2$s</string>
     <string name="tube_changed">Тръба сменена</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values-cs-rCZ/strings.xml b/insight/src/main/res/values-cs-rCZ/strings.xml
index a8fca7d393..b26c49268e 100644
--- a/insight/src/main/res/values-cs-rCZ/strings.xml
+++ b/insight/src/main/res/values-cs-rCZ/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Souhlasí kódy zobrazené na tomto zařízení a na pumpě?</string>
     <string name="insight_pairing">Insight párování</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">Podáno %1$.2f U / %2$.2f U</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Vyměněna hadičky</string>
     <string name="insightpump_shortname">Insight</string>
diff --git a/insight/src/main/res/values-da-rDK/strings.xml b/insight/src/main/res/values-da-rDK/strings.xml
index b1557b9a98..7d3e525db3 100644
--- a/insight/src/main/res/values-da-rDK/strings.xml
+++ b/insight/src/main/res/values-da-rDK/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Stemmer de viste koder overens mellem dette apparat og din pumpe?</string>
     <string name="insight_pairing">Insight parring</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f IE / %2$.2f IE leveret</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Slange skiftet</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values-de-rDE/strings.xml b/insight/src/main/res/values-de-rDE/strings.xml
index 4a1032acfb..bcff03ea9e 100644
--- a/insight/src/main/res/values-de-rDE/strings.xml
+++ b/insight/src/main/res/values-de-rDE/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Stimmen die Codes auf diesem Gerät und auf deiner Pumpe überein?</string>
     <string name="insight_pairing">Insight Kopplung</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f IE / %2$.2f IE abgegeben</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Schlauch gewechselt</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values-es-rES/strings.xml b/insight/src/main/res/values-es-rES/strings.xml
index 0247f64554..8ef38ef27c 100644
--- a/insight/src/main/res/values-es-rES/strings.xml
+++ b/insight/src/main/res/values-es-rES/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">¿Coinciden los códigos mostrados en este dispositivo con los de la bomba?</string>
     <string name="insight_pairing">Insight emparejada</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f U / %2$.2f U entregado</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Tubo cambiado</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values-fr-rFR/strings.xml b/insight/src/main/res/values-fr-rFR/strings.xml
index a218610084..31004af864 100644
--- a/insight/src/main/res/values-fr-rFR/strings.xml
+++ b/insight/src/main/res/values-fr-rFR/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Les codes affichés sur cet appareil et sur la pompe sont-ils identiques ?</string>
     <string name="insight_pairing">Appairage de Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f U / %2$.2f U délivrés</string>
     <string name="insight_alert_formatter">%1$s : %2$s</string>
     <string name="tube_changed">Tubulure changée</string>
     <string name="insightpump_shortname">AC-I</string>
diff --git a/insight/src/main/res/values-ga-rIE/strings.xml b/insight/src/main/res/values-ga-rIE/strings.xml
index 28a4614bb0..3ea04e700d 100644
--- a/insight/src/main/res/values-ga-rIE/strings.xml
+++ b/insight/src/main/res/values-ga-rIE/strings.xml
@@ -1,18 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="insight_status">Stádas</string>
-    <string name="started">Thosaigh</string>
-    <string name="tdd_bolus">TDD Bólas</string>
-    <string name="tdd_basal">TDD Bunaidh</string>
-    <string name="tdd_total">TDD Lomlán</string>
-    <string name="eb_formatter">%1$.2f / %2$.2f A do %3$d nom</string>
-    <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f A / %2$.2f A seachadta</string>
-    <string name="insight_alert_formatter">%1$s: %2$s</string>
-    <string name="pump_stopped">Caidéil stopadh</string>
-    <string name="pump_started">Caidéil tosú</string>
-    <string name="pump_paused">Caidéil ar sos</string>
-    <string name="short_status_tdd">TDD: %1$.2f</string>
-    <string name="short_status_battery">Ceal.: %1$d%%</string>
-    <string name="mute_alert">Balbh</string>
-</resources>
+<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 ab9bb89df7..f472a03a83 100644
--- a/insight/src/main/res/values-it-rIT/strings.xml
+++ b/insight/src/main/res/values-it-rIT/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">I codici mostrati su questo dispositivo e sul micro combaciano?</string>
     <string name="insight_pairing">Associazione Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f U / %2$.2f U erogato</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Catetere sostituito</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values-iw-rIL/strings.xml b/insight/src/main/res/values-iw-rIL/strings.xml
index 7076fcc849..fffb9f3b7f 100644
--- a/insight/src/main/res/values-iw-rIL/strings.xml
+++ b/insight/src/main/res/values-iw-rIL/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">האם הקודים המוצגים בהתקן זה ובמשאבה זהים?</string>
     <string name="insight_pairing">צימוד Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f יח\' מתוך %2$.2f יח\' הוזרקו</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">הצינורית הוחלפה</string>
     <string name="insightpump_shortname">Insight</string>
diff --git a/insight/src/main/res/values-ko-rKR/strings.xml b/insight/src/main/res/values-ko-rKR/strings.xml
index efb441f1ed..02c0d4225a 100644
--- a/insight/src/main/res/values-ko-rKR/strings.xml
+++ b/insight/src/main/res/values-ko-rKR/strings.xml
@@ -26,7 +26,6 @@
     <string name="code_compare">이 장치에서 보여지는 코드와 펌프에서 보여지는 코드가 동일한가요?</string>
     <string name="insight_pairing">Insight와 동기화</string>
     <string name="insight_local">아큐-첵 Insight</string>
-    <string name="insight_delivered">%1$.2f U / %2$.2f U 주입됨</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">튜브 변경</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values-lt-rLT/strings.xml b/insight/src/main/res/values-lt-rLT/strings.xml
index daf025ad85..4ba1aaeff1 100644
--- a/insight/src/main/res/values-lt-rLT/strings.xml
+++ b/insight/src/main/res/values-lt-rLT/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Ar kodas, kurį matote įrenginyje, sutampa su pompos kodu?</string>
     <string name="insight_pairing">Insight sujungimas</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f vv iš %2$.2f vv suleista</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Kateteris pakeistas</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values-nl-rNL/strings.xml b/insight/src/main/res/values-nl-rNL/strings.xml
index 2efcf95fbd..6505b5f3e5 100644
--- a/insight/src/main/res/values-nl-rNL/strings.xml
+++ b/insight/src/main/res/values-nl-rNL/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Worden dezelfde codes weergegeven op dit apparaat als op je pomp?</string>
     <string name="insight_pairing">Insight koppelen</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f E / %2$.2f E toegediend</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Slang vervangen</string>
     <string name="insightpump_shortname">Insight</string>
diff --git a/insight/src/main/res/values-no-rNO/strings.xml b/insight/src/main/res/values-no-rNO/strings.xml
index 14871c36c7..05e452e49b 100644
--- a/insight/src/main/res/values-no-rNO/strings.xml
+++ b/insight/src/main/res/values-no-rNO/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Stemmer de viste kodene overens mellom denne enheten og din pumpe?</string>
     <string name="insight_pairing">Sammenkobling av Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f E / %2$.2f E levert</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Slange byttet</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values-pl-rPL/strings.xml b/insight/src/main/res/values-pl-rPL/strings.xml
index 717cf0a20b..5fd910388e 100644
--- a/insight/src/main/res/values-pl-rPL/strings.xml
+++ b/insight/src/main/res/values-pl-rPL/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Czy kody wyświetlone na tym urządzeniu i na twojej pompie pasują?</string>
     <string name="insight_pairing">Parowanie Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">podano %1$.2f U / %2$.2f U</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Dren zmieniony</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values-pt-rPT/strings.xml b/insight/src/main/res/values-pt-rPT/strings.xml
index becf828d63..befcfa9dd3 100644
--- a/insight/src/main/res/values-pt-rPT/strings.xml
+++ b/insight/src/main/res/values-pt-rPT/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Os códigos exibidos neste dispositivo e na sua bomba correspondem?</string>
     <string name="insight_pairing">Emparelhamento Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f U / %2$.2f U administrado</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Tubo mudado</string>
     <string name="insightpump_shortname">Visão</string>
diff --git a/insight/src/main/res/values-ro-rRO/strings.xml b/insight/src/main/res/values-ro-rRO/strings.xml
index f005b68bea..0cea3bfe86 100644
--- a/insight/src/main/res/values-ro-rRO/strings.xml
+++ b/insight/src/main/res/values-ro-rRO/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Sunt identice codurile afișate aici și cele de pe pompă?</string>
     <string name="insight_pairing">Asociere Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f U din %2$.2f U livrate</string>
     <string name="insight_alert_formatter">%1$s:%2$s</string>
     <string name="tube_changed">Canulă schimbată</string>
     <string name="insightpump_shortname">Obiectiv</string>
diff --git a/insight/src/main/res/values-ru-rRU/strings.xml b/insight/src/main/res/values-ru-rRU/strings.xml
index 2c34e92dfc..909280c5af 100644
--- a/insight/src/main/res/values-ru-rRU/strings.xml
+++ b/insight/src/main/res/values-ru-rRU/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Коды на этом устройстве и на вашей помпе совпадают?</string>
     <string name="insight_pairing">Сопряжение с Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">Подано %1$.2fед / %2$.2fед</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Трубка заменена</string>
     <string name="insightpump_shortname">Поле обзора</string>
diff --git a/insight/src/main/res/values-sk-rSK/strings.xml b/insight/src/main/res/values-sk-rSK/strings.xml
index b8fb7f6d8e..cc0d65f2ff 100644
--- a/insight/src/main/res/values-sk-rSK/strings.xml
+++ b/insight/src/main/res/values-sk-rSK/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Zhodujú sa kódy zobrazené na tomto zariadení a na pumpe?</string>
     <string name="insight_pairing">Párovanie Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f JI / %2$.2f JI podaných</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Hadička vymenená</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values-sv-rSE/strings.xml b/insight/src/main/res/values-sv-rSE/strings.xml
index 1ca1a27151..36d3fd2de2 100644
--- a/insight/src/main/res/values-sv-rSE/strings.xml
+++ b/insight/src/main/res/values-sv-rSE/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">Stämmer koderna överens mellan denna enhet och din pump?</string>
     <string name="insight_pairing">Parkoppling av Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2fU / %2$.2fU levererat</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Slang bytt</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values-tr-rTR/strings.xml b/insight/src/main/res/values-tr-rTR/strings.xml
index ad1eb34680..9e277c8349 100644
--- a/insight/src/main/res/values-tr-rTR/strings.xml
+++ b/insight/src/main/res/values-tr-rTR/strings.xml
@@ -27,7 +27,6 @@
     <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>
diff --git a/insight/src/main/res/values-zh-rCN/strings.xml b/insight/src/main/res/values-zh-rCN/strings.xml
index b66a09bfa9..a87e136d2f 100644
--- a/insight/src/main/res/values-zh-rCN/strings.xml
+++ b/insight/src/main/res/values-zh-rCN/strings.xml
@@ -27,7 +27,6 @@
     <string name="code_compare">此设备和您的泵上显示的代码是否匹配？</string>
     <string name="insight_pairing">Insight 正在配对</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f U / %2$.2f U 已输注</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">管路已经更换</string>
     <string name="insightpump_shortname">Sight</string>
diff --git a/insight/src/main/res/values/strings.xml b/insight/src/main/res/values/strings.xml
index f07833d819..a6bfaf9b02 100644
--- a/insight/src/main/res/values/strings.xml
+++ b/insight/src/main/res/values/strings.xml
@@ -28,7 +28,6 @@
     <string name="code_compare">Do the codes displayed on this device and on your pump match?</string>
     <string name="insight_pairing">Insight pairing</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f U / %2$.2f U delivered</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Tube changed</string>
     <string name="insightpump_shortname">Sight</string>
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 dd43c9bf3f..551a06f862 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
@@ -341,6 +341,7 @@ class MedtronicPumpPlugin @Inject constructor(
         val refreshTypesNeededToReschedule: MutableSet<MedtronicStatusRefreshType> = mutableSetOf()
         for ((key, value) in statusRefresh) {
             if (value > 0 && System.currentTimeMillis() > value) {
+                @Suppress("WHEN_ENUM_CAN_BE_NULL_IN_JAVA")
                 when (key) {
                     MedtronicStatusRefreshType.PumpHistory                                                -> {
                         readPumpHistory()
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 2151ac018a..09ebc9d5b7 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
@@ -358,7 +358,7 @@ class MedtronicHistoryData @Inject constructor(
         aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: TBRs Processed [count=%d, items=%s]", tbrs.size, gson.toJson(tbrs)))
         if (tbrs.isNotEmpty()) {
             try {
-                processTBREntries(tbrs, rewindRecords)
+                processTBREntries(tbrs)
             } catch (ex: Exception) {
                 aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing TBR entries: " + ex.message, ex)
                 throw ex
@@ -583,7 +583,7 @@ class MedtronicHistoryData @Inject constructor(
         }
     }
 
-    private fun processTBREntries(entryList: MutableList<PumpHistoryEntry>, rewindList: MutableList<PumpHistoryEntry>) {
+    private fun processTBREntries(entryList: MutableList<PumpHistoryEntry>) {
         entryList.reverse()
         val tbr = entryList[0].getDecodedDataEntry("Object") as TempBasalPair
 //        var readOldItem = false
@@ -607,7 +607,7 @@ class MedtronicHistoryData @Inject constructor(
 
         val tbrRecords = pumpSyncStorage.getTBRs()
 
-        val processList: MutableList<TempBasalProcessDTO> = createTBRProcessList(entryList, rewindList)
+        val processList: MutableList<TempBasalProcessDTO> = createTBRProcessList(entryList)
 
         if (processList.isNotEmpty()) {
             for (tempBasalProcessDTO in processList) {
@@ -731,7 +731,7 @@ class MedtronicHistoryData @Inject constructor(
     }
 
 
-    fun createTBRProcessList(entryList: MutableList<PumpHistoryEntry>, rewindList: MutableList<PumpHistoryEntry>) : MutableList<TempBasalProcessDTO> {
+    fun createTBRProcessList(entryList: MutableList<PumpHistoryEntry>) : MutableList<TempBasalProcessDTO> {
 
         aapsLogger.debug(LTag.PUMP, "${ProcessHistoryRecord.TBR.description}  List (before filter): ${gson.toJson(entryList)}")
 
@@ -797,24 +797,68 @@ class MedtronicHistoryData @Inject constructor(
             }
         }
 
-        // see if rewind items, need to fix any of current tempBasalProcessDTO items (bug 1724)
-        if (rewindList.isNotEmpty()) {
-            for (rewindEntry in rewindList) {
-                for (tempBasalProcessDTO in processList) {
-                    if (tempBasalProcessDTO.itemTwo==null) {
-                        val endTime: Long = DateTimeUtil.getATDWithAddedMinutes(tempBasalProcessDTO.itemOne.atechDateTime, tempBasalProcessDTO.itemOneTbr!!.durationMinutes)
+        // TODO this solution needs to be overworked, commenting out for now
+        // val suspendList = getFilteredItems(newHistory,  //
+        //                                      setOf(PumpHistoryEntryType.SuspendPump))
+        //
+        // val stopList : MutableList<PumpHistoryEntry> = mutableListOf()
+        // stopList.addAll(suspendList);
+        // stopList.addAll(rewindList);
+        //
+        // // TODO remove see if rewind items, need to fix any of current tempBasalProcessDTO items (bug 1724)
+        // if (rewindList.isNotEmpty()) {
+        //     for (rewindEntry in rewindList) {
+        //         for (tempBasalProcessDTO in processList) {
+        //             if (tempBasalProcessDTO.itemTwo==null) {
+        //                 val endTime: Long = DateTimeUtil.getATDWithAddedMinutes(tempBasalProcessDTO.itemOne.atechDateTime, tempBasalProcessDTO.itemOneTbr!!.durationMinutes)
+        //
+        //                 if ((rewindEntry.atechDateTime > tempBasalProcessDTO.itemOne.atechDateTime) &&
+        //                     (rewindEntry.atechDateTime < endTime)) {
+        //                     tempBasalProcessDTO.itemTwo = rewindEntry
+        //                     continue
+        //                 }
+        //             }
+        //         }
+        //     }
+        // }
+        //
+        // // see if have rewind/stop items that need to fix any of current tempBasalProcessDTO items (bug 1724)
+        // if (stopList.isNotEmpty()) {
+        //     for (tempBasalProcessDTO in processList) {
+        //         if (tempBasalProcessDTO.itemTwo==null) {
+        //             val endTime: Long = DateTimeUtil.getATDWithAddedMinutes(tempBasalProcessDTO.itemOne.atechDateTime, tempBasalProcessDTO.itemOneTbr!!.durationMinutes)
+        //
+        //             val findNearestEntry = findNearestEntry(tempBasalProcessDTO.itemOne.atechDateTime, endTime, stopList);
+        //
+        //             if (findNearestEntry!=null) {
+        //                 tempBasalProcessDTO.itemTwo = findNearestEntry
+        //                 stopList.remove(findNearestEntry)
+        //             }
+        //         }
+        //     }
+        // }
 
-                        if ((rewindEntry.atechDateTime > tempBasalProcessDTO.itemOne.atechDateTime) &&
-                            (rewindEntry.atechDateTime < endTime)) {
-                            tempBasalProcessDTO.itemTwo = rewindEntry
-                            continue
-                        }
-                    }
-                }
+        return processList
+    }
+
+    fun findNearestEntry(startTime: Long, endTime: Long, list: MutableList<PumpHistoryEntry>) : PumpHistoryEntry? {
+        val outList: MutableList<PumpHistoryEntry> = mutableListOf()
+
+        for (pumpHistoryEntry in list) {
+            if ((pumpHistoryEntry.atechDateTime > startTime) &&
+                (pumpHistoryEntry.atechDateTime < endTime)) {
+                outList.add(pumpHistoryEntry)
             }
         }
 
-        return processList
+        if (outList.size == 0) {
+            return null
+        } else if (outList.size==1) {
+            return outList[0]
+        } else {
+            // TODO
+            return null
+        }
     }
 
     fun isTBRActive(dbEntry: PumpDbEntryTBR): Boolean {
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt
index e88d3de97f..8d86bce696 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt
@@ -18,20 +18,17 @@ object MedtronicConst {
         val BolusDelay = R.string.key_medtronic_bolus_delay
         val Encoding = R.string.key_medtronic_encoding
         val BatteryType = R.string.key_medtronic_battery_type
-        val BolusDebugEnabled = R.string.key_medtronic_bolus_debug
     }
 
     object Statistics {
-        const val StatsPrefix = "medtronic_"
+        private const val StatsPrefix = "medtronic_"
         const val FirstPumpStart = Prefix + "first_pump_use"
         const val LastGoodPumpCommunicationTime = Prefix + "lastGoodPumpCommunicationTime"
-        const val LastGoodPumpFrequency = Prefix + "LastGoodPumpFrequency"
         const val TBRsSet = StatsPrefix + "tbrs_set"
         const val StandardBoluses = StatsPrefix + "std_boluses_delivered"
         const val SMBBoluses = StatsPrefix + "smb_boluses_delivered"
         const val LastPumpHistoryEntry = StatsPrefix + "pump_history_entry"
         const val LastPrime = StatsPrefix + "last_sent_prime"
         const val LastRewind = StatsPrefix + "last_sent_rewind"
-        const val InternalTemporaryDatabase = StatsPrefix + "temporary_entries"
     }
 }
\ No newline at end of file
diff --git a/medtronic/src/main/res/values-de-rDE/strings.xml b/medtronic/src/main/res/values-de-rDE/strings.xml
index 95a8a4f820..7f886fd428 100644
--- a/medtronic/src/main/res/values-de-rDE/strings.xml
+++ b/medtronic/src/main/res/values-de-rDE/strings.xml
@@ -91,4 +91,6 @@
     <string name="set_neutral_temps_summary">Wenn diese Option aktiviert ist, wird die TBR vor Ende jeder Stunde abgebrochen. Dies kann dazu beitragen, einige Pumpen davon abzuhalten, zur vollen Stunde zu vibrieren / zu piepsen.</string>
     <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d Minuten verbleibend)</string>
     <string name="invalid_history_data">Ungültige Pumpenhistorie erkannt. Eröffne ein neues Ticket (issue) und füge Logs bei.</string>
+    <string name="riley_statistics">RL Statistik</string>
+    <string name="medtronic_history_type">Typ:</string>
 </resources>
diff --git a/medtronic/src/main/res/values-ga-rIE/strings.xml b/medtronic/src/main/res/values-ga-rIE/strings.xml
index 124cf31da4..7dd05e5965 100644
--- a/medtronic/src/main/res/values-ga-rIE/strings.xml
+++ b/medtronic/src/main/res/values-ga-rIE/strings.xml
@@ -4,7 +4,6 @@
     <!-- MDT Configuration -->
     <!-- MDT Fragment -->
     <!-- MDT Errors -->
-    <string name="medtronic_errors">Earráidí</string>
     <!-- MDT History -->
     <!--    <string name="medtronic_history_group_basal">Basals</string>-->
     <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
@@ -13,11 +12,7 @@
     <!--    <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> -->
-    <string name="medtronic_warning">Rabhadh</string>
     <!-- medtronic_warning -->
-    <string name="medtronic_pump_connected_now">Anois</string>
     <!-- combo_pump_connected_now -->
-    <string name="ago">ó shin</string>
-    <string name="medtronic_notification_check_time_date">Is nuashonrú gá clog Caidéil</string>
     <!-- combo_notification_check_time_date -->
 </resources>
diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt
index e2864fc967..0557795620 100644
--- a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt
+++ b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt
@@ -141,7 +141,7 @@ class MedtronicHistoryDataUTest : TestBase() {
 
         println("PumpHistoryEntries: getRewindItems: $rewindRecords.size : " + gson.toJson(rewindRecords))
 
-        val processList: MutableList<TempBasalProcessDTO> = medtronicHistoryData.createTBRProcessList(tbrs, rewindRecords)
+        val processList: MutableList<TempBasalProcessDTO> = medtronicHistoryData.createTBRProcessList(tbrs)
 
         println("PumpHistoryEntries: processList: " + processList.size)
 
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
index f880537198..c930e83710 100644
--- 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
@@ -55,7 +55,7 @@ class MedtronicHistoryDataUTest : TestBase() {
 
         println("TBR Pre-Process List: " + gson.toJson(yourClassList))
 
-        val createTBRProcessList = unitToTest.createTBRProcessList(yourClassList, mutableListOf())
+        val createTBRProcessList = unitToTest.createTBRProcessList(yourClassList)
 
         println("TBR Process List: " + createTBRProcessList.size)
 
@@ -98,7 +98,7 @@ class MedtronicHistoryDataUTest : TestBase() {
 
         println("TBR Pre-Process List (Special): " + gson.toJson(yourClassList))
 
-        val createTBRProcessList = unitToTest.createTBRProcessList(yourClassList, mutableListOf())
+        val createTBRProcessList = unitToTest.createTBRProcessList(yourClassList)
 
         println("TBR Process List (Special): " + createTBRProcessList.size)
 
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 84aa19951d..2ef6ee79eb 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
@@ -44,8 +44,10 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.mapProfileToBas
 import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.queue.commands.CustomCommand
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DecimalFormatter.to0Decimal
 import info.nightscout.androidaps.utils.DecimalFormatter.to2Decimal
 import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.Round
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.TimeChangeType
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
@@ -698,7 +700,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
             }
             val percent = (waited.toFloat() / estimatedDeliveryTimeSeconds) * 100
             updateBolusProgressDialog(
-                rh.gs(R.string.dash_bolusdelivering, requestedBolusAmount),
+                rh.gs(R.string.bolus_delivered, Round.roundTo(percent*requestedBolusAmount/100, PodConstants.POD_PULSE_BOLUS_UNITS), requestedBolusAmount),
                 percent.toInt()
             )
         }
@@ -729,7 +731,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 val remainingUnits = podStateManager.lastBolus!!.bolusUnitsRemaining
                 val percent = ((requestedBolusAmount - remainingUnits) / requestedBolusAmount) * 100
                 updateBolusProgressDialog(
-                    rh.gs(R.string.bolusdelivering, requestedBolusAmount),
+                    rh.gs(R.string.bolus_delivered, Round.roundTo(requestedBolusAmount - remainingUnits, PodConstants.POD_PULSE_BOLUS_UNITS), requestedBolusAmount),
                     percent.toInt()
                 )
 
@@ -1062,7 +1064,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
         }
         ret += rh.gs(
             R.string.omnipod_common_short_status_reservoir,
-            podStateManager.pulsesRemaining?.let { reservoirLevel.toString() } ?: "50+"
+            podStateManager.pulsesRemaining?.let { to0Decimal(reservoirLevel) } ?: "50+"
         )
         return ret.trim()
     }
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 d09d9fc130..08078883ba 100644
--- a/omnipod-dash/src/main/res/values-bg-rBG/strings.xml
+++ b/omnipod-dash/src/main/res/values-bg-rBG/strings.xml
@@ -16,5 +16,4 @@
     <!-- Exceptions -->
     <string name="omnipod_common_history_tbr_value">Количество: %1$.2f U, Продължителност: %2$d мин</string>
     <string name="omnipod_common_history_bolus_value">%1$.2fЕ</string>
-    <string name="dash_bolusdelivering">Доставяне %1$.2f U</string>
 </resources>
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 45c6e82aec..75048fb574 100644
--- a/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml
+++ b/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml
@@ -33,7 +33,6 @@
     <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>
     <string name="omnipod_common_alert_delivery_suspended">Výdej inzulínu je pozastaven</string>
     <string name="omnipod_dash_connection_lost">Ztraceno připojení k podu</string>
     <string name="omnipod_dash_bolus_already_in_progress">Vydává se další bolus</string>
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 28b866ad34..7a798a11d1 100644
--- a/omnipod-dash/src/main/res/values-da-rDK/strings.xml
+++ b/omnipod-dash/src/main/res/values-da-rDK/strings.xml
@@ -34,7 +34,6 @@
     <string name="omnipod_dash_unknown">Ukendt tilstand for kommandoen</string>
     <string name="omnipod_common_history_tbr_value">Rate: %1$.2f IE, varighed: %2$d minutter</string>
     <string name="omnipod_common_history_bolus_value">%1$.2f IE</string>
-    <string name="dash_bolusdelivering">Afgiver %1$.2f IE</string>
     <string name="omnipod_common_alert_delivery_suspended">Insulintilførslen suspenderet</string>
     <string name="omnipod_dash_connection_lost">Mistede forbindelse til pod</string>
     <string name="omnipod_dash_bolus_already_in_progress">En anden bolus er ved at blive afgivet</string>
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 a43c501d96..b6ad4b3dc8 100644
--- a/omnipod-dash/src/main/res/values-de-rDE/strings.xml
+++ b/omnipod-dash/src/main/res/values-de-rDE/strings.xml
@@ -33,7 +33,6 @@
     <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>
-    <string name="dash_bolusdelivering">Gebe %1$.2f IE ab</string>
     <string name="omnipod_common_alert_delivery_suspended">Insulinabgabe ist unterbrochen</string>
     <string name="omnipod_dash_connection_lost">Verbindung zum Pod verloren</string>
     <string name="omnipod_dash_bolus_already_in_progress">Ein weiterer Bolus wird abgegeben</string>
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 a302a379a8..81653b86c9 100644
--- a/omnipod-dash/src/main/res/values-es-rES/strings.xml
+++ b/omnipod-dash/src/main/res/values-es-rES/strings.xml
@@ -34,7 +34,6 @@
     <string name="omnipod_dash_unknown">Estado desconocido para el comando</string>
     <string name="omnipod_common_history_tbr_value">Tasa: %1$.2f U, duración: %2$d minutos</string>
     <string name="omnipod_common_history_bolus_value">%1$.2f U</string>
-    <string name="dash_bolusdelivering">Entregando %1$.2f U</string>
     <string name="omnipod_common_alert_delivery_suspended">Suspendida la entrega de insulina</string>
     <string name="omnipod_dash_connection_lost">Conexión perdida con el pod</string>
     <string name="omnipod_dash_bolus_already_in_progress">Otro bolo está siendo entregado</string>
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 0369cb2044..52c52fb151 100644
--- a/omnipod-dash/src/main/res/values-fr-rFR/strings.xml
+++ b/omnipod-dash/src/main/res/values-fr-rFR/strings.xml
@@ -33,7 +33,6 @@
     <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>
-    <string name="dash_bolusdelivering">Injection de %1$.2fU en cours</string>
     <string name="omnipod_common_alert_delivery_suspended">Injection d\'insuline suspendue</string>
     <string name="omnipod_dash_connection_lost">Connexion perdue avec le pod</string>
     <string name="omnipod_dash_bolus_already_in_progress">Un autre bolus est en cours d\'injection</string>
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 7fba31370b..0ac8ec4b81 100644
--- a/omnipod-dash/src/main/res/values-it-rIT/strings.xml
+++ b/omnipod-dash/src/main/res/values-it-rIT/strings.xml
@@ -33,7 +33,6 @@
     <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>
-    <string name="dash_bolusdelivering">Erogazione di %1$.2f U</string>
     <string name="omnipod_common_alert_delivery_suspended">L\'erogazione di insulina è sospesa</string>
     <string name="omnipod_dash_connection_lost">Persa connessione al pod</string>
     <string name="omnipod_dash_bolus_already_in_progress">Altro bolo in erogazione</string>
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 38f204c426..59bc448d89 100644
--- a/omnipod-dash/src/main/res/values-iw-rIL/strings.xml
+++ b/omnipod-dash/src/main/res/values-iw-rIL/strings.xml
@@ -33,7 +33,6 @@
     <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>
-    <string name="dash_bolusdelivering">מזריק %1$.2f יח\'</string>
     <string name="omnipod_common_alert_delivery_suspended">הזרקת האינסולין מופסקת</string>
     <string name="omnipod_dash_connection_lost">אבד החיבור לפוד</string>
     <string name="omnipod_dash_bolus_already_in_progress">בולוס אחר מוזרק כרגע</string>
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 0c70dc4f41..71d5b28037 100644
--- a/omnipod-dash/src/main/res/values-lt-rLT/strings.xml
+++ b/omnipod-dash/src/main/res/values-lt-rLT/strings.xml
@@ -33,7 +33,6 @@
     <string name="omnipod_dash_unknown">Nežinoma komandos būklė</string>
     <string name="omnipod_common_history_tbr_value">Kiekis: %1$.2f vv, trukmė: %2$d min</string>
     <string name="omnipod_common_history_bolus_value">%1$.2f vv</string>
-    <string name="dash_bolusdelivering">Leidžiama %1$.2f vv</string>
     <string name="omnipod_common_alert_delivery_suspended">Insulino leidimas sustabdytas</string>
     <string name="omnipod_dash_connection_lost">Ryšys su Pod prarastas</string>
     <string name="omnipod_dash_bolus_already_in_progress">Kitas bolusas yra jau leidžiamas</string>
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 ab89814c50..feeb7e87c3 100644
--- a/omnipod-dash/src/main/res/values-nl-rNL/strings.xml
+++ b/omnipod-dash/src/main/res/values-nl-rNL/strings.xml
@@ -33,7 +33,6 @@
     <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>
-    <string name="dash_bolusdelivering">%1$.2f eh worden toegediend</string>
     <string name="omnipod_common_alert_delivery_suspended">Insuline levering is opgeschort</string>
     <string name="omnipod_dash_connection_lost">Verbinding met pod verbroken</string>
     <string name="omnipod_dash_bolus_already_in_progress">Een andere bolus wordt op dit moment toegediend</string>
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 d80f5ba0ae..d8cdfdb3c9 100644
--- a/omnipod-dash/src/main/res/values-no-rNO/strings.xml
+++ b/omnipod-dash/src/main/res/values-no-rNO/strings.xml
@@ -33,7 +33,6 @@
     <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>
     <string name="omnipod_common_alert_delivery_suspended">Insulintilførsel er suspendert</string>
     <string name="omnipod_dash_connection_lost">Mistet tilkoblingen til pod</string>
     <string name="omnipod_dash_bolus_already_in_progress">En annen bolusdose blir levert</string>
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 8954e5d32a..df41465053 100644
--- a/omnipod-dash/src/main/res/values-pl-rPL/strings.xml
+++ b/omnipod-dash/src/main/res/values-pl-rPL/strings.xml
@@ -33,7 +33,6 @@
     <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>
-    <string name="dash_bolusdelivering">Dostarczanie %1$.2f U</string>
     <string name="omnipod_common_alert_delivery_suspended">Podawanie insuliny zawieszone</string>
     <string name="omnipod_dash_connection_lost">Utracono połączenie z Podem</string>
     <string name="omnipod_dash_bolus_already_in_progress">Inny bolus jest dostarczany</string>
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 4cabe33872..c53e9bef97 100644
--- a/omnipod-dash/src/main/res/values-pt-rPT/strings.xml
+++ b/omnipod-dash/src/main/res/values-pt-rPT/strings.xml
@@ -34,7 +34,6 @@
     <string name="omnipod_dash_unknown">Estado desconhecido para o comando</string>
     <string name="omnipod_common_history_tbr_value">Rácio: %1$.2f U, duração: %2$d minutes</string>
     <string name="omnipod_common_history_bolus_value">%1$.2f U</string>
-    <string name="dash_bolusdelivering">A administrar %1$.2f U</string>
     <string name="omnipod_common_alert_delivery_suspended">A entrega de insulina está suspensa</string>
     <string name="omnipod_dash_connection_lost">Perda de ligação ao pod</string>
     <string name="omnipod_dash_bolus_already_in_progress">Outro bólus está a ser administrado</string>
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 0ed49aca60..7af51302b3 100644
--- a/omnipod-dash/src/main/res/values-ro-rRO/strings.xml
+++ b/omnipod-dash/src/main/res/values-ro-rRO/strings.xml
@@ -34,7 +34,6 @@
     <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>
-    <string name="dash_bolusdelivering">Se livrează %1$.2f U</string>
     <string name="omnipod_common_alert_delivery_suspended">Administrarea insulinei este suspendată</string>
     <string name="omnipod_dash_connection_lost">S-a pierdut conexiunea la pod</string>
     <string name="omnipod_dash_bolus_already_in_progress">Un alt bolus este în curs de livrare</string>
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 7c1ad24700..0c3943c952 100644
--- a/omnipod-dash/src/main/res/values-ru-rRU/strings.xml
+++ b/omnipod-dash/src/main/res/values-ru-rRU/strings.xml
@@ -33,7 +33,6 @@
     <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>
-    <string name="dash_bolusdelivering">Подается болюс %1$.2f ед</string>
     <string name="omnipod_common_alert_delivery_suspended">Введение инсулина приостановлено</string>
     <string name="omnipod_dash_connection_lost">Потеряно соединение с подом</string>
     <string name="omnipod_dash_bolus_already_in_progress">Вводится еще один болюс</string>
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 bb3e57ff8b..a95a3387db 100644
--- a/omnipod-dash/src/main/res/values-sk-rSK/strings.xml
+++ b/omnipod-dash/src/main/res/values-sk-rSK/strings.xml
@@ -33,7 +33,6 @@
     <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>
     <string name="omnipod_common_alert_delivery_suspended">Podávanie inzulínu je pozastavené</string>
     <string name="omnipod_dash_connection_lost">Stratilo sa spojenie s Podom</string>
     <string name="omnipod_dash_bolus_already_in_progress">Už sa podáva iný bolus</string>
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 657863b9be..6afa96c186 100644
--- a/omnipod-dash/src/main/res/values-sv-rSE/strings.xml
+++ b/omnipod-dash/src/main/res/values-sv-rSE/strings.xml
@@ -33,7 +33,6 @@
     <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>
-    <string name="dash_bolusdelivering">Levererar %1$.2f enheter</string>
     <string name="omnipod_common_alert_delivery_suspended">Insulinleverans är pausad</string>
     <string name="omnipod_dash_connection_lost">Tappade anslutningen till pod</string>
     <string name="omnipod_dash_bolus_already_in_progress">En annan bolus håller på att levereras</string>
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 7d72f133b1..2c89b47912 100644
--- a/omnipod-dash/src/main/res/values-tr-rTR/strings.xml
+++ b/omnipod-dash/src/main/res/values-tr-rTR/strings.xml
@@ -33,7 +33,6 @@
     <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>
     <string name="omnipod_common_alert_delivery_suspended">İnsülin iletimi askıya alındı</string>
     <string name="omnipod_dash_connection_lost">Pod ile bağlantı koptu</string>
     <string name="omnipod_dash_bolus_already_in_progress">Diğer bolus iletiliyor</string>
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 f5fcc1a77d..3d893017b7 100644
--- a/omnipod-dash/src/main/res/values-zh-rCN/strings.xml
+++ b/omnipod-dash/src/main/res/values-zh-rCN/strings.xml
@@ -33,7 +33,6 @@
     <string name="omnipod_dash_unknown">命令的未知状态</string>
     <string name="omnipod_common_history_tbr_value">速率： %1$.2f U，持续时间： %2$d 分钟</string>
     <string name="omnipod_common_history_bolus_value">%1$.2f U</string>
-    <string name="dash_bolusdelivering">正在输注 %1$.2f U</string>
     <string name="omnipod_common_alert_delivery_suspended">胰岛素输注已暂停</string>
     <string name="omnipod_dash_connection_lost">最后一次连接pod</string>
     <string name="omnipod_dash_bolus_already_in_progress">另一个大剂量正在输注</string>
diff --git a/omnipod-dash/src/main/res/values/strings.xml b/omnipod-dash/src/main/res/values/strings.xml
index 9a13bac3c0..63db714e30 100644
--- a/omnipod-dash/src/main/res/values/strings.xml
+++ b/omnipod-dash/src/main/res/values/strings.xml
@@ -46,7 +46,6 @@
     <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>
     <string name="omnipod_common_alert_delivery_suspended">Insulin delivery is suspended</string>
     <string name="omnipod_dash_connection_lost">Lost connection to pod</string>
     <string name="omnipod_dash_bolus_already_in_progress">Another bolus is being delivered</string>
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 f4c1bb19c7..f1c8882213 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
@@ -46,6 +46,7 @@ import info.nightscout.androidaps.interfaces.Pump;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpPluginBase;
 import info.nightscout.androidaps.interfaces.PumpSync;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule;
 import info.nightscout.shared.logging.AAPSLogger;
 import info.nightscout.shared.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBus;
@@ -628,8 +629,9 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
         if (!podStateManager.isPodRunning()) {
             return 0.0d;
         }
-
-        return podStateManager.getBasalSchedule().rateAt(TimeUtil.toDuration(DateTime.now()));
+        BasalSchedule schedule = podStateManager.getBasalSchedule();
+        if (schedule != null) return schedule.rateAt(TimeUtil.toDuration(DateTime.now()));
+        else return 0;
     }
 
     @Override
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 faa58d345d..26a5a3445d 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
@@ -291,6 +291,15 @@ public class AapsOmnipodErosManager {
             return new PumpEnactResult(injector).success(false).enacted(false).comment(note);
         }
 
+        // #1963 return synthetic success if pre-activation
+        // to allow profile switch prior to pod activation
+        // otherwise a catch-22
+        if (!podStateManager.getActivationProgress().isCompleted()) {
+            // TODO: i18n string
+            return new PumpEnactResult(injector).success(true).enacted(false).comment("pre" +
+                    "-activation basal change moot");
+        }
+
         PodHistoryEntryType historyEntryType = podStateManager.isSuspended() ? PodHistoryEntryType.RESUME_DELIVERY : PodHistoryEntryType.SET_BASAL_SCHEDULE;
 
         try {
@@ -370,7 +379,7 @@ public class AapsOmnipodErosManager {
             bolusCommandResult = executeCommand(() -> delegate.bolus(PumpType.OMNIPOD_EROS.determineCorrectBolusSize(detailedBolusInfo.insulin), beepsEnabled, beepsEnabled, detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB ? null :
                     (estimatedUnitsDelivered, percentage) -> {
                         EventOverviewBolusProgress progressUpdateEvent = EventOverviewBolusProgress.INSTANCE;
-                        progressUpdateEvent.setStatus(getStringResource(R.string.goingtodeliver, detailedBolusInfo.insulin));
+                        progressUpdateEvent.setStatus(getStringResource(R.string.bolus_delivered, estimatedUnitsDelivered, detailedBolusInfo.insulin));
                         progressUpdateEvent.setPercent(percentage);
                         sendEvent(progressUpdateEvent);
                     }));
diff --git a/openhumans/src/main/res/values-da-rDK/strings.xml b/openhumans/src/main/res/values-da-rDK/strings.xml
index dd505c8935..735188e7cc 100644
--- a/openhumans/src/main/res/values-da-rDK/strings.xml
+++ b/openhumans/src/main/res/values-da-rDK/strings.xml
@@ -16,6 +16,42 @@
     <string name="you_have_been_signed_out_of_open_humans">Du er blevet logget ud af Open Humans</string>
     <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klik her for at logge ind igen, hvis dette ikke var meningen.</string>
     <string name="upload_now">Upload nu</string>
+    <string name="next">Næste</string>
+    <string name="welcome_to_open_humans">Velkommen til Open Humans</string>
+    <string name="setup_data_upload">Klik på \'Næste\' for at opsætte dataoverførsel.</string>
+    <string name="consent">Samtykke</string>
+    <string name="terms_of_use">Vilkår for anvendelse</string>
+    <string name="please_read__information">Læs venligst følgende oplysninger grundigt og accepter vilkårene for brug for at fortsætte.</string>
+    <string name="info_openhumans">Dette er et open source værktøj, der vil kopiere dine data til Open Humans. Vi har ingen rettigheder til at dele dine data med tredjeparter uden din udtrykkelige tilladelse. De data, som projektet og appen modtager, identificeres via et tilfældigt bruger-ID og vil kun blive overført sikkert til en Open Humans konto med din godkendelse af denne proces. Du kan til enhver tid stoppe med at uploade og slette dine uploaddata via www.openhumans.org.</string>
+    <string name="data_uploaded">Data Uploadet</string>
+    <string name="glucose_values">Glukose værdier</string>
+    <string name="boluses">Bolusser</string>
+    <string name="extended_boluses">Forlænget bolus</string>
+    <string name="carbohydrates">Kulhydrater</string>
+    <string name="careportal_events">Careportal Begivenheder (undtagen noter)</string>
+    <string name="profile_switches">Profilskift</string>
+    <string name="total_daily_doses">Samlede Daglige Doser</string>
+    <string name="temporary_basal_rates">Midlertidige basal rater</string>
+    <string name="temporary_targets">Midlertidige Mål</string>
+    <string name="settings">Indstillinger</string>
+    <string name="application_version">Programversion</string>
+    <string name="device_model">Enhedsmodel</string>
+    <string name="screen_dimensions">Skærm Dimensioner</string>
+    <string name="algorithm_debug_data">Algoritme Fejlretningsdata</string>
+    <string name="data_not_uploaded">Data IKKE uploadet</string>
+    <string name="passwords">Kodeord</string>
+    <string name="nightscout_url">Nightscout URL</string>
+    <string name="nightscout_api_secret">Nightscout API Secret</string>
+    <string name="free_text_fields">Fritekstfelt</string>
+    <string name="agree">Jeg forstår og er enig.</string>
+    <string name="login_open_humans">Login på Open Humans</string>
+    <string name="final_touches">Afsluttende detaljer</string>
+    <string name="uploading_proceed">Du er kun et skridt væk fra at uploade dine data til Open Humans. Vil du fortsætte?</string>
     <string name="cancel">Annuller</string>
+    <string name="proceed">Fortsæt</string>
+    <string name="finishing">Afslutter...</string>
+    <string name="this_may_take_a_few_seconds">Dette kan tage nogle sekunder.</string>
+    <string name="we_re_done">Vi er færdige!</string>
+    <string name="silently_upload_date_note">Fra nu af vil telefonen lydløst uploade data i baggrunden fra tid til anden.</string>
     <string name="close">Luk</string>
 </resources>
diff --git a/openhumans/src/main/res/values-de-rDE/strings.xml b/openhumans/src/main/res/values-de-rDE/strings.xml
index 19a6178baa..45854805de 100644
--- a/openhumans/src/main/res/values-de-rDE/strings.xml
+++ b/openhumans/src/main/res/values-de-rDE/strings.xml
@@ -16,7 +16,42 @@
     <string name="you_have_been_signed_out_of_open_humans">Du wurdest von Open Humans abgemeldet.</string>
     <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klicke hier, um Dich erneut anzumelden, falls dies versehentlich passiert ist.</string>
     <string name="upload_now">Jetzt hochladen</string>
+    <string name="next">Weiter</string>
+    <string name="welcome_to_open_humans">Willkommen bei Open Humans</string>
+    <string name="setup_data_upload">Klicken Sie auf \'Weiter\', um das Hochladen der Daten einzurichten.</string>
+    <string name="consent">Einwilligen</string>
     <string name="terms_of_use">Nutzungsbedingungen</string>
+    <string name="please_read__information">Bitte lesen Sie die folgenden Informationen sorgfältig und akzeptieren Sie die Nutzungsbedingungen, um fortzufahren.</string>
+    <string name="info_openhumans">Dies ist ein Open-Source-Tool, das Deine Daten zu Open Humans hochlädt. Wir behalten uns keine Rechte vor, Deine Daten ohne Deine ausdrückliche Genehmigung an Dritte weiterzugeben. Die Daten, die das Projekt und die Anwendung erhalten, werden über eine zufällige Benutzer-ID identifiziert und nur nach Deiner Zustimmung sicher auf ein Open Humans-Konto übertragen. Du kannst jederzeit das Hochladen beenden und Deine hochgeladenen Daten über www.openhumans.org löschen.</string>
+    <string name="data_uploaded">Daten hochgeladen</string>
+    <string name="glucose_values">Glukosewerte</string>
+    <string name="boluses">Boli</string>
+    <string name="extended_boluses">Verzögerte Boli</string>
+    <string name="carbohydrates">Kohlenhydrate</string>
+    <string name="careportal_events">Careportal-Ereignisse (mit Ausnahme von Notizen)</string>
+    <string name="profile_switches">Profilwechsel</string>
+    <string name="total_daily_doses">Tägliche Gesamtdosis (TDD)</string>
+    <string name="temporary_basal_rates">Temporäre Basalraten</string>
+    <string name="temporary_targets">Temporäre Ziele</string>
+    <string name="settings">Einstellungen</string>
+    <string name="application_version">Programmversion</string>
+    <string name="device_model">Gerätemodell</string>
+    <string name="screen_dimensions">Bildschirmgröße</string>
+    <string name="algorithm_debug_data">Algorithmus-Debug-Daten</string>
+    <string name="data_not_uploaded">Daten NICHT hochgeladen</string>
+    <string name="passwords">Passwörter</string>
+    <string name="nightscout_url">Nightscout-URL</string>
+    <string name="nightscout_api_secret">Nightscout API Secret</string>
+    <string name="free_text_fields">Freitextfelder</string>
+    <string name="agree">Verstanden und akzeptiert. </string>
+    <string name="login_open_humans">Login Open Humans</string>
+    <string name="final_touches">letzter Schliff</string>
+    <string name="uploading_proceed">Sie sind nur einen Schritt vom Hochladen Ihrer Daten zu Open Humans entfernt. Möchten Sie fortfahren?</string>
     <string name="cancel">Abbrechen</string>
+    <string name="proceed">Fortfahren</string>
+    <string name="finishing">Beende...</string>
+    <string name="this_may_take_a_few_seconds">Dies kann einige Sekunden dauern.</string>
+    <string name="we_re_done">Wir sind fertig!</string>
+    <string name="silently_upload_date_note">Von nun an wird Ihr Telefon von Zeit zu Zeit stillschweigend Daten im Hintergrund hochladen.</string>
     <string name="close">Schließen</string>
 </resources>
diff --git a/openhumans/src/main/res/values-ga-rIE/strings.xml b/openhumans/src/main/res/values-ga-rIE/strings.xml
index d1e993eb08..3ea04e700d 100644
--- a/openhumans/src/main/res/values-ga-rIE/strings.xml
+++ b/openhumans/src/main/res/values-ga-rIE/strings.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="cancel">Cuir ar ceal</string>
-    <string name="close">Dún</string>
-</resources>
+<resources></resources>
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt
index 6333af2cc2..db19107d75 100755
--- a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt
@@ -133,7 +133,7 @@ class PumpBLEConfigActivity : DaggerAppCompatActivity() {
                         aapsLogger.debug(TAG, "Device can be detected near, so trying to remove bond if possible.")
                         bleSelector.removeDevice(bluetoothDevice!!)
                     } else {
-                        val remoteDevice = bluetoothAdapter!!.getRemoteDevice(deviceAddress)
+                        val remoteDevice = bluetoothAdapter?.getRemoteDevice(deviceAddress)
                         if (remoteDevice != null) {
                             bleSelector.removeDevice(remoteDevice)
                         }
@@ -184,7 +184,7 @@ class PumpBLEConfigActivity : DaggerAppCompatActivity() {
     }
 
     private fun prepareForScanning() {
-        bleScanner = bluetoothAdapter!!.bluetoothLeScanner
+        bleScanner = bluetoothAdapter?.bluetoothLeScanner
         settings = bleSelector.getScanSettings()
         filters = bleSelector.getScanFilters()
     }
@@ -243,7 +243,7 @@ class PumpBLEConfigActivity : DaggerAppCompatActivity() {
             binding.pumpBleConfigButtonScanStop.visibility = View.VISIBLE
         }
         scanning = true
-        bleScanner!!.startScan(filters, settings, bleScanCallback)
+        bleScanner?.startScan(filters, settings, bleScanCallback)
         aapsLogger.debug(LTag.PUMPBTCOMM, "startLeDeviceScan: Scanning Start")
         bleSelector.onStartLeDeviceScan(this@PumpBLEConfigActivity)
     }
@@ -251,7 +251,7 @@ class PumpBLEConfigActivity : DaggerAppCompatActivity() {
     private fun stopLeDeviceScan(manualStop: Boolean) {
         if (scanning) {
             scanning = false
-            bleScanner!!.stopScan(bleScanCallback)
+            bleScanner?.stopScan(bleScanCallback)
             aapsLogger.debug(LTag.PUMPBTCOMM, "stopLeDeviceScan: Scanning Stop")
             bleSelector.onStopLeDeviceScan(this@PumpBLEConfigActivity)
             handler.removeCallbacks(stopScanAfterTimeoutRunnable)
@@ -320,8 +320,8 @@ class PumpBLEConfigActivity : DaggerAppCompatActivity() {
             if (currentlySelectedAddress == device.address) {
                 deviceName += " (" + resources.getString(R.string.ble_config_scan_selected) + ")"
             }
-            holder.deviceName!!.text = deviceName
-            holder.deviceAddress!!.text = device.address
+            holder.deviceName?.text = deviceName
+            holder.deviceAddress?.text = device.address
             return v!!
         }
     }
diff --git a/pump-common/src/main/res/layout/pump_history_activity.xml b/pump-common/src/main/res/layout/pump_history_activity.xml
index e5f3c4a1c7..0202071a6f 100755
--- a/pump-common/src/main/res/layout/pump_history_activity.xml
+++ b/pump-common/src/main/res/layout/pump_history_activity.xml
@@ -29,7 +29,7 @@
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <Spinner
-            android:theme="@style/YourSpinnerItemStyle"
+            android:theme="@style/CommonSpinnerItemStyle"
             android:id="@+id/pump_history_type"
             android:layout_width="100dp"
 
diff --git a/pump-common/src/main/res/values-af-rZA/strings.xml b/pump-common/src/main/res/values-af-rZA/strings.xml
index 33c77af761..555b0265bf 100644
--- a/pump-common/src/main/res/values-af-rZA/strings.xml
+++ b/pump-common/src/main/res/values-af-rZA/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operasie nog nie ondersteun deur pomp.</string>
     <!-- PumpCommon - Pump Status -->
     <!-- PumpCommon - History Group -->
     <!-- Time -->
diff --git a/pump-common/src/main/res/values-bg-rBG/strings.xml b/pump-common/src/main/res/values-bg-rBG/strings.xml
index 33c77af761..6d8edea0a3 100644
--- a/pump-common/src/main/res/values-bg-rBG/strings.xml
+++ b/pump-common/src/main/res/values-bg-rBG/strings.xml
@@ -1,11 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Помпата не поддържа тази операция.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Операцията не се поддържа от помпата (ВСЕ ОЩЕ).</string>
+    <string name="common_resultok">ОК</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">Събуждане</string>
+    <string name="pump_status_error_comm">Грешка в комуникацията</string>
+    <string name="pump_status_timeout_comm">Изтече времето за връзка</string>
+    <string name="pump_status_pump_unreachable">Помпата е недостъпна</string>
+    <string name="pump_status_invalid_config">Грешна конфигурация</string>
+    <string name="pump_status_active">Активна</string>
+    <string name="pump_status_sleeping">Спинка си</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Базали</string>
+    <string name="history_group_configuration">Конфигурации</string>
+    <string name="history_group_notification">Известия</string>
+    <string name="history_group_statistic">Статистика</string>
+    <string name="history_group_unknown">Неизвестни</string>
+    <string name="history_group_all">Всички</string>
+    <string name="history_group_bolus">Болуси</string>
+    <string name="history_group_prime">Пълнене</string>
+    <string name="history_group_alarm">Аларми</string>
+    <string name="history_group_glucose">Кръвна захар</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d ден</item>
+        <item quantity="other">%1$d дни</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d часа</item>
+        <item quantity="other">%1$d часа</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-ca-rES/strings.xml b/pump-common/src/main/res/values-ca-rES/strings.xml
index 33c77af761..9c30e430ff 100644
--- a/pump-common/src/main/res/values-ca-rES/strings.xml
+++ b/pump-common/src/main/res/values-ca-rES/strings.xml
@@ -1,11 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operació no compatible amb la bomba i/o controlador.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operació no compatible ENCARA amb la bomba.</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">Iniciant</string>
+    <string name="pump_status_error_comm">Error de comunicació</string>
+    <string name="pump_status_timeout_comm">Temps d\'espera excedit en la comunicació</string>
+    <string name="pump_status_pump_unreachable">Bomba no accessible</string>
+    <string name="pump_status_invalid_config">Configuració no vàlida</string>
+    <string name="pump_status_active">Activa</string>
+    <string name="pump_status_sleeping">En suspens</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basals</string>
+    <string name="history_group_configuration">Configuracions</string>
+    <string name="history_group_notification">Avisos</string>
+    <string name="history_group_statistic">Estadístiques</string>
+    <string name="history_group_unknown">Desconeguts</string>
+    <string name="history_group_all">Tots</string>
+    <string name="history_group_bolus">Bolus</string>
+    <string name="history_group_prime">Encebaments</string>
+    <string name="history_group_alarm">Alarmes</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dia</item>
+        <item quantity="other">%1$d dies</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d hora</item>
+        <item quantity="other">%1$d hores</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-cs-rCZ/strings.xml b/pump-common/src/main/res/values-cs-rCZ/strings.xml
index 5a147c6ca5..82ff929227 100644
--- a/pump-common/src/main/res/values-cs-rCZ/strings.xml
+++ b/pump-common/src/main/res/values-cs-rCZ/strings.xml
@@ -5,6 +5,7 @@
     <string name="pump_operation_not_yet_supported_by_pump">Operace prozatím pumpou nepodporována.</string>
     <string name="common_resultok">OK</string>
     <string name="pump_serial_number">Sériové číslo pumpy</string>
+    <string name="bolus_delivered">Vydáno %1$.2f U / %2$.2f U</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Nikdy nekontaktováno</string>
     <string name="pump_status_waking_up">Probouzení</string>
diff --git a/pump-common/src/main/res/values-da-rDK/strings.xml b/pump-common/src/main/res/values-da-rDK/strings.xml
index 33c77af761..3fb031c1f9 100644
--- a/pump-common/src/main/res/values-da-rDK/strings.xml
+++ b/pump-common/src/main/res/values-da-rDK/strings.xml
@@ -1,11 +1,90 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operationen understøttes ikke af pumpen og/eller driveren.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operationen er ikke understøttet af pumpen ENDNU.</string>
+    <string name="common_resultok">OK</string>
+    <string name="pump_serial_number">Pumpe Serienummer</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Aldrig kontaktet</string>
+    <string name="pump_status_waking_up">Vågner</string>
+    <string name="pump_status_error_comm">Fejl i kommunikation</string>
+    <string name="pump_status_timeout_comm">Timeout ved kommunikation</string>
+    <string name="pump_status_pump_unreachable">Pumpe utilgængelig</string>
+    <string name="pump_status_invalid_config">Ugyldig konfiguration</string>
+    <string name="pump_status_active">Aktiv</string>
+    <string name="pump_status_sleeping">Sover</string>
+    <string name="pump_status_not_initialized">Ikke initialiseret</string>
+    <string name="pump_status_initialized">Initialiseret</string>
+    <string name="pump_status_encrypt">Krypterer kommunikation</string>
+    <string name="pump_status_ready">Klar</string>
+    <string name="pump_status_busy">Optaget</string>
+    <string name="pump_status_suspended">Sat på pause</string>
+    <string name="pump_status_executing_command">Udfører Kommando</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basaler</string>
+    <string name="history_group_configuration">Konfigurationer</string>
+    <string name="history_group_notification">Notifikationer</string>
+    <string name="history_group_statistic">Statistikker</string>
+    <string name="history_group_unknown">Ukendte</string>
+    <string name="history_group_all">Alle</string>
+    <string name="history_group_bolus">Bolusser</string>
+    <string name="history_group_prime">Klargør</string>
+    <string name="history_group_alarm">Alarmer</string>
+    <string name="history_group_glucose">Blodsukker</string>
+    <string name="history_group_base">Grundlæggende</string>
+    <string name="history_group_other">Andet</string>
+    <string name="history_group_events">Alle Begivenheder</string>
+    <string name="history_group_events_no_stat">Begivenheder (ingen statistik)</string>
     <!-- Time -->
+    <string name="time_today">I dag</string>
+    <string name="time_last_hour">Seneste time</string>
+    <string name="time_last_3_hours">Seneste 3 timer</string>
+    <string name="time_last_6_hours">Seneste 6 timer</string>
+    <string name="time_last_12_hours">Seneste 12 timer</string>
+    <string name="time_last_2_days">Seneste 2 dage</string>
+    <string name="time_last_4_days">Seneste 4 dage</string>
+    <string name="time_last_week">Seneste uge</string>
+    <string name="time_last_month">Seneste måned</string>
     <!-- BLE Config -->
+    <string name="ble_config_button_scan_start">Scan</string>
+    <string name="ble_config_scan_stop">Stop</string>
+    <string name="ble_config_scan_selected">Valgt</string>
+    <string name="ble_config_scan_scanning">Scanning</string>
+    <string name="ble_config_scan_finished">Scanning fuldendt</string>
+    <string name="ble_config_scan_error">Scanningsfejl: %1$d</string>
+    <string name="ble_config_connected_never">Aldrig</string>
+    <string name="ble_config_remove">Fjern</string>
     <!-- BLE Errors -->
+    <string name="ble_error_bt_disabled">Bluetooth er deaktiveret</string>
+    <string name="ble_error_no_bt_adapter">Ingen bluetooth adapter</string>
+    <string name="ble_error_configured_pump_not_found">Konfigureret pumpe Ikke fundet</string>
+    <string name="ble_error_pump_unreachable">Pumpe utilgængelig</string>
+    <string name="ble_error_failed_to_conn_to_ble_device">Kunne Ikke forbinde til BLE enheden</string>
+    <string name="ble_error_encryption_failed">Kryptering mislykkedes</string>
+    <string name="ble_error_pump_found_unbonded">Fandt pumpe som ikke er forbundet</string>
     <!-- Pump Error -->
+    <string name="pump_settings_error_basal_profiles_not_enabled">Basalprofil indstilling er ikke aktiveret på pumpen. Aktiver den på pumpen.</string>
+    <string name="pump_settings_error_incorrect_basal_profile_selected">Basal profil indstillet på pumpe er forkert (skal være %s).</string>
+    <string name="pump_settings_error_wrong_tbr_type_set">Forkert midlertidig basal type indstillet på pumpe (skal være %s).</string>
+    <string name="pump_settings_error_wrong_max_bolus_set">Forkert Max Bolus sat på Pump (skal være %1$.2f).</string>
+    <string name="pump_settings_error_wrong_max_basal_set">Forkert Max Basal sat på Pump (skal være %1$.2f).</string>
     <!-- Pump History -->
+    <string name="pump_history_type">Type:</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dage</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d time</item>
+        <item quantity="other">%1$d timer</item>
+    </plurals>
+    <plurals name="hoursago">
+        <item quantity="one">%1$d time siden</item>
+        <item quantity="other">%1$d timer siden</item>
+    </plurals>
+    <plurals name="daysago">
+        <item quantity="one">%1$d dag siden</item>
+        <item quantity="other">%1$d dage siden</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-de-rDE/strings.xml b/pump-common/src/main/res/values-de-rDE/strings.xml
index 33c77af761..a67ea2b760 100644
--- a/pump-common/src/main/res/values-de-rDE/strings.xml
+++ b/pump-common/src/main/res/values-de-rDE/strings.xml
@@ -1,11 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Aktion von Pumpe und/oder Treiber nicht unterstützt.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operation NOCH NICHT von Pumpe unterstützt.</string>
+    <string name="common_resultok">OK</string>
+    <string name="pump_serial_number">Seriennummer der Pumpe</string>
+    <string name="bolus_delivered">%1$.2f IE / %2$.2f IE abgegeben</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Nie verbunden</string>
+    <string name="pump_status_waking_up">Aufwecken</string>
+    <string name="pump_status_error_comm">Fehler bei der Kommunikation</string>
+    <string name="pump_status_timeout_comm">Zeitüberschreitung bei Kommunikation</string>
+    <string name="pump_status_pump_unreachable">Pumpe nicht erreichbar</string>
+    <string name="pump_status_invalid_config">Ungültige Einstellung</string>
+    <string name="pump_status_active">Aktiv</string>
+    <string name="pump_status_sleeping">Schlafen</string>
+    <string name="pump_status_not_initialized">Nicht initialisiert</string>
+    <string name="pump_status_initialized">Initialisiert</string>
+    <string name="pump_status_encrypt">Kommunikation verschlüsseln</string>
+    <string name="pump_status_ready">Bereit</string>
+    <string name="pump_status_busy">Beschäftigt</string>
+    <string name="pump_status_suspended">Angehalten</string>
+    <string name="pump_status_executing_command">Befehl ausführen</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basal</string>
+    <string name="history_group_configuration">Konfigurationen</string>
+    <string name="history_group_notification">Benachrichtigungen</string>
+    <string name="history_group_statistic">Statistiken</string>
+    <string name="history_group_unknown">Unbekannte</string>
+    <string name="history_group_all">Alle</string>
+    <string name="history_group_bolus">Boli</string>
+    <string name="history_group_prime">Füllen</string>
+    <string name="history_group_alarm">Alarme</string>
+    <string name="history_group_glucose">Glukose</string>
+    <string name="history_group_base">Basis</string>
+    <string name="history_group_other">Anderes</string>
+    <string name="history_group_events">Alle Events</string>
+    <string name="history_group_events_no_stat">Events (keine Statistik)</string>
     <!-- Time -->
+    <string name="time_today">Heute</string>
+    <string name="time_last_hour">Letzte Stunde</string>
+    <string name="time_last_3_hours">Letzte 3 Stunden</string>
+    <string name="time_last_6_hours">Letzte 6 Stunden</string>
+    <string name="time_last_12_hours">Letzte 12 Stunden</string>
+    <string name="time_last_2_days">Letzte 2 Tage</string>
+    <string name="time_last_4_days">Letzte 4 Tage</string>
+    <string name="time_last_week">Letzte Woche</string>
+    <string name="time_last_month">Letzter Monat</string>
     <!-- BLE Config -->
+    <string name="ble_config_button_scan_start">Scannen</string>
+    <string name="ble_config_scan_stop">Stopp</string>
+    <string name="ble_config_scan_selected">Ausgewählt</string>
+    <string name="ble_config_scan_scanning">Scannt</string>
+    <string name="ble_config_scan_finished">Scannen abgeschlossen</string>
+    <string name="ble_config_scan_error">Scanfehler: %1$d</string>
+    <string name="ble_config_connected_never">Nie</string>
+    <string name="ble_config_remove">Löschen</string>
     <!-- BLE Errors -->
+    <string name="ble_error_bt_disabled">Bluetooth ist deaktiviert</string>
+    <string name="ble_error_no_bt_adapter">Kein Bluetooth-Adapter</string>
+    <string name="ble_error_configured_pump_not_found">Konfigurierte Pumpe nicht gefunden</string>
+    <string name="ble_error_pump_unreachable">Pumpe nicht erreichbar</string>
+    <string name="ble_error_failed_to_conn_to_ble_device">Verbindung zum BLE-Gerät fehlgeschlagen</string>
+    <string name="ble_error_encryption_failed">Verschlüsselung fehlgeschlagen</string>
+    <string name="ble_error_pump_found_unbonded">Nicht gebundene Pumpe gefunden</string>
     <!-- Pump Error -->
+    <string name="pump_settings_error_basal_profiles_not_enabled">Einstellung für Basalprofile/-muster ist auf der Pumpe nicht aktiviert. Aktiviere es auf der Pumpe.</string>
+    <string name="pump_settings_error_incorrect_basal_profile_selected">Basalprofil auf Pumpe ist falsch (muss %s sein).</string>
+    <string name="pump_settings_error_wrong_tbr_type_set">Falscher TBR-Typ auf der Pumpe (muss %s sein).</string>
+    <string name="pump_settings_error_wrong_max_bolus_set">Falscher Max-Bolus auf Pumpe eingestellt (muss %1$.2f sein).</string>
+    <string name="pump_settings_error_wrong_max_basal_set">Falsche Max-Basal auf Pumpe eingestellt (muss %1$.2f sein).</string>
     <!-- Pump History -->
+    <string name="pump_history_type">Typ:</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d Tag</item>
+        <item quantity="other">%1$d Tage</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d Stunde</item>
+        <item quantity="other">%1$d Stunden</item>
+    </plurals>
+    <plurals name="hoursago">
+        <item quantity="one">Vor %1$d Stunde(n)</item>
+        <item quantity="other">Vor %1$d Stunden</item>
+    </plurals>
+    <plurals name="daysago">
+        <item quantity="one">Vor %1$d Tage</item>
+        <item quantity="other">Vor %1$d Tagen</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-el-rGR/strings.xml b/pump-common/src/main/res/values-el-rGR/strings.xml
index 33c77af761..11a7c88fb4 100644
--- a/pump-common/src/main/res/values-el-rGR/strings.xml
+++ b/pump-common/src/main/res/values-el-rGR/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Η λειτουργία δεν υποστηρίζεται ΑΚΟΜΑ από την αντλία.</string>
     <!-- PumpCommon - Pump Status -->
     <!-- PumpCommon - History Group -->
     <!-- Time -->
diff --git a/pump-common/src/main/res/values-es-rES/strings.xml b/pump-common/src/main/res/values-es-rES/strings.xml
index 24850a5c07..2f69dba75d 100644
--- a/pump-common/src/main/res/values-es-rES/strings.xml
+++ b/pump-common/src/main/res/values-es-rES/strings.xml
@@ -5,6 +5,7 @@
     <string name="pump_operation_not_yet_supported_by_pump">Operación no soportada todavía por la bomba.</string>
     <string name="common_resultok">OK</string>
     <string name="pump_serial_number">Número de serie de la bomba</string>
+    <string name="bolus_delivered">%1$.2f U / %2$.2f U entregado</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Nunca contactado</string>
     <string name="pump_status_waking_up">En fase de inicio</string>
diff --git a/pump-common/src/main/res/values-fr-rFR/strings.xml b/pump-common/src/main/res/values-fr-rFR/strings.xml
index 5a8c14e3e7..c983d9cde7 100644
--- a/pump-common/src/main/res/values-fr-rFR/strings.xml
+++ b/pump-common/src/main/res/values-fr-rFR/strings.xml
@@ -5,6 +5,7 @@
     <string name="pump_operation_not_yet_supported_by_pump">Opération PAS ENCORE supportée par la pompe.</string>
     <string name="common_resultok">OK</string>
     <string name="pump_serial_number">Numéro de série de la pompe</string>
+    <string name="bolus_delivered">%1$.2fU / %2$.2fU injectés</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Jamais contacté</string>
     <string name="pump_status_waking_up">Réveil en cours</string>
diff --git a/pump-common/src/main/res/values-hu-rHU/strings.xml b/pump-common/src/main/res/values-hu-rHU/strings.xml
index 33c77af761..9453621bea 100644
--- a/pump-common/src/main/res/values-hu-rHU/strings.xml
+++ b/pump-common/src/main/res/values-hu-rHU/strings.xml
@@ -8,4 +8,12 @@
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d nap</item>
+        <item quantity="other">%1$d nap</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d óra</item>
+        <item quantity="other">%1$d óra</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-it-rIT/strings.xml b/pump-common/src/main/res/values-it-rIT/strings.xml
index 010278c8ce..af17f3e0a7 100644
--- a/pump-common/src/main/res/values-it-rIT/strings.xml
+++ b/pump-common/src/main/res/values-it-rIT/strings.xml
@@ -5,6 +5,7 @@
     <string name="pump_operation_not_yet_supported_by_pump">Operazione NON ANCORA supportata dal micro.</string>
     <string name="common_resultok">OK</string>
     <string name="pump_serial_number">Numero seriale micro</string>
+    <string name="bolus_delivered">%1$.2f U / %2$.2f U erogate</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Mai connesso</string>
     <string name="pump_status_waking_up">Risveglio</string>
diff --git a/pump-common/src/main/res/values-iw-rIL/strings.xml b/pump-common/src/main/res/values-iw-rIL/strings.xml
index da2dfd704a..39fdd67134 100644
--- a/pump-common/src/main/res/values-iw-rIL/strings.xml
+++ b/pump-common/src/main/res/values-iw-rIL/strings.xml
@@ -4,6 +4,8 @@
     <string name="pump_operation_not_supported_by_pump_driver">הפעולה לא נתמכת ע\"י המשאבה ו\\או מנהל ההתקן.</string>
     <string name="pump_operation_not_yet_supported_by_pump">הפעולה עוד לא נתמכת על ידי המשאבה.</string>
     <string name="common_resultok">אישור</string>
+    <string name="pump_serial_number">המספר הסידורי של המשאבה</string>
+    <string name="bolus_delivered">%1$.2f יח\' מתוך %2$.2f יח\' הוזרקו</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">מעולם לא נוצר קשר</string>
     <string name="pump_status_waking_up">מתעורר</string>
@@ -13,6 +15,13 @@
     <string name="pump_status_invalid_config">תצורה לא חוקית</string>
     <string name="pump_status_active">פעיל</string>
     <string name="pump_status_sleeping">שינה</string>
+    <string name="pump_status_not_initialized">לא מאותחל</string>
+    <string name="pump_status_initialized">מאותחל</string>
+    <string name="pump_status_encrypt">מצפין תקשורת</string>
+    <string name="pump_status_ready">מוכן</string>
+    <string name="pump_status_busy">עסוק</string>
+    <string name="pump_status_suspended">מושהה</string>
+    <string name="pump_status_executing_command">מבצע פקודה</string>
     <!-- PumpCommon - History Group -->
     <string name="history_group_basal">בזאלים</string>
     <string name="history_group_configuration">תצורות</string>
@@ -24,9 +33,67 @@
     <string name="history_group_prime">תיחול</string>
     <string name="history_group_alarm">התראות</string>
     <string name="history_group_glucose">גלוקוז</string>
+    <string name="history_group_base">בסיס</string>
+    <string name="history_group_other">אחר</string>
+    <string name="history_group_events">כל האירועים</string>
+    <string name="history_group_events_no_stat">אירועים(ללא סטטיסטיקה)</string>
     <!-- Time -->
+    <string name="time_today">היום</string>
+    <string name="time_last_hour">בשעה האחרונה</string>
+    <string name="time_last_3_hours">ב-3 השעות האחרונות</string>
+    <string name="time_last_6_hours">ב-6 השעות האחרונות</string>
+    <string name="time_last_12_hours">ב-12 השעות האחרונות</string>
+    <string name="time_last_2_days">ביומיים אחרונים</string>
+    <string name="time_last_4_days">ב-4 הימים האחרונים</string>
+    <string name="time_last_week">בשבוע שעבר</string>
+    <string name="time_last_month">בחודש שעבר</string>
     <!-- BLE Config -->
+    <string name="ble_config_button_scan_start">סריקה</string>
+    <string name="ble_config_scan_stop">עצור</string>
+    <string name="ble_config_scan_selected">נבחר</string>
+    <string name="ble_config_scan_scanning">סורק</string>
+    <string name="ble_config_scan_finished">הסריקה הושלמה</string>
+    <string name="ble_config_scan_error">שגיאת סריקה: %1$d</string>
+    <string name="ble_config_connected_never">אף פעם</string>
+    <string name="ble_config_remove">הסרה</string>
     <!-- BLE Errors -->
+    <string name="ble_error_bt_disabled">בלוטות\' כבוי</string>
+    <string name="ble_error_no_bt_adapter">אין מתאם בלוטות\'</string>
+    <string name="ble_error_configured_pump_not_found">לא נמצאה משאבה מוגדרת</string>
+    <string name="ble_error_pump_unreachable">המשאבה אינה זמינה</string>
+    <string name="ble_error_failed_to_conn_to_ble_device">נכשל החיבור למכשיר בלוטות\'</string>
+    <string name="ble_error_encryption_failed">ההצפנה נכשלה</string>
+    <string name="ble_error_pump_found_unbonded">נמצאה משאבה שאינה מצומדת</string>
     <!-- Pump Error -->
+    <string name="pump_settings_error_basal_profiles_not_enabled">הגדרת פרופילי הבזאלי\\תבניות אינה מאופשרת במשאבה. הפעילו אותן בגוף המשאבה.</string>
+    <string name="pump_settings_error_incorrect_basal_profile_selected">הפרופיל הבזאלי שהוגדר במשאבה שגוי (חייב להיות %s).</string>
+    <string name="pump_settings_error_wrong_tbr_type_set">סוג הבזאלי הזמני שהוגדר במשאבה שגוי (חייב להיות %s).</string>
+    <string name="pump_settings_error_wrong_max_bolus_set">מינון הבולוס המרבי המוגדר במשאבה אינו נכון (חייב להיות %1$.2f).</string>
+    <string name="pump_settings_error_wrong_max_basal_set">המינון הבזאלי המרבי המוגדר במשאבה אינו נכון (חייב להיות %1$.2f).</string>
     <!-- Pump History -->
+    <string name="pump_history_type">סוג:</string>
+    <plurals name="duration_days">
+        <item quantity="one">יום %1$d</item>
+        <item quantity="two">יומיים</item>
+        <item quantity="many">%1$d ימים</item>
+        <item quantity="other">%1$d ימים</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">שעה</item>
+        <item quantity="two">שעתיים</item>
+        <item quantity="many">%1$d שעות</item>
+        <item quantity="other">%1$d שעות</item>
+    </plurals>
+    <plurals name="hoursago">
+        <item quantity="one">לפני שעה</item>
+        <item quantity="two">לפני שעתיים</item>
+        <item quantity="many">לפני %1$d שעות</item>
+        <item quantity="other">לפני %1$d שעות</item>
+    </plurals>
+    <plurals name="daysago">
+        <item quantity="one">לפני יום אחד</item>
+        <item quantity="two">לפני יומיים</item>
+        <item quantity="many">לפני %1$d ימים</item>
+        <item quantity="other">לפני %1$d ימים</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-ko-rKR/strings.xml b/pump-common/src/main/res/values-ko-rKR/strings.xml
index 33c77af761..e247034563 100644
--- a/pump-common/src/main/res/values-ko-rKR/strings.xml
+++ b/pump-common/src/main/res/values-ko-rKR/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">펌프에서 지원되지 않는 작동.</string>
     <!-- PumpCommon - Pump Status -->
     <!-- PumpCommon - History Group -->
     <!-- Time -->
@@ -8,4 +9,10 @@
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="other">%1$d 일</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="other">%1$d 시간</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-lt-rLT/strings.xml b/pump-common/src/main/res/values-lt-rLT/strings.xml
index 33c77af761..84e1d1c00b 100644
--- a/pump-common/src/main/res/values-lt-rLT/strings.xml
+++ b/pump-common/src/main/res/values-lt-rLT/strings.xml
@@ -1,11 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Pompa ir/ar jos valdiklis nepalaiko operacijos.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Pompa dar nepalaiko operacijos.</string>
+    <string name="common_resultok">Gerai</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">Pažadinimas</string>
+    <string name="pump_status_error_comm">Ryšio klaida</string>
+    <string name="pump_status_timeout_comm">Ryšiui skirtas laikas baigėsi</string>
+    <string name="pump_status_pump_unreachable">Pompa nepasiekiama</string>
+    <string name="pump_status_invalid_config">Neteisinga konfigūracija</string>
+    <string name="pump_status_active">Aktyvi</string>
+    <string name="pump_status_sleeping">Užmigusi</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Bazė</string>
+    <string name="history_group_configuration">Nustatymai</string>
+    <string name="history_group_notification">Pranešimai</string>
+    <string name="history_group_statistic">Statistika</string>
+    <string name="history_group_unknown">Nežinoma</string>
+    <string name="history_group_all">Visi</string>
+    <string name="history_group_bolus">Bolusai</string>
+    <string name="history_group_prime">Užpildyti sistemą</string>
+    <string name="history_group_alarm">Aliarmai</string>
+    <string name="history_group_glucose">Gliukozė</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d d.</item>
+        <item quantity="few">%1$d d.</item>
+        <item quantity="many">%1$d d.</item>
+        <item quantity="other">%1$d d.</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d val.</item>
+        <item quantity="few">%1$d val.</item>
+        <item quantity="many">%1$d val.</item>
+        <item quantity="other">%1$d val.</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-no-rNO/strings.xml b/pump-common/src/main/res/values-no-rNO/strings.xml
index 560538d7cb..1cb9a104f8 100644
--- a/pump-common/src/main/res/values-no-rNO/strings.xml
+++ b/pump-common/src/main/res/values-no-rNO/strings.xml
@@ -5,6 +5,7 @@
     <string name="pump_operation_not_yet_supported_by_pump">Operasjonen støttes ikke av pumpen ennå.</string>
     <string name="common_resultok">OK</string>
     <string name="pump_serial_number">Pumpens serienummer</string>
+    <string name="bolus_delivered">%1$.2f E / %2$.2f E levert</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Aldri kontaktet</string>
     <string name="pump_status_waking_up">Våkner opp</string>
diff --git a/pump-common/src/main/res/values-pl-rPL/strings.xml b/pump-common/src/main/res/values-pl-rPL/strings.xml
index 33c77af761..b306d45c6e 100644
--- a/pump-common/src/main/res/values-pl-rPL/strings.xml
+++ b/pump-common/src/main/res/values-pl-rPL/strings.xml
@@ -3,9 +3,22 @@
     <!-- PumoCommon - Pump Abstract -->
     <!-- PumpCommon - Pump Status -->
     <!-- PumpCommon - History Group -->
+    <string name="history_group_prime">Napełnianie</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dzień</item>
+        <item quantity="few">%1$d dni</item>
+        <item quantity="many">%1$d dni</item>
+        <item quantity="other">%1$d dni</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d godzina</item>
+        <item quantity="few">%1$d godziny</item>
+        <item quantity="many">%1$d godzin</item>
+        <item quantity="other">%1$d godzin</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-pt-rBR/strings.xml b/pump-common/src/main/res/values-pt-rBR/strings.xml
index 33c77af761..770dc80acb 100644
--- a/pump-common/src/main/res/values-pt-rBR/strings.xml
+++ b/pump-common/src/main/res/values-pt-rBR/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operação não suportada ainda pela Bomba.</string>
     <!-- PumpCommon - Pump Status -->
     <!-- PumpCommon - History Group -->
     <!-- Time -->
diff --git a/pump-common/src/main/res/values-pt-rPT/strings.xml b/pump-common/src/main/res/values-pt-rPT/strings.xml
index 33c77af761..77bc7ca340 100644
--- a/pump-common/src/main/res/values-pt-rPT/strings.xml
+++ b/pump-common/src/main/res/values-pt-rPT/strings.xml
@@ -1,11 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operação não suportada pela Bomba e/ou Controlador.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operação não suportada ainda pela Bomba.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">A acordar</string>
+    <string name="pump_status_error_comm">Erro com comunicação</string>
+    <string name="pump_status_timeout_comm">Tempo limite para comunicação</string>
+    <string name="pump_status_pump_unreachable">Bomba inacessível</string>
+    <string name="pump_status_invalid_config">Configuração inválida</string>
+    <string name="pump_status_active">Activo</string>
+    <string name="pump_status_sleeping">A dormir</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basais</string>
+    <string name="history_group_configuration">Configurações</string>
+    <string name="history_group_notification">Notificações</string>
+    <string name="history_group_statistic">Estatísticas</string>
+    <string name="history_group_unknown">Desconhecido</string>
+    <string name="history_group_all">Tudo</string>
+    <string name="history_group_bolus">Bólus</string>
+    <string name="history_group_prime">Purgar</string>
+    <string name="history_group_alarm">Alarmes</string>
+    <string name="history_group_glucose">Glucose</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dia</item>
+        <item quantity="other">%1$d dias</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d hora</item>
+        <item quantity="other">%1$d horas</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-ro-rRO/strings.xml b/pump-common/src/main/res/values-ro-rRO/strings.xml
index 33c77af761..5ef0652d1d 100644
--- a/pump-common/src/main/res/values-ro-rRO/strings.xml
+++ b/pump-common/src/main/res/values-ro-rRO/strings.xml
@@ -1,11 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operațiunea nu este suportată de către pompă și/sau driver.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operațiunea nu este ÎNCĂ suportată de către pompă.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">Se pornește</string>
+    <string name="pump_status_error_comm">Eroare de comunicație</string>
+    <string name="pump_status_timeout_comm">Comunicația nu a reușit la timp</string>
+    <string name="pump_status_pump_unreachable">Pompă indisponibilă</string>
+    <string name="pump_status_invalid_config">Configurație invalidă</string>
+    <string name="pump_status_active">Activă</string>
+    <string name="pump_status_sleeping">În repaus</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Bazale</string>
+    <string name="history_group_configuration">Configurații</string>
+    <string name="history_group_notification">Notificări</string>
+    <string name="history_group_statistic">Statistici</string>
+    <string name="history_group_unknown">Necunoscute</string>
+    <string name="history_group_all">Toate</string>
+    <string name="history_group_bolus">Bolusuri</string>
+    <string name="history_group_prime">Amorsare</string>
+    <string name="history_group_alarm">Alarme</string>
+    <string name="history_group_glucose">Glicemie</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d zi</item>
+        <item quantity="few">%1$d zile</item>
+        <item quantity="other">%1$d zile</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d oră</item>
+        <item quantity="few">%1$d ore</item>
+        <item quantity="other">%1$d ore</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-ru-rRU/strings.xml b/pump-common/src/main/res/values-ru-rRU/strings.xml
index f6655e4645..f4cdec2277 100644
--- a/pump-common/src/main/res/values-ru-rRU/strings.xml
+++ b/pump-common/src/main/res/values-ru-rRU/strings.xml
@@ -5,6 +5,7 @@
     <string name="pump_operation_not_yet_supported_by_pump">Операция ЕЩЕ не поддерживается помпой.</string>
     <string name="common_resultok">OK</string>
     <string name="pump_serial_number">Серийный номер помпы</string>
+    <string name="bolus_delivered">Подано %1$.2fед / %2$.2fед</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Никогда не подключалась</string>
     <string name="pump_status_waking_up">Пробуждение</string>
@@ -40,8 +41,59 @@
     <string name="time_today">Сегодня</string>
     <string name="time_last_hour">За прошедший час</string>
     <string name="time_last_3_hours">За прошедшие 3 часа</string>
+    <string name="time_last_6_hours">За прошедшие 6 часов</string>
+    <string name="time_last_12_hours">За прошедшие 12 часов</string>
+    <string name="time_last_2_days">За прошедшие 2 дня</string>
+    <string name="time_last_4_days">За прошедшие 4 дня</string>
+    <string name="time_last_week">За прошедшую неделю</string>
+    <string name="time_last_month">За прошлый месяц</string>
     <!-- BLE Config -->
+    <string name="ble_config_button_scan_start">Сканирование</string>
+    <string name="ble_config_scan_stop">Прервать</string>
+    <string name="ble_config_scan_selected">Выбрано</string>
+    <string name="ble_config_scan_scanning">Сканирование</string>
+    <string name="ble_config_scan_finished">Сканирование завершено</string>
+    <string name="ble_config_scan_error">Ошибка сканирования: %1$d</string>
+    <string name="ble_config_connected_never">Не было</string>
+    <string name="ble_config_remove">Удалить</string>
     <!-- BLE Errors -->
+    <string name="ble_error_bt_disabled">Bluetooth выключен</string>
+    <string name="ble_error_no_bt_adapter">Адаптер Bluetooth не найден</string>
+    <string name="ble_error_configured_pump_not_found">Сконфигурированная помпа не найдена</string>
+    <string name="ble_error_pump_unreachable">Помпа недоступна</string>
+    <string name="ble_error_failed_to_conn_to_ble_device">Не удалось подключиться к устройству BLE</string>
+    <string name="ble_error_encryption_failed">Ошибка шифрования</string>
+    <string name="ble_error_pump_found_unbonded">Найдена несопряженная помпа</string>
     <!-- Pump Error -->
+    <string name="pump_settings_error_basal_profiles_not_enabled">Базальные профили/настройки шаблонов не активированы в помпе. Включите их на помпе.</string>
+    <string name="pump_settings_error_incorrect_basal_profile_selected">Базальный профиль на помпе неверен (должен быть %s).</string>
+    <string name="pump_settings_error_wrong_tbr_type_set">Неверный тип временной скорости базала TBR на помпе (должен быть %s).</string>
+    <string name="pump_settings_error_wrong_max_bolus_set">На помпе задан неверный макс болюс (должен быть %1$.2f).</string>
+    <string name="pump_settings_error_wrong_max_basal_set">На помпе задан неверный макс базал (должен быть %1$.2f).</string>
     <!-- Pump History -->
+    <string name="pump_history_type">Тип:</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d день</item>
+        <item quantity="few">%1$d дня</item>
+        <item quantity="many">%1$d дней</item>
+        <item quantity="other">%1$d дн</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d час</item>
+        <item quantity="few">%1$d часа</item>
+        <item quantity="many">%1$d часов</item>
+        <item quantity="other">%1$d ч</item>
+    </plurals>
+    <plurals name="hoursago">
+        <item quantity="one">%1$d час назад</item>
+        <item quantity="few">%1$d часа назад</item>
+        <item quantity="many">%1$d часов назад</item>
+        <item quantity="other">%1$d ч назад</item>
+    </plurals>
+    <plurals name="daysago">
+        <item quantity="one">%1$d день назад</item>
+        <item quantity="few">%1$d дня назад</item>
+        <item quantity="many">%1$d дней назад</item>
+        <item quantity="other">%1$d дн назад</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-sk-rSK/strings.xml b/pump-common/src/main/res/values-sk-rSK/strings.xml
index 2c707642f5..fb265967e8 100644
--- a/pump-common/src/main/res/values-sk-rSK/strings.xml
+++ b/pump-common/src/main/res/values-sk-rSK/strings.xml
@@ -4,6 +4,8 @@
     <string name="pump_operation_not_supported_by_pump_driver">Operácia nepodporovaná pumpou a/alebo ovládačom.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Operácia zatiaľ nepodporovaná pumpou.</string>
     <string name="common_resultok">OK</string>
+    <string name="pump_serial_number">Sériové číslo pumpy</string>
+    <string name="bolus_delivered">Podané %1$.2f JI / %2$.2f JI</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Nikdy nepripojené</string>
     <string name="pump_status_waking_up">Prebúdzanie</string>
@@ -13,6 +15,13 @@
     <string name="pump_status_invalid_config">Neplatná konfigurácia</string>
     <string name="pump_status_active">Aktívna</string>
     <string name="pump_status_sleeping">Spiaca</string>
+    <string name="pump_status_not_initialized">Nie je inicializovaný</string>
+    <string name="pump_status_initialized">Inicializované</string>
+    <string name="pump_status_encrypt">Šifrovanie komunikácie</string>
+    <string name="pump_status_ready">Pripravený</string>
+    <string name="pump_status_busy">Zaneprázdnený</string>
+    <string name="pump_status_suspended">Pozastavené</string>
+    <string name="pump_status_executing_command">Vykonávanie príkazu</string>
     <!-- PumpCommon - History Group -->
     <string name="history_group_basal">Bazály</string>
     <string name="history_group_configuration">Konfigurácie</string>
@@ -24,9 +33,67 @@
     <string name="history_group_prime">Plnenie</string>
     <string name="history_group_alarm">Alarmy</string>
     <string name="history_group_glucose">Glykémia</string>
+    <string name="history_group_base">Základ</string>
+    <string name="history_group_other">Iné</string>
+    <string name="history_group_events">Všetky udalosti</string>
+    <string name="history_group_events_no_stat">Udalosti (bez štatistík)</string>
     <!-- Time -->
+    <string name="time_today">Dnes</string>
+    <string name="time_last_hour">Posledná hodina</string>
+    <string name="time_last_3_hours">Posledné 3 hodiny</string>
+    <string name="time_last_6_hours">Posledných 6 hodín</string>
+    <string name="time_last_12_hours">Posledných 12 hodín</string>
+    <string name="time_last_2_days">Posledné 2 dni</string>
+    <string name="time_last_4_days">Posledné 4 dni</string>
+    <string name="time_last_week">Posledný týždeň</string>
+    <string name="time_last_month">Posledný mesiac</string>
     <!-- BLE Config -->
+    <string name="ble_config_button_scan_start">Vyhľadávanie</string>
+    <string name="ble_config_scan_stop">Stop</string>
+    <string name="ble_config_scan_selected">Vybrané</string>
+    <string name="ble_config_scan_scanning">Vyhľadávanie</string>
+    <string name="ble_config_scan_finished">Vyhľadávanie dokončené</string>
+    <string name="ble_config_scan_error">Chyba vyhľadávania: %1$d</string>
+    <string name="ble_config_connected_never">Nikdy</string>
+    <string name="ble_config_remove">Vymazať</string>
     <!-- BLE Errors -->
+    <string name="ble_error_bt_disabled">Bluetooth je deaktivované</string>
+    <string name="ble_error_no_bt_adapter">Žiadny Bluetooth adaptér</string>
+    <string name="ble_error_configured_pump_not_found">Konfigurovaná pumpa nenájdená</string>
+    <string name="ble_error_pump_unreachable">Pumpa nedostupná</string>
+    <string name="ble_error_failed_to_conn_to_ble_device">Nepodarilo sa pripojiť k BLE zariadeniu</string>
+    <string name="ble_error_encryption_failed">Šifrovanie zlyhalo</string>
+    <string name="ble_error_pump_found_unbonded">Nájdená nespárovaná pumpa</string>
     <!-- Pump Error -->
+    <string name="pump_settings_error_basal_profiles_not_enabled">Nastavenie bazálnych profilov/vzorov nie je na pumpe povolené. Povoľte ich na pumpe.</string>
+    <string name="pump_settings_error_incorrect_basal_profile_selected">Bazálny profil nastavený na pumpe je nesprávny (musí byť %s).</string>
+    <string name="pump_settings_error_wrong_tbr_type_set">Chybný typ dočasného bazálu nastavený na pumpe (musí byť %s).</string>
+    <string name="pump_settings_error_wrong_max_bolus_set">Chybný max. bolus na pumpe (musí byť %1$.2f).</string>
+    <string name="pump_settings_error_wrong_max_basal_set">Chybný max. bazál na pumpe (musí byť %1$.2f).</string>
     <!-- Pump History -->
+    <string name="pump_history_type">Typ:</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d deň</item>
+        <item quantity="few">%1$d dní</item>
+        <item quantity="many">%1$d dní</item>
+        <item quantity="other">%1$d dní</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d hodina</item>
+        <item quantity="few">%1$d hodín</item>
+        <item quantity="many">%1$d hodín</item>
+        <item quantity="other">%1$d hodín</item>
+    </plurals>
+    <plurals name="hoursago">
+        <item quantity="one">Pred %1$d hodinou</item>
+        <item quantity="few">Pred %1$d hodinami</item>
+        <item quantity="many">Pred %1$d hodinami</item>
+        <item quantity="other">Pred %1$d hodinami</item>
+    </plurals>
+    <plurals name="daysago">
+        <item quantity="one">Pred %1$d dňom</item>
+        <item quantity="few">Pred %1$d dňami</item>
+        <item quantity="many">Pred %1$d dňami</item>
+        <item quantity="other">Pred %1$d dňami</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-sv-rSE/strings.xml b/pump-common/src/main/res/values-sv-rSE/strings.xml
index 33c77af761..22fbdda8af 100644
--- a/pump-common/src/main/res/values-sv-rSE/strings.xml
+++ b/pump-common/src/main/res/values-sv-rSE/strings.xml
@@ -1,11 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operation stöds inte av pumpen/pumpdrivrutinen.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operationen stöds inte av pumpen ännu.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">Väcker</string>
+    <string name="pump_status_error_comm">Kommunikationsfel</string>
+    <string name="pump_status_timeout_comm">Kommunikationstimeout</string>
+    <string name="pump_status_pump_unreachable">Pumpen kan inte nås</string>
+    <string name="pump_status_invalid_config">Felaktig konfiguration</string>
+    <string name="pump_status_active">Aktiv</string>
+    <string name="pump_status_sleeping">Sover</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basaldoser</string>
+    <string name="history_group_configuration">Konfigurationer</string>
+    <string name="history_group_notification">Notiser</string>
+    <string name="history_group_statistic">Statistik</string>
+    <string name="history_group_unknown">Okända</string>
+    <string name="history_group_all">Alla</string>
+    <string name="history_group_bolus">Bolusar</string>
+    <string name="history_group_prime">Förfyllningar</string>
+    <string name="history_group_alarm">Larm</string>
+    <string name="history_group_glucose">Glukos</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dagar</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d tim</item>
+        <item quantity="other">%1$d tim</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-tr-rTR/strings.xml b/pump-common/src/main/res/values-tr-rTR/strings.xml
index bfc8e2017f..33349a586d 100644
--- a/pump-common/src/main/res/values-tr-rTR/strings.xml
+++ b/pump-common/src/main/res/values-tr-rTR/strings.xml
@@ -4,6 +4,8 @@
     <string name="pump_operation_not_supported_by_pump_driver">Pompa ve/veya sürücü tarafından desteklenmeyen işlem.</string>
     <string name="pump_operation_not_yet_supported_by_pump">İşlem HENÜZ pompa tarafından desteklenmiyor.</string>
     <string name="common_resultok">Tamam</string>
+    <string name="pump_serial_number">Pompa Seri Numarası</string>
+    <string name="bolus_delivered">%1$.2f Ü / %2$.2f Ü gönderildi</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Hiç bağlantı yapılmadı</string>
     <string name="pump_status_waking_up">Uyanıyor</string>
@@ -13,6 +15,13 @@
     <string name="pump_status_invalid_config">Geçersiz yapılandırma</string>
     <string name="pump_status_active">Aktif</string>
     <string name="pump_status_sleeping">Uyuyor</string>
+    <string name="pump_status_not_initialized">Başlatılmadı</string>
+    <string name="pump_status_initialized">Başlatıldı</string>
+    <string name="pump_status_encrypt">İletişim Şifreleniyor</string>
+    <string name="pump_status_ready">Hazır</string>
+    <string name="pump_status_busy">Meşgul</string>
+    <string name="pump_status_suspended">Askıya Alındı</string>
+    <string name="pump_status_executing_command">Komut Çalıştırılıyor</string>
     <!-- PumpCommon - History Group -->
     <string name="history_group_basal">Bazallar</string>
     <string name="history_group_configuration">Konfigürasyon</string>
@@ -24,9 +33,59 @@
     <string name="history_group_prime">Dolumlar</string>
     <string name="history_group_alarm">Alarmlar</string>
     <string name="history_group_glucose">Glikoz</string>
+    <string name="history_group_base">Temel</string>
+    <string name="history_group_other">Diğer</string>
+    <string name="history_group_events">Tüm Etkinlikler</string>
+    <string name="history_group_events_no_stat">Etkinlikler (İstatistik yok)</string>
     <!-- Time -->
+    <string name="time_today">Bugün</string>
+    <string name="time_last_hour">Son 1 Saat</string>
+    <string name="time_last_3_hours">Son 3 Saat</string>
+    <string name="time_last_6_hours">Son 6 Saat</string>
+    <string name="time_last_12_hours">Son 12 Saat</string>
+    <string name="time_last_2_days">Son 2 gün</string>
+    <string name="time_last_4_days">Son 4 gün</string>
+    <string name="time_last_week">Geçen hafta</string>
+    <string name="time_last_month">Geçen ay</string>
     <!-- BLE Config -->
+    <string name="ble_config_button_scan_start">Tara</string>
+    <string name="ble_config_scan_stop">Dur</string>
+    <string name="ble_config_scan_selected">Seçili</string>
+    <string name="ble_config_scan_scanning">Taranıyor</string>
+    <string name="ble_config_scan_finished">Tarama tamamlandı</string>
+    <string name="ble_config_scan_error">Tarama Hatası:%1$d</string>
+    <string name="ble_config_connected_never">Asla</string>
+    <string name="ble_config_remove">Kaldır</string>
     <!-- BLE Errors -->
+    <string name="ble_error_bt_disabled">Bluetooth devre dışı</string>
+    <string name="ble_error_no_bt_adapter">Bluetooth Adaptörü Yok</string>
+    <string name="ble_error_configured_pump_not_found">Yapılandırılan Pompa Bulunamadı</string>
+    <string name="ble_error_pump_unreachable">Pompa ulaşılamıyor</string>
+    <string name="ble_error_failed_to_conn_to_ble_device">BLE Cihazına Bağlanılamadı</string>
+    <string name="ble_error_encryption_failed">Şifreleme Başarısız</string>
+    <string name="ble_error_pump_found_unbonded">Bağlı Pompa Bulunamadı</string>
     <!-- Pump Error -->
+    <string name="pump_settings_error_basal_profiles_not_enabled">Bazal profiller/şablon ayarı pompada etkinleştirilmemiştir. Pompada etkinleştirin.</string>
+    <string name="pump_settings_error_incorrect_basal_profile_selected">Pompada ayarlanan bazal profili yanlış (%s olmalıdır).</string>
+    <string name="pump_settings_error_wrong_tbr_type_set">Pompada yanlış GBO tipi ayarlanmış (%s olmalıdır).</string>
+    <string name="pump_settings_error_wrong_max_bolus_set">Pompada Yanlış Maksimum Bolus ayarlanmış (%1$.2f olmalıdır).</string>
+    <string name="pump_settings_error_wrong_max_basal_set">Pompada Yanlış Maksimum Bazal ayarlanmış (%1$.2f olmalıdır).</string>
     <!-- Pump History -->
+    <string name="pump_history_type">Tip:</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>
+    <plurals name="hoursago">
+        <item quantity="one">%1$d saat önce</item>
+        <item quantity="other">%1$d saat önce</item>
+    </plurals>
+    <plurals name="daysago">
+        <item quantity="one">%1$d gün önce</item>
+        <item quantity="other">%1$d gün önce</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values/strings.xml b/pump-common/src/main/res/values/strings.xml
index 8bbb70d064..d51c9755f6 100644
--- a/pump-common/src/main/res/values/strings.xml
+++ b/pump-common/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
     <string name="common_resultok">OK</string>
 
     <string name="pump_serial_number">Pump Serial Number</string>
+    <string name="bolus_delivered">%1$.2f U / %2$.2f U delivered</string>
 
 
     <!-- PumpCommon - Pump Status -->
diff --git a/pump-common/src/main/res/values/styles.xml b/pump-common/src/main/res/values/styles.xml
deleted file mode 100644
index cb12b773ce..0000000000
--- a/pump-common/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<resources>
-
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="android:spinnerItemStyle">@style/YourSpinnerItemStyle</item>
-    </style>
-
-    <style name="YourSpinnerItemStyle" parent="Widget.AppCompat.TextView.SpinnerItem">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:textSize">15sp</item>
-    </style>
-
-    <style name="mySpinnerItemStyle" parent="ThemeOverlay.AppCompat.Dark">
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">@color/white</item>
-    </style>
-
-</resources>
-
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt
index 61be9e9b16..0dbbd0302b 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.common.dialog
 
+import android.Manifest
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothDevice
@@ -10,6 +11,8 @@ import android.bluetooth.le.ScanFilter
 import android.bluetooth.le.ScanResult
 import android.bluetooth.le.ScanSettings
 import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.HandlerThread
@@ -22,8 +25,10 @@ import android.widget.AdapterView.OnItemClickListener
 import android.widget.BaseAdapter
 import android.widget.TextView
 import android.widget.Toast
+import androidx.core.app.ActivityCompat
 import dagger.android.support.DaggerAppCompatActivity
 import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst
@@ -32,7 +37,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.Gatt
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.databinding.RileyLinkBleConfigActivityBinding
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
@@ -225,16 +229,20 @@ class RileyLinkBLEConfigActivity : DaggerAppCompatActivity() {
             binding.rileyLinkBleConfigButtonScanStop.visibility = View.VISIBLE
         }
         scanning = true
-        bleScanner?.startScan(filters, settings, bleScanCallback)
-        aapsLogger.debug(LTag.PUMPBTCOMM, "startLeDeviceScan: Scanning Start")
-        Toast.makeText(this@RileyLinkBLEConfigActivity, R.string.riley_link_ble_config_scan_scanning, Toast.LENGTH_SHORT).show()
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED) {
+            bleScanner?.startScan(filters, settings, bleScanCallback)
+            aapsLogger.debug(LTag.PUMPBTCOMM, "startLeDeviceScan: Scanning Start")
+            Toast.makeText(this@RileyLinkBLEConfigActivity, R.string.riley_link_ble_config_scan_scanning, Toast.LENGTH_SHORT).show()
+        }
     }
 
     private fun stopLeDeviceScan() {
         if (scanning) {
             scanning = false
             if (bluetoothAdapter?.isEnabled == true && bluetoothAdapter?.state == BluetoothAdapter.STATE_ON)
-                bleScanner?.stopScan(bleScanCallback)
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED) {
+                    bleScanner?.stopScan(bleScanCallback)
+                }
             aapsLogger.debug(LTag.PUMPBTCOMM, "stopLeDeviceScan: Scanning Stop")
             Toast.makeText(this, R.string.riley_link_ble_config_scan_finished, Toast.LENGTH_SHORT).show()
             handler.removeCallbacks(stopScanAfterTimeoutRunnable)
@@ -268,7 +276,7 @@ class RileyLinkBLEConfigActivity : DaggerAppCompatActivity() {
         override fun getItem(i: Int): Any = leDevices[i]
         override fun getItemId(i: Int): Long = i.toLong()
 
-        @SuppressLint("InflateParams")
+        @SuppressLint("InflateParams", "MissingPermission")
         override fun getView(i: Int, v: View?, viewGroup: ViewGroup): View {
             var view = v
             val viewHolder: ViewHolder
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt
index 5a48ec26cf..09a7a68c49 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt
@@ -217,15 +217,17 @@ class RileyLinkBLE @Inject constructor(
                 // Tell Android that we want the notifications
                 bluetoothConnectionGatt?.setCharacteristicNotification(chara, true)
                 val list = chara.descriptors
-                if (gattDebugEnabled) for (i in list.indices) aapsLogger.debug(LTag.PUMPBTCOMM, "Found descriptor: " + list[i].toString())
-                // Tell the remote device to send the notifications
-                mCurrentOperation = DescriptorWriteOperation(aapsLogger, bluetoothConnectionGatt, list[0], BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE)
-                mCurrentOperation?.execute(this)
-                when {
-                    mCurrentOperation?.timedOut == true    -> retValue.resultCode = BLECommOperationResult.RESULT_TIMEOUT
-                    mCurrentOperation?.interrupted == true -> retValue.resultCode = BLECommOperationResult.RESULT_INTERRUPTED
-                    else                                   -> retValue.resultCode = BLECommOperationResult.RESULT_SUCCESS
-                }
+                if (list.size > 0) {
+                    if (gattDebugEnabled) for (i in list.indices) aapsLogger.debug(LTag.PUMPBTCOMM, "Found descriptor: " + list[i].toString())
+                    // Tell the remote device to send the notifications
+                    mCurrentOperation = DescriptorWriteOperation(aapsLogger, bluetoothConnectionGatt, list[0], BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE)
+                    mCurrentOperation?.execute(this)
+                    when {
+                        mCurrentOperation?.timedOut == true    -> retValue.resultCode = BLECommOperationResult.RESULT_TIMEOUT
+                        mCurrentOperation?.interrupted == true -> retValue.resultCode = BLECommOperationResult.RESULT_INTERRUPTED
+                        else                                   -> retValue.resultCode = BLECommOperationResult.RESULT_SUCCESS
+                    }
+                } else return retValue.apply { resultCode = BLECommOperationResult.RESULT_NONE }
             }
             mCurrentOperation = null
             gattOperationSema.release()
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt
index d7efd6ca73..9e5e10cd79 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt
@@ -7,6 +7,7 @@ import android.content.Intent
 import dagger.android.DaggerService
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.ResourceHelper
 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
@@ -17,8 +18,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLink
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice
-import info.nightscout.androidaps.interfaces.ResourceHelper
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
@@ -85,8 +84,6 @@ abstract class RileyLinkService : DaggerService() {
     }
 
     abstract val deviceCommunicationManager: RileyLinkCommunicationManager<*>
-    val rileyLinkServiceState: RileyLinkServiceState?
-        get() = rileyLinkServiceData.rileyLinkServiceState
 
     // Here is where the wake-lock begins:
     // We've received a service startCommand, we grab the lock.
@@ -94,7 +91,7 @@ abstract class RileyLinkService : DaggerService() {
 
     fun bluetoothInit(): Boolean {
         aapsLogger.debug(LTag.PUMPBTCOMM, "bluetoothInit: attempting to get an adapter")
-        rileyLinkServiceData.rileyLinkServiceState = RileyLinkServiceState.BluetoothInitializing
+        rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothInitializing)
         if (bluetoothAdapter == null) {
             aapsLogger.error("Unable to obtain a BluetoothAdapter.")
             rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.NoBluetoothAdapter)
@@ -103,7 +100,7 @@ abstract class RileyLinkService : DaggerService() {
                 aapsLogger.error("Bluetooth is not enabled.")
                 rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.BluetoothDisabled)
             } else {
-                rileyLinkServiceData.rileyLinkServiceState = RileyLinkServiceState.BluetoothReady
+                rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothReady)
                 return true
             }
         }
@@ -112,7 +109,7 @@ abstract class RileyLinkService : DaggerService() {
 
     // returns true if our Rileylink configuration changed
     fun reconfigureRileyLink(deviceAddress: String): Boolean {
-        rileyLinkServiceData.rileyLinkServiceState = RileyLinkServiceState.RileyLinkInitializing
+        rileyLinkServiceData.setServiceState(RileyLinkServiceState.RileyLinkInitializing)
         return if (rileyLinkBLE.isConnected) {
             if (deviceAddress == rileyLinkServiceData.rileyLinkAddress) {
                 aapsLogger.info(LTag.PUMPBTCOMM, "No change to RL address.  Not reconnecting.")
@@ -141,7 +138,7 @@ abstract class RileyLinkService : DaggerService() {
 
     // FIXME: This needs to be run in a session so that is incorruptible, has a separate thread, etc.
     fun doTuneUpDevice() {
-        rileyLinkServiceData.rileyLinkServiceState = RileyLinkServiceState.TuneUpDevice
+        rileyLinkServiceData.setServiceState(RileyLinkServiceState.TuneUpDevice)
         setPumpDeviceState(PumpDeviceState.Sleeping)
         val lastGoodFrequency =  rileyLinkServiceData.lastGoodFrequency ?: sp.getDouble(RileyLinkConst.Prefs.LastGoodDeviceFrequency, 0.0)
         val newFrequency = deviceCommunicationManager.tuneForDevice()
@@ -157,7 +154,7 @@ abstract class RileyLinkService : DaggerService() {
             rileyLinkServiceData.setServiceState(RileyLinkServiceState.PumpConnectorError, RileyLinkError.TuneUpOfDeviceFailed)
         } else {
             deviceCommunicationManager.clearNotConnectedCount()
-            rileyLinkServiceData.rileyLinkServiceState = RileyLinkServiceState.PumpConnectorReady
+            rileyLinkServiceData.setServiceState(RileyLinkServiceState.PumpConnectorReady)
         }
     }
 
@@ -168,7 +165,7 @@ abstract class RileyLinkService : DaggerService() {
             rileyLinkServiceData.rileyLinkAddress = null
             rileyLinkServiceData.rileyLinkName = null
         }
-        rileyLinkServiceData.rileyLinkServiceState = RileyLinkServiceState.BluetoothReady
+        rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothReady)
     }
 
     fun changeRileyLinkEncoding(encodingType: RileyLinkEncodingType?) {
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt
index 047467fd7f..39dcf629bb 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt
@@ -27,6 +27,7 @@ class RileyLinkServiceData @Inject constructor() {
     var tuneUpDone = false
     var rileyLinkError: RileyLinkError? = null
     var rileyLinkServiceState: RileyLinkServiceState = RileyLinkServiceState.NotStarted
+        private set
     var lastServiceStateChange = 0L
         private set
 
@@ -62,11 +63,11 @@ class RileyLinkServiceData @Inject constructor() {
     }
 
     @Synchronized
-    fun setServiceState(newState: RileyLinkServiceState, errorCode: RileyLinkError) {
+    fun setServiceState(newState: RileyLinkServiceState, errorCode: RileyLinkError? = null) {
         rileyLinkServiceState = newState
         lastServiceStateChange = System.currentTimeMillis()
         rileyLinkError = errorCode
-        aapsLogger.info(LTag.PUMP, String.format(Locale.ENGLISH, "RileyLink State Changed: $newState - Error State: ${errorCode.name}"))
+        aapsLogger.info(LTag.PUMP, String.format(Locale.ENGLISH, "RileyLink State Changed: $newState - Error State: ${errorCode?.name}"))
         rileyLinkUtil.rileyLinkHistory.add(RLHistoryItem(rileyLinkServiceState, errorCode, targetDevice))
         rxBus.send(EventRileyLinkDeviceStatusChange(targetDevice!!, newState, errorCode))
     }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt
index 935aff66bc..cc7f946d74 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt
@@ -39,10 +39,10 @@ class InitializePumpManagerTask(injector: HasAndroidInjector, private val contex
         val rileyLinkCommunicationManager = pumpDevice?.rileyLinkService?.deviceCommunicationManager
         if (activePlugin.activePump.manufacturer() === ManufacturerType.Medtronic) {
             if (lastGoodFrequency > 0.0 && rileyLinkCommunicationManager?.isValidFrequency(lastGoodFrequency) == true) {
-                rileyLinkServiceData.rileyLinkServiceState = RileyLinkServiceState.RileyLinkReady
+                rileyLinkServiceData.setServiceState(RileyLinkServiceState.RileyLinkReady)
                 aapsLogger.info(LTag.PUMPBTCOMM, "Setting radio frequency to $lastGoodFrequency MHz")
                 rileyLinkCommunicationManager.setRadioFrequencyForPump(lastGoodFrequency)
-                if (rileyLinkCommunicationManager.tryToConnectToDevice()) rileyLinkServiceData.rileyLinkServiceState = RileyLinkServiceState.PumpConnectorReady
+                if (rileyLinkCommunicationManager.tryToConnectToDevice()) rileyLinkServiceData.setServiceState(RileyLinkServiceState.PumpConnectorReady)
                 else {
                     rileyLinkServiceData.setServiceState(RileyLinkServiceState.PumpConnectorError, RileyLinkError.NoContactWithDevice)
                     rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.IPC.MSG_PUMP_tunePump, context)
@@ -54,11 +54,11 @@ class InitializePumpManagerTask(injector: HasAndroidInjector, private val contex
                 lastGoodFrequency = (lastGoodFrequency * 1000.0).roundToLong() / 1000.0
                 rileyLinkServiceData.lastGoodFrequency = lastGoodFrequency
             }
-            rileyLinkServiceData.rileyLinkServiceState = RileyLinkServiceState.RileyLinkReady
+            rileyLinkServiceData.setServiceState(RileyLinkServiceState.RileyLinkReady)
             rileyLinkServiceData.rileyLinkTargetFrequency = RileyLinkTargetFrequency.Omnipod // TODO shouldn't be needed
             aapsLogger.info(LTag.PUMPBTCOMM, "Setting radio frequency to $lastGoodFrequency MHz")
             rileyLinkCommunicationManager?.setRadioFrequencyForPump(lastGoodFrequency)
-            rileyLinkServiceData.rileyLinkServiceState = RileyLinkServiceState.PumpConnectorReady
+            rileyLinkServiceData.setServiceState(RileyLinkServiceState.PumpConnectorReady)
         }
     }
 }
\ No newline at end of file
diff --git a/shared/build.gradle b/shared/build.gradle
index 3a6a62902e..befbf26b4a 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -20,7 +20,7 @@ android {
 
 dependencies {
     api "androidx.preference:preference-ktx:$preferencektx_version"
-    api "net.danlew:android.joda:$joga_version"
+    api "net.danlew:android.joda:$joda_version"
 
     // for old fashioned support-app version (wear)
     api "com.google.dagger:dagger:$dagger_version"
@@ -28,12 +28,12 @@ dependencies {
     api "com.google.dagger:dagger-android-support:$dagger_version"
 
     //Logger
-    api 'org.slf4j:slf4j-api:1.7.36'
+    api 'org.slf4j:slf4j-api:2.0.0'
     api("com.github.tony19:logback-android-classic:1.1.1-6") {
         exclude group: "com.google.android", module: "android"
     }
 
-    api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
+    api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0"
     api "org.apache.commons:commons-lang3:$commonslang3_version"
 
     //RxBus
diff --git a/shared/src/main/java/info/nightscout/shared/logging/AAPSLogger.kt b/shared/src/main/java/info/nightscout/shared/logging/AAPSLogger.kt
index a8161abac5..2eaf448b45 100644
--- a/shared/src/main/java/info/nightscout/shared/logging/AAPSLogger.kt
+++ b/shared/src/main/java/info/nightscout/shared/logging/AAPSLogger.kt
@@ -5,10 +5,10 @@ package info.nightscout.shared.logging
  */
 
 interface AAPSLogger {
-
     fun debug(message: String)
     fun debug(enable: Boolean, tag: LTag, message: String)
     fun debug(tag: LTag, message: String)
+    fun debug(tag: LTag, accessor: () -> String)
     fun debug(tag: LTag, format: String, vararg arguments: Any?)
     fun warn(tag: LTag, message: String)
     fun warn(tag: LTag, format: String, vararg arguments: Any?)
@@ -20,4 +20,13 @@ interface AAPSLogger {
     fun error(message: String)
     fun error(message: String, throwable: Throwable)
     fun error(format: String, vararg arguments: Any?)
+
+    // These are variants of the calls above that allow for explicitly
+    // specifying the exact logging location. They are primarily meant
+    // as a way to integrate other logging infrastructures into AndroidAPS,
+    // and typically aren't practical to use directly for logging in code.
+    fun debug(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String)
+    fun info(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String)
+    fun warn(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String)
+    fun error(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String)
 }
\ No newline at end of file
diff --git a/shared/src/main/java/info/nightscout/shared/logging/AAPSLoggerProduction.kt b/shared/src/main/java/info/nightscout/shared/logging/AAPSLoggerProduction.kt
index 95a046fe51..be0c6a54df 100644
--- a/shared/src/main/java/info/nightscout/shared/logging/AAPSLoggerProduction.kt
+++ b/shared/src/main/java/info/nightscout/shared/logging/AAPSLoggerProduction.kt
@@ -22,6 +22,11 @@ class AAPSLoggerProduction constructor(val l: L) : AAPSLogger {
             LoggerFactory.getLogger(tag.tag).debug(stackLogMarker() + message)
     }
 
+    override fun debug(tag: LTag, accessor: () -> String) {
+        if (l.findByName(tag.tag).enabled)
+            LoggerFactory.getLogger(tag.tag).debug(stackLogMarker() + accessor.invoke())
+    }
+
     override fun debug(tag: LTag, format: String, vararg arguments: Any?) {
         if (l.findByName(tag.tag).enabled)
             LoggerFactory.getLogger(tag.tag).debug(stackLogMarker() + format, arguments)
@@ -69,9 +74,29 @@ class AAPSLoggerProduction constructor(val l: L) : AAPSLogger {
     override fun error(tag: LTag, format: String, vararg arguments: Any?) {
         LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + format, arguments)
     }
+
+    override fun debug(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String) {
+        LoggerFactory.getLogger(tag.tag).debug(logLocationPrefix(className, methodName, lineNumber) + message)
+    }
+
+    override fun info(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String) {
+        LoggerFactory.getLogger(tag.tag).info(logLocationPrefix(className, methodName, lineNumber) + message)
+    }
+
+    override fun warn(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String) {
+        LoggerFactory.getLogger(tag.tag).warn(logLocationPrefix(className, methodName, lineNumber) + message)
+    }
+
+    override fun error(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String) {
+        LoggerFactory.getLogger(tag.tag).error(logLocationPrefix(className, methodName, lineNumber) + message)
+    }
 }
 
-fun StackTraceElement.toLogString(): String = "[${this.className.substringAfterLast(".")}.${this.methodName}():${this.lineNumber}]: "
+private fun logLocationPrefix(className: String, methodName: String, lineNumber: Int) =
+    "[$className.$methodName():$lineNumber]: "
+
+fun StackTraceElement.toLogString(): String =
+    logLocationPrefix(this.className.substringAfterLast("."), this.methodName, this.lineNumber)
 
 /* Needs to be inline. Don't remove even if IDE suggests it. */
 @Suppress("NOTHING_TO_INLINE")
diff --git a/shared/src/main/java/info/nightscout/shared/logging/AAPSLoggerTest.kt b/shared/src/main/java/info/nightscout/shared/logging/AAPSLoggerTest.kt
index aa3e9f08f5..d7ff2ded5a 100644
--- a/shared/src/main/java/info/nightscout/shared/logging/AAPSLoggerTest.kt
+++ b/shared/src/main/java/info/nightscout/shared/logging/AAPSLoggerTest.kt
@@ -18,6 +18,10 @@ class AAPSLoggerTest : AAPSLogger {
         println("DEBUG: : " + tag.tag + " " + message)
     }
 
+    override fun debug(tag: LTag, accessor: () -> String) {
+        println("DEBUG: : " + tag.tag + " " + accessor.invoke())
+    }
+
     override fun debug(tag: LTag, format: String, vararg arguments: Any?) {
         println("DEBUG: : " + tag.tag + " " + String.format(format, arguments))
     }
@@ -61,4 +65,20 @@ class AAPSLoggerTest : AAPSLogger {
     override fun error(tag: LTag, format: String, vararg arguments: Any?) {
         println("ERROR: : " + tag.tag + " " + String.format(format, arguments))
     }
+
+    override fun debug(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String) {
+        println("DEBUG: : ${tag.tag} $className.$methodName():$lineNumber $message")
+    }
+
+    override fun info(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String) {
+        println("INFO: : ${tag.tag} $className.$methodName():$lineNumber $message")
+    }
+
+    override fun warn(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String) {
+        println("WARN: : ${tag.tag} $className.$methodName():$lineNumber $message")
+    }
+
+    override fun error(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String) {
+        println("ERROR: : ${tag.tag} $className.$methodName():$lineNumber $message")
+    }
 }
\ No newline at end of file
diff --git a/shared/src/main/java/info/nightscout/shared/sharedPreferences/Delegates.kt b/shared/src/main/java/info/nightscout/shared/sharedPreferences/Delegates.kt
new file mode 100644
index 0000000000..a7f80f7128
--- /dev/null
+++ b/shared/src/main/java/info/nightscout/shared/sharedPreferences/Delegates.kt
@@ -0,0 +1,83 @@
+package info.nightscout.shared.sharedPreferences
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+/*
+
+These classes allow to combine SP values with Kotlin delegates like this:
+
+    private var myValue: String
+        by SPDelegateString(sp, "myValueKey", "default-value")
+
+Then, accessing myValue works by simply using the Kotlin setters & getters:
+
+    val value = myValue // reading from sp
+    myValue = "newvalue" // writing to sp
+
+*/
+
+class SPDelegateBoolean(
+    private val sp: SP,
+    private val key: String,
+    private val defaultValue: Boolean = false,
+    private val commit: Boolean = false
+) : ReadWriteProperty<Any, Boolean> {
+    override fun getValue(thisRef: Any, property: KProperty<*>) =
+        sp.getBoolean(key, defaultValue)
+
+    override fun setValue(thisRef: Any, property: KProperty<*>, value: Boolean) =
+        sp.edit(commit = commit) { putBoolean(key, value) }
+}
+
+class SPDelegateDouble(
+    private val sp: SP,
+    private val key: String,
+    private val defaultValue: Double = 0.0,
+    private val commit: Boolean = false
+) : ReadWriteProperty<Any, Double> {
+    override fun getValue(thisRef: Any, property: KProperty<*>) =
+        sp.getDouble(key, defaultValue)
+
+    override fun setValue(thisRef: Any, property: KProperty<*>, value: Double) =
+        sp.edit(commit = commit) { putDouble(key, value) }
+}
+
+class SPDelegateLong(
+    private val sp: SP,
+    private val key: String,
+    private val defaultValue: Long = 0,
+    private val commit: Boolean = false
+) : ReadWriteProperty<Any, Long> {
+    override fun getValue(thisRef: Any, property: KProperty<*>) =
+        sp.getLong(key, defaultValue)
+
+    override fun setValue(thisRef: Any, property: KProperty<*>, value: Long) =
+        sp.edit(commit = commit) { putLong(key, value) }
+}
+
+class SPDelegateInt(
+    private val sp: SP,
+    private val key: String,
+    private val defaultValue: Int = 0,
+    private val commit: Boolean = false
+) : ReadWriteProperty<Any, Int> {
+    override fun getValue(thisRef: Any, property: KProperty<*>) =
+        sp.getInt(key, defaultValue)
+
+    override fun setValue(thisRef: Any, property: KProperty<*>, value: Int) =
+        sp.edit(commit = commit) { putInt(key, value) }
+}
+
+class SPDelegateString(
+    private val sp: SP,
+    private val key: String,
+    private val defaultValue: String = "",
+    private val commit: Boolean = false
+) : ReadWriteProperty<Any, String> {
+    override fun getValue(thisRef: Any, property: KProperty<*>) =
+        sp.getString(key, defaultValue)
+
+    override fun setValue(thisRef: Any, property: KProperty<*>, value: String) =
+        sp.edit(commit = commit) { putString(key, value) }
+}
diff --git a/shared/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt b/shared/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt
index ca4b5b5ae7..5c3a36d101 100644
--- a/shared/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt
+++ b/shared/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt
@@ -7,6 +7,45 @@ import androidx.annotation.StringRes
  */
 
 interface SP {
+    // Using a helper Editor interface to distinguish its
+    // methods from SP's. The latter always run apply().
+    // The whole point of the edit() function below is to
+    // _avoid_ unnecessary apply() / commit() calls, so
+    // we cannot use SP's put* methods in edit().
+    interface Editor {
+        fun clear()
+
+        fun remove(@StringRes resourceID: Int)
+        fun remove(key: String)
+
+        fun putBoolean(key: String, value: Boolean)
+        fun putBoolean(@StringRes resourceID: Int, value: Boolean)
+        fun putDouble(key: String, value: Double)
+        fun putDouble(@StringRes resourceID: Int, value: Double)
+        fun putLong(key: String, value: Long)
+        fun putLong(@StringRes resourceID: Int, value: Long)
+        fun putInt(key: String, value: Int)
+        fun putInt(@StringRes resourceID: Int, value: Int)
+        fun putString(key: String, value: String)
+        fun putString(@StringRes resourceID: Int, value: String)
+    }
+
+    /**
+     * Allows for editing shared preferences in a scoped manner.
+     *
+     * This works just the same way as the androidx.core.content.edit
+     * extension does. An [Editor] instance is created and used as
+     * the receiver of [block]. When the block is done, either
+     * the shared preferences commit or apply functions are called,
+     * depending on the value of [commit].
+     *
+     * Example:
+     *
+     *     sp.edit(commit = false) {
+     *         putString("my-key", "abc123")
+     *     }
+     */
+    fun edit(commit: Boolean = false, block: Editor.() -> Unit)
 
     fun getAll(): Map<String, *>
     fun clear()
diff --git a/shared/src/main/java/info/nightscout/shared/sharedPreferences/SPImplementation.kt b/shared/src/main/java/info/nightscout/shared/sharedPreferences/SPImplementation.kt
index 5bed8fbb04..71ebc4808c 100644
--- a/shared/src/main/java/info/nightscout/shared/sharedPreferences/SPImplementation.kt
+++ b/shared/src/main/java/info/nightscout/shared/sharedPreferences/SPImplementation.kt
@@ -1,7 +1,9 @@
 package info.nightscout.shared.sharedPreferences
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
+import androidx.annotation.StringRes
 import info.nightscout.shared.SafeParse
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -12,6 +14,62 @@ class SPImplementation @Inject constructor(
     private val context: Context
 ) : SP {
 
+    @SuppressLint("ApplySharedPref")
+    override fun edit(commit: Boolean, block: SP.Editor.() -> Unit) {
+        val spEdit = sharedPreferences.edit()
+
+        val edit = object : SP.Editor {
+            override fun clear() {
+                spEdit.clear()
+            }
+
+            override fun remove(@StringRes resourceID: Int) {
+                spEdit.remove(context.getString(resourceID))
+            }
+            override fun remove(key: String) {
+                spEdit.remove(key)
+            }
+
+            override fun putBoolean(key: String, value: Boolean) {
+                spEdit.putBoolean(key, value)
+            }
+            override fun putBoolean(@StringRes resourceID: Int, value: Boolean) {
+                spEdit.putBoolean(context.getString(resourceID), value)
+            }
+            override fun putDouble(key: String, value: Double) {
+                spEdit.putString(key, value.toString())
+            }
+            override fun putDouble(@StringRes resourceID: Int, value: Double) {
+                spEdit.putString(context.getString(resourceID), value.toString())
+            }
+            override fun putLong(key: String, value: Long) {
+                spEdit.putLong(key, value)
+            }
+            override fun putLong(@StringRes resourceID: Int, value: Long) {
+                spEdit.putLong(context.getString(resourceID), value)
+            }
+            override fun putInt(key: String, value: Int) {
+                spEdit.putInt(key, value)
+            }
+            override fun putInt(@StringRes resourceID: Int, value: Int) {
+                spEdit.putInt(context.getString(resourceID), value)
+            }
+            override fun putString(key: String, value: String) {
+                spEdit.putString(key, value)
+            }
+            override fun putString(@StringRes resourceID: Int, value: String) {
+                spEdit.putString(context.getString(resourceID), value)
+            }
+        }
+
+        block(edit)
+
+        if (commit)
+            spEdit.commit()
+        else
+            spEdit.apply()
+    }
+
     override fun getAll(): Map<String, *> = sharedPreferences.all
 
     override fun clear() = sharedPreferences.edit().clear().apply()
diff --git a/shared/src/main/res/values-bg-rBG/strings.xml b/shared/src/main/res/values-bg-rBG/strings.xml
index 56da387b4b..83ed6a08e5 100644
--- a/shared/src/main/res/values-bg-rBG/strings.xml
+++ b/shared/src/main/res/values-bg-rBG/strings.xml
@@ -3,7 +3,7 @@
     <!--    DateUtil-->
     <string name="minago">преди %1$d мин</string>
     <string name="hoursago">преди %1$.1fч</string>
-    <string name="shorthour">ч.</string>
+    <string name="shorthour">ч</string>
     <string name="days">дни</string>
     <string name="hours">часа</string>
     <string name="unit_second">секунда</string>
@@ -16,6 +16,6 @@
     <string name="unit_hours">часове</string>
     <string name="unit_days">дни</string>
     <string name="unit_weeks">седмици</string>
-    <string name="shortminute">мин.</string>
+    <string name="shortminute">м</string>
     <string name="shortday">д</string>
 </resources>
diff --git a/shared/src/main/res/values-de-rDE/strings.xml b/shared/src/main/res/values-de-rDE/strings.xml
index 8c95db789a..34fe22987f 100644
--- a/shared/src/main/res/values-de-rDE/strings.xml
+++ b/shared/src/main/res/values-de-rDE/strings.xml
@@ -4,7 +4,11 @@
     <string name="minago">vor %1$d Min.</string>
     <string name="minago_long">vor %1$d Minuten</string>
     <string name="hoursago">vor %1$.1f Stunde</string>
-    <string name="shorthour">Std</string>
+    <string name="days_ago">vor %1$.1f Tagen</string>
+    <string name="days_ago_round">vor %1$.0f Tagen</string>
+    <string name="in_days">in %1$.0f Tagen</string>
+    <string name="in_days_round">in %1$.0f Tagen</string>
+    <string name="shorthour">s</string>
     <string name="days">Tage</string>
     <string name="hours">Stunden</string>
     <string name="unit_second">Sekunde</string>
@@ -17,6 +21,10 @@
     <string name="unit_hours">Stunden</string>
     <string name="unit_days">Tage</string>
     <string name="unit_weeks">Wochen</string>
-    <string name="shortminute">min</string>
+    <string name="shortminute">m</string>
     <string name="shortday">d</string>
+    <string name="later_today">Später heute</string>
+    <string name="tomorrow">Morgen</string>
+    <string name="today">Heute</string>
+    <string name="yesterday">Gestern</string>
 </resources>
diff --git a/shared/src/main/res/values-ga-rIE/strings.xml b/shared/src/main/res/values-ga-rIE/strings.xml
index 8d4df752e5..554d7a16e3 100644
--- a/shared/src/main/res/values-ga-rIE/strings.xml
+++ b/shared/src/main/res/values-ga-rIE/strings.xml
@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--    DateUtil-->
-    <string name="minago">%1$d nóim ó shin</string>
-    <string name="hoursago">%1$.1f u ó shin</string>
-    <string name="shorthour">u</string>
-    <string name="days">lá</string>
-    <string name="hours">uair</string>
-    <string name="unit_second">soicind</string>
-    <string name="unit_minute">nóiméad</string>
-    <string name="unit_hour">uair</string>
-    <string name="unit_day">lá</string>
-    <string name="unit_week">seachtain</string>
-    <string name="unit_seconds">soicind</string>
-    <string name="unit_minutes">nóiméad</string>
-    <string name="unit_hours">uair</string>
-    <string name="unit_days">lá</string>
-    <string name="unit_weeks">seachtaine</string>
-    <string name="shortminute">n</string>
-    <string name="shortday">lá</string>
 </resources>
diff --git a/shared/src/main/res/values-lt-rLT/strings.xml b/shared/src/main/res/values-lt-rLT/strings.xml
index bb053b1723..6d6f79ce59 100644
--- a/shared/src/main/res/values-lt-rLT/strings.xml
+++ b/shared/src/main/res/values-lt-rLT/strings.xml
@@ -3,7 +3,7 @@
     <!--    DateUtil-->
     <string name="minago">prieš %1$d min</string>
     <string name="hoursago">Prieš %1$.1f val.</string>
-    <string name="shorthour">val</string>
+    <string name="shorthour">v</string>
     <string name="days">d.</string>
     <string name="hours">val.</string>
     <string name="unit_second">sek.</string>
@@ -16,6 +16,6 @@
     <string name="unit_hours">val.</string>
     <string name="unit_days">d.</string>
     <string name="unit_weeks">savaičių</string>
-    <string name="shortminute">min.</string>
+    <string name="shortminute">m</string>
     <string name="shortday">d</string>
 </resources>
diff --git a/shared/src/main/res/values-ro-rRO/strings.xml b/shared/src/main/res/values-ro-rRO/strings.xml
index 025c5d22c6..6e585ee663 100644
--- a/shared/src/main/res/values-ro-rRO/strings.xml
+++ b/shared/src/main/res/values-ro-rRO/strings.xml
@@ -16,6 +16,6 @@
     <string name="unit_hours">ore</string>
     <string name="unit_days">zile</string>
     <string name="unit_weeks">săptămâni</string>
-    <string name="shortminute">min</string>
+    <string name="shortminute">m</string>
     <string name="shortday">z</string>
 </resources>
diff --git a/shared/src/main/res/values-ru-rRU/strings.xml b/shared/src/main/res/values-ru-rRU/strings.xml
index 823285bb86..9f9658a2ae 100644
--- a/shared/src/main/res/values-ru-rRU/strings.xml
+++ b/shared/src/main/res/values-ru-rRU/strings.xml
@@ -21,8 +21,8 @@
     <string name="unit_hours">час</string>
     <string name="unit_days">дн</string>
     <string name="unit_weeks">нед</string>
-    <string name="shortminute">мин</string>
-    <string name="shortday">дн</string>
+    <string name="shortminute">м</string>
+    <string name="shortday">д</string>
     <string name="later_today">Позднее сегодня</string>
     <string name="tomorrow">Завтра</string>
     <string name="today">Cегодня</string>
diff --git a/shared/src/main/res/values-tr-rTR/strings.xml b/shared/src/main/res/values-tr-rTR/strings.xml
index b457090d83..2ad3b92db1 100644
--- a/shared/src/main/res/values-tr-rTR/strings.xml
+++ b/shared/src/main/res/values-tr-rTR/strings.xml
@@ -21,7 +21,7 @@
     <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="shortminute">d</string>
     <string name="shortday">g</string>
     <string name="later_today">Bugünden sonra</string>
     <string name="tomorrow">Yarın</string>
diff --git a/wear/build.gradle b/wear/build.gradle
index 802c30ddef..e5410ca95a 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -43,7 +43,7 @@ def generateGitBuild = { ->
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 23
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt
index 3b1b8113b8..af60e9e3f3 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/WatchfaceViewAdapter.kt
@@ -70,7 +70,7 @@ class WatchfaceViewAdapter(
     val timePeriod = ds?.timePeriod
     val dayName = ds?.dayName
     val mainMenuTap = ds?.mainMenuTap ?: sP?.mainMenuTap
-    val chartZoomTap = sP?.chartZoomTap
+    val chartZoomTap = ds?.chartZoomTap ?: sP?.chartZoomTap
     val dateTime = ds?.dateTime ?: a2?.dateTime
     // val minuteHand = sP?.minuteHand
     // val secondaryLayout = aL?.secondaryLayout ?: a2?.secondaryLayout ?: aa?.secondaryLayout ?: ds?.secondaryLayout ?: sP?.secondaryLayout
diff --git a/wear/src/main/res/values-da-rDK/strings.xml b/wear/src/main/res/values-da-rDK/strings.xml
index dbb73b2586..cbfc8fc219 100644
--- a/wear/src/main/res/values-da-rDK/strings.xml
+++ b/wear/src/main/res/values-da-rDK/strings.xml
@@ -168,4 +168,22 @@
     <string name="tile_no_config">Ingen konfiguration tilgængelig</string>
     <string name="wear_control_not_enabled">Wear kontrol deaktiveret</string>
     <string name="wear_control_no_data">Ingen data tilgængelig</string>
+    <string name="increment">forøgelse</string>
+    <string name="decrement">formindskelse</string>
+    <string name="first_char_high">H</string>
+    <string name="first_char_low">L</string>
+    <string name="abbreviation_average">gns.</string>
+    <string name="no_iob_u">--IE</string>
+    <string name="no_cob_g">--g</string>
+    <string name="no_tmp_basal_u_h">-.--E/t</string>
+    <string name="uploader_na">Uploader: ---%</string>
+    <string name="no_status">S: ingen status</string>
+    <string name="time_stamp_na_min_ago">-- Minutter siden</string>
+    <string name="delta_na">--- mg/dl</string>
+    <string name="no_loop_status">Ingen Loop Status</string>
+    <string name="cob_000g">000g</string>
+    <string name="svg_00_0" comment="use , or . only">00,0</string>
+    <string name="iob_0_00u">0,00E</string>
+    <string name="snooze_alert">AAPS Snooze Alarm</string>
+    <string name="sending_snooze">Sender snooze til AAPS</string>
 </resources>
diff --git a/wear/src/main/res/values-de-rDE/strings.xml b/wear/src/main/res/values-de-rDE/strings.xml
index b606b31916..cbf731f77e 100644
--- a/wear/src/main/res/values-de-rDE/strings.xml
+++ b/wear/src/main/res/values-de-rDE/strings.xml
@@ -2,6 +2,18 @@
 <resources>
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
+    <string name="label_watchface">AAPS</string>
+    <string name="label_watchface_large">AAPS(groß)</string>
+    <string name="label_watchface_big_chart">AAPS(GroßerGraph)</string>
+    <string name="label_watchface_no_chart">AAPS(KeinGraph)</string>
+    <string name="label_watchface_circle">AAPS(Kreis)</string>
+    <string name="label_watchface_v2">AAPS(v2)</string>
+    <string name="label_watchface_cockpit">AAPS(Cockpit)</string>
+    <string name="label_watchface_steampunk">AAPS(Steampunk)</string>
+    <string name="label_watchface_digital_style">AAPS(DigitalStyle)</string>
+    <string name="label_actions_tile">AAPS(Aktionen)</string>
+    <string name="label_temp_target_tile">AAPS(Temp Target)</string>
+    <string name="label_quick_wizard_tile">AAPS(Quick Wizard)</string>
     <string name="label_warning_sync">Keine Daten!</string>
     <string name="label_warning_old">Veraltete Daten!</string>
     <string name="label_warning_since">Seit %1$s</string>
@@ -45,14 +57,23 @@
     <string name="pref_ring_history">Ring BZ-Historie</string>
     <string name="pref_light_ring_history">Ring BZ-Historie light</string>
     <string name="pref_animations">Animationen</string>
+    <string name="pref_wizard_in_menu">Rechner im Menü</string>
     <string name="pref_prime_in_menu">Befüllung im Menü</string>
     <string name="pref_single_target">Einzelzielwert</string>
+    <string name="pref_wizard_percentage">Rechner Prozentsatz</string>
     <string name="pref_complication_tap_action">Tipp Komplikation</string>
     <string name="pref_unicode_in_complications">Unicode in Komplikationen</string>
     <string name="pref_version">Version:</string>
+    <string name="pref_moreWatchfaceSettings">Weitere Watchface Einstellungen</string>
     <string name="pref_lookInYourWatchfaceConfiguration">Schaue Dir bitte die Watchface-Konfiguration an.</string>
     <string name="menu_tempt">Temp. Ziel</string>
+    <string name="menu_wizard">Rechner</string>
+    <string name="menu_wizard_short">Rechner</string>
+    <string name="menu_treatment">Bolus</string>
+    <string name="menu_treatment_short">Behandl</string>
     <string name="menu_bolus">Bolus</string>
+    <string name="menu_carb">Kohlenhydrate</string>
+    <string name="menu_ecarb">eCarbs</string>
     <string name="menu_settings">Einstellung</string>
     <string name="menu_status">Status</string>
     <string name="menu_resync">Erneut synchronisieren</string>
@@ -60,17 +81,38 @@
     <string name="menu_none">Kein(e)</string>
     <string name="menu_default">Standard</string>
     <string name="menu_menu">Menü</string>
+    <string name="quick_wizard_short">XL</string>
+    <string name="action_duration">Dauer</string>
+    <string name="action_tempt_confirmation">Temp Target angefordert</string>
+    <string name="action_quick_wizard_confirmation">Quick Wizard angefordert</string>
+    <string name="action_treatment_confirmation">Behandlung angefordert</string>
+    <string name="action_bolus_confirmation">Bolus angefordert</string>
+    <string name="action_wizard_confirmation">Berechnung angefordert</string>
+    <string name="action_fill_confirmation">Füllen angefordert</string>
+    <string name="action_ecarb_confirmation">KH angefordert</string>
+    <string name="action_profile_switch_confirmation">Profilwechsel angefordert</string>
+    <string name="action_target" comment="In temp target menu, single target value">Ziel</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">Niedrig</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">Hoch</string>
+    <string name="action_carbs">Kohlenhydrate</string>
+    <string name="action_ecarbs">eCarbs</string>
+    <string name="action_percentage">Prozentsatz</string>
+    <string name="action_start_min">Start [min]</string>
+    <string name="action_duration_h">Dauer [h]</string>
+    <string name="action_insulin">Insulin</string>
     <string name="action_preset_1">Voreinstellung 1</string>
     <string name="action_preset_2">Voreinstellung 2</string>
     <string name="action_preset_3">Voreinstellung 3</string>
     <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Freie Menge</string>
     <string name="action_confirm">BESTÄTIGEN</string>
     <string name="action_timeshift">Zeitverschiebung</string>
+    <string name="action_bolus">Bolus</string>
     <string name="bolus_progress">Bolusabgabe läuft </string>
     <string name="press_to_cancel">Zum Abbrechen drücken</string>
     <string name="cancel_bolus">Bolus löschen </string>
     <string name="status_pump">Pumpe</string>
     <string name="status_loop">Loop</string>
+    <string name="status_profile_switch">Profilwechsel</string>
     <string name="status_tdd">TDD</string>
     <string name="activity_carb">KH</string>
     <string name="activity_IOB">IOB</string>
@@ -117,4 +159,31 @@
     <string name="simple_ui_charging">Während des Ladevorgangs</string>
     <string name="simple_ui_always_on">Immer im Modus</string>
     <string name="simple_ui_always_on_charging">Immer ein und Aufladen</string>
+    <string name="temp_target_eating_soon">Essen</string>
+    <string name="temp_target_hypo">Hypo</string>
+    <string name="temp_target_activity">Aktivität</string>
+    <string name="temp_target_manual">Manuell</string>
+    <string name="temp_target_cancel">Abbrechen</string>
+    <string name="tile_none">Kein(e)</string>
+    <string name="tile_no_config">Keine Konfiguration verfügbar</string>
+    <string name="wear_control_not_enabled">Uhren Steuerung ausgeschaltet</string>
+    <string name="wear_control_no_data">Keine Daten vorhanden</string>
+    <string name="increment">erhöhen</string>
+    <string name="decrement">verringern</string>
+    <string name="first_char_high">H</string>
+    <string name="first_char_low">L</string>
+    <string name="abbreviation_average">Ø</string>
+    <string name="no_iob_u">--IE</string>
+    <string name="no_cob_g">--g</string>
+    <string name="no_tmp_basal_u_h">-.--IE/h</string>
+    <string name="uploader_na">Uploader: ---%</string>
+    <string name="no_status">S: kein Status</string>
+    <string name="time_stamp_na_min_ago">-- Minuten vorher</string>
+    <string name="delta_na">--- mg/dl</string>
+    <string name="no_loop_status">Kein Loop Status</string>
+    <string name="cob_000g">000g</string>
+    <string name="svg_00_0" comment="use , or . only">00,0</string>
+    <string name="iob_0_00u">0,00U</string>
+    <string name="snooze_alert">AAPS Schlummeralarm</string>
+    <string name="sending_snooze">Sende Schlummern an AAPS</string>
 </resources>