diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
index a0981c1b56..889f365ec4 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
@@ -64,23 +64,23 @@ data class UserEntry(
         CALIBRATION (ColorGroup.Careportal),
         PRIME_BOLUS (ColorGroup.Pump),
         TREATMENT (ColorGroup.InsulinTreatment),
-        CAREPORTAL_NS_REFRESH (ColorGroup.Aaps),
-        PROFILE_SWITCH_NS_REFRESH (ColorGroup.Aaps),
-        TREATMENTS_NS_REFRESH (ColorGroup.Aaps),
-        TT_NS_REFRESH (ColorGroup.Aaps),
+        CAREPORTAL_NS_REFRESH (ColorGroup.Careportal),
+        PROFILE_SWITCH_NS_REFRESH (ColorGroup.Profile),
+        TREATMENTS_NS_REFRESH (ColorGroup.InsulinTreatment),
+        TT_NS_REFRESH (ColorGroup.TT),
         AUTOMATION_REMOVED (ColorGroup.Aaps),
         BG_REMOVED (ColorGroup.Aaps),
-        CAREPORTAL_REMOVED (ColorGroup.Aaps),
-        EXTENDED_BOLUS_REMOVED (ColorGroup.Aaps),
+        CAREPORTAL_REMOVED (ColorGroup.Careportal),
+        EXTENDED_BOLUS_REMOVED (ColorGroup.InsulinTreatment),
         FOOD_REMOVED (ColorGroup.CarbTreatment),
         PROFILE_REMOVED (ColorGroup.Profile),
-        PROFILE_SWITCH_REMOVED (ColorGroup.Aaps),
+        PROFILE_SWITCH_REMOVED (ColorGroup.Profile),
         RESTART_EVENTS_REMOVED (ColorGroup.Aaps),
-        TREATMENT_REMOVED (ColorGroup.Aaps),
-        BOLUS_REMOVED (ColorGroup.Aaps),
-        CARBS_REMOVED (ColorGroup.Aaps),
-        TEMP_BASAL_REMOVED (ColorGroup.Aaps),
-        TT_REMOVED (ColorGroup.Aaps),
+        TREATMENT_REMOVED (ColorGroup.InsulinTreatment),
+        BOLUS_REMOVED (ColorGroup.InsulinTreatment),
+        CARBS_REMOVED (ColorGroup.CarbTreatment),
+        TEMP_BASAL_REMOVED (ColorGroup.BasalTreatment),
+        TT_REMOVED (ColorGroup.TT),
         NS_PAUSED (ColorGroup.Aaps),
         NS_RESUME (ColorGroup.Aaps),
         NS_QUEUE_CLEARED (ColorGroup.Aaps),