diff --git a/app/build.gradle b/app/build.gradle
index 77d1bde228..d7f83ead97 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ def generateGitBuild = { ->
         stringBuilder.append('NoGitSystemAvailable')
     }
     stringBuilder.append('-')
-    stringBuilder.append((new Date()).format('yyyy.MM.dd'))
+    stringBuilder.append((new Date()).format('yyyy.MM.dd-HH:mm'))
     stringBuilder.append('"')
     return stringBuilder.toString()
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
index dda2e61006..7b9b8570d6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
@@ -179,10 +179,10 @@ public class FillDialog extends DialogFragment implements OnClickListener {
             }
 
             if (pumpSiteChangeCheckbox.isChecked())
-                confirmMessage.add("" + "<font color='" + MainApp.gc(R.color.high) + "'>" + MainApp.gs(R.string.record_pump_site_change) +  "</font>");
+                confirmMessage.add("" + "<font color='" + MainApp.gc(R.color.actionsConfirm) + "'>" + MainApp.gs(R.string.record_pump_site_change) +  "</font>");
 
             if (insulinCartridgeChangeCheckbox.isChecked())
-                confirmMessage.add("" + "<font color='" + MainApp.gc(R.color.high) + "'>" + MainApp.gs(R.string.record_insulin_cartridge_change) + "</font>");
+                confirmMessage.add("" + "<font color='" + MainApp.gc(R.color.actionsConfirm) + "'>" + MainApp.gs(R.string.record_insulin_cartridge_change) + "</font>");
 
             final String notes = notesEdit.getText().toString();
             if (!notes.isEmpty()) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java
index 8ef6ec2fc6..9974471528 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java
@@ -112,7 +112,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
                 stopPressed = true;
                 stopPressedView.setVisibility(View.VISIBLE);
                 stopButton.setVisibility(View.INVISIBLE);
-                ConfigBuilderPlugin.getActivePump().stopBolusDelivering();
+                ConfigBuilderPlugin.getCommandQueue().cancelAllBoluses();
                 break;
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
index 4360e2ed34..3951b8415f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
@@ -303,21 +303,21 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, C
                 if (currentProfile.getUnits().equals(Constants.MMOL)) {
                     unitLabel = "mmol/l";
                 }
-
-                actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.high) + "'>" + DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + activityTTDuration + " min)</font>");
-
+                actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + activityTTDuration + " min)</font>");
             }
             if (startEatingSoonTTCheckbox.isChecked()) {
                 if (currentProfile.getUnits().equals(Constants.MMOL)) {
-                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.high) + "'>" + DecimalFormatter.to1Decimal(eatingSoonTT) + " mmol/l (" + eatingSoonTTDuration + " min)</font>");
-                } else
-                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.high) + "'>" + DecimalFormatter.to0Decimal(eatingSoonTT) + " mg/dl (" + eatingSoonTTDuration + " min)</font>");
+                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(eatingSoonTT) + " mmol/l (" + eatingSoonTTDuration + " min)</font>");
+                } else {
+                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to0Decimal(eatingSoonTT) + " mg/dl (" + eatingSoonTTDuration + " min)</font>");
+                }
             }
             if (startHypoTTCheckbox.isChecked()) {
                 if (currentProfile.getUnits().equals(Constants.MMOL)) {
-                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.high) + "'>" + DecimalFormatter.to1Decimal(hypoTT) + " mmol/l (" + hypoTTDuration + " min)</font>");
-                } else
-                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.high) + "'>" + DecimalFormatter.to0Decimal(hypoTT) + " mg/dl (" + hypoTTDuration + " min)</font>");
+                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(hypoTT) + " mmol/l (" + hypoTTDuration + " min)</font>");
+                } else {
+                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to0Decimal(hypoTT) + " mg/dl (" + hypoTTDuration + " min)</font>");
+                }
             }
 
             int timeOffset = editTime.getValue().intValue();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java
index 875d207352..c4aba7004a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java
@@ -217,9 +217,9 @@ public class NewInsulinDialog extends DialogFragment implements OnClickListener
 
             if (startEatingSoonTTCheckbox.isChecked()) {
                 if (currentProfile.getUnits().equals(Constants.MMOL)) {
-                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.high) + "'>" + DecimalFormatter.to1Decimal(eatingSoonTT) + " mmol/l (" + eatingSoonTTDuration + " min)</font>");
+                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to1Decimal(eatingSoonTT) + " mmol/l (" + eatingSoonTTDuration + " min)</font>");
                 } else
-                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.high) + "'>" + DecimalFormatter.to0Decimal(eatingSoonTT) + " mg/dl (" + eatingSoonTTDuration + " min)</font>");
+                    actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "<font color='" + MainApp.gc(R.color.tempTargetConfirmation) + "'>" + DecimalFormatter.to0Decimal(eatingSoonTT) + " mg/dl (" + eatingSoonTTDuration + " min)</font>");
             }
 
             int timeOffset = editTime.getValue().intValue();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
index 3cf4557e54..eb06d4055d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
@@ -56,6 +56,7 @@ import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
 import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory;
 import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest;
 import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd;
+import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.CommandQueue;
@@ -421,9 +422,6 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         return pump.basalProfile.hourlyRates[currentHour];
     }
 
-    private static BolusProgressReporter nullBolusProgressReporter = (state, percent, delivered) -> {
-    };
-
     private static BolusProgressReporter bolusProgressReporter = (state, percent, delivered) -> {
         EventOverviewBolusProgress event = EventOverviewBolusProgress.getInstance();
         switch (state) {
@@ -549,12 +547,14 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
                 return new PumpEnactResult().success(true).enacted(false);
             }
 
-            BolusProgressReporter progressReporter = detailedBolusInfo.isSMB ? nullBolusProgressReporter : bolusProgressReporter;
+            Treatment treatment = new Treatment();
+            treatment.isSMB = detailedBolusInfo.isSMB;
+            EventOverviewBolusProgress.getInstance().t = treatment;
 
             // start bolus delivery
             scripterIsBolusing = true;
             runCommand(null, 0,
-                    () -> ruffyScripter.deliverBolus(detailedBolusInfo.insulin, progressReporter));
+                    () -> ruffyScripter.deliverBolus(detailedBolusInfo.insulin, bolusProgressReporter));
             scripterIsBolusing = false;
 
             // Note that the result of the issued bolus command is not checked. If there was
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
index d2fd2a5e24..cc28eb28a0 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
@@ -213,6 +213,12 @@ public class CommandQueue {
         return true;
     }
 
+    public synchronized void cancelAllBoluses() {
+        removeAll(Command.CommandType.BOLUS);
+        removeAll(Command.CommandType.SMB_BOLUS);
+        ConfigBuilderPlugin.getActivePump().stopBolusDelivering();
+    }
+
     // returns true if command is queued
     public boolean tempBasalAbsolute(double absoluteRate, int durationInMinutes, boolean enforceNew, Profile profile, Callback callback) {
         if (!enforceNew && isRunning(Command.CommandType.TEMPBASAL)) {
diff --git a/app/src/main/java/info/nightscout/utils/T.java b/app/src/main/java/info/nightscout/utils/T.java
index ce8541dd8c..99f4e573c3 100644
--- a/app/src/main/java/info/nightscout/utils/T.java
+++ b/app/src/main/java/info/nightscout/utils/T.java
@@ -7,6 +7,12 @@ package info.nightscout.utils;
 public class T {
     private long time; // in msec
 
+    public static T now() {
+        T t = new T();
+        t.time = System.currentTimeMillis();
+        return t;
+    }
+
     public static T msecs(long msec) {
         T t = new T();
         t.time = msec;
@@ -56,4 +62,12 @@ public class T {
     public long days() {
         return time / 24 / 60 / 60 / 1000L;
     }
+
+    public T plus(T plus) {
+        return T.msecs(time + plus.time);
+    }
+
+    public T minus(T minus) {
+        return T.msecs(time - minus.time);
+    }
 }
diff --git a/app/src/main/res/layout/actions_fill_dialog.xml b/app/src/main/res/layout/actions_fill_dialog.xml
index 2883485bf7..21fb5d3c66 100644
--- a/app/src/main/res/layout/actions_fill_dialog.xml
+++ b/app/src/main/res/layout/actions_fill_dialog.xml
@@ -11,27 +11,24 @@
         android:padding="10dp">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:orientation="horizontal">
 
             <ImageView
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:padding="5dp"
                 android:src="@drawable/icon_cp_pump_canula" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingBottom="10dp"
-                android:paddingLeft="15dp"
-                android:paddingRight="15dp"
-                android:paddingTop="10dp"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:text="@string/primefill"
-                android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:textColor="@color/colorInsulinButton" />
 
diff --git a/app/src/main/res/layout/overview_calibration_dialog.xml b/app/src/main/res/layout/overview_calibration_dialog.xml
index 3a51ecec3c..85f8e82317 100644
--- a/app/src/main/res/layout/overview_calibration_dialog.xml
+++ b/app/src/main/res/layout/overview_calibration_dialog.xml
@@ -11,8 +11,8 @@
         android:layout_height="match_parent">
 
         <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="10dp">
 
@@ -20,10 +20,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:padding="10dp"
-                android:text="@string/overview_calibration_bg_label"
+                android:text="@string/overview_calibration"
+                android:textColor="@color/colorCalibrationButton"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="5dp"
+                android:src="@drawable/icon_calibration" />
+
             <TextView
                 android:id="@+id/overview_calibration_units"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/overview_newcarbs_dialog.xml b/app/src/main/res/layout/overview_newcarbs_dialog.xml
index dff7dabf15..9df434f2ea 100644
--- a/app/src/main/res/layout/overview_newcarbs_dialog.xml
+++ b/app/src/main/res/layout/overview_newcarbs_dialog.xml
@@ -20,28 +20,25 @@
             android:padding="10dp">
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:orientation="horizontal">
 
                 <ImageView
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:padding="5dp"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:src="@drawable/icon_cp_bolus_carbs" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingBottom="10dp"
-                    android:paddingLeft="15dp"
-                    android:paddingRight="15dp"
-                    android:paddingTop="10dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
                     android:text="@string/carbs"
-                    android:textAlignment="center"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
                     android:textColor="@color/colorCarbsButton" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/overview_newinsulin_dialog.xml b/app/src/main/res/layout/overview_newinsulin_dialog.xml
index 8103f4378b..e4647fac38 100644
--- a/app/src/main/res/layout/overview_newinsulin_dialog.xml
+++ b/app/src/main/res/layout/overview_newinsulin_dialog.xml
@@ -17,26 +17,23 @@
             android:padding="10dp">
 
             <LinearLayout
-                android:layout_width="match_parent"
+            android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:orientation="horizontal">
 
                 <ImageView
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:padding="5dp"
+                android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:src="@drawable/icon_bolus" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingBottom="10dp"
-                    android:paddingLeft="15dp"
-                    android:paddingRight="15dp"
-                    android:paddingTop="10dp"
-                    android:textAlignment="center"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
                     android:text="@string/overview_insulin_label"
                     android:textAppearance="?android:attr/textAppearanceLarge"
                     android:textColor="@color/colorInsulinButton" />
@@ -59,7 +56,7 @@
                     android:id="@+id/newinsulin_record_only"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="@string/don_t_bolus_record_only" />
+                    android:text="@string/do_not_bolus_record_only" />
 
             </LinearLayout>
 
@@ -124,6 +121,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:layout_marginRight="5dp"
                     android:text="@string/insulin_unit_shortname" />
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/overview_newtreatment_dialog.xml b/app/src/main/res/layout/overview_newtreatment_dialog.xml
index a332cece9a..348c182a7a 100644
--- a/app/src/main/res/layout/overview_newtreatment_dialog.xml
+++ b/app/src/main/res/layout/overview_newtreatment_dialog.xml
@@ -29,7 +29,7 @@
                 android:id="@+id/newtreatment_record_only"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:text="@string/don_t_bolus_record_only" />
+                android:text="@string/do_not_bolus_record_only" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index adf1ed3b6c..2a473d49b9 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -810,7 +810,7 @@
     <string name="data_choices">Избор на данни</string>
     <string name="allow_automated_crash_reporting">Позволява автоматично изпращане на данни за грешки и статистически данни до разработчиците чрез fabric.io service.</string>
     <string name="g5appnotdetected">Моля обновете G5 приложението до поддържана версия.</string>
-    <string name="don_t_bolus_record_only">Не доставяй болус, само запис</string>
+    <string name="do_not_bolus_record_only">Не доставяй болус, само запис</string>
     <string name="category">Категория</string>
     <string name="subcategory">Подкатегория</string>
     <string name="bolusrecordedonly">Болусът ще бъде само записан</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d4b1a0f9dc..bfe0605b44 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -810,7 +810,7 @@
     <string name="start_eating_soon_tt">Spustit Dočasný cíl Blížící se jídlo</string>
     <string name="temptargetshort">DoCíl</string>
     <string name="insight_min">min</string>
-    <string name="don_t_bolus_record_only">Nepouštět bolus, jen zaznamenat</string>
+    <string name="do_not_bolus_record_only">Nepouštět bolus, jen zaznamenat</string>
     <string name="subcategory">Podkategorie</string>
     <string name="category">Kategorie</string>
     <string name="bolusrecordedonly">Bolus bude pouze zaznamenán</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9d990334ff..10d46dd495 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -797,4 +797,6 @@
     <string name="connectionsettings_title">Verbindungs-Einstellungen</string>
     <string formatted="false" name="objectivenotstarted">Zielsetzung %d nicht gestartet</string>
     <string formatted="false" name="objectivenotfinished">Zielsetzung %d nicht abgeschlossen</string>
+    <string name="do_not_bolus_record_only">Bolus nur erfassen</string>
+    <string name="bolusrecordedonly">Bolus wird nur erfasst</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a39ab1ce48..dc96612c1c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -744,7 +744,7 @@
     <string name="bolusrecordedonly">El Bolo solo será anotado</string>
     <string name="category">Categoría</string>
     <string name="subcategory">Subcategoría</string>
-    <string name="don_t_bolus_record_only">No administrar Bolo, solo anotar</string>
+    <string name="do_not_bolus_record_only">No administrar Bolo, solo anotar</string>
     <string name="insight_min">min</string>
     <string name="temptargetshort">TT</string>
     <string name="start_activity_tt">Inicio TT Actividad</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 6a32c1dd18..684a401a30 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -557,7 +557,7 @@
     <string name="careportal_sensorage_label">Czas sensora</string>
     <string name="careportal_canulaage_label">Czas wkłucia</string>
     <string name="careportal_insulinage_label">Czas insuliny</string>
-    <string name="hours">godziny</string>
+    <string name="hours">godzin</string>
     <string name="overview_newtempbasal_basaltype_label">Typ bazy</string>
     <string name="invalidprofile">Nieważny profil !!!</string>
     <string name="profileswitch">ZmieńProfil</string>
@@ -835,7 +835,7 @@
     <string name="start_activity_tt">Rozpocznij TT Ćwiczenia</string>
     <string name="start_eating_soon_tt">Rozpocznij TT WkrótcePosiłek</string>
     <string name="temptargetshort">TT</string>
-    <string name="don_t_bolus_record_only">Nie podawaj bolusa, tylko zapisz rekord</string>
+    <string name="do_not_bolus_record_only">Nie podawaj bolusa, tylko zapisz rekord</string>
     <string name="category">Kategoria</string>
     <string name="subcategory">Podkategoria</string>
     <string name="bolusrecordedonly">Bolus zostanie tylko zapisany w rekordach</string>
@@ -934,4 +934,4 @@
     <string name="wear_wizard_settings_summary">Obliczenia uwzględnione w wynikach kreatora:</string>
     <string name="wear_display_settings">Ustawienia wyświetlania</string>
     <string name="wear_general_settings">Ustawienia ogólne</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 0c7c0bb55e..520ad59437 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -53,19 +53,19 @@
     <string name="careportal_newnstreatment_carbs_label">KH</string>
     <string name="careportal_newnstreatment_carbtime_label">KH-tid</string>
     <string name="careportal_newnstreatment_duration_label">Duration</string>
-    <string name="careportal_newnstreatment_enteredby_title">Infört av</string>
+    <string name="careportal_newnstreatment_enteredby_title">Loggat av</string>
     <string name="careportal_newnstreatment_eventtime_label">Tid</string>
     <string name="careportal_newnstreatment_eventtype">Händelsetyp</string>
     <string name="careportal_newnstreatment_insulin_label">Insulin</string>
     <string name="careportal_newnstreatment_meter">Mätare</string>
-    <string name="careportal_newnstreatment_notes_label">Notering</string>
+    <string name="careportal_newnstreatment_notes_label">Anteckning</string>
     <string name="careportal_newnstreatment_other">Annat</string>
     <string name="careportal_newnstreatment_percent_label">Procent</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
     <string name="careportal_newnstreatment_split_label">Delad</string>
-    <string name="careportal_note">Notering</string>
-    <string name="careportal_openapsoffline">Offline</string>
+    <string name="careportal_note">Anteckning</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
     <string name="careportal_pbage_label">Pumpbatteri ålder</string>
     <string name="careportal_profileswitch">Byt profil</string>
     <string name="careportal_pumpsitechange">Byte pumpkanyl</string>
@@ -89,7 +89,7 @@
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_bgsource">BG-källa</string>
     <string name="configbuilder_constraints">Begränsningar</string>
-    <string name="configbuilder_general">Generell</string>
+    <string name="configbuilder_general">Generella inställningar</string>
     <string name="configbuilder_insulin">Insulin</string>
     <string name="configbuilder_loop">Loop</string>
     <string name="configbuilder_nightscoutversion_label">Nightscoutversion:</string>
@@ -229,7 +229,7 @@
     <string name="nav_export">Exportera inställningar</string>
     <string name="nav_import">Importera inställningar</string>
     <string name="nav_preferences">Inställningar</string>
-    <string name="nav_refreshtreatments">Uppdatera behandlingar från NS</string>
+    <string name="nav_refreshtreatments">Uppdatera från Nightscout</string>
     <string name="nav_resetdb">Återställ databaserna</string>
     <string name="nav_show_logcat">Visa logg</string>
     <string name="nav_test_alert">Testa alarm</string>
@@ -243,10 +243,10 @@
     <string name="nosuccess">misslyckat - kontrollera telefonen</string>
     <string name="notavailable">Ej tillgängligt</string>
     <string name="nowritepermission">NS Client har inga skrivrättigheter. Fel API secret?</string>
-    <string name="ns_alarmoptions">Alarm inställningar</string>
+    <string name="ns_alarmoptions">Larminställningar</string>
     <string name="ns_localbroadcasts">Slå på sändning av data till alla appar i telefonen (ex xDrip).</string>
     <string name="ns_localbroadcasts_title">Aktivera lokala broadcasts</string>
-    <string name="ns_logappstartedevent">Markera app start till Nightscout</string>
+    <string name="ns_logappstartedevent">Markera appstart till Nightscout</string>
     <string name="ns_noupload">Ingen uppladdning till Nightscout</string>
     <string name="ns_noupload_summary">Ingen data sänds till Nightscout. AAPS ansluter till Nightscout men inga ändringar görs i Nightscout.</string>
     <string name="ns_sync_use_absolute_title">Använd alltid absoluta värden i basal</string>
@@ -254,19 +254,19 @@
     <string name="ns_upload_only_summary">Endast uppladdning till Nightscout. Kommer inte få BG-data om inte lokal källa som xDrip används. Kommer heller inte att kunna hämta basalprofiler från Nightscout.</string>
     <string name="nsalarm_high">Hög</string>
     <string name="nsalarm_low">Låg</string>
-    <string name="nsalarm_staledata">Gammal data</string>
+    <string name="nsalarm_staledata">BG-data saknas</string>
     <string name="nsclient">NSClient</string>
     <string name="nsclientinternal_devicename_dialogtitle">Ange enhetens namn</string>
     <string name="nsclientinternal_devicename_title">Enhetens namn</string>
-    <string name="nsclientinternal_secret_dialogmessage">Ange NS API secret (min 12 tecken)</string>
-    <string name="nsclientinternal_secret_dialogtitle">NS API secret</string>
+    <string name="nsclientinternal_secret_dialogmessage">Ange Nightscout API secret (min 12 tecken)</string>
+    <string name="nsclientinternal_secret_dialogtitle">Nightscout API secret</string>
     <string name="nsclientnotinstalled">NSClient är inte installerad. Data förlorad!</string>
     <string name="nsclientinternal_url_title">Nightscout URL</string>
     <string name="nsclientinternal_url_dialogmessage">Ange Nightscout URL</string>
     <string name="nsclientinternal_url">URL:</string>
     <string name="nsclientinternal_title">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
-    <string name="nsclientinternal_secret_title">NS API secret</string>
+    <string name="nsclientinternal_secret_title">Nightscout API secret</string>
     <string name="nsprofileview_activeprofile_label">Aktiv profil</string>
     <string name="nsprofileview_basal_label">Basal</string>
     <string name="nsprofileview_dia_label">DIA</string>
@@ -318,7 +318,7 @@
     <string name="unsupportedclientver">Osupportad version av NSClient</string>
     <string name="unlock_settings">Lås upp inställningar</string>
     <string name="units">Enheter:</string>
-    <string name="treatmentssafety_title">Säkerhet vid behandling</string>
+    <string name="treatmentssafety_title">Säkerhetsbegränsingar</string>
     <string name="treatmentssafety_maxcarbs_title">Max tillåtna KH [g]</string>
     <string name="treatmentssafety_maxbolus_title">Max tillåten bolus [E]</string>
     <string name="treatments_wizard_unit_label">E</string>
@@ -333,21 +333,21 @@
     <string name="treatments_shortname">Beh</string>
     <string name="treatments_newtreatment_insulinamount_label">Insulin</string>
     <string name="treatments_newtreatment_carbsamount_label">KH</string>
-    <string name="treatments_iobtotal_label_string">Total IOB:</string>
-    <string name="treatments_iobactivitytotal_label_string">Totalt aktiverat IOB:</string>
+    <string name="treatments_iobtotal_label_string">Total IOB (bolus):</string>
+    <string name="treatments_iobactivitytotal_label_string">Total aktivitet (5m):</string>
     <string name="treatments_iob_label_string">IOB:</string>
     <string name="treatments_insulin_label_string">Insulin:</string>
     <string name="treatments_carbs_label_string">KH:</string>
-    <string name="treatments_activity_string">Redan aktiverat:</string>
+    <string name="treatments_activity_string">5m:</string>
     <string name="treatments">Behandlingar</string>
     <string name="treatmentdeliveryerror">Fel vid bolusleverans</string>
     <string name="temptargetrange_shortname">TT</string>
     <string name="temptarget">Temp mål</string>
     <string name="tempbasals_shortname">TB</string>
     <string name="tempbasals_realduration_label_string">Dur:</string>
-    <string name="tempbasals_netratio_label_string">Kvot:</string>
+    <string name="tempbasals_netratio_label_string">Tot:</string>
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
-    <string name="tempbasals_iobtotal_label_string">Total IOB:</string>
+    <string name="tempbasals_iobtotal_label_string">Total IOB (basal):</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasaldeliveryerror">Fel vid justering av tempbasal</string>
     <string name="tempbasal">Temp basal</string>
@@ -409,19 +409,19 @@
     <string name="resume">Återuppta</string>
     <string name="result">Resultat</string>
     <string name="restartingapp">Avslutar appen för att inställningarna ska läsas in.</string>
-    <string name="restart">Omstart</string>
+    <string name="restart">Starta om</string>
     <string name="reset_db_confirm">Vill du verkligen återställa databaserna?</string>
     <string name="resend_all_data">Uppdatera klockans data</string>
     <string name="removerecord">Ta bort sparad data:</string>
     <string name="reloadprofile">Ladda om profil</string>
-    <string name="refresheventsfromnightscout">Uppdatera händelser från Nightscout</string>
+    <string name="refresheventsfromnightscout">Uppdatera från Nightscout</string>
     <string name="reason">Orsak</string>
     <string name="ratio_short">RAT</string>
     <string name="rate">Hastighet</string>
     <string name="quickwizardsettings">Kalkylatorinställningar</string>
     <string name="quickwizard">Kalkylator</string>
     <string name="queue">Kö:</string>
-    <string name="pumpsuspendedclicktorefresh">Pump pausad. Klicka för ladda om status.</string>
+    <string name="pumpsuspendedclicktorefresh">Pump pausad. Klicka för att ladda om status.</string>
     <string name="pumpsuspended">Pump pausad</string>
     <string name="pumpshutdown">Pump avstängd</string>
     <string name="pumperror">Pumpfel</string>
@@ -457,7 +457,7 @@
     <string name="overview_calibration_bg_label">Kalibrering</string>
     <string name="overview_calibration">Kalibrering</string>
     <string name="overview_calculator_label">Kalkylator</string>
-    <string name="overview_bolusprogress_stoppressed">STOPP NEDTRYCKT</string>
+    <string name="overview_bolusprogress_stoppressed">Stopp nedtryckt</string>
     <string name="overview_bolusprogress_stoped">Stoppad</string>
     <string name="overview_bolusprogress_stop">Stopp</string>
     <string name="overview_bolusprogress_goingtodeliver" formatted="false">Kommer tillföra %.2f enheter</string>
@@ -496,12 +496,13 @@
     <string name="openapsama_autosens_period_summary">Antal timmar för beräkning av känslighet (Absorptionstid för KH är exkluderad).</string>
     <string name="openapsama_autosens_period">Intervall för autosens [tim]</string>
     <string name="openapsama_autosens_max_summary">Standardvärde: 1.2  Med standarvärdet 1.2 kan autosens justera upp dina basaler, kvoter etc med upp till 20% för att kompensera för t ex tillfällig insulinresistens.</string>
-    <string name="openapsama_autosens_adjusttargets_summary">Standardvärde: sant  Detta för att tillåta autosens justera BG målvärden, ISF och basaler.</string>
+    <string name="openapsama_autosens_adjusttargets_summary">Standardvärde: sant. Detta för att tillåta autosens justera mål-BG utöver ISF och basaler.</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens justerar även mål-BG</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="openaps">OpenAPS</string>
     <string name="open_settings_on_wear">Öppna inställningar på klockan</string>
-    <string name="ongoingnotificaction">Konstant infonotis i telefonen</string>
-    <string name="old_data">GAMMAL DATA</string>
+    <string name="ongoingnotificaction">Konstant avisering i telefonen</string>
+    <string name="old_data">Aktuellt BG saknas!</string>
     <string name="ok">OK</string>
     <string name="occlusion">Ocklusion</string>
     <string name="objectives_shortname">Mål</string>
@@ -525,7 +526,7 @@
     <string name="objectives_1_objective">Starta med open loop</string>
     <string name="objectives_1_gate">Starta med open loop och använd det några dagar. Försök att ge många föreslagna temp basaler.</string>
     <string name="absorption_maxtime_summary">Tid i timmar när alla kolhydradet förväntas vara absorberade</string>
-    <string name="absorption_maxtime_title">Max absorptions tid för en måltid [tim]</string>
+    <string name="absorption_maxtime_title">Max absorptionstid för en måltid [tim]</string>
     <string name="absorptionsettings_title">Absorptionsinställningar</string>
     <string name="careportal_pump_label">PUMP</string>
     <string name="careportal_pumpbatterychange">Byte pumpbatteri</string>
@@ -540,7 +541,7 @@
     <string name="lock_screen">Lås skärm</string>
     <string name="lock_screen_short">Lås</string>
     <string name="mmol">mmol/l</string>
-    <string name="minago" formatted="false">%d min sedan</string>
+    <string name="minago" formatted="false">%d&#160;m</string>
     <string name="mgdl">mg/dl</string>
     <string name="mdtp_ok">OK</string>
     <string name="mdi">MDI</string>
@@ -550,9 +551,9 @@
     <string name="overview_newtempbasal_basaltype_label">Basaltyp</string>
     <string name="sensitivity_shortname">SENS</string>
     <string name="sensitivity_warning">Genom att slå på Autosens funktionen, kom ihåg att skriva in alla KH. Annars kommer programmet göra fel i beräkningar av känslighet (ISF)!!</string>
-    <string name="sensitivityaaps">Känslighetsavkänning AAPS</string>
-    <string name="sensitivityoref0">Känslighetsavkänning Oref0</string>
-    <string name="sensitivityweightedaverage">Känslighetsavkänning WeightedAverage</string>
+    <string name="sensitivityaaps">AAPS</string>
+    <string name="sensitivityoref0">Oref0</string>
+    <string name="sensitivityweightedaverage">WeightedAverage</string>
     <string name="settingtempbasal">Ställer in temp basal</string>
     <string name="simpleprofile_shortname">SP</string>
     <string name="sms_actualbg">BG:</string>
@@ -560,12 +561,12 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="sms_delta">Delta:</string>
     <string name="sms_iob">IOB:</string>
-    <string name="sms_minago" formatted="false">%d min sedan</string>
-    <string name="nsalarm_staledatavalue_label">Tröskelvärde för \"Gammal data\" [min]</string>
-    <string name="nsalarm_urgent_staledatavalue_label">Tröskelvärde för \"Väldigt gammal data\" [min]</string>
+    <string name="sms_minago" formatted="false">%d min</string>
+    <string name="nsalarm_staledatavalue_label">Första varning efter [min]</string>
+    <string name="nsalarm_urgent_staledatavalue_label">Akut varning efter [min]</string>
     <string name="nsalarm_urgenthigh">Akut hög</string>
     <string name="nsalarm_urgentlow">Akut låg</string>
-    <string name="nsalarm_urgentstaledata">Väldigt gammal data</string>
+    <string name="nsalarm_urgentstaledata">BG-data saknas (akut larm)</string>
     <string name="app_name">AndroidAPS</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="overview_newtempbasal_basalpercent">Basal [%]</string>
@@ -586,7 +587,7 @@
     <string name="danar_model">Modell: %02X Protokoll: %02X Kod: %02X</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">"Standardvärde: 4  Detta är en grundsten i OpenAPS säkerhet. Detta begränsar dina tempbasaler till maximalt 4x din nuvarande basal, oberoende av din max basalhastighet. Detta för att undvika att man av misstag gör farliga inställningar. Om man når taket i denna inställning så kanske ändringar i andra inställningar behövs. De flesta behöver inte ändra denna inställning. "</string>
     <string name="openapsama_autosens_min_summary">Standardvärde: 0.7  Med standardvärdet 0.7 kan autosens justera ner dina basaler, kvoter etc med upp till 30% för att kompensera för t ex tillfällig hög insulinkänslighet.</string>
-    <string name="nsclientinternal_devicename_dialogmessage">"Det kommer att användas för att ange \"Inmatat av: \". "</string>
+    <string name="nsclientinternal_devicename_dialogmessage">"Det kommer att användas för att ange \"Loggat av: \". "</string>
     <string name="batteryoptimalizationerror">Enheten verkar inte stöda vitlistning av appar för batteriförbrukning</string>
     <string name="pleaseallowpermission">Tillåt</string>
     <string name="needwhitelisting">%s behöver kunna kringgå batterisparfunktionerna för att fungera korrekt</string>
@@ -638,7 +639,7 @@
     <string name="wearcontrol_title">Kontroller från klockan</string>
     <string name="wearcontrol_summary">Sätt tempmål och ange behandlingar från klockan.</string>
     <string name="connectiontimedout">Anslutningen tog för lång tid</string>
-    <string name="food">Mat</string>
+    <string name="food">Matdatabas</string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Pr</string>
@@ -676,7 +677,7 @@
     <string name="positiveonly">Endast positiva</string>
     <string name="negativeonly">Endast negativa</string>
     <string name="overview_editquickwizard_usecob">Använd COB</string>
-    <string name="overview_editquickwizard_usetemptarget">Använd tempmål</string>
+    <string name="overview_editquickwizard_usetemptarget">Använd temp mål</string>
     <string name="loopenabled">Loop aktiverad</string>
     <string name="apsselected">APS vald</string>
     <string name="nsclienthaswritepermission">NSClient har skrivrättigheter</string>
@@ -813,7 +814,7 @@
     <string name="g5appnotdetected">Vänligen uppdatera din G5-app till en supportad version</string>
     <string name="start_activity_tt">Starta \"Träning\"</string>
     <string name="start_eating_soon_tt">Starta \"Äta snart\"</string>
-    <string name="don_t_bolus_record_only">Ge ingen bolus, logga bara</string>
+    <string name="do_not_bolus_record_only">Ge ingen bolus, logga bara</string>
     <string name="category">Kategori</string>
     <string name="subcategory">Underkategori</string>
     <string name="bolusrecordedonly">Bolusen sparas bara i loggboken</string>
@@ -868,7 +869,7 @@
     <string name="unsafeusage">osäker användning</string>
     <string name="readstatusfailed">Statuskontroll misslyckad</string>
     <string name="record_pump_site_change">Logga byte av kanyl</string>
-    <string name="record_insulin_cartridge_change">Logga byte a insulinreservoar</string>
+    <string name="record_insulin_cartridge_change">Logga byte av insulinreservoar</string>
     <string name="smbalwaysdisabled">SMB Alltid På och SMB Efter Kolhydrater är inaktiverat pga att den aktiva BG-källan inte stöder avancerad filtrering</string>
     <string name="smbnotallowedinopenloopmode">SMB inte tillåtet i Open Loop</string>
     <string name="food_short">Mat</string>
@@ -885,7 +886,7 @@
     <string name="absorption_cutoff_title">Max absorptionstid för kolhydrater [tim]</string>
     <string name="absorption_cutoff_summary">Efter denna tid anses alla kolhydrater vara absorberade. Om det fortfarande finns COB, kommer dessa att tas bort ur beräkningen.</string>
     <string name="time">Tid</string>
-    <string name="overview_show_notes_field_in_dialogs_title">Visa noteringsrutan i behandlingsdialogerna</string>
+    <string name="overview_show_notes_field_in_dialogs_title">Visa anteckningar i behandlingsdialogerna</string>
     <string name="boluserrorcode">Angivet: %.2f enheter. Levererat: %.2f enheter. Felkod: %d</string>
     <string name="firstinsulinincrement">Första snabbknabben för insulin</string>
     <string name="secondinsulinincrement">Andra snabbknabben för insulin</string>
@@ -925,4 +926,9 @@
     <string name="careportal_carbsandbolus_label">KOLHYDRATER &amp; BOLUS</string>
     <string name="careportal_cgm_label">CGM &amp; LOGGNING</string>
     <string name="othersettings_title">Övrigt</string>
+    <string name="combo_pump_state_initializing">Initierar</string>
+    <string name="smbmaxminutes_summary">Max antal minuter som kan bli SMB</string>
+    <string name="shorthour">t</string>
+    <string name="shortminute">m</string>
+    <string name="danarv2pump">DanaR v2</string>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 32df48e57c..6ae1ed06e1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,6 +14,7 @@
     <color name="inrange">#00FF00</color>
     <color name="low">#FF0000</color>
     <color name="high">#FFFF00</color>
+    <color name="actionsConfirm">#FFFF00</color>
     <color name="listdelimiter">#505050</color>
     <color name="tabBgColor">#f0003f59</color>
     <color name="tabBgColorSelected">#FF33B5E5</color>
@@ -28,6 +29,7 @@
     <color name="defaultbackground">#424242</color>
 
     <color name="tempTargetBackground">#77dd77</color>
+    <color name="tempTargetConfirmation">#77dd77</color>
     <color name="tempTargetDisabledBackground">#303F9F</color>
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a80e75483b..2a8b75f33b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -922,7 +922,7 @@
     <string name="start_activity_tt">Start Activity TT</string>
     <string name="start_eating_soon_tt">Start Eating soon TT</string>
     <string name="temptargetshort">TT</string>
-    <string name="don_t_bolus_record_only">Don\'t bolus, record only</string>
+    <string name="do_not_bolus_record_only">Do not bolus, record only</string>
     <string name="category">Category</string>
     <string name="subcategory">Subcategory</string>
     <string name="bolusrecordedonly">Bolus will be recorded only</string>
diff --git a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java
index c4a73ccd04..dd6493fd66 100644
--- a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java
@@ -156,4 +156,24 @@ public class CommandQueueTest extends CommandQueue {
     public boolean isThisProfileSet(Profile profile) {
         return false;
     }
+
+    @Test
+    public void callingCancelAllBolusesClearsQueue() throws Exception {
+        prepareMock(0d, 0);
+
+        // add normal and SMB-bolus to queue
+        Assert.assertEquals(0, size());
+
+        bolus(new DetailedBolusInfo(), null);
+
+        DetailedBolusInfo smb = new DetailedBolusInfo();
+        smb.isSMB = true;
+        bolus(smb, null);
+
+        Assert.assertEquals(2, size());
+
+        // cancelling all boluses clear all boluses from the queue
+        cancelAllBoluses();
+        Assert.assertEquals(0, size());
+    }
 }
diff --git a/app/src/test/java/info/nightscout/utils/TTest.java b/app/src/test/java/info/nightscout/utils/TTest.java
index ca7bb7cdaf..764754623e 100644
--- a/app/src/test/java/info/nightscout/utils/TTest.java
+++ b/app/src/test/java/info/nightscout/utils/TTest.java
@@ -9,11 +9,11 @@ import org.powermock.modules.junit4.PowerMockRunner;
  * Created by mike on 26.03.2018.
  */
 
-@RunWith(PowerMockRunner.class)
+//@RunWith(PowerMockRunner.class)
 public class TTest {
 
     @Test
-    public void doTests() {
+    public void toUnits() {
         Assert.assertEquals(1, T.msecs(1000).secs());
         Assert.assertEquals(1, T.secs(60).mins());
         Assert.assertEquals(1, T.mins(60).hours());
@@ -21,4 +21,31 @@ public class TTest {
         Assert.assertEquals(24, T.days(1).hours());
         Assert.assertEquals(60000, T.mins(1).msecs());
     }
+
+    @Test
+    public void now() {
+        Assert.assertTrue(Math.abs(T.now().msecs() - System.currentTimeMillis()) < 5000);
+    }
+
+    @Test
+    public void additions() {
+        long nowMsecs = System.currentTimeMillis();
+        T now = T.msecs(nowMsecs);
+
+        Assert.assertEquals(now.plus(T.secs(5)).msecs(), nowMsecs + 5 * 1000);
+        Assert.assertEquals(now.plus(T.mins(5)).msecs(), nowMsecs + 5 * 60 * 1000);
+        Assert.assertEquals(now.plus(T.hours(5)).msecs(), nowMsecs + 5 * 60 * 60 * 1000);
+        Assert.assertEquals(now.plus(T.days(5)).msecs(), nowMsecs + 5 * 24 * 60 * 60 * 1000);
+    }
+
+    @Test
+    public void subtractions() {
+        long nowMsecs = System.currentTimeMillis();
+        T now = T.msecs(nowMsecs);
+
+        Assert.assertEquals(now.minus(T.secs(5)).msecs(), nowMsecs - 5 * 1000);
+        Assert.assertEquals(now.minus(T.mins(5)).msecs(), nowMsecs - 5 * 60 * 1000);
+        Assert.assertEquals(now.minus(T.hours(5)).msecs(), nowMsecs - 5 * 60 * 60 * 1000);
+        Assert.assertEquals(now.minus(T.days(5)).msecs(), nowMsecs - 5 * 24 * 60 * 60 * 1000);
+    }
 }